From 1790e777ccf725e0db592a3185773dd3658cc3f9 Mon Sep 17 00:00:00 2001 From: Maurits Lourens Date: Mon, 6 Sep 2021 17:55:19 +0200 Subject: [PATCH] fix tests --- packages/builder/src/pages/builder/_layout.svelte | 2 +- packages/builder/src/pages/builder/admin/_layout.svelte | 2 +- packages/builder/src/stores/portal/admin.js | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index b1f6d7e733..aac5d28f52 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -6,7 +6,7 @@ let loaded = false $: multiTenancyEnabled = $admin.multiTenancy - $: hasAdminUser = !!$admin?.checklist?.adminUser + $: hasAdminUser = !!$admin?.checklist?.adminUser.checked $: tenantSet = $auth.tenantSet onMount(async () => { diff --git a/packages/builder/src/pages/builder/admin/_layout.svelte b/packages/builder/src/pages/builder/admin/_layout.svelte index 70823b9a34..602b6a6de3 100644 --- a/packages/builder/src/pages/builder/admin/_layout.svelte +++ b/packages/builder/src/pages/builder/admin/_layout.svelte @@ -6,7 +6,7 @@ let loaded = false onMount(() => { - if ($admin?.checklist?.adminUser) { + if ($admin?.checklist?.adminUser.checked) { $redirect("../") } else { loaded = true diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js index 28178a98eb..24b8c31aab 100644 --- a/packages/builder/src/stores/portal/admin.js +++ b/packages/builder/src/stores/portal/admin.js @@ -8,7 +8,12 @@ export function createAdminStore() { multiTenancy: false, sandbox: false, onboardingProgress: 0, - checklist: { apps: 0, smtp: false, adminUser: false, sso: false }, + checklist: { + apps: { checked: false }, + smtp: { checked: false }, + adminUser: { checked: false }, + sso: { checked: false }, + }, } const admin = writable(DEFAULT_CONFIG)