mirror of
https://github.com/appwrite/console.git
synced 2026-06-06 19:27:48 +00:00
fix: deployments and overview
This commit is contained in:
1 parent
19efdafad8
commit
96e8064bd6
9 files changed
+323
-271
No files matched your search
+1
-1
@@ -23,7 +23,7 @@
|
||||
"@appwrite.io/pink-icons": "0.25.0",
|
||||
"@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16",
|
||||
"@appwrite.io/pink-legacy": "^1.0.0",
|
||||
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462",
|
||||
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37",
|
||||
"@popperjs/core": "^2.11.8",
|
||||
"@sentry/sveltekit": "^8.38.0",
|
||||
"@stripe/stripe-js": "^3.5.0",
|
||||
|
||||
Generated
+12
-12
@@ -21,8 +21,8 @@ importers:
|
||||
specifier: ^1.0.0
|
||||
version: 1.0.0
|
||||
'@appwrite.io/pink-svelte':
|
||||
specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462
|
||||
version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)
|
||||
specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37
|
||||
version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)
|
||||
'@popperjs/core':
|
||||
specifier: ^2.11.8
|
||||
version: 2.11.8
|
||||
@@ -218,14 +218,14 @@ packages:
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c}
|
||||
version: 1.2.1
|
||||
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16}
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c}
|
||||
version: 1.0.0-next.7
|
||||
peerDependencies:
|
||||
svelte: ^4.0.0
|
||||
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7}
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16}
|
||||
version: 1.0.0-next.7
|
||||
peerDependencies:
|
||||
svelte: ^4.0.0
|
||||
@@ -239,8 +239,8 @@ packages:
|
||||
'@appwrite.io/pink-legacy@1.0.0':
|
||||
resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==}
|
||||
|
||||
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462}
|
||||
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37':
|
||||
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37}
|
||||
version: 1.0.0-next.85
|
||||
peerDependencies:
|
||||
react-dom: ^18.0.0
|
||||
@@ -4090,11 +4090,11 @@ snapshots:
|
||||
|
||||
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@70f1b0c': {}
|
||||
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16(svelte@4.2.19)':
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c(svelte@4.2.19)':
|
||||
dependencies:
|
||||
svelte: 4.2.19
|
||||
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19)':
|
||||
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a07c16(svelte@4.2.19)':
|
||||
dependencies:
|
||||
svelte: 4.2.19
|
||||
|
||||
@@ -4107,9 +4107,9 @@ snapshots:
|
||||
'@appwrite.io/pink-icons': 1.0.0
|
||||
the-new-css-reset: 1.11.3
|
||||
|
||||
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a7f0462(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)':
|
||||
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@464cb37(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)':
|
||||
dependencies:
|
||||
'@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a7f04622ed0e219920d7194a21aae086ef8c61f7(svelte@4.2.19)
|
||||
'@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@464cb37a6262e37aac7d9211e0d4986556a6c39c(svelte@4.2.19)
|
||||
'@floating-ui/dom': 1.6.13
|
||||
'@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19)
|
||||
'@melt-ui/svelte': 0.86.2(svelte@4.2.19)
|
||||
|
||||
@@ -19,13 +19,16 @@
|
||||
|
||||
<Container>
|
||||
<Layout.Stack gap="xxl">
|
||||
<SiteCard deployment={data.deployment} proxyRuleList={data.proxyRuleList}>
|
||||
<svelte:fragment slot="footer">
|
||||
<Button external href={`${$protocol}${data.deployment.domain}`}>Visit</Button>
|
||||
<!-- TODO: disable when disabled={data.hasProdReadyDeployments} -->
|
||||
<Button secondary on:click={() => (showRollback = true)}>Instant rollback</Button>
|
||||
</svelte:fragment>
|
||||
</SiteCard>
|
||||
{#if data.deployment}
|
||||
<SiteCard deployment={data.deployment} proxyRuleList={data.proxyRuleList}>
|
||||
<svelte:fragment slot="footer">
|
||||
<Button external href={`${$protocol}${data.deployment.domain}`}>Visit</Button>
|
||||
<!-- TODO: disable when disabled={data.hasProdReadyDeployments} -->
|
||||
<Button secondary on:click={() => (showRollback = true)}
|
||||
>Instant rollback</Button>
|
||||
</svelte:fragment>
|
||||
</SiteCard>
|
||||
{/if}
|
||||
|
||||
<Divider />
|
||||
|
||||
|
||||
@@ -7,8 +7,7 @@ export const load = async ({ params, depends, parent }) => {
|
||||
depends(Dependencies.SITES_DOMAINS);
|
||||
const { site, proxyRuleList } = await parent();
|
||||
|
||||
const [deployment, deploymentList, prodReadyDeployments] = await Promise.all([
|
||||
sdk.forProject.sites.getDeployment(params.site, site.deploymentId),
|
||||
const [deploymentList, prodReadyDeployments] = await Promise.all([
|
||||
sdk.forProject.sites.listDeployments(params.site, [Query.limit(5), Query.orderDesc('')]),
|
||||
sdk.forProject.sites.listDeployments(params.site, [
|
||||
Query.limit(1)
|
||||
@@ -18,8 +17,10 @@ export const load = async ({ params, depends, parent }) => {
|
||||
]);
|
||||
return {
|
||||
site,
|
||||
deployment,
|
||||
deploymentList,
|
||||
deployment: deploymentList?.total
|
||||
? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId)
|
||||
: null,
|
||||
proxyRuleList,
|
||||
hasProdReadyDeployments: prodReadyDeployments?.deployments?.length > 0
|
||||
};
|
||||
|
||||
+93
-154
@@ -1,25 +1,22 @@
|
||||
<script lang="ts">
|
||||
import { PaginationWithLimit, ViewSelector, EmptyFilter } from '$lib/components';
|
||||
import { Button, InputSelect } from '$lib/elements/forms';
|
||||
import { PaginationWithLimit, ViewSelector, EmptyFilter, Empty } from '$lib/components';
|
||||
import { Button } from '$lib/elements/forms';
|
||||
import { Container } from '$lib/layout';
|
||||
import { SiteUsageRange, type Models } from '@appwrite.io/console';
|
||||
import { type Models } from '@appwrite.io/console';
|
||||
import { Filters } from '$lib/components/filters';
|
||||
import { queries, tags } from '$lib/components/filters/store';
|
||||
import { View } from '$lib/helpers/load';
|
||||
import { Pill } from '$lib/elements';
|
||||
import { onMount } from 'svelte';
|
||||
import { ActionMenu, Layout, Popover, Typography } from '@appwrite.io/pink-svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { page } from '$app/stores';
|
||||
import { toLocaleDate } from '$lib/helpers/date';
|
||||
import { ActionMenu, Icon, Layout, Popover } from '@appwrite.io/pink-svelte';
|
||||
import Table from './table.svelte';
|
||||
import QuickFilters from './quickFilters.svelte';
|
||||
import RedeployModal from '../../redeployModal.svelte';
|
||||
import CreateGitDeploymentModal from './createGitDeploymentModal.svelte';
|
||||
import UsageCard from './usageCard.svelte';
|
||||
import ConnectRepoModal from '../../(components)/connectRepoModal.svelte';
|
||||
import { columns } from './store';
|
||||
import CreateManualDeploymentModal from './createManualDeploymentModal.svelte';
|
||||
import DeploymentMetrics from './deploymentMetrics.svelte';
|
||||
import { IconPlus } from '@appwrite.io/pink-icons-svelte';
|
||||
|
||||
export let data;
|
||||
|
||||
@@ -32,134 +29,63 @@
|
||||
let showConnectManual = false;
|
||||
let showMobileFilters = false;
|
||||
|
||||
let range = SiteUsageRange.ThirtyDays;
|
||||
const rangeOptions = [
|
||||
{ value: SiteUsageRange.TwentyFourHours, label: 'Last 24 hours' },
|
||||
{ value: SiteUsageRange.ThirtyDays, label: 'Last 30 days' },
|
||||
{ value: SiteUsageRange.NinetyDays, label: 'Last 90 days' }
|
||||
];
|
||||
const now = new Date();
|
||||
let metrics = [
|
||||
{
|
||||
id: 'buildsTotal',
|
||||
value: null,
|
||||
description: 'Total build count'
|
||||
},
|
||||
{
|
||||
id: 'buildsStorageTotal',
|
||||
value: null,
|
||||
description: 'Total build size'
|
||||
},
|
||||
{
|
||||
id: 'buildsTimeTotal',
|
||||
value: null,
|
||||
description: 'Total build time'
|
||||
},
|
||||
{
|
||||
id: 'avgTime',
|
||||
value: null,
|
||||
description: 'Average build time'
|
||||
},
|
||||
{
|
||||
id: 'success',
|
||||
value: null,
|
||||
description: 'Successful deployment'
|
||||
},
|
||||
{
|
||||
id: 'failed',
|
||||
value: null,
|
||||
description: 'Failed deployment'
|
||||
}
|
||||
];
|
||||
onMount(async () => {
|
||||
data?.query ? (showMobileFilters = true) : (showMobileFilters = false);
|
||||
await fetchUsage();
|
||||
});
|
||||
|
||||
async function fetchUsage() {
|
||||
metrics.forEach((metric) => {
|
||||
metric.value = null;
|
||||
});
|
||||
metrics = metrics;
|
||||
try {
|
||||
const usage = await sdk.forProject.sites.getSiteUsage($page.params.site, range);
|
||||
metrics = metrics.map((metric) => {
|
||||
metric.value = usage[metric.id];
|
||||
return metric;
|
||||
});
|
||||
metrics = metrics;
|
||||
console.log(usage);
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
function clearAll() {
|
||||
queries.clearAll();
|
||||
queries.apply();
|
||||
}
|
||||
|
||||
$: console.log(metrics);
|
||||
</script>
|
||||
|
||||
<Container>
|
||||
<Layout.Stack gap="xxl">
|
||||
<Layout.Stack gap="xl">
|
||||
<Layout.Stack direction="row" justifyContent="space-between" alignItems="center">
|
||||
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-tertiary">
|
||||
Metrics for {range !== SiteUsageRange.TwentyFourHours
|
||||
? `${toLocaleDate(
|
||||
new Date(
|
||||
now.getTime() -
|
||||
parseInt(range.split('d')[0]) * 24 * 60 * 60 * 1000
|
||||
).toString()
|
||||
)} to`
|
||||
: ''}
|
||||
{toLocaleDate(now.toString())}
|
||||
</Typography.Text>
|
||||
<div>
|
||||
<InputSelect
|
||||
id="range"
|
||||
bind:value={range}
|
||||
options={rangeOptions}
|
||||
on:change={fetchUsage} />
|
||||
</div>
|
||||
</Layout.Stack>
|
||||
<Layout.Stack direction="row">
|
||||
{#each metrics as metric}
|
||||
<UsageCard description={metric.description} bind:value={metric.value} />
|
||||
{/each}
|
||||
</Layout.Stack>
|
||||
</Layout.Stack>
|
||||
{#if data.deploymentList.total}
|
||||
<DeploymentMetrics deploymentList={data.deploymentList} />
|
||||
{/if}
|
||||
<Layout.Stack gap="l">
|
||||
<Layout.Stack justifyContent="space-between" direction="row">
|
||||
<Layout.Stack alignItems="center" direction="row" gap="s">
|
||||
<QuickFilters {columns} />
|
||||
<Filters query={data.query} {columns} let:disabled let:toggle singleCondition>
|
||||
<Layout.Stack alignItems="center" direction="row" gap="xs">
|
||||
<Button
|
||||
text
|
||||
on:click={toggle}
|
||||
{disabled}
|
||||
size="s"
|
||||
ariaLabel="open filter">
|
||||
<span class="icon-filter-line" />
|
||||
<span class="text">More filters</span>
|
||||
</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 data.deploymentList.total}
|
||||
<QuickFilters {columns} />
|
||||
<Filters
|
||||
query={data.query}
|
||||
{columns}
|
||||
let:disabled
|
||||
let:toggle
|
||||
singleCondition>
|
||||
<Layout.Stack alignItems="center" direction="row" gap="xs">
|
||||
<Button
|
||||
text
|
||||
on:click={toggle}
|
||||
{disabled}
|
||||
size="s"
|
||||
ariaLabel="open filter">
|
||||
<span class="icon-filter-line" />
|
||||
<span class="text">More filters</span>
|
||||
</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>
|
||||
<ViewSelector view={View.Table} {columns} hideView allowNoColumns hideText />
|
||||
{#if data.deploymentList.total}
|
||||
<ViewSelector
|
||||
view={View.Table}
|
||||
{columns}
|
||||
hideView
|
||||
allowNoColumns
|
||||
hideText />
|
||||
{/if}
|
||||
<Popover let:toggle>
|
||||
<Button size="s" on:click={toggle}>Create deployment</Button>
|
||||
<Button size="s" on:click={toggle}>
|
||||
<Icon size="s" icon={IconPlus} />
|
||||
Create deployment
|
||||
</Button>
|
||||
<svelte:fragment slot="tooltip">
|
||||
<ActionMenu.Root>
|
||||
<ActionMenu.Item.Button
|
||||
@@ -190,40 +116,42 @@
|
||||
</Popover>
|
||||
</Layout.Stack>
|
||||
</Layout.Stack>
|
||||
<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>
|
||||
{#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 />
|
||||
</Layout.Stack>
|
||||
<div
|
||||
class:u-hide={!showMobileFilters}
|
||||
class:u-flex={showMobileFilters}
|
||||
class=" u-gap-8 u-flex-wrap u-margin-block-start-16">
|
||||
<QuickFilters {columns} />
|
||||
<ViewSelector view={View.Table} {columns} hideView allowNoColumns />
|
||||
</Layout.Stack>
|
||||
<div
|
||||
class:u-hide={!showMobileFilters}
|
||||
class:u-flex={showMobileFilters}
|
||||
class=" u-gap-8 u-flex-wrap u-margin-block-start-16">
|
||||
<QuickFilters {columns} />
|
||||
|
||||
<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">
|
||||
<span class="text">More filters</span>
|
||||
<span class="icon-cheveron-down" />
|
||||
</Pill>
|
||||
</svelte:fragment>
|
||||
</Filters>
|
||||
<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">
|
||||
<span class="text">More filters</span>
|
||||
<span class="icon-cheveron-down" />
|
||||
</Pill>
|
||||
</svelte:fragment>
|
||||
</Filters>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{#if data.deploymentList.total}
|
||||
<Table {data} />
|
||||
|
||||
@@ -234,6 +162,17 @@
|
||||
total={data.deploymentList?.total} />
|
||||
{:else if data?.query}
|
||||
<EmptyFilter resource="deployments" />
|
||||
{:else}
|
||||
<Empty
|
||||
single
|
||||
target="deployment"
|
||||
on:click={() => {
|
||||
if (!hasInstallation) {
|
||||
showConnectRepo = true;
|
||||
} else {
|
||||
showCreateDeployment = true;
|
||||
}
|
||||
}} />
|
||||
{/if}
|
||||
</Layout.Stack>
|
||||
</Layout.Stack>
|
||||
|
||||
@@ -5,7 +5,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants';
|
||||
import { queries, queryParamToMap } from '$lib/components/filters';
|
||||
|
||||
export const load = async ({ params, depends, url, route, parent }) => {
|
||||
const data = await parent();
|
||||
const { site } = await parent();
|
||||
depends(Dependencies.DEPLOYMENTS);
|
||||
const page = getPage(url);
|
||||
const limit = getLimit(url, route, PAGE_LIMIT);
|
||||
@@ -29,10 +29,11 @@ export const load = async ({ params, depends, url, route, parent }) => {
|
||||
offset,
|
||||
limit,
|
||||
query,
|
||||
activeDeployment: data.site.deploymentId
|
||||
? await sdk.forProject.sites.getDeployment(params.site, data.site.deploymentId)
|
||||
: null,
|
||||
deploymentList,
|
||||
activeDeployment:
|
||||
site.deploymentId && deploymentList?.total
|
||||
? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId)
|
||||
: null,
|
||||
installations
|
||||
};
|
||||
};
|
||||
+1
@@ -143,6 +143,7 @@
|
||||
<Repositories
|
||||
bind:selectedRepository
|
||||
installationList={installations}
|
||||
product="sites"
|
||||
action="button"
|
||||
callbackState={{
|
||||
createDeployment: 'true'
|
||||
|
||||
+103
@@ -0,0 +1,103 @@
|
||||
<script lang="ts">
|
||||
import { InputSelect } from '$lib/elements/forms';
|
||||
import { toLocaleDate } from '$lib/helpers/date';
|
||||
import { Layout, Typography } from '@appwrite.io/pink-svelte';
|
||||
import UsageCard from './usageCard.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { SiteUsageRange, type Models } from '@appwrite.io/console';
|
||||
import { onMount } from 'svelte';
|
||||
import { page } from '$app/stores';
|
||||
|
||||
export let deploymentList: Models.DeploymentList;
|
||||
let range = SiteUsageRange.ThirtyDays;
|
||||
const rangeOptions = [
|
||||
{ value: SiteUsageRange.TwentyFourHours, label: 'Last 24 hours' },
|
||||
{ value: SiteUsageRange.ThirtyDays, label: 'Last 30 days' },
|
||||
{ value: SiteUsageRange.NinetyDays, label: 'Last 90 days' }
|
||||
];
|
||||
const now = new Date();
|
||||
let metrics = [
|
||||
{
|
||||
id: 'buildsTotal',
|
||||
value: null,
|
||||
description: 'Total build count'
|
||||
},
|
||||
{
|
||||
id: 'buildsStorageTotal',
|
||||
value: null,
|
||||
description: 'Total build size'
|
||||
},
|
||||
{
|
||||
id: 'buildsTimeTotal',
|
||||
value: null,
|
||||
description: 'Total build time'
|
||||
},
|
||||
{
|
||||
id: 'avgTime',
|
||||
value: null,
|
||||
description: 'Average build time'
|
||||
},
|
||||
{
|
||||
id: 'success',
|
||||
value: null,
|
||||
description: 'Successful deployment'
|
||||
},
|
||||
{
|
||||
id: 'failed',
|
||||
value: null,
|
||||
description: 'Failed deployment'
|
||||
}
|
||||
];
|
||||
onMount(async () => {
|
||||
if (deploymentList.total) {
|
||||
await fetchUsage();
|
||||
}
|
||||
});
|
||||
|
||||
async function fetchUsage() {
|
||||
metrics.forEach((metric) => {
|
||||
metric.value = null;
|
||||
});
|
||||
metrics = metrics;
|
||||
try {
|
||||
const usage = await sdk.forProject.sites.getSiteUsage($page.params.site, range);
|
||||
metrics = metrics.map((metric) => {
|
||||
metric.value = usage[metric.id];
|
||||
return metric;
|
||||
});
|
||||
metrics = metrics;
|
||||
console.log(usage);
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
|
||||
$: console.log(metrics);
|
||||
</script>
|
||||
|
||||
<Layout.Stack gap="xl">
|
||||
<Layout.Stack direction="row" justifyContent="space-between" alignItems="center">
|
||||
<Typography.Text variant="m-400" color="--color-fgcolor-neutral-tertiary">
|
||||
Metrics for {range !== SiteUsageRange.TwentyFourHours
|
||||
? `${toLocaleDate(
|
||||
new Date(
|
||||
now.getTime() - parseInt(range.split('d')[0]) * 24 * 60 * 60 * 1000
|
||||
).toString()
|
||||
)} to`
|
||||
: ''}
|
||||
{toLocaleDate(now.toString())}
|
||||
</Typography.Text>
|
||||
<div>
|
||||
<InputSelect
|
||||
id="range"
|
||||
bind:value={range}
|
||||
options={rangeOptions}
|
||||
on:change={fetchUsage} />
|
||||
</div>
|
||||
</Layout.Stack>
|
||||
<Layout.Stack direction="row">
|
||||
{#each metrics as metric}
|
||||
<UsageCard description={metric.description} bind:value={metric.value} />
|
||||
{/each}
|
||||
</Layout.Stack>
|
||||
</Layout.Stack>
|
||||
+94
-90
@@ -31,98 +31,102 @@
|
||||
$: console.log(deploymentList);
|
||||
</script>
|
||||
|
||||
<Layout.Stack>
|
||||
<Layout.Stack direction="row" justifyContent="space-between" alignItems="center">
|
||||
<Layout.Stack gap="xs" direction="row" alignItems="center" inline>
|
||||
<Typography.Text variant="l-500">Deployments</Typography.Text><Badge
|
||||
variant="secondary"
|
||||
content={deploymentList?.total.toString()}
|
||||
size="s" />
|
||||
{#if deploymentList.total}
|
||||
<Layout.Stack>
|
||||
<Layout.Stack direction="row" justifyContent="space-between" alignItems="center">
|
||||
<Layout.Stack gap="xs" direction="row" alignItems="center" inline>
|
||||
<Typography.Text variant="l-500">Deployments</Typography.Text><Badge
|
||||
variant="secondary"
|
||||
content={deploymentList?.total.toString()}
|
||||
size="s" />
|
||||
</Layout.Stack>
|
||||
<Button
|
||||
secondary
|
||||
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments`}>
|
||||
View all
|
||||
</Button>
|
||||
</Layout.Stack>
|
||||
<Button
|
||||
secondary
|
||||
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments`}>
|
||||
View all
|
||||
</Button>
|
||||
</Layout.Stack>
|
||||
{#if deploymentList?.total}
|
||||
<Table.Root>
|
||||
<svelte:fragment slot="header">
|
||||
<Table.Header.Cell>Deployment ID</Table.Header.Cell>
|
||||
<Table.Header.Cell>Status</Table.Header.Cell>
|
||||
<Table.Header.Cell>Source</Table.Header.Cell>
|
||||
<Table.Header.Cell>Updated</Table.Header.Cell>
|
||||
<Table.Header.Cell />
|
||||
</svelte:fragment>
|
||||
{#each deploymentList?.deployments as deployment}
|
||||
<Table.Link
|
||||
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments/deployment-${deployment.$id}`}>
|
||||
<Table.Cell>
|
||||
<Id value={deployment.$id}>{deployment.$id}</Id>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
{@const status = deployment.status}
|
||||
{#if activeDeployment?.$id === deployment?.$id}
|
||||
<Status status="complete" label="active" />
|
||||
{:else}
|
||||
<Status
|
||||
status={status === 'failed'
|
||||
? status
|
||||
: status === 'building'
|
||||
? 'pending'
|
||||
: 'ready'}
|
||||
label={status} />
|
||||
{/if}
|
||||
</Table.Cell>
|
||||
{#if deploymentList?.total}
|
||||
<Table.Root>
|
||||
<svelte:fragment slot="header">
|
||||
<Table.Header.Cell>Deployment ID</Table.Header.Cell>
|
||||
<Table.Header.Cell>Status</Table.Header.Cell>
|
||||
<Table.Header.Cell>Source</Table.Header.Cell>
|
||||
<Table.Header.Cell>Updated</Table.Header.Cell>
|
||||
<Table.Header.Cell />
|
||||
</svelte:fragment>
|
||||
{#each deploymentList?.deployments as deployment}
|
||||
<Table.Link
|
||||
href={`${base}/project-${$page.params.project}/sites/site-${$page.params.site}/deployments/deployment-${deployment.$id}`}>
|
||||
<Table.Cell>
|
||||
<Id value={deployment.$id}>{deployment.$id}</Id>
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
{@const status = deployment.status}
|
||||
{#if activeDeployment?.$id === deployment?.$id}
|
||||
<Status status="complete" label="active" />
|
||||
{:else}
|
||||
<Status
|
||||
status={status === 'failed'
|
||||
? status
|
||||
: status === 'building'
|
||||
? 'pending'
|
||||
: 'ready'}
|
||||
label={status} />
|
||||
{/if}
|
||||
</Table.Cell>
|
||||
|
||||
<Table.Cell>
|
||||
<DeploymentSource {deployment} />
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<DeploymentCreatedBy {deployment} />
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<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.Button
|
||||
leadingIcon={IconGlobeAlt}
|
||||
on:click={(e) => {
|
||||
e.preventDefault();
|
||||
selectedDeployment = deployment;
|
||||
showPromote = true;
|
||||
toggle(e);
|
||||
}}>
|
||||
Promote
|
||||
</ActionMenu.Item.Button>
|
||||
</ActionMenu.Root>
|
||||
</svelte:fragment>
|
||||
</Popover>
|
||||
</Table.Cell>
|
||||
</Table.Link>
|
||||
{/each}
|
||||
</Table.Root>
|
||||
{/if}
|
||||
</Layout.Stack>
|
||||
<Table.Cell>
|
||||
<DeploymentSource {deployment} />
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<DeploymentCreatedBy {deployment} />
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
<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.Button
|
||||
leadingIcon={IconGlobeAlt}
|
||||
on:click={(e) => {
|
||||
e.preventDefault();
|
||||
selectedDeployment = deployment;
|
||||
showPromote = true;
|
||||
toggle(e);
|
||||
}}>
|
||||
Promote
|
||||
</ActionMenu.Item.Button>
|
||||
</ActionMenu.Root>
|
||||
</svelte:fragment>
|
||||
</Popover>
|
||||
</Table.Cell>
|
||||
</Table.Link>
|
||||
{/each}
|
||||
</Table.Root>
|
||||
{/if}
|
||||
</Layout.Stack>
|
||||
{:else}
|
||||
hi
|
||||
{/if}
|
||||
|
||||
{#if selectedDeployment && showRedeploy}
|
||||
<RedeployModal {site} selectedDeploymentId={selectedDeployment.$id} bind:show={showRedeploy} />
|
||||
|
||||
Reference in new issue
Block a user