From c016ec4e9333e7782fee8b6dc8d0f3969191b976 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 14:53:10 +0100 Subject: [PATCH] fix: deployment overview --- src/lib/actions/analytics.ts | 2 +- ....svelte => activateDeploymentModal.svelte} | 16 ++--- .../sites/create-site/configuration.svelte | 35 +++++++---- .../site-[site]/deployments/table.svelte | 13 +++- .../site-[site]/deploymentsOverview.svelte | 60 +++++++++++++------ 5 files changed, 86 insertions(+), 40 deletions(-) rename src/routes/(console)/project-[project]/sites/{promoteModal.svelte => activateDeploymentModal.svelte} (66%) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index d78860b15..f02f4c490 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -340,5 +340,5 @@ export enum Submit { SiteConnectRepo = 'submit_site_connect_repo', SiteRedeploy = 'submit_site_redeploy', SiteDisconnectRepo = 'submit_site_disconnect_repo', - SitePromoteDeployment = 'submit_site_promote_deployment' + SiteActivateDeployment = 'submit_site_activate_deployment' } diff --git a/src/routes/(console)/project-[project]/sites/promoteModal.svelte b/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte similarity index 66% rename from src/routes/(console)/project-[project]/sites/promoteModal.svelte rename to src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte index 2e549fc47..4f391bda2 100644 --- a/src/routes/(console)/project-[project]/sites/promoteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte @@ -12,32 +12,32 @@ export let siteId: string; let error: string; - async function promote() { + async function activate() { try { - await sdk.forProject.sites.updateDeploymentBuild(siteId, selectedDeploymentId); + await sdk.forProject.sites.updateDeployment(siteId, selectedDeploymentId); addNotification({ type: 'success', - message: `Deployment has been promoted` + message: `Deployment has been activated` }); - trackEvent(Submit.SitePromoteDeployment); + trackEvent(Submit.SiteActivateDeployment); invalidate(Dependencies.SITE); invalidate(Dependencies.DEPLOYMENTS); show = false; } catch (e) { error = e.message; - trackError(e, Submit.SitePromoteDeployment); + trackError(e, Submit.SiteActivateDeployment); } } - +

- Are you sure you want to promote this deployment? This might affect your production code. + Are you sure you want to activate this deployment? This might affect your production code.

- + diff --git a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte index 2080e8409..ac68052dd 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte @@ -10,7 +10,9 @@ Badge, HiddenText, ActionMenu, - Accordion + Accordion, + Tooltip, + Button as PinkButton } from '@appwrite.io/pink-svelte'; import { IconDotsHorizontal, @@ -166,7 +168,16 @@
{#if variable.secret} - + + + + This value is secret, you cannot see its + value. + + {:else}
- + + + - + { showEditorModal = true; }}> @@ -197,7 +211,7 @@ {#if !variable?.secret} { currentVariable = variable; showSecretModal = true; @@ -206,7 +220,8 @@ {/if} { showImportModal = true; }}> diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte index ea9cbea4a..515923ad6 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte @@ -21,11 +21,12 @@ IconXCircle } from '@appwrite.io/pink-icons-svelte'; import { columns } from './store'; + import ActivateDeploymentModal from '../../activateDeploymentModal.svelte'; export let data: PageData; let showDelete = false; - // let showActivate = false; + let showActivate = false; let showRedeploy = false; let showCancel = false; @@ -139,7 +140,7 @@ on:click={(e) => { e.preventDefault(); selectedDeployment = deployment; - // showActivate = true; + showActivate = true; toggle(e); }}> Activate @@ -182,10 +183,16 @@ {#if selectedDeployment} - + {/if} +{#if selectedDeployment && showActivate} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte index 7a80fb3a7..308cdb9e5 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -16,20 +16,25 @@ import DeploymentCreatedBy from '../(components)/deploymentCreatedBy.svelte'; import DeploymentSource from '../(components)/deploymentSource.svelte'; import Id from '$lib/components/id.svelte'; - import { IconDotsHorizontal, IconGlobeAlt, IconRefresh } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconGlobeAlt, + IconRefresh, + IconXCircle + } from '@appwrite.io/pink-icons-svelte'; import RedeployModal from '../redeployModal.svelte'; - import PromoteModal from '../promoteModal.svelte'; import { Card } from '$lib/components'; + import ActivateDeploymentModal from '../activateDeploymentModal.svelte'; + import CancelDeploymentModal from './deployments/cancelDeploymentModal.svelte'; export let site: Models.Site; export let activeDeployment: Models.Deployment; export let deploymentList: Models.DeploymentList = undefined; - let showPromote = false; + let showActivate = false; let showRedeploy = false; + let showCancel = false; let selectedDeployment: Models.Deployment = null; - - $: console.log(deploymentList); {#if deploymentList.total} @@ -106,16 +111,31 @@ }}> Redeploy - { - e.preventDefault(); - selectedDeployment = deployment; - showPromote = true; - toggle(e); - }}> - Promote - + {#if deployment?.status === 'ready' && deployment?.$id !== site.deploymentId} + { + e.preventDefault(); + selectedDeployment = deployment; + showActivate = true; + toggle(e); + }}> + Activate + + {/if} + {#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'} + { + e.preventDefault(); + selectedDeployment = deployment; + showCancel = true; + toggle(e); + }}> + Cancel + + {/if} @@ -135,9 +155,13 @@ {/if} -{#if selectedDeployment && showPromote} - + bind:show={showActivate} /> +{/if} + +{#if selectedDeployment && showCancel} + {/if}