From ec6e81316a6c72d664749ffaa300c2130f5d8bfe Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 19 Sep 2025 16:20:48 +0200
Subject: [PATCH] fixed unwanted redirect to start page

---
 vue3/src/apps/tandoor/Tandoor.vue      |  8 ++++++--
 vue3/src/stores/UserPreferenceStore.ts | 10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/vue3/src/apps/tandoor/Tandoor.vue b/vue3/src/apps/tandoor/Tandoor.vue
index bb45ce7a7..39f647241 100644
--- a/vue3/src/apps/tandoor/Tandoor.vue
+++ b/vue3/src/apps/tandoor/Tandoor.vue
@@ -156,14 +156,18 @@ const router = useRouter()
 const isPrintMode = useMediaQuery('print')
 
 onMounted(() => {
-    useUserPreferenceStore().init()
+    useUserPreferenceStore().init().then(() => {
+        if (useUserPreferenceStore().activeSpace.spaceSetupCompleted != undefined && !useUserPreferenceStore().activeSpace.spaceSetupCompleted) {
+            router.push({name: 'WelcomePage'})
+        }
+    })
 })
 
 /**
  * global title update handler, might be overridden by page specific handlers
  */
 router.afterEach((to, from) => {
-    if(to.name == 'StartPage' && !useUserPreferenceStore().activeSpace.spaceSetupCompleted != undefined &&!useUserPreferenceStore().activeSpace.spaceSetupCompleted && useUserPreferenceStore().activeSpace.createdBy.id! == useUserPreferenceStore().userSettings.user.id!){
+    if(to.name == 'StartPage' && useUserPreferenceStore().initCompleted && !useUserPreferenceStore().activeSpace.spaceSetupCompleted != undefined &&!useUserPreferenceStore().activeSpace.spaceSetupCompleted && useUserPreferenceStore().activeSpace.createdBy.id! == useUserPreferenceStore().userSettings.user.id!){
         router.push({name: 'WelcomePage'})
     }
     nextTick(() => {
diff --git a/vue3/src/stores/UserPreferenceStore.ts b/vue3/src/stores/UserPreferenceStore.ts
index ca9ac2686..dacffd148 100644
--- a/vue3/src/stores/UserPreferenceStore.ts
+++ b/vue3/src/stores/UserPreferenceStore.ts
@@ -45,6 +45,11 @@ export const useUserPreferenceStore = defineStore('user_preference_store', () =>
      */
     let isAuthenticated = ref(false)
 
+    /**
+     * complete refresh of all data from server completed
+     */
+    const initCompleted = ref(false)
+
     const theme = useTheme()
     const router = useRouter()
 
@@ -233,7 +238,9 @@ export const useUserPreferenceStore = defineStore('user_preference_store', () =>
         promises.push(loadSpaces())
         updateTheme()
 
-        return Promise.allSettled(promises)
+        return Promise.allSettled(promises).then(() => {
+            initCompleted.value = true
+        })
     }
 
     return {
@@ -246,6 +253,7 @@ export const useUserPreferenceStore = defineStore('user_preference_store', () =>
         spaces,
         activeUserSpace,
         isAuthenticated,
+        initCompleted,
         loadUserSettings,
         loadServerSettings,
         updateUserSettings,