feat: executions filters

This commit is contained in:
Arman committed 2024-06-21 15:02:39 +02:00
1 parent 16714258c2
commit 01ea844ec6
4 files changed
+171 -92

No files matched your search

+2 -7
View File
@@ -16,7 +16,6 @@
import { isCloud } from '$lib/system';
import { getServiceLimit, tierToPlan, upgradeURL } from '$lib/stores/billing';
import { organization } from '$lib/stores/organization';
import { app } from '$lib/stores/app';
import { Button } from '$lib/elements/forms';
import { BillingPlan } from '$lib/constants';
@@ -163,9 +162,7 @@
</div>
</header>
<div class="code-panel-content grid-1-2" style="u-grid">
<div
class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16"
class:theme-dark={$app.themeInUse === 'light'}>
<div class="grid-1-2-col-1 u-flex u-flex-vertical u-gap-16">
<Heading tag="h3" size="6">Request</Heading>
<div class="u-sep-block-end">
<Tabs>
@@ -276,9 +273,7 @@
</p>
{/if}
</div>
<div
class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0"
class:theme-dark={$app.themeInUse === 'light'}>
<div class="grid-1-2-col-2 u-flex u-flex-vertical u-gap-16 u-min-width-0">
<Heading tag="h3" size="6">Response</Heading>
<div class="u-sep-block-end">
<Tabs>
@@ -1,36 +1,37 @@
<script lang="ts">
import { invalidate } from '$app/navigation';
import { Alert, EmptySearch, Id, PaginationWithLimit } from '$lib/components';
import { Alert, EmptySearch, PaginationWithLimit, ViewSelector } from '$lib/components';
import { BillingPlan, Dependencies } from '$lib/constants';
import { Pill } from '$lib/elements';
import { Button } from '$lib/elements/forms';
import {
TableBody,
TableCell,
TableCellHead,
TableCellText,
TableHeader,
TableRowButton,
TableScroll
} from '$lib/elements/table';
import { hoursToDays, timeFromNow, toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
import { calculateTime } from '$lib/helpers/timeConversion';
import { hoursToDays } from '$lib/helpers/date';
import { Container, ContainerHeader } from '$lib/layout';
import { log } from '$lib/stores/logs';
import { sdk } from '$lib/stores/sdk';
import { onMount } from 'svelte';
import { func } from '../store';
import type { Models } from '@appwrite.io/console';
import { organization } from '$lib/stores/organization';
import { getServiceLimit, showUsageRatesModal } from '$lib/stores/billing';
import { project } from '$routes/console/project-[project]/store';
import Create from '../create.svelte';
import { abbreviateNumber } from '$lib/helpers/numbers';
import { base } from '$app/paths';
import { tooltip } from '$lib/actions/tooltip';
import { Filters } from '$lib/components/filters';
import { writable } from 'svelte/store';
import type { Column } from '$lib/helpers/types';
import { View } from '$lib/helpers/load';
import Table from './table.svelte';
export let data;
const columns = writable<Column[]>([
{ id: '$id', title: 'Execution ID', type: 'string', show: true, width: 150 },
{ id: 'status', title: 'Status', type: 'string', show: true, width: 110 },
{ id: '$createdAt', title: 'Created', type: 'datetime', show: true, width: 140 },
{ id: 'trigger', title: 'Trigger', type: 'string', show: true, filter: false, width: 90 },
{ id: 'requestMethod', title: 'Method', type: 'string', show: true, width: 70 },
{ id: 'requestPath', title: 'Path', type: 'string', show: true, width: 90 },
{ id: 'duration', title: 'Duration', type: 'string', show: true, width: 80 }
]);
onMount(() => {
return sdk.forConsole.client.subscribe('console', (response) => {
if (response.events.includes('functions.*.executions.*')) {
@@ -39,21 +40,11 @@
});
});
function showLogs(execution: Models.Execution) {
$log.show = true;
$log.func = $func;
$log.data = execution;
}
const logs = getServiceLimit('logs');
</script>
<Container>
<ContainerHeader
title="Executions"
buttonText="Execute now"
buttonEvent="execute_function"
buttonHref={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
<ContainerHeader title="Executions">
<svelte:fragment slot="tooltip" let:tier let:limit let:upgradeMethod>
<p class="u-bold">The {tier} plan has limits</p>
<ul>
@@ -82,6 +73,42 @@
{/if}
</svelte:fragment>
</ContainerHeader>
<div class="u-flex u-main-space-between is-not-mobile u-margin-block-start-16">
<Filters query={data.query} {columns} />
<div class="u-flex u-gap-16">
<ViewSelector view={View.Table} {columns} hideView allowNoColumns showColsTextMobile />
<Button
event="execute_function"
href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
<span class="icon-plus" aria-hidden="true" />
<span class="text">Execute now</span>
</Button>
</div>
</div>
<div class="u-flex u-flex-vertical u-gap-16 u-margin-block-start-16 is-only-mobile">
<div class=" u-flex u-gap-16">
<div class="u-flex-basis-50-percent">
<ViewSelector
view={View.Table}
{columns}
hideView
allowNoColumns
showColsTextMobile
fullWidthMobile />
</div>
<div class="u-flex-basis-50-percent">
<Filters query={data.query} {columns} fullWidthMobile />
</div>
</div>
<Button
event="execute_function"
href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
fullWidthMobile>
<span class="icon-plus" aria-hidden="true" />
<span class="text">Execute now</span>
</Button>
</div>
{#if !$func.logging}
<div class="common-section">
@@ -97,62 +124,8 @@
</Alert>
</div>
{/if}
{#if data.executions.total}
<TableScroll>
<TableHeader>
<TableCellHead width={150}>Execution ID</TableCellHead>
<TableCellHead width={110}>Status</TableCellHead>
<TableCellHead width={140}>Created</TableCellHead>
<TableCellHead width={90}>Trigger</TableCellHead>
<TableCellHead width={70}>Method</TableCellHead>
<TableCellHead width={90}>Path</TableCellHead>
<TableCellHead width={80}>Duration</TableCellHead>
</TableHeader>
<TableBody>
{#each data.executions.executions as execution}
<TableRowButton on:click={() => showLogs(execution)}>
<TableCell width={150} title="Execution ID">
<Id value={execution.$id}>{execution.$id}</Id>
</TableCell>
<TableCell width={110} title="Status">
{@const status = execution.status}
<div
use:tooltip={{
content: `Scheduled to execute on ${toLocaleDateTime(execution?.schedule)}`,
disabled: !execution?.schedule
}}>
<Pill
warning={status === 'waiting' || status === 'building'}
danger={status === 'failed'}
info={status === 'completed' || status === 'ready'}>
{#if status === 'scheduled'}
<span class="icon-clock" aria-hidden="true" />
{/if}
{status}
</Pill>
</div>
</TableCell>
<TableCellText width={140} title="Created">
{timeFromNow(execution.$createdAt)}
</TableCellText>
<TableCell width={90} title="Trigger">
<Pill>
<span class="text u-trim">{execution.trigger}</span>
</Pill>
</TableCell>
<TableCellText width={70} title="Method">
{execution.requestMethod}
</TableCellText>
<TableCellText width={90} title="Path">
{execution.requestPath}
</TableCellText>
<TableCellText width={80} title="Duration">
{calculateTime(execution.duration)}
</TableCellText>
</TableRowButton>
{/each}
</TableBody>
</TableScroll>
{#if data?.executions?.total}
<Table columns={$columns} {data} />
<PaginationWithLimit
name="Executions"
@@ -1,22 +1,29 @@
import { Query } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
import { getLimit, getPage, getQuery, pageToOffset } from '$lib/helpers/load';
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import type { PageLoad } from './$types';
import { queries, queryParamToMap } from '$lib/components/filters';
export const load: PageLoad = async ({ params, depends, url, route }) => {
depends(Dependencies.EXECUTIONS);
const page = getPage(url);
const limit = getLimit(url, route, PAGE_LIMIT);
const offset = pageToOffset(page, limit);
const query = getQuery(url);
const parsedQueries = queryParamToMap(query || '[]');
queries.set(parsedQueries);
return {
offset,
limit,
query,
executions: await sdk.forProject.functions.listExecutions(params.function, [
Query.limit(limit),
Query.offset(offset),
Query.orderDesc('')
Query.orderDesc(''),
...parsedQueries.values()
])
};
};
@@ -0,0 +1,104 @@
<script lang="ts">
import { Id } from '$lib/components';
import {
TableBody,
TableCell,
TableCellHead,
TableCellText,
TableHeader,
TableRowButton,
TableScroll
} from '$lib/elements/table';
import type { PageData } from './$types';
import { timeFromNow, toLocaleDateTime } from '$lib/helpers/date';
import { type Models } from '@appwrite.io/console';
import type { Column } from '$lib/helpers/types';
import { tooltip } from '$lib/actions/tooltip';
import { Pill } from '$lib/elements';
import { calculateTime } from '$lib/helpers/timeConversion';
import { log } from '$lib/stores/logs';
import { func } from '../store';
export let columns: Column[];
export let data: PageData;
let execution: Record<string, Models.Execution> = {};
$: data.executions.executions.forEach((s) => {
execution[s.$id] = s;
});
function showLogs(execution: Models.Execution) {
$log.show = true;
$log.func = $func;
$log.data = execution;
}
</script>
<TableScroll>
<TableHeader>
{#each columns as column}
{#if column.show}
<TableCellHead width={column.width}>{column.title}</TableCellHead>
{/if}
{/each}
</TableHeader>
<TableBody>
{#each data.executions.executions as execution (execution.$id)}
<TableRowButton on:click={() => showLogs(execution)}>
{#each columns as column}
{#if column.show}
{#if column.id === '$id'}
{#key column.id}
<TableCell width={column.width} title="Execution ID">
<Id value={execution.$id}>{execution.$id}</Id>
</TableCell>
{/key}
{:else if column.id === 'status'}
<TableCell width={column.width} title={column.title}>
{@const status = execution.status}
<div
use:tooltip={{
content: `Scheduled to execute on ${toLocaleDateTime(execution?.schedule)}`,
disabled: !execution?.schedule
}}>
<Pill
warning={status === 'waiting' || status === 'building'}
danger={status === 'failed'}
info={status === 'completed' || status === 'ready'}>
{#if status === 'scheduled'}
<span class="icon-clock" aria-hidden="true" />
{/if}
{status}
</Pill>
</div>
</TableCell>
{:else if column.id === '$createdAt'}
<TableCellText width={column.width} title={column.title}>
{timeFromNow(execution.$createdAt)}
</TableCellText>
{:else if column.id === 'trigger'}
<TableCell width={column.width} title={column.title}>
<Pill>
<span class="text u-trim">{execution.trigger}</span>
</Pill>
</TableCell>
{:else if column.id === 'requestMethod'}
<TableCellText width={column.width} title={column.title}>
{execution.requestMethod}
</TableCellText>
{:else if column.id === 'requestPath'}
<TableCellText width={column.width} title={column.title}>
{execution.requestPath}
</TableCellText>
{:else if column.id === 'duration'}
<TableCellText width={column.width} title={column.title}>
{calculateTime(execution.duration)}
</TableCellText>
{/if}
{/if}
{/each}
</TableRowButton>
{/each}
</TableBody>
</TableScroll>