chore: fix initial state

yourselfhosted · Jun 3, 2024 · e0e4a1a · e0e4a1a
1 parent 769b474
commit e0e4a1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/frontend/web/src/App.tsx b/frontend/web/src/App.tsx
@@ -13,7 +13,9 @@ function App() {
   // Redirect to sign up page if no instance owner.
   useEffect(() => {
     if (!workspaceStore.profile.owner) {
-      navigateTo("/auth/signup");
+      navigateTo("/auth/signup", {
+        replace: true,
+      });
     }
   }, [workspaceStore.profile]);
 

diff --git a/frontend/web/src/layouts/CommonContextProvider.tsx b/frontend/web/src/layouts/CommonContextProvider.tsx
@@ -14,7 +14,9 @@ const CommonContextProvider = ({ children }: { children: React.ReactNode }) => {
   useEffect(() => {
     (async () => {
       try {
-        await Promise.all([workspaceStore.fetchWorkspaceProfile(), workspaceStore.fetchWorkspaceSetting(), userStore.fetchCurrentUser()]);
+        await workspaceStore.fetchWorkspaceProfile();
+        await workspaceStore.fetchWorkspaceSetting();
+        await userStore.fetchCurrentUser();
       } catch (error) {
         // Do nothing.
       }

diff --git a/frontend/web/src/stores/workspace.ts b/frontend/web/src/stores/workspace.ts
@@ -11,17 +11,17 @@ interface WorkspaceState {
   fetchWorkspaceSetting: () => Promise<WorkspaceSetting>;
 }
 
-const useWorkspaceStore = create<WorkspaceState>()((set) => ({
+const useWorkspaceStore = create<WorkspaceState>()((set, get) => ({
   profile: WorkspaceProfile.fromPartial({}),
   setting: WorkspaceSetting.fromPartial({}),
   fetchWorkspaceProfile: async () => {
     const workspaceProfile = (await workspaceServiceClient.getWorkspaceProfile({})).profile as WorkspaceProfile;
-    set({ profile: workspaceProfile });
+    set({ ...get(), profile: workspaceProfile });
     return workspaceProfile;
   },
   fetchWorkspaceSetting: async () => {
     const workspaceSetting = (await workspaceServiceClient.getWorkspaceSetting({})).setting as WorkspaceSetting;
-    set({ setting: workspaceSetting });
+    set({ ...get(), setting: workspaceSetting });
     return workspaceSetting;
   },
 }));