From f5c8ad72ef026435d7c22aa4815c9495d1cfeb6f Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 16 Aug 2023 17:28:00 +0200 Subject: [PATCH] fix: code review --- src/lib/layout/shell.svelte | 13 ++-- src/lib/wizards/functions/createManual.svelte | 65 +++++++++++-------- .../project-[project]/functions/+layout.ts | 2 +- .../functions/function-[function]/+layout.ts | 4 +- .../function-[function]/+page.svelte | 2 +- .../function-[function]/redeployModal.svelte | 2 +- 6 files changed, 48 insertions(+), 40 deletions(-) diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index c3cc62ae0..132f458e8 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -30,13 +30,12 @@ * Cancel navigation when wizard is open and triggered by popstate */ beforeNavigate((n) => { - if ($wizard.show || $wizard.cover) { - if (n.type === 'popstate') { - n.cancel(); - } - if (n.type !== 'leave') { - wizard.hide(); - } + if (!$wizard.show || !$wizard.cover) return; + if (n.type === 'popstate') { + n.cancel(); + } + if (n.type !== 'leave') { + wizard.hide(); } }); diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte index c9a5276d8..7d6af860d 100644 --- a/src/lib/wizards/functions/createManual.svelte +++ b/src/lib/wizards/functions/createManual.svelte @@ -21,34 +21,43 @@ import ExecuteAccess from './steps/executeAccess.svelte'; async function create() { - const response = await sdk.forProject.functions.create( - $createFunction.$id || ID.unique(), - $createFunction.name, - $createFunction.runtime, - $createFunction.entrypoint, - $createFunction.execute || undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - $createFunction.commands || undefined - ); - await sdk.forProject.functions.createDeployment( - response.$id, - $createFunctionDeployment[0], - true - ); - goto(`${base}/console/project-${$page.params.project}/functions/function-${response.$id}`); - addNotification({ - message: `${$createFunction.name} has been created`, - type: 'success' - }); - trackEvent(Submit.FunctionCreate, { - customId: !!$createFunction.$id - }); - resetState(); - wizard.hide(); + try { + const response = await sdk.forProject.functions.create( + $createFunction.$id || ID.unique(), + $createFunction.name, + $createFunction.runtime, + $createFunction.entrypoint, + $createFunction.execute || undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + $createFunction.commands || undefined + ); + await sdk.forProject.functions.createDeployment( + response.$id, + $createFunctionDeployment[0], + true + ); + goto( + `${base}/console/project-${$page.params.project}/functions/function-${response.$id}` + ); + addNotification({ + message: `${$createFunction.name} has been created`, + type: 'success' + }); + trackEvent(Submit.FunctionCreate, { + customId: !!$createFunction.$id + }); + resetState(); + wizard.hide(); + } catch (error) { + addNotification({ + message: error.message, + type: 'error' + }); + } } function resetState() { diff --git a/src/routes/console/project-[project]/functions/+layout.ts b/src/routes/console/project-[project]/functions/+layout.ts index eb22ec923..7fb46f02c 100644 --- a/src/routes/console/project-[project]/functions/+layout.ts +++ b/src/routes/console/project-[project]/functions/+layout.ts @@ -11,6 +11,6 @@ export const load: LayoutLoad = async ({ depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - installations: await sdk.forProject.vcs.listInstallations([Query.limit(100)]) + installations: sdk.forProject.vcs.listInstallations([Query.limit(100)]) }; }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts index a02943cf4..b5792bfda 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts @@ -13,8 +13,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - function: await sdk.forProject.functions.get(params.function), - domain: await sdk.forProject.proxy.listRules([ + function: sdk.forProject.functions.get(params.function), + domain: sdk.forProject.proxy.listRules([ Query.equal('resourceType', 'function'), Query.equal('resourceId', params.function), Query.limit(1) 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 f99fcec63..0e6e0c743 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -116,7 +116,7 @@
{data.domain.rules[0].domain} diff --git a/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte index 7c785d58d..4716fe0f2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte @@ -21,7 +21,7 @@ ); addNotification({ type: 'success', - message: `${$func.name} has been redeployed.` + message: `Redeploying ${$func.name}` }); trackEvent(Submit.FunctionRedeploy);