From 28377a156dbbd20c68b9f3fcab7042509fe43d94 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 11:45:02 +0200 Subject: [PATCH 1/9] feat: cleanup unconfigured applications --- apps/api/src/lib/common.ts | 2 +- .../routes/api/v1/applications/handlers.ts | 37 ++++++++++++++ .../src/routes/api/v1/applications/index.ts | 4 +- apps/api/src/routes/api/v1/handlers.ts | 10 +++- apps/ui/src/routes/_NewResource.svelte | 6 +-- apps/ui/src/routes/index.svelte | 48 +++++++++++++------ package.json | 2 +- 7 files changed, 88 insertions(+), 21 deletions(-) diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index d9cb80a58..e8d12c97e 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -21,7 +21,7 @@ import { scheduler } from './scheduler'; import { supportedServiceTypesAndVersions } from './services/supportedVersions'; import { includeServices } from './services/common'; -export const version = '3.10.11'; +export const version = '3.10.12'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 70c593728..895f69dc5 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -69,6 +69,43 @@ export async function getImages(request: FastifyRequest) { return errorHandler({ status, message }) } } +export async function cleanupUnconfigured(request: FastifyRequest) { + try { + let teamId = request.user.teamId + let applications = await prisma.application.findMany({ + where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, + include: { settings: true, destinationDocker: true, teams: true }, + }); + for (const application of applications) { + if (!application.buildPack || !application.destinationDockerId || !application.branch || (!application.settings?.isBot && !application?.fqdn)) { + if (application?.destinationDockerId && application.destinationDocker?.network) { + const { stdout: containers } = await executeDockerCmd({ + dockerId: application.destinationDocker.id, + command: `docker ps -a --filter network=${application.destinationDocker.network} --filter name=${application.id} --format '{{json .}}'` + }) + if (containers) { + const containersArray = containers.trim().split('\n'); + for (const container of containersArray) { + const containerObj = JSON.parse(container); + const id = containerObj.ID; + await removeContainer({ id, dockerId: application.destinationDocker.id }); + } + } + } + await prisma.applicationSettings.deleteMany({ where: { applicationId: application.id } }); + await prisma.buildLog.deleteMany({ where: { applicationId: application.id } }); + await prisma.build.deleteMany({ where: { applicationId: application.id } }); + await prisma.secret.deleteMany({ where: { applicationId: application.id } }); + await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: application.id } }); + await prisma.applicationConnectedDatabase.deleteMany({ where: { applicationId: application.id } }); + await prisma.application.deleteMany({ where: { id: application.id } }); + } + } + return {} + } catch ({ status, message }) { + return errorHandler({ status, message }) + } +} export async function getApplicationStatus(request: FastifyRequest) { try { const { id } = request.params diff --git a/apps/api/src/routes/api/v1/applications/index.ts b/apps/api/src/routes/api/v1/applications/index.ts index af39e63ce..cece28f84 100644 --- a/apps/api/src/routes/api/v1/applications/index.ts +++ b/apps/api/src/routes/api/v1/applications/index.ts @@ -1,6 +1,6 @@ import { FastifyPluginAsync } from 'fastify'; import { OnlyId } from '../../../../types'; -import { cancelDeployment, checkDNS, checkDomain, checkRepository, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildPack, getBuilds, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getPreviewStatus, getSecrets, getStorages, getUsage, listApplications, loadPreviews, newApplication, restartApplication, restartPreview, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveConnectedDatabase, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication, updatePreviewSecret, updateSecret } from './handlers'; +import { cancelDeployment, checkDNS, checkDomain, checkRepository, cleanupUnconfigured, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildPack, getBuilds, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getPreviewStatus, getSecrets, getStorages, getUsage, listApplications, loadPreviews, newApplication, restartApplication, restartPreview, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveConnectedDatabase, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication, updatePreviewSecret, updateSecret } from './handlers'; import type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuilds, GetImages, RestartPreviewApplication, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, StopPreviewApplication } from './types'; @@ -11,6 +11,8 @@ const root: FastifyPluginAsync = async (fastify): Promise => { fastify.get('/', async (request) => await listApplications(request)); fastify.post('/images', async (request) => await getImages(request)); + fastify.post('/cleanup/unconfigured', async (request) => await cleanupUnconfigured(request)); + fastify.post('/new', async (request, reply) => await newApplication(request, reply)); fastify.get('/:id', async (request) => await getApplication(request)); diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 117bb9d13..815ca3000 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -122,7 +122,7 @@ export async function showDashboard(request: FastifyRequest) { try { const userId = request.user.userId; const teamId = request.user.teamId; - const applications = await prisma.application.findMany({ + let applications = await prisma.application.findMany({ where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, include: { settings: true, destinationDocker: true, teams: true }, }); @@ -143,7 +143,15 @@ export async function showDashboard(request: FastifyRequest) { include: { teams: true }, }); const settings = await listSettings(); + let foundUnconfiguredApplication = false; + for (const application of applications) { + if (!application.buildPack || !application.destinationDockerId || !application.branch || (!application.settings?.isBot && !application?.fqdn)) { + foundUnconfiguredApplication = true + } + } + return { + foundUnconfiguredApplication, applications, databases, services, diff --git a/apps/ui/src/routes/_NewResource.svelte b/apps/ui/src/routes/_NewResource.svelte index e3c494aa3..84e115c5c 100644 --- a/apps/ui/src/routes/_NewResource.svelte +++ b/apps/ui/src/routes/_NewResource.svelte @@ -19,7 +19,7 @@
+ > Create New Resource +
    diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index 03584247a..57cd74baf 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -21,6 +21,7 @@
    -
    +
    + {#if foundUnconfiguredApplication} + + {/if}
    {/if} {#if filtered.applications.length > 0 && applications.length > 0} @@ -559,7 +579,7 @@
    -

    +

    {application.name} {#if application.settings?.isBot}
    -

    +

    {application.name} {#if application.settings?.isBot} BOT
    -

    {service.name}

    +

    {service.name}

    {#if service?.fqdn}

    {service?.fqdn.replace('https://', '').replace('http://', '')}

    @@ -851,7 +871,7 @@
    -

    {service.name}

    +

    {service.name}

    {#if service?.fqdn}

    {service?.fqdn.replace('https://', '').replace('http://', '')}

    @@ -933,7 +953,7 @@
    -

    {database.name}

    +

    {database.name}

    {#if database?.version}

    {database?.version}

    @@ -1010,7 +1030,7 @@
    -

    {database.name}

    +

    {database.name}

    {#if database?.version}

    {database?.version}

    @@ -1129,7 +1149,7 @@
    -

    {source.name}

    +

    {source.name}

    {#if source.teams.length > 0 && source.teams[0]?.name}
    {source.teams[0]?.name}
    {/if} @@ -1218,7 +1238,7 @@
    -

    {source.name}

    +

    {source.name}

    {#if source.teams.length > 0 && source.teams[0]?.name}
    {source.teams[0]?.name}
    {/if} @@ -1292,7 +1312,7 @@ {/if}
    -

    {destination.name}

    +

    {destination.name}

    {#if $appSession.teamId === '0' && destination.remoteVerified === false && destination.remoteEngine}

    Not verified yet

    @@ -1373,7 +1393,7 @@ {/if}
    -

    {destination.name}

    +

    {destination.name}

    {#if $appSession.teamId === '0' && destination.remoteVerified === false && destination.remoteEngine}

    Not verified yet

    diff --git a/package.json b/package.json index 12a7d4a11..8c4799c7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.10.11", + "version": "3.10.12", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 683b8c966fa8d94e568d75fd96f8255b50c91af2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 28 Sep 2022 15:41:20 +0200 Subject: [PATCH 2/9] feat: cleanup unconfigured services and databases --- apps/api/src/lib/services/handlers.ts | 4 +- .../routes/api/v1/applications/handlers.ts | 4 +- .../src/routes/api/v1/applications/index.ts | 4 +- .../src/routes/api/v1/databases/handlers.ts | 24 ++++++++ apps/api/src/routes/api/v1/databases/index.ts | 4 +- apps/api/src/routes/api/v1/handlers.ts | 16 ++++- .../src/routes/api/v1/services/handlers.ts | 27 +++++++++ apps/api/src/routes/api/v1/services/index.ts | 3 + .../src/routes/databases/[id]/__layout.svelte | 1 - apps/ui/src/routes/index.svelte | 58 +++++++++++++++++-- 10 files changed, 130 insertions(+), 15 deletions(-) diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts index e951004fa..ee9ab88ec 100644 --- a/apps/api/src/lib/services/handlers.ts +++ b/apps/api/src/lib/services/handlers.ts @@ -1883,11 +1883,11 @@ async function stopServiceContainers(request: FastifyRequest) if (destinationDockerId) { await executeDockerCmd({ dockerId: destinationDockerId, - command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}|xargs -n 1 docker stop -t 0` + command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}|xargs -r -n 1 docker stop -t 0` }) await executeDockerCmd({ dockerId: destinationDockerId, - command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}|xargs -n 1 docker rm --force` + command: `docker ps -a --filter 'label=com.docker.compose.project=${id}' --format {{.ID}}|xargs -r -n 1 docker rm --force` }) return {} } diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index 895f69dc5..fb5ea386c 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -69,9 +69,9 @@ export async function getImages(request: FastifyRequest) { return errorHandler({ status, message }) } } -export async function cleanupUnconfigured(request: FastifyRequest) { +export async function cleanupUnconfiguredApplications(request: FastifyRequest) { try { - let teamId = request.user.teamId + const teamId = request.user.teamId let applications = await prisma.application.findMany({ where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, include: { settings: true, destinationDocker: true, teams: true }, diff --git a/apps/api/src/routes/api/v1/applications/index.ts b/apps/api/src/routes/api/v1/applications/index.ts index cece28f84..26e7ff16a 100644 --- a/apps/api/src/routes/api/v1/applications/index.ts +++ b/apps/api/src/routes/api/v1/applications/index.ts @@ -1,6 +1,6 @@ import { FastifyPluginAsync } from 'fastify'; import { OnlyId } from '../../../../types'; -import { cancelDeployment, checkDNS, checkDomain, checkRepository, cleanupUnconfigured, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildPack, getBuilds, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getPreviewStatus, getSecrets, getStorages, getUsage, listApplications, loadPreviews, newApplication, restartApplication, restartPreview, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveConnectedDatabase, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication, updatePreviewSecret, updateSecret } from './handlers'; +import { cancelDeployment, checkDNS, checkDomain, checkRepository, cleanupUnconfiguredApplications, deleteApplication, deleteSecret, deleteStorage, deployApplication, getApplication, getApplicationLogs, getApplicationStatus, getBuildIdLogs, getBuildPack, getBuilds, getGitHubToken, getGitLabSSHKey, getImages, getPreviews, getPreviewStatus, getSecrets, getStorages, getUsage, listApplications, loadPreviews, newApplication, restartApplication, restartPreview, saveApplication, saveApplicationSettings, saveApplicationSource, saveBuildPack, saveConnectedDatabase, saveDeployKey, saveDestination, saveGitLabSSHKey, saveRepository, saveSecret, saveStorage, stopApplication, stopPreviewApplication, updatePreviewSecret, updateSecret } from './handlers'; import type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuilds, GetImages, RestartPreviewApplication, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, StopPreviewApplication } from './types'; @@ -11,7 +11,7 @@ const root: FastifyPluginAsync = async (fastify): Promise => { fastify.get('/', async (request) => await listApplications(request)); fastify.post('/images', async (request) => await getImages(request)); - fastify.post('/cleanup/unconfigured', async (request) => await cleanupUnconfigured(request)); + fastify.post('/cleanup/unconfigured', async (request) => await cleanupUnconfiguredApplications(request)); fastify.post('/new', async (request, reply) => await newApplication(request, reply)); diff --git a/apps/api/src/routes/api/v1/databases/handlers.ts b/apps/api/src/routes/api/v1/databases/handlers.ts index 16d43205c..48a29a900 100644 --- a/apps/api/src/routes/api/v1/databases/handlers.ts +++ b/apps/api/src/routes/api/v1/databases/handlers.ts @@ -51,6 +51,30 @@ export async function newDatabase(request: FastifyRequest, reply: FastifyReply) return errorHandler({ status, message }) } } +export async function cleanupUnconfiguredDatabases(request: FastifyRequest) { + try { + const teamId = request.user.teamId; + let databases = await prisma.database.findMany({ + where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, + include: { settings: true, destinationDocker: true, teams: true }, + }); + for (const database of databases) { + if (!database?.version) { + const { id } = database; + if (database.destinationDockerId) { + const everStarted = await stopDatabaseContainer(database); + if (everStarted) await stopTcpHttpProxy(id, database.destinationDocker, database.publicPort); + } + await prisma.databaseSettings.deleteMany({ where: { databaseId: id } }); + await prisma.databaseSecret.deleteMany({ where: { databaseId: id } }); + await prisma.database.delete({ where: { id } }); + } + } + return {} + } catch ({ status, message }) { + return errorHandler({ status, message }) + } +} export async function getDatabaseStatus(request: FastifyRequest) { try { const { id } = request.params; diff --git a/apps/api/src/routes/api/v1/databases/index.ts b/apps/api/src/routes/api/v1/databases/index.ts index 8f269c8b5..65f0d58f4 100644 --- a/apps/api/src/routes/api/v1/databases/index.ts +++ b/apps/api/src/routes/api/v1/databases/index.ts @@ -1,5 +1,5 @@ import { FastifyPluginAsync } from 'fastify'; -import { deleteDatabase, deleteDatabaseSecret, getDatabase, getDatabaseLogs, getDatabaseSecrets, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSecret, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers'; +import { cleanupUnconfiguredDatabases, deleteDatabase, deleteDatabaseSecret, getDatabase, getDatabaseLogs, getDatabaseSecrets, getDatabaseStatus, getDatabaseTypes, getDatabaseUsage, getVersions, listDatabases, newDatabase, saveDatabase, saveDatabaseDestination, saveDatabaseSecret, saveDatabaseSettings, saveDatabaseType, saveVersion, startDatabase, stopDatabase } from './handlers'; import type { OnlyId } from '../../../../types'; @@ -12,6 +12,8 @@ const root: FastifyPluginAsync = async (fastify): Promise => { fastify.get('/', async (request) => await listDatabases(request)); fastify.post('/new', async (request, reply) => await newDatabase(request, reply)); + fastify.post('/cleanup/unconfigured', async (request) => await cleanupUnconfiguredDatabases(request)); + fastify.get('/:id', async (request) => await getDatabase(request)); fastify.post('/:id', async (request, reply) => await saveDatabase(request, reply)); fastify.delete('/:id', async (request) => await deleteDatabase(request)); diff --git a/apps/api/src/routes/api/v1/handlers.ts b/apps/api/src/routes/api/v1/handlers.ts index 815ca3000..c57766ed6 100644 --- a/apps/api/src/routes/api/v1/handlers.ts +++ b/apps/api/src/routes/api/v1/handlers.ts @@ -143,15 +143,29 @@ export async function showDashboard(request: FastifyRequest) { include: { teams: true }, }); const settings = await listSettings(); + let foundUnconfiguredApplication = false; for (const application of applications) { if (!application.buildPack || !application.destinationDockerId || !application.branch || (!application.settings?.isBot && !application?.fqdn)) { foundUnconfiguredApplication = true } } - + let foundUnconfiguredService = false; + for (const service of services) { + if (!service.fqdn) { + foundUnconfiguredService = true + } + } + let foundUnconfiguredDatabase = false; + for (const database of databases) { + if (!database.version) { + foundUnconfiguredDatabase = true + } + } return { foundUnconfiguredApplication, + foundUnconfiguredDatabase, + foundUnconfiguredService, applications, databases, services, diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts index 2207841d2..2dcc434b6 100644 --- a/apps/api/src/routes/api/v1/services/handlers.ts +++ b/apps/api/src/routes/api/v1/services/handlers.ts @@ -36,6 +36,33 @@ export async function newService(request: FastifyRequest, reply: FastifyReply) { return errorHandler({ status, message }) } } +export async function cleanupUnconfiguredServices(request: FastifyRequest) { + try { + const teamId = request.user.teamId; + let services = await prisma.service.findMany({ + where: { teams: { some: { id: teamId === "0" ? undefined : teamId } } }, + include: { destinationDocker: true, teams: true }, + }); + for (const service of services) { + if (!service.fqdn) { + if (service.destinationDockerId) { + await executeDockerCmd({ + dockerId: service.destinationDockerId, + command: `docker ps -a --filter 'label=com.docker.compose.project=${service.id}' --format {{.ID}}|xargs -r -n 1 docker stop -t 0` + }) + await executeDockerCmd({ + dockerId: service.destinationDockerId, + command: `docker ps -a --filter 'label=com.docker.compose.project=${service.id}' --format {{.ID}}|xargs -r -n 1 docker rm --force` + }) + } + await removeService({ id: service.id }); + } + } + return {} + } catch ({ status, message }) { + return errorHandler({ status, message }) + } +} export async function getServiceStatus(request: FastifyRequest) { try { const teamId = request.user.teamId; diff --git a/apps/api/src/routes/api/v1/services/index.ts b/apps/api/src/routes/api/v1/services/index.ts index 17ac60fdd..bd0311b4d 100644 --- a/apps/api/src/routes/api/v1/services/index.ts +++ b/apps/api/src/routes/api/v1/services/index.ts @@ -5,6 +5,7 @@ import { checkService, checkServiceDomain, cleanupPlausibleLogs, + cleanupUnconfiguredServices, deleteService, deleteServiceSecret, deleteServiceStorage, @@ -39,6 +40,8 @@ const root: FastifyPluginAsync = async (fastify): Promise => { fastify.get('/', async (request) => await listServices(request)); fastify.post('/new', async (request, reply) => await newService(request, reply)); + fastify.post('/cleanup/unconfigured', async (request) => await cleanupUnconfiguredServices(request)); + fastify.get('/:id', async (request) => await getService(request)); fastify.post('/:id', async (request, reply) => await saveService(request, reply)); fastify.delete('/:id', async (request) => await deleteService(request)); diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte index 9c8604d25..58daedd82 100644 --- a/apps/ui/src/routes/databases/[id]/__layout.svelte +++ b/apps/ui/src/routes/databases/[id]/__layout.svelte @@ -55,7 +55,6 @@ export let database: any; import { del, get, post } from '$lib/api'; import { t } from '$lib/translations'; - import { goto } from '$app/navigation'; import { page } from '$app/stores'; import { errorNotification, handlerNotFoundLoad } from '$lib/common'; import { appSession, status, isDeploymentEnabled } from '$lib/store'; diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index 57cd74baf..23a6559dd 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -22,6 +22,8 @@
    {/if} {#if (filtered.databases.length > 0 && databases.length > 0) || filtered.otherDatabases.length > 0} -
    -

    Databases

    +
    +

    Databases

    + {#if foundUnconfiguredDatabase} + + {/if}
    {/if} {#if filtered.databases.length > 0 && databases.length > 0} From 4fe436e4d1b16996bd5ebbb1f548ba57da8d8777 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 29 Sep 2022 13:02:10 +0200 Subject: [PATCH 3/9] fix: dashboard statuses --- apps/ui/src/routes/index.svelte | 49 ++++++++++++--------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte index 23a6559dd..acba143c4 100644 --- a/apps/ui/src/routes/index.svelte +++ b/apps/ui/src/routes/index.svelte @@ -57,31 +57,28 @@ doSearch(); async function refreshStatusApplications() { - loading.applications = true; noInitialStatus.applications = false; numberOfGetStatus = 0; for (const application of applications) { - await getStatus(application, true); + status[application.id] = 'loading'; + getStatus(application, true); } - loading.applications = false; } async function refreshStatusServices() { - loading.services = true; noInitialStatus.services = false; numberOfGetStatus = 0; for (const service of services) { - await getStatus(service, true); + status[service.id] = 'loading'; + getStatus(service, true); } - loading.services = false; } async function refreshStatusDatabases() { - loading.databases = true; noInitialStatus.databases = false; numberOfGetStatus = 0; for (const database of databases) { - await getStatus(database, true); + status[database.id] = 'loading'; + getStatus(database, true); } - loading.databases = false; } function setInitials(onlyOthers: boolean = false) { return { @@ -565,11 +562,7 @@ {#if (filtered.applications.length > 0 && applications.length > 0) || filtered.otherApplications.length > 0}

    Applications

    - {#if foundUnconfiguredApplication} @@ -597,7 +590,7 @@ {:then} {#if !noInitialStatus.applications} - {#if loading.applications} + {#if status[application.id] === 'loading'} {:else if status[application.id] === 'running'} @@ -704,7 +697,7 @@ {:then} {#if !noInitialStatus.applications} - {#if loading.applications} + {#if status[application.id] === 'loading'} {:else if status[application.id] === 'running'} @@ -792,11 +785,7 @@ {#if (filtered.services.length > 0 && services.length > 0) || filtered.otherServices.length > 0}

    Services

    - {#if foundUnconfiguredService} @@ -824,7 +813,7 @@ {:then} {#if !noInitialStatus.services} - {#if loading.services} + {#if status[service.id] === 'loading'} {:else if status[service.id] === 'running'} @@ -897,7 +886,7 @@ {:then} {#if !noInitialStatus.services} - {#if loading.services} + {#if status[service.id] === 'loading'} {:else if status[service.id] === 'running'} @@ -954,11 +943,7 @@ {#if (filtered.databases.length > 0 && databases.length > 0) || filtered.otherDatabases.length > 0}

    Databases

    - {#if foundUnconfiguredDatabase} @@ -986,9 +971,9 @@ {:then} {#if !noInitialStatus.databases} - {#if loading.databases} + {#if status[database.id] === 'loading'} - {:else if status[databases.id] === 'running'} + {:else if status[database.id] === 'running'} {:else} @@ -1063,9 +1048,9 @@ {:then} {#if !noInitialStatus.databases} - {#if loading.databases} + {#if status[database.id] === 'loading'} - {:else if status[databases.id] === 'running'} + {:else if status[database.id] === 'running'} {:else} From a67618675dd15eccf75aca726e88c26b8c395707 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 29 Sep 2022 13:15:16 +0200 Subject: [PATCH 4/9] fix: default buildImage and baseBuildImage --- apps/api/src/routes/api/v1/applications/handlers.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index fb5ea386c..be06a3519 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -798,7 +798,10 @@ export async function saveBuildPack(request, reply) { try { const { id } = request.params const { buildPack } = request.body - await prisma.application.update({ where: { id }, data: { buildPack } }); + const { baseImage, baseBuildImage } = setDefaultBaseImage( + buildPack + ); + await prisma.application.update({ where: { id }, data: { buildPack, baseImage, baseBuildImage } }); return reply.code(201).send() } catch ({ status, message }) { return errorHandler({ status, message }) From f40e142704fc67138c76c1acd176c4aaed26168e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 29 Sep 2022 13:15:19 +0200 Subject: [PATCH 5/9] ui: fix --- .../applications/[id]/configuration/_PublicRepository.svelte | 3 +-- .../src/routes/applications/[id]/configuration/source.svelte | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte b/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte index f35970727..0c10fa14a 100644 --- a/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte +++ b/apps/ui/src/routes/applications/[id]/configuration/_PublicRepository.svelte @@ -170,9 +170,8 @@
    -
    +
    -
    +
    -
    +