fix(ui): prevent welcome redirection (#1265)

kestra-io · May 10, 2023 · 74d8e82 · 74d8e82
1 parent 844823a
commit 74d8e82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -42,6 +42,7 @@
             };
         },
         computed: {
+            ...mapState("auth", ["user"]),
             ...mapState("core", ["message", "error"]),
             ...mapGetters("core", ["guidedProperties"]),
             ...mapState("flow", ["overallTotal"]),
@@ -97,7 +98,6 @@
             initGuidedTour() {
                 this.$store.dispatch("flow/findFlows", {limit: 1})
                     .then(flows => {
-                        this.$store.commit("flow/setOverallTotal", flows.total);
                         if (flows.total === 0 && this.$route.name === "home") {
                             this.$router.push({name: "welcome"});
                         }
@@ -106,7 +106,7 @@
         },
         watch: {
             $route(to) {
-                if (to.name === "home" && this.overallTotal === 0) {
+                if (this.user && to.name === "home" && this.overallTotal === 0) {
                     this.$router.push({name: "welcome"});
                 }
             }

diff --git a/ui/src/stores/flow.js b/ui/src/stores/flow.js
@@ -33,6 +33,7 @@ export default {
             }).then(response => {
                 commit("setFlows", response.data.results)
                 commit("setTotal", response.data.total)
+                commit("setOverallTotal", response.data.total)
 
                 return response.data;
             })
@@ -70,6 +71,7 @@ export default {
                         commit("setFlow", response.data);
                     }
 
+                    commit("setOverallTotal", 1)
                     return response.data;
                 })
         },