From 9eb2b6ea3a2a71a72cb26a0fd209b216b0badae6 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 24 Feb 2025 16:48:28 +0100 Subject: [PATCH] fix: deployment screens --- src/lib/components/filters/filters.svelte | 2 +- .../(components)/deploymentActionMenu.svelte | 118 +++++++++++ .../sites/create-site/finish/+page.svelte | 2 +- .../sites/site-[site]/+page.svelte | 2 +- .../site-[site]/deployments/+page.svelte | 184 +++++++++--------- .../deployments/deleteDeploymentModal.svelte | 2 - .../site-[site]/deployments/table.svelte | 95 ++------- .../site-[site]/deploymentsOverview.svelte | 84 ++------ ...ain.svelte => instantRollbackModal.svelte} | 0 9 files changed, 237 insertions(+), 252 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte rename src/routes/(console)/project-[project]/sites/site-[site]/{instantRollbackDomain.svelte => instantRollbackModal.svelte} (100%) diff --git a/src/lib/components/filters/filters.svelte b/src/lib/components/filters/filters.svelte index e6f4587e9..bad4a6fe5 100644 --- a/src/lib/components/filters/filters.svelte +++ b/src/lib/components/filters/filters.svelte @@ -1,6 +1,6 @@ + + + + + + { + e.preventDefault(); + selectedDeployment = deployment; + showRedeploy = true; + toggle(e); + }}> + Redeploy + + { + e.preventDefault(); + toggle(e); + }}> + View details + + {#if deployment?.status === 'ready' && deployment?.$id !== activeDeployment} + { + e.preventDefault(); + selectedDeployment = deployment; + showActivate = true; + toggle(e); + }}> + Activate + + {/if} + {#if deployment?.status === 'ready'} + { + toggle(e); + }}> + Download + + {/if} + + {#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'} + { + e.preventDefault(); + selectedDeployment = deployment; + showCancel = true; + toggle(e); + }}> + Cancel + + {/if} + {#if deployment.status !== 'building' && deployment.status !== 'processing' && deployment?.status !== 'waiting'} + { + e.preventDefault(); + selectedDeployment = deployment; + showDelete = true; + toggle(e); + }}> + Delete + + {/if} + + + diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte index cb8505733..555efa368 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte @@ -57,7 +57,7 @@
- + {#if !data.site.installationId && !data.site.providerRepositoryId} - - {#if data.deploymentList.total} - - - - - {#if $tags?.length} - -
-
- - {/if} -
-
- {/if} -
- - {#if data.deploymentList.total} - - {/if} - - - - - { - toggle(e); - if (!hasInstallation) { - showConnectRepo = true; - } else { - showCreateDeployment = true; - } - }}> - Git - - { - toggle(e); - showConnectCLI = true; - }}> - CLI - - { - toggle(e); - showConnectManual = true; - }}> - Manual - - - - - -
- {#if data.deploymentList.total} -
- - - - +
+ + {#if data.deploymentList.total} + + + + + {#if $tags?.length} + +
+
+ + {/if} +
+
+ {/if}
+
+
+
- + More filters - +
- {/if} +
+ + {#if data.deploymentList.total} + + {/if} + + + + + { + toggle(e); + if (!hasInstallation) { + showConnectRepo = true; + } else { + showCreateDeployment = true; + } + }}> + Git + + { + toggle(e); + showConnectCLI = true; + }}> + CLI + + { + toggle(e); + showConnectManual = true; + }}> + Manual + + + + + +
+
+ {#if data.deploymentList.total} @@ -210,5 +204,5 @@ {/if} {#if showConnectCLI} - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte index 7447bde6e..9ac0ca240 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte @@ -1,10 +1,8 @@ @@ -90,57 +78,14 @@ - - - - - { - e.preventDefault(); - selectedDeployment = deployment; - showRedeploy = true; - toggle(e); - }}> - Redeploy - - {#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} - - - + @@ -172,3 +117,6 @@ {#if selectedDeployment && showCancel} {/if} +{#if selectedDeployment && showDelete} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackDomain.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackDomain.svelte rename to src/routes/(console)/project-[project]/sites/site-[site]/instantRollbackModal.svelte