fix: deployment screens

This commit is contained in:
Arman committed 2025-02-24 16:48:28 +01:00
1 parent b6855dfdaf
commit 9eb2b6ea3a
9 files changed
+237 -252

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { beforeNavigate } from '$app/navigation';
import { Drop, Modal } from '$lib/components';
import { Modal } from '$lib/components';
import { Button } from '$lib/elements/forms';
import type { Column } from '$lib/helpers/types';
import type { Writable } from 'svelte/store';
@@ -0,0 +1,118 @@
<script lang="ts">
import { base } from '$app/paths';
import { page } from '$app/stores';
import { Button } from '$lib/elements/forms';
import { sdk } from '$lib/stores/sdk';
import type { Models } from '@appwrite.io/console';
import {
IconDotsHorizontal,
IconDownload,
IconLightningBolt,
IconRefresh,
IconTerminal,
IconTrash,
IconXCircle
} from '@appwrite.io/pink-icons-svelte';
import { ActionMenu, Icon, Popover } from '@appwrite.io/pink-svelte';
export let selectedDeployment: Models.Deployment;
export let deployment: Models.Deployment;
export let showDelete = false;
export let showActivate = false;
export let showRedeploy = false;
export let showCancel = false;
export let activeDeployment: string;
function getDownload(deploymentId: string) {
return (
sdk.forProject.sites.getDeploymentDownload($page.params.site, deploymentId).toString() +
'&mode=admin'
);
}
</script>
<Popover placement="bottom-end" let:toggle>
<Button
text
icon
size="s"
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
<Icon size="s" icon={IconDotsHorizontal} />
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
<ActionMenu.Item.Button
leadingIcon={IconRefresh}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showRedeploy = true;
toggle(e);
}}>
Redeploy
</ActionMenu.Item.Button>
<ActionMenu.Item.Anchor
leadingIcon={IconTerminal}
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments/deployment-${deployment.$id}`}
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
View details
</ActionMenu.Item.Anchor>
{#if deployment?.status === 'ready' && deployment?.$id !== activeDeployment}
<ActionMenu.Item.Button
leadingIcon={IconLightningBolt}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showActivate = true;
toggle(e);
}}>
Activate
</ActionMenu.Item.Button>
{/if}
{#if deployment?.status === 'ready'}
<ActionMenu.Item.Anchor
href={getDownload(deployment.$id)}
external
leadingIcon={IconDownload}
on:click={(e) => {
toggle(e);
}}>
Download
</ActionMenu.Item.Anchor>
{/if}
{#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'}
<ActionMenu.Item.Button
leadingIcon={IconXCircle}
status="danger"
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showCancel = true;
toggle(e);
}}>
Cancel
</ActionMenu.Item.Button>
{/if}
{#if deployment.status !== 'building' && deployment.status !== 'processing' && deployment?.status !== 'waiting'}
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showDelete = true;
toggle(e);
}}>
Delete
</ActionMenu.Item.Button>
{/if}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
@@ -57,7 +57,7 @@
<div style="margin-block-start: var(--gap-xxl);">
<Step.List>
<Step.Item state="current" shortLine={true}>
<Layout.Stack direction="row" gap="l">
<Layout.Stack direction="row" gap="l" wrap="wrap">
{#if !data.site.installationId && !data.site.providerRepositoryId}
<Card
isTile
@@ -6,7 +6,7 @@
import DeploymentsOverview from './deploymentsOverview.svelte';
import { Button } from '$lib/elements/forms';
import { protocol } from '$routes/(console)/store';
import InstantRollbackDomain from './instantRollbackDomain.svelte';
import InstantRollbackDomain from './instantRollbackModal.svelte';
import { app } from '$lib/stores/app';
import EmptyDeploymentDark from './empty-deployment-dark.svg';
import EmptyDeploymentLight from './empty-deployment-light.svg';
@@ -7,7 +7,7 @@
import { queries, tags } from '$lib/components/filters/store';
import { View } from '$lib/helpers/load';
import { Pill } from '$lib/elements';
import { ActionMenu, Icon, Layout, Popover } from '@appwrite.io/pink-svelte';
import { ActionMenu, Icon, Layout, Popover, Tag } from '@appwrite.io/pink-svelte';
import Table from './table.svelte';
import QuickFilters from './quickFilters.svelte';
import RedeployModal from '../../redeployModal.svelte';
@@ -56,92 +56,47 @@
{/if}
<Layout.Stack gap="l">
<Layout.Stack justifyContent="space-between" direction="row">
<Layout.Stack alignItems="center" direction="row">
{#if data.deploymentList.total}
<QuickFilters {columns} />
<Filters
query={data.query}
{columns}
let:disabled
let:toggle
singleCondition>
<Layout.Stack alignItems="center" direction="row" gap="xs">
<Button
compact
on:click={toggle}
{disabled}
size="s"
ariaLabel="open filter">
<Icon icon={IconFilterLine} size="s" slot="start" />
More filters
</Button>
{#if $tags?.length}
<!-- TODO: add vertical divider to pink 2 -->
<div
style="flex-basis:1px; background-color:hsl(var(--color-border)); width: 1px">
</div>
<Button text on:click={clearAll} size="s">Clear all</Button>
{/if}
</Layout.Stack>
</Filters>
{/if}
</Layout.Stack>
<Layout.Stack direction="row" inline>
{#if data.deploymentList.total}
<ViewSelector view={View.Table} {columns} hideView allowNoColumns />
{/if}
<Popover let:toggle>
<Button size="s" on:click={toggle}>
<Icon size="s" icon={IconPlus} />
Create deployment
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root noPadding>
<ActionMenu.Item.Button
badge="Recommended"
on:click={(e) => {
toggle(e);
if (!hasInstallation) {
showConnectRepo = true;
} else {
showCreateDeployment = true;
}
}}>
Git
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
on:click={(e) => {
toggle(e);
showConnectCLI = true;
}}>
CLI
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
on:click={(e) => {
toggle(e);
showConnectManual = true;
}}>
Manual
</ActionMenu.Item.Button>
</ActionMenu.Root>
</svelte:fragment>
</Popover>
</Layout.Stack>
</Layout.Stack>
{#if data.deploymentList.total}
<div class="is-only-mobile">
<Layout.Stack justifyContent="space-between" direction="row">
<Button
text
size="s"
on:click={() => (showMobileFilters = !showMobileFilters)}
ariaLabel="toggle filters">
<span class="icon-filter-line" />
<span class="text">Filters</span>
</Button>
<ViewSelector view={View.Table} {columns} hideView allowNoColumns />
<div class="is-not-mobile">
<Layout.Stack alignItems="center" direction="row">
{#if data.deploymentList.total}
<QuickFilters {columns} />
<Filters
query={data.query}
{columns}
let:disabled
let:toggle
singleCondition>
<Layout.Stack alignItems="center" direction="row" gap="xs">
<Button
compact
on:click={toggle}
{disabled}
size="s"
ariaLabel="open filter">
<Icon icon={IconFilterLine} size="s" slot="start" />
More filters
</Button>
{#if $tags?.length}
<!-- TODO: add vertical divider to pink 2 -->
<div
style="flex-basis:1px; background-color:hsl(var(--color-border)); width: 1px">
</div>
<Button text on:click={clearAll} size="s">Clear all</Button>
{/if}
</Layout.Stack>
</Filters>
{/if}
</Layout.Stack>
</div>
<div class="is-only-mobile">
<Button
secondary
size="s"
on:click={() => (showMobileFilters = !showMobileFilters)}
ariaLabel="toggle filters">
<span class="icon-filter-line" />
<span class="text">Filters</span>
</Button>
<div
class:u-hide={!showMobileFilters}
class:u-flex={showMobileFilters}
@@ -150,20 +105,59 @@
<Filters query={data.query} {columns} clearOnClick>
<svelte:fragment slot="mobile" let:disabled let:toggle>
<Pill
button
on:click={toggle}
{disabled}
class="u-flex u-gap-4 u-cross-center"
style="--p-tag-content-height: auto">
<Tag on:click={toggle} {disabled}>
<span class="text">More filters</span>
<span class="icon-cheveron-down" />
</Pill>
</Tag>
</svelte:fragment>
</Filters>
</div>
</div>
{/if}
<div>
<Layout.Stack direction="row" inline>
{#if data.deploymentList.total}
<ViewSelector view={View.Table} {columns} hideView allowNoColumns />
{/if}
<Popover let:toggle>
<Button size="s" on:click={toggle}>
<Icon size="s" icon={IconPlus} />
Create deployment
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root noPadding>
<ActionMenu.Item.Button
badge="Recommended"
on:click={(e) => {
toggle(e);
if (!hasInstallation) {
showConnectRepo = true;
} else {
showCreateDeployment = true;
}
}}>
Git
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
on:click={(e) => {
toggle(e);
showConnectCLI = true;
}}>
CLI
</ActionMenu.Item.Button>
<ActionMenu.Item.Button
on:click={(e) => {
toggle(e);
showConnectManual = true;
}}>
Manual
</ActionMenu.Item.Button>
</ActionMenu.Root>
</svelte:fragment>
</Popover>
</Layout.Stack>
</div>
</Layout.Stack>
{#if data.deploymentList.total}
<Table {data} />
@@ -210,5 +204,5 @@
<CreateManualDeploymentModal bind:show={showConnectManual} site={data.site} />
{/if}
{#if showConnectCLI}
<CreateCliModal bind:show={showConnectCLI} site={data.site} />
<CreateCliModal bind:show={showConnectCLI} />
{/if}
@@ -1,10 +1,8 @@
<script lang="ts">
import { invalidate } from '$app/navigation';
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
import { Modal } from '$lib/components';
import Confirm from '$lib/components/confirm.svelte';
import { Dependencies } from '$lib/constants';
import { Button } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
import type { Models } from '@appwrite.io/console';
@@ -12,20 +12,13 @@
import RedeployModal from '../../redeployModal.svelte';
import Cancel from './cancelDeploymentModal.svelte';
import { base } from '$app/paths';
import { ActionMenu, Icon, Layout, Popover, Status, Table } from '@appwrite.io/pink-svelte';
import {
IconDotsHorizontal,
IconLightningBolt,
IconRefresh,
IconTerminal,
IconTrash,
IconXCircle
} from '@appwrite.io/pink-icons-svelte';
import { Layout, Status, Table } from '@appwrite.io/pink-svelte';
import { columns } from './store';
import ActivateDeploymentModal from '../../activateDeploymentModal.svelte';
import { deploymentStatusConverter } from '../store';
import { capitalize } from '$lib/helpers/string';
import { Button } from '$lib/elements/forms';
import DeploymentActionMenu from '../../(components)/deploymentActionMenu.svelte';
export let data: PageData;
@@ -107,80 +100,14 @@
{/each}
<Table.Cell>
<Layout.Stack alignItems="flex-end">
<Popover placement="bottom-end" let:toggle>
<Button
text
icon
size="s"
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
<Icon size="s" icon={IconDotsHorizontal} />
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
<ActionMenu.Item.Button
leadingIcon={IconRefresh}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showRedeploy = true;
toggle(e);
}}>
Redeploy
</ActionMenu.Item.Button>
<ActionMenu.Item.Anchor
leadingIcon={IconTerminal}
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments/deployment-${deployment.$id}`}
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
View details
</ActionMenu.Item.Anchor>
{#if deployment?.status === 'ready' && deployment?.$id !== data.site.deploymentId}
<ActionMenu.Item.Button
leadingIcon={IconLightningBolt}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showActivate = true;
toggle(e);
}}>
Activate
</ActionMenu.Item.Button>
{/if}
{#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'}
<ActionMenu.Item.Button
leadingIcon={IconXCircle}
status="danger"
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showCancel = true;
toggle(e);
}}>
Cancel
</ActionMenu.Item.Button>
{/if}
{#if deployment.status !== 'building' && deployment.status !== 'processing' && deployment?.status !== 'waiting'}
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showDelete = true;
toggle(e);
}}>
Delete
</ActionMenu.Item.Button>
{/if}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
<DeploymentActionMenu
{deployment}
bind:selectedDeployment
bind:showRedeploy
bind:showActivate
bind:showDelete
bind:showCancel
activeDeployment={data.site.deploymentId} />
</Layout.Stack>
</Table.Cell>
</Table.Link>
@@ -1,15 +1,5 @@
<script lang="ts">
import {
ActionMenu,
Badge,
Empty,
Icon,
Layout,
Popover,
Status,
Table,
Typography
} from '@appwrite.io/pink-svelte';
import { Badge, Empty, Layout, Status, Table, Typography } from '@appwrite.io/pink-svelte';
import Button from '$lib/elements/forms/button.svelte';
import { base } from '$app/paths';
import { page } from '$app/stores';
@@ -17,18 +7,15 @@
import DeploymentCreatedBy from '../(components)/deploymentCreatedBy.svelte';
import DeploymentSource from '../(components)/deploymentSource.svelte';
import Id from '$lib/components/id.svelte';
import {
IconDotsHorizontal,
IconLightningBolt,
IconRefresh,
IconXCircle
} from '@appwrite.io/pink-icons-svelte';
import RedeployModal from '../redeployModal.svelte';
import { Card } from '$lib/components';
import ActivateDeploymentModal from '../activateDeploymentModal.svelte';
import CancelDeploymentModal from './deployments/cancelDeploymentModal.svelte';
import { capitalize } from '$lib/helpers/string';
import { deploymentStatusConverter } from './store';
import DeleteDeploymentModal from './deployments/deleteDeploymentModal.svelte';
import DeploymentActionMenu from '../(components)/deploymentActionMenu.svelte';
export let site: Models.Site;
export let activeDeployment: Models.Deployment;
@@ -37,6 +24,7 @@
let showActivate = false;
let showRedeploy = false;
let showCancel = false;
let showDelete = false;
let selectedDeployment: Models.Deployment = null;
</script>
@@ -90,57 +78,14 @@
</Table.Cell>
<Table.Cell>
<Layout.Stack alignItems="flex-end">
<Popover placement="bottom-end" let:toggle>
<Button
text
icon
size="s"
on:click={(e) => {
e.preventDefault();
toggle(e);
}}>
<Icon size="s" icon={IconDotsHorizontal} />
</Button>
<svelte:fragment slot="tooltip" let:toggle>
<ActionMenu.Root>
<ActionMenu.Item.Button
leadingIcon={IconRefresh}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showRedeploy = true;
toggle(e);
}}>
Redeploy
</ActionMenu.Item.Button>
{#if deployment?.status === 'ready' && deployment?.$id !== site.deploymentId}
<ActionMenu.Item.Button
leadingIcon={IconLightningBolt}
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showActivate = true;
toggle(e);
}}>
Activate
</ActionMenu.Item.Button>
{/if}
{#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'}
<ActionMenu.Item.Button
leadingIcon={IconXCircle}
status="danger"
on:click={(e) => {
e.preventDefault();
selectedDeployment = deployment;
showCancel = true;
toggle(e);
}}>
Cancel
</ActionMenu.Item.Button>
{/if}
</ActionMenu.Root>
</svelte:fragment>
</Popover>
<DeploymentActionMenu
{deployment}
bind:selectedDeployment
bind:showRedeploy
bind:showActivate
bind:showDelete
bind:showCancel
activeDeployment={site.deploymentId} />
</Layout.Stack>
</Table.Cell>
</Table.Link>
@@ -172,3 +117,6 @@
{#if selectedDeployment && showCancel}
<CancelDeploymentModal {selectedDeployment} bind:showCancel />
{/if}
{#if selectedDeployment && showDelete}
<DeleteDeploymentModal {selectedDeployment} bind:showDelete />
{/if}