From 2624eef75f47a1ad85994962c15f82a2b87deb87 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 9 Nov 2022 11:30:48 +0100 Subject: [PATCH 1/2] fix: api key expiration date --- .../overview/keys/[key]/+page.ts | 7 +- .../overview/keys/wizard/step1.svelte | 74 ++++++++++++++++++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts index 11847cc4a..62c8a4fdb 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts @@ -7,9 +7,14 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEY); + const key = await sdkForConsole.projects.getKey(params.project, params.key); + if (key.expire) { + key.expire = new Date(key.expire).toISOString().slice(0, 23); + } + return { header: Header, breadcrumbs: Breadcrumbs, - key: await sdkForConsole.projects.getKey(params.project, params.key) + key }; }; diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte index 3637cd145..3dfe50463 100644 --- a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte +++ b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte @@ -1,7 +1,45 @@ @@ -14,6 +52,38 @@ placeholder="API Key Name" required bind:value={$key.name} /> - + + {#if preset === 'custom'} + + {/if} From 88a53b295ba7af2c8862b856b8cfcbfff23fae40 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 9 Nov 2022 16:22:54 +0100 Subject: [PATCH 2/2] fix: custom expiration date --- .../project-[project]/overview/keys/wizard/step1.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte index 3dfe50463..37fb03702 100644 --- a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte +++ b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte @@ -3,7 +3,7 @@ import { WizardStep } from '$lib/layout'; import { key } from './store'; - let preset: string = null; + let preset = 'never'; function incrementToday(value: number, type: 'day' | 'month' | 'year'): string { const date = new Date(); switch (type) { @@ -83,7 +83,7 @@ id="preset" label="Expiration Date" /> {#if preset === 'custom'} - + {/if}