diff --git a/apps/api/src/routes/api/v1/applications/handlers.ts b/apps/api/src/routes/api/v1/applications/handlers.ts index ffb9e64d4..be7648bfe 100644 --- a/apps/api/src/routes/api/v1/applications/handlers.ts +++ b/apps/api/src/routes/api/v1/applications/handlers.ts @@ -787,64 +787,74 @@ export async function saveConnectedDatabase(request, reply) { export async function getSecrets(request: FastifyRequest) { try { const { id } = request.params + let secrets = await prisma.secret.findMany({ - where: { applicationId: id }, - orderBy: { createdAt: 'desc' } + where: { applicationId: id, isPRMRSecret: false }, + orderBy: { createdAt: 'asc' } }); + let previewSecrets = await prisma.secret.findMany({ + where: { applicationId: id, isPRMRSecret: true }, + orderBy: { createdAt: 'asc' } + }); + secrets = secrets.map((secret) => { secret.value = decrypt(secret.value); return secret; }); - secrets = secrets.filter((secret) => !secret.isPRMRSecret).sort((a, b) => { - return ('' + a.name).localeCompare(b.name); - }) + previewSecrets = previewSecrets.map((secret) => { + secret.value = decrypt(secret.value); + return secret; + }); + return { - secrets + previewSecrets: previewSecrets.sort((a, b) => { + return ('' + a.name).localeCompare(b.name); + }), + secrets: secrets.sort((a, b) => { + return ('' + a.name).localeCompare(b.name); + }) } } catch ({ status, message }) { return errorHandler({ status, message }) } } +export async function updatePreviewSecret(request: FastifyRequest, reply: FastifyReply) { + try { + const { id } = request.params + const { name, value } = request.body + await prisma.secret.updateMany({ + where: { applicationId: id, name, isPRMRSecret: true }, + data: { value: encrypt(value.trim()) } + }); + return reply.code(201).send() + } catch ({ status, message }) { + return errorHandler({ status, message }) + } +} +export async function updateSecret(request: FastifyRequest, reply: FastifyReply) { + try { + const { id } = request.params + const { name, value, isBuildSecret = undefined } = request.body + await prisma.secret.updateMany({ + where: { applicationId: id, name }, + data: { value: encrypt(value.trim()), isBuildSecret } + }); + return reply.code(201).send() + } catch ({ status, message }) { + return errorHandler({ status, message }) + } +} export async function saveSecret(request: FastifyRequest, reply: FastifyReply) { try { const { id } = request.params - let { name, value, isBuildSecret, isPRMRSecret, isNew } = request.body - if (isNew) { - const found = await prisma.secret.findFirst({ where: { name, applicationId: id, isPRMRSecret } }); - if (found) { - throw { status: 500, message: `Secret ${name} already exists.` } - } else { - value = encrypt(value.trim()); - await prisma.secret.create({ - data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } } - }); - } - } else { - if (value) { - value = encrypt(value.trim()); - } - const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } }); - - if (found) { - if (!value && isPRMRSecret) { - await prisma.secret.deleteMany({ - where: { applicationId: id, name, isPRMRSecret } - }); - } else { - - await prisma.secret.updateMany({ - where: { applicationId: id, name, isPRMRSecret }, - data: { value, isBuildSecret, isPRMRSecret } - }); - } - - } else { - await prisma.secret.create({ - data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } } - }); - } - } + const { name, value, isBuildSecret = false } = request.body + await prisma.secret.create({ + data: { name, value: encrypt(value.trim()), isBuildSecret, isPRMRSecret: false, application: { connect: { id } } } + }); + await prisma.secret.create({ + data: { name, value: encrypt(value.trim()), isBuildSecret, isPRMRSecret: true, application: { connect: { id } } } + }); return reply.code(201).send() } catch ({ status, message }) { return errorHandler({ status, message }) diff --git a/apps/api/src/routes/api/v1/applications/index.ts b/apps/api/src/routes/api/v1/applications/index.ts index 74370de4d..af39e63ce 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 } from './handlers'; +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 type { CancelDeployment, CheckDNS, CheckDomain, CheckRepository, DeleteApplication, DeleteSecret, DeleteStorage, DeployApplication, GetApplicationLogs, GetBuildIdLogs, GetBuilds, GetImages, RestartPreviewApplication, SaveApplication, SaveApplicationSettings, SaveApplicationSource, SaveDeployKey, SaveDestination, SaveSecret, SaveStorage, StopPreviewApplication } from './types'; @@ -30,6 +30,8 @@ const root: FastifyPluginAsync = async (fastify): Promise => { fastify.get('/:id/secrets', async (request) => await getSecrets(request)); fastify.post('/:id/secrets', async (request, reply) => await saveSecret(request, reply)); + fastify.put('/:id/secrets', async (request, reply) => await updateSecret(request, reply)); + fastify.put('/:id/secrets/preview', async (request, reply) => await updatePreviewSecret(request, reply)); fastify.delete('/:id/secrets', async (request) => await deleteSecret(request)); fastify.get('/:id/storages', async (request) => await getStorages(request)); diff --git a/apps/api/src/routes/api/v1/applications/types.ts b/apps/api/src/routes/api/v1/applications/types.ts index 0699518a5..121d23d75 100644 --- a/apps/api/src/routes/api/v1/applications/types.ts +++ b/apps/api/src/routes/api/v1/applications/types.ts @@ -65,7 +65,7 @@ export interface SaveSecret extends OnlyId { name: string, value: string, isBuildSecret: boolean, - isPRMRSecret: boolean, + previewSecret: boolean, isNew: boolean } } diff --git a/apps/ui/src/lib/components/CopyPasswordField.svelte b/apps/ui/src/lib/components/CopyPasswordField.svelte index 24ed90f94..9083fa47c 100644 --- a/apps/ui/src/lib/components/CopyPasswordField.svelte +++ b/apps/ui/src/lib/components/CopyPasswordField.svelte @@ -15,7 +15,7 @@ export let placeholder = ''; export let inputStyle = ''; - let disabledClass = 'bg-coolback disabled:bg-coolblack lg:w-64 w-full'; + let disabledClass = 'bg-coolback disabled:bg-coolblack w-full'; let isHttps = browser && window.location.protocol === 'https:'; function copyToClipboard() { diff --git a/apps/ui/src/routes/applications/[id]/_Menu.svelte b/apps/ui/src/routes/applications/[id]/_Menu.svelte index 33247d740..19075a254 100644 --- a/apps/ui/src/routes/applications/[id]/_Menu.svelte +++ b/apps/ui/src/routes/applications/[id]/_Menu.svelte @@ -4,10 +4,72 @@ import { page } from '$app/stores'; -
    +
    • Configuration
      • + {#if application.gitSource?.htmlUrl && application.repository && application.branch} +
    • + + {#if application.gitSource?.type === 'gitlab'} + + + + {:else if application.gitSource?.type === 'github'} + + + + {/if} + Open on Git + + + + +
      • + {/if} +
    • - Environment Variables (secrets)Secrets
    • Features
      • +
    • Logs
      • @@ -101,7 +164,9 @@ class="rounded" class:bg-coollabs={$page.url.pathname === `/applications/${$page.params.id}/logs`} > - Advanced +
    • + + + + Monitoring +
      • {#if !application.settings.isBot}
    • + export let length = 0; + export let index: number = 0; + export let name = ''; + export let value = ''; + export let isBuildSecret = false; + + import { page } from '$app/stores'; + import { del, post, put } from '$lib/api'; + import { errorNotification } from '$lib/common'; + import CopyPasswordField from '$lib/components/CopyPasswordField.svelte'; + import { addToast } from '$lib/store'; + import { t } from '$lib/translations'; + import { createEventDispatcher } from 'svelte'; + + const dispatch = createEventDispatcher(); + const { id } = $page.params; + + async function updatePreviewSecret() { + try { + await put(`/applications/${id}/secrets/preview`, { + name, + value + }); + addToast({ + message: 'Secret updated.', + type: 'success' + }); + } catch (error) { + return errorNotification(error); + } + } + + +
      +
      + {#if index === 0 || length === 0} + + {/if} + + +
      +
      + {#if index === 0 || length === 0} + + {/if} + + +
      +
      + {#if index === 0 || length === 0} + + {/if} + + +
      + +
      +
      +
      + {#if index === 0 || length === 0} + + {/if} + +
      +
      +
      + +
      +
      +
      +
      +
      diff --git a/apps/ui/src/routes/applications/[id]/_Secret.svelte b/apps/ui/src/routes/applications/[id]/_Secret.svelte index 248e0952e..a16158587 100644 --- a/apps/ui/src/routes/applications/[id]/_Secret.svelte +++ b/apps/ui/src/routes/applications/[id]/_Secret.svelte @@ -1,122 +1,97 @@ -
      +
      - - {#if isNewSecret} -
      New Secret
      + {#if (index === 0 && !isNewSecret) || length === 0} + {/if} +
      - + {#if (index === 0 && !isNewSecret) || length === 0} + + {/if} +
      - - {#if isNewSecret} - + {#if (index === 0 && !isNewSecret) || length === 0} + {/if} -
      + + +
      - + {#if (index === 0 && !isNewSecret) || length === 0} + + {/if} +
      {#if isNewSecret}
      - +
      {:else}
      - + +
      +
      +
      - {#if !isPRMRSecret} -
      - -
      - {/if}
      {/if}
      diff --git a/apps/ui/src/routes/applications/[id]/_Storage.svelte b/apps/ui/src/routes/applications/[id]/_Storage.svelte index 2fe473f51..dc7058036 100644 --- a/apps/ui/src/routes/applications/[id]/_Storage.svelte +++ b/apps/ui/src/routes/applications/[id]/_Storage.svelte @@ -60,12 +60,9 @@
      -
      - - {#if isNew} -
      New Persistent Storage
      - {/if} -
      +
      + +
      +
      Configurations
      +
      + {$status.application.isRunning ? 'Running' : 'Stopped'} +
      +
      {/if}
      {#if $status.application.isExited || $status.application.isRestarting} Restart (useful to change secrets) -
      handleDeploySubmit(true)}> - - Force redeploy (without cache) -
      + + + + + Force Redeploy (without cache) {:else} -
      handleDeploySubmit(false)}> - -
      + + + + Build & Deploy + {/if} {#if $location && $status.application.isRunning} -       - Open + Open Application {/if}
      -
      +
      -
      +
      diff --git a/apps/ui/src/routes/applications/[id]/danger.svelte b/apps/ui/src/routes/applications/[id]/danger.svelte index db5dfe1d5..28de992b0 100644 --- a/apps/ui/src/routes/applications/[id]/danger.svelte +++ b/apps/ui/src/routes/applications/[id]/danger.svelte @@ -72,7 +72,7 @@ on:click={() => deleteApplication(application.name, false)} type="submit" disabled={!$appSession.isAdmin} - class="btn btn-sm btn-error text-sm" + class="btn btn-lg btn-error hover:bg-red-700 text-sm" > Delete Application diff --git a/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte b/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte index fd294940f..eeccd7988 100644 --- a/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte +++ b/apps/ui/src/routes/applications/[id]/logs/_BuildLog.svelte @@ -104,8 +104,7 @@ }); -
      -
      +
      diff --git a/apps/ui/src/routes/applications/[id]/logs/build.svelte b/apps/ui/src/routes/applications/[id]/logs/build.svelte index 4f44a2e0d..14b4a848d 100644 --- a/apps/ui/src/routes/applications/[id]/logs/build.svelte +++ b/apps/ui/src/routes/applications/[id]/logs/build.svelte @@ -114,12 +114,14 @@
      -
      +
      {#if $selectedBuildId} {#key $selectedBuildId} {/key} + {:else} + Select a build to see the logs. {/if}
      @@ -141,10 +143,10 @@ on:click={() => loadBuild(build.id)} class:rounded-tr={index === 0} class:rounded-br={index === builds.length - 1} - class="flex cursor-pointer items-center justify-center py-4 no-underline transition-all duration-100 hover:bg-coolgray-300 hover:shadow-xl" + class="flex cursor-pointer items-center justify-center py-4 no-underline transition-all duration-150 hover:bg-coolgray-300 hover:shadow-xl" class:bg-coolgray-200={$selectedBuildId === build.id} > -
      +
      {build.branch || application.branch}
      @@ -160,7 +162,7 @@
      -
      +
      {#if build.status === 'running'}
      {build.elapsed}s diff --git a/apps/ui/src/routes/applications/[id]/previews/index.svelte b/apps/ui/src/routes/applications/[id]/previews/index.svelte index 38447538d..2debec2e8 100644 --- a/apps/ui/src/routes/applications/[id]/previews/index.svelte +++ b/apps/ui/src/routes/applications/[id]/previews/index.svelte @@ -18,23 +18,17 @@ + +
      +
      +
      Monitoring
      +
      +
      +
      +
      +
      +
      Used Memory / Memory Limit
      +
      {usage?.MemUsage}
      +
      + +
      +
      Used CPU
      +
      {usage?.CPUPerc}
      +
      + +
      +
      Network IO
      +
      {usage?.NetIO}
      +
      +
      +
      diff --git a/apps/ui/src/routes/applications/[id]/utils.ts b/apps/ui/src/routes/applications/[id]/utils.ts deleted file mode 100644 index 7805024e1..000000000 --- a/apps/ui/src/routes/applications/[id]/utils.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { post } from '$lib/api'; -import { t } from '$lib/translations'; -import { errorNotification } from '$lib/common'; - -type Props = { - isNew: boolean; - name: string; - value: string; - isBuildSecret?: boolean; - isPRMRSecret?: boolean; - isNewSecret?: boolean; - applicationId: string; -}; - -export async function saveSecret({ - isNew, - name, - value, - isBuildSecret, - isPRMRSecret, - isNewSecret, - applicationId -}: Props): Promise { - if (!name) return errorNotification(`${t.get('forms.name')} ${t.get('forms.is_required')}`); - if (!value && isNew) return errorNotification(`${t.get('forms.value')} ${t.get('forms.is_required')}`); - try { - await post(`/applications/${applicationId}/secrets`, { - name, - value, - isBuildSecret, - isPRMRSecret, - isNew: isNew || false - }); - if (isNewSecret) { - name = ''; - value = ''; - isBuildSecret = false; - } - } catch (error) { - throw error - } -}