From 9449596a7b48eee4901b8889ba249fb8e04c5b52 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 29 Sep 2022 10:37:18 +0200 Subject: [PATCH] fix: dates and stores --- src/lib/elements/forms/form.svelte | 2 +- src/lib/helpers/date.ts | 2 +- .../console/project-[project]/functions/+page.svelte | 5 +++-- .../functions/function/[function]/+page.svelte | 7 ++++--- .../function/[function]/executions/+page.svelte | 4 ++-- .../functions/function/[function]/executions/store.ts | 7 +++---- .../function/[function]/settings/+page.svelte | 11 ++++++----- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/lib/elements/forms/form.svelte b/src/lib/elements/forms/form.svelte index 563942b30..cfbd1a2ed 100644 --- a/src/lib/elements/forms/form.svelte +++ b/src/lib/elements/forms/form.svelte @@ -3,6 +3,6 @@ -
+ diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts index 85891a77e..1a7693967 100644 --- a/src/lib/helpers/date.ts +++ b/src/lib/helpers/date.ts @@ -9,7 +9,7 @@ export const toLocaleDate = (datetime: string) => { return date.toLocaleDateString('en', options); }; -export const toLocaleDateTime = (datetime: string) => { +export const toLocaleDateTime = (datetime: string | number) => { const date = new Date(datetime); const options: Intl.DateTimeFormatOptions = { year: 'numeric', diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte index b9adbc8f1..124329a10 100644 --- a/src/routes/console/project-[project]/functions/+page.svelte +++ b/src/routes/console/project-[project]/functions/+page.svelte @@ -14,6 +14,7 @@ import { wizard } from '$lib/stores/wizard'; import { beforeNavigate } from '$app/navigation'; import { Query } from '@aw-labs/appwrite-console'; + import { toLocaleDateTime } from '$lib/helpers/date'; let search = ''; let offset = 0; @@ -34,7 +35,7 @@ wizard.hide(); }); - $: functionList.load([Query.limit(0), Query.offset(0)], search); + $: functionList.load([Query.limit(6), Query.offset(0)], search); $: if (search) offset = 0; @@ -89,7 +90,7 @@ aria-hidden="true" use:tooltip={{ content: `Next execution: - ${func.scheduleNext}` + ${toLocaleDateTime(func.scheduleNext)}` }} /> {/if} diff --git a/src/routes/console/project-[project]/functions/function/[function]/+page.svelte b/src/routes/console/project-[project]/functions/function/[function]/+page.svelte index c4636d948..22880ed3d 100644 --- a/src/routes/console/project-[project]/functions/function/[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function/[function]/+page.svelte @@ -23,6 +23,7 @@ import { calculateSize } from '$lib/helpers/sizeConvertion'; import Activate from './_activate.svelte'; import { Query } from '@aw-labs/appwrite-console'; + import { toLocaleDateTime } from '$lib/helpers/date'; let search = ''; let offset = 0; @@ -75,8 +76,8 @@
-

Created at: {$func.$createdAt}

-

Updated at: {$func.$updatedAt}

+

Created at: {toLocaleDateTime($func.$createdAt)}

+

Updated at: {toLocaleDateTime($func.$updatedAt)}

Entrypoint: {activeDeployment?.entrypoint}

{activeDeployment.status} @@ -146,7 +147,7 @@ - {deployment.$createdAt} + {toLocaleDateTime(deployment.$createdAt)} {deployment.status} diff --git a/src/routes/console/project-[project]/functions/function/[function]/executions/store.ts b/src/routes/console/project-[project]/functions/function/[function]/executions/store.ts index ea783d8f5..a09315308 100644 --- a/src/routes/console/project-[project]/functions/function/[function]/executions/store.ts +++ b/src/routes/console/project-[project]/functions/function/[function]/executions/store.ts @@ -5,15 +5,14 @@ import { cachedStore } from '$lib/helpers/cache'; export const executionList = cachedStore< Models.ExecutionList, { - load: (functionId: string, limit: number, offset: number, search: string) => Promise; + load: (functionId: string, queries?: string[], search?: string) => Promise; } >('executionList', function ({ set }) { return { - load: async (functionId, limit, offset, search) => { + load: async (functionId, queries, search) => { const response = await sdkForProject.functions.listExecutions( functionId, - limit, - offset, + queries, search ); set(response); diff --git a/src/routes/console/project-[project]/functions/function/[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function/[function]/settings/+page.svelte index c4b2c5fdd..23ea0587e 100644 --- a/src/routes/console/project-[project]/functions/function/[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function/[function]/settings/+page.svelte @@ -20,6 +20,7 @@ import type { Models } from '@aw-labs/appwrite-console'; import Variable from '../../../createVariable.svelte'; import Upload from './uploadVariables.svelte'; + import { toLocaleDateTime } from '$lib/helpers/date'; const functionId = $page.params.function; let showDelete = false; @@ -136,8 +137,8 @@

Function ID: {$func.$id}

-

Created at: {$func.$createdAt}

-

Updated at: {$func.$updatedAt}

+

Created at: {toLocaleDateTime($func.$createdAt)}

+

Updated at: {toLocaleDateTime($func.$updatedAt)}

@@ -153,7 +154,7 @@ -
console.log($func.schedule)}> + console.log($func.schedule)}>

Update CRON Schedule

@@ -179,7 +180,7 @@

-
+

Update Timeout

@@ -335,7 +336,7 @@

{$func.name}
-

Last Updated: {$func.$updatedAt}

+

Last Updated: {toLocaleDateTime($func.$updatedAt)}