fix: filter out log if logStreamUrl is not configured

Signed-off-by: Akiff Manji <[email protected]>
bcgov · Jan 10, 2025 · 2e3909f · 2e3909f
1 parent 2b6b472
commit 2e3909f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/services/tenant-ui/frontend/src/components/layout/Sidebar.vue b/services/tenant-ui/frontend/src/components/layout/Sidebar.vue
@@ -6,7 +6,7 @@
     </h1>
     <!-- eslint-disable-next-line @intlify/vue-i18n/no-raw-text -->
     <h1 class="sidebar-app-title small">T</h1>
-    <PanelMenu :model="items" class="mt-5">
+    <PanelMenu :model="sidebarItems" class="mt-5">
       <template #item="{ item }">
         <PanelMenuItemLink :item="item" />
       </template>
@@ -19,16 +19,16 @@ import { ref } from 'vue';
 import PanelMenu from 'primevue/panelmenu';
 import ProgressSpinner from 'primevue/progressspinner';
 import { storeToRefs } from 'pinia';
-import { useTenantStore } from '../../store';
 import { useI18n } from 'vue-i18n';
+import { useConfigStore, useTenantStore } from '../../store';
 import PanelMenuItemLink from '../common/PanelMenuItemLink.vue';
 
 const { t } = useI18n();
-
+const { config } = useConfigStore();
 // tenant should be loaded by login...
 const { tenant, loading } = storeToRefs(useTenantStore());
 
-const items = ref([
+const sidebarItems = [
   {
     label: t('dashboard.dashboard'),
     icon: 'pi pi-fw pi-chart-bar',
@@ -103,11 +103,14 @@ const items = ref([
     icon: 'pi pi-fw pi-question-circle',
     route: '/about',
   },
+];
 
-  {
+const { logStreamUrl } = config?.frontend;
+if (logStreamUrl) {
+  sidebarItems.push({
     label: t('log.log'),
     icon: 'pi pi-fw pi-file',
     route: '/log',
-  },
-]);
+  });
+}
 </script>
diff --git a/services/tenant-ui/frontend/src/main.ts b/services/tenant-ui/frontend/src/main.ts
@@ -67,6 +67,13 @@ async function loadApp() {
     console.warn('Matomo not configured');
   }
 
+  // Log Setup
+  const { logStreamUrl } = configStore?.config?.frontend;
+  if (!logStreamUrl) {
+    console.warn('Log not configured');
+    router.removeRoute('Log');
+  }
+
   // 4. load/initialize other components
   app.use(i18n);
   app.use(PrimeVue);

diff --git a/services/tenant-ui/frontend/src/store/logStore.ts b/services/tenant-ui/frontend/src/store/logStore.ts
@@ -43,7 +43,7 @@ export const useLogStore = defineStore('log', () => {
       }
       if (!logStream.value) {
         logStream.value = new WebSocket(
-          `${config.frontend.logStreamUrl}?token=${token}`
+          `${config?.frontend?.logStreamUrl}?token=${token}`
         );
         logStream.value.onopen = () => {
           logStreamState.value = LogStreamState.OPEN;