From 7afdf95ef3d52049439b3fc2a1278d613bb8d5e5 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:43:49 +0000 Subject: [PATCH 1/3] refactor: simplify create api-key step --- .../overview/keys/wizard/step1.svelte | 48 +++++++------------ 1 file changed, 17 insertions(+), 31 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 37fb03702..9a35d4859 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,6 @@ import { WizardStep } from '$lib/layout'; import { key } from './store'; - let preset = 'never'; function incrementToday(value: number, type: 'day' | 'month' | 'year'): string { const date = new Date(); switch (type) { @@ -21,24 +20,11 @@ return date.toISOString(); } + let expirationSelect = null; + let expirationCustom: string | undefined = undefined; + $: { - switch (preset) { - case 'never': - $key.expire = null; - break; - case '1day': - $key.expire = incrementToday(1, 'day'); - break; - case '7days': - $key.expire = incrementToday(7, 'day'); - break; - case '1month': - $key.expire = incrementToday(1, 'month'); - break; - case '1year': - $key.expire = incrementToday(1, 'year'); - break; - } + $key.expire = expirationSelect === 'custom' ? expirationCustom : expirationSelect; } @@ -53,37 +39,37 @@ required bind:value={$key.name} /> - {#if preset === 'custom'} - + {#if expirationSelect === 'custom'} + {/if} From 453948dc24ca102e29c3918a45eea9587c0a0a42 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 7 Feb 2023 17:59:03 +0000 Subject: [PATCH 2/3] feat: add expiration select to update api-key --- .../keys/[key]/+page@project-[project].svelte | 48 ++------------ .../keys/[key]/updateExpirationDate.svelte | 56 +++++++++++++++++ .../overview/keys/expirationInput.svelte | 63 +++++++++++++++++++ .../overview/keys/wizard/step1.svelte | 61 +----------------- 4 files changed, 128 insertions(+), 100 deletions(-) create mode 100644 src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte create mode 100644 src/routes/console/project-[project]/overview/keys/expirationInput.svelte diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index ff3f5b24b..ae2389e79 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -1,8 +1,9 @@ + +
+ + Update Expiration Date +

Choose any name that will help you distinguish between API keys.

+ + + + + + + + + +
+
diff --git a/src/routes/console/project-[project]/overview/keys/expirationInput.svelte b/src/routes/console/project-[project]/overview/keys/expirationInput.svelte new file mode 100644 index 000000000..55fca9e05 --- /dev/null +++ b/src/routes/console/project-[project]/overview/keys/expirationInput.svelte @@ -0,0 +1,63 @@ + + + +{#if expirationSelect === 'custom'} + +{/if} 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 9a35d4859..7e6c0947f 100644 --- a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte +++ b/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte @@ -1,31 +1,8 @@ @@ -38,38 +15,6 @@ placeholder="API Key Name" required bind:value={$key.name} /> - - {#if expirationSelect === 'custom'} - - {/if} + From 5b7fc9e2960aed31091a3ed82a3e1c8e66451c6a Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:00:05 +0000 Subject: [PATCH 3/3] fix: change api key expiration date description --- .../overview/keys/[key]/updateExpirationDate.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte index ebeb39dbe..9fa7c7703 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte @@ -42,7 +42,7 @@
Update Expiration Date -

Choose any name that will help you distinguish between API keys.

+

Set a date after which your API Key will expire.