#139 fix error on load projects without is_default key

buggregator · Jul 28, 2024 · 421ec35 · 421ec35
1 parent c32f55a
commit 421ec35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/shared/stores/events/events-store.ts b/src/shared/stores/events/events-store.ts
@@ -65,7 +65,7 @@ export const useEventsStore = defineStore("eventsStore", {
     availableProjects: ({ projects }) => projects.available,
     isMultipleProjects: ({ projects }) => (
       projects.available.length > 1 ||
-      projects.available.find((proj) => !proj.is_default)
+      !projects.available.some((proj) => proj.is_default)
     ),
   },
   actions: {
@@ -213,18 +213,18 @@ export const useEventsStore = defineStore("eventsStore", {
 
         if (!this.projects.activeKey) {
           const defaultProject = projects.find((proj) => proj.is_default) || projects[0];
-          this.setActiveProject(defaultProject.key);
+          this.setActiveProjectKey(defaultProject.key);
         }
       } else {
-        this.resetActiveProject();
+        this.resetActiveProjectKey();
       }
     },
-    setActiveProject(project: string) {
+    setActiveProjectKey(project: string) {
       this.projects.activeKey = project;
 
       setStoredProject(project);
     },
-    resetActiveProject() {
+    resetActiveProjectKey() {
       this.projects.activeKey = undefined;
 
       removeStoredProject();

diff --git a/src/widgets/ui/layout-sidebar/layout-sidebar.vue b/src/widgets/ui/layout-sidebar/layout-sidebar.vue
@@ -35,6 +35,9 @@ const userMenu = ref<HTMLElement | null>(null);
 const isVisibleProfile = ref(false);
 const isVisibleProjects = ref(false);
 
+// TODO: need to check why project is empty on first load
+const isProjectLoading = computed(() => !activeProject.value);
+
 onClickOutside(projectMenu, () => {
   isVisibleProjects.value = false;
 });
@@ -115,15 +118,15 @@ const serverVersion = computed(() =>
     : `@${apiVersion.value}`,
 );
 
-const setProject = (project: string) => {
-  eventsStore.setActiveProject(project);
+const setProject = (projectKey: string) => {
+  eventsStore.setActiveProjectKey(projectKey);
 
   isVisibleProjects.value = false;
 };
 
-const makeShortTitle = (title: string) => title.substring(0, 2);
+const makeShortTitle = (title: string) => (title || "").substring(0, 2);
 const generateRadialGradient = (input: string) =>
-  `linear-gradient(to right, ${textToColors(input).join(", ")})`;
+  `linear-gradient(to right, ${textToColors(input || "").join(", ")})`;
 </script>
 
 <template>
@@ -138,7 +141,7 @@ const generateRadialGradient = (input: string) =>
         <IconSvg class="layout-sidebar__link-icon" name="logo-short" />
       </NuxtLink>
 
-      <template v-if="isMultipleProjects">
+      <template v-if="!isProjectLoading && isMultipleProjects">
         <hr class="layout-sidebar__sep" />
 
         <div class="layout-sidebar__projects">
@@ -163,7 +166,7 @@ const generateRadialGradient = (input: string) =>
         <hr class="layout-sidebar__sep" />
       </template>
 
-      <template v-if="!isMultipleProjects">
+      <template v-if="!isMultipleProjects || isProjectLoading">
         <NuxtLink to="/" title="Events" class="layout-sidebar__link">
           <IconSvg class="layout-sidebar__link-icon" name="events" />
         </NuxtLink>