fix setup wizard

cmintey · Nov 7, 2024 · 177f773 · 177f773
1 parent b10fa04
commit 177f773
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/src/lib/components/admin/InviteUser.svelte b/src/lib/components/admin/InviteUser.svelte
@@ -25,7 +25,6 @@
     let showUrl = $state(true);
 
     $effect(() => {
-        $inspect(form);
         if (form?.success && form?.sent !== undefined && config.smtp.enable) {
             let toastConfig: ToastSettings;
             if (form?.sent) {

diff --git a/src/routes/setup-wizard/step/[step]/+page.svelte b/src/routes/setup-wizard/step/[step]/+page.svelte
@@ -23,10 +23,6 @@
         $state.current = Number.parseInt($page.params.step) - 1;
     });
 
-    $effect(() => {
-        if ($page.form?.success) next();
-    });
-
     const next = () => {
         if ($state.current + 1 < $state.total) {
             $state.current = $state.current + 1;
@@ -43,7 +39,7 @@
 </script>
 
 <div transition:fade>
-    <SvelteComponent />
+    <SvelteComponent onSuccess={next} />
 
     <div class="flex justify-between pt-4">
         <!-- Button: Back -->

diff --git a/src/routes/setup-wizard/step/[step]/CreateAccountStep.svelte b/src/routes/setup-wizard/step/[step]/CreateAccountStep.svelte
@@ -4,6 +4,11 @@
     import { getContext } from "svelte";
     import type { Writable } from "svelte/store";
 
+    interface Props {
+        onSuccess: () => void;
+    }
+    let { onSuccess }: Props = $props();
+
     let form: HTMLFormElement | undefined = $state();
 
     const submit: Writable<() => void> = getContext("submit");
@@ -21,7 +26,12 @@
         action="/signup"
         method="POST"
         use:enhance={() => {
-            return async ({ result }) => await applyAction(result);
+            return async ({ result }) => {
+                await applyAction(result);
+                if (result.type === "success" && result.data?.success) {
+                    onSuccess();
+                }
+            };
         }}
     >
         <CreateAccountForm hideActions />

diff --git a/src/routes/setup-wizard/step/[step]/GlobalSettingsStep.svelte b/src/routes/setup-wizard/step/[step]/GlobalSettingsStep.svelte
@@ -5,6 +5,11 @@
     import { getContext } from "svelte";
     import type { Writable } from "svelte/store";
 
+    interface Props {
+        onSuccess: () => void;
+    }
+    let { onSuccess }: Props = $props();
+
     let config: Config = $state($page.data.config);
     let form: HTMLFormElement | undefined = $state();
     let sending = $state(false);
@@ -42,6 +47,9 @@
                     }
 
                     await applyAction(result);
+                    if (result.type === "success" && result.data?.success) {
+                        onSuccess();
+                    }
                 };
             }}
         >

diff --git a/src/routes/setup-wizard/step/[step]/InviteUsersStep.svelte b/src/routes/setup-wizard/step/[step]/InviteUsersStep.svelte
@@ -4,6 +4,11 @@
     import InviteUser from "$lib/components/admin/InviteUser.svelte";
     import type { Group } from "@prisma/client";
 
+    interface Props {
+        onSuccess: () => void;
+    }
+    let { onSuccess }: Props = $props();
+
     let config: Config = $derived($page.data.config);
     const groups: Group[] = $page.data.groups;
 </script>
@@ -19,7 +24,12 @@
         action="/admin/users"
         method="POST"
         use:enhance={() => {
-            return async ({ result }) => await applyAction(result);
+            return async ({ result }) => {
+                await applyAction(result);
+                if (result.type === "success" && result.data?.success) {
+                    onSuccess();
+                }
+            };
         }}
     >
         <InviteUser {config} defaultGroup={groups[0]} vertical />