From acd702dab39340f6d3aaa2f198d399cb4f497484 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 29 Aug 2021 10:08:58 +0200
Subject: [PATCH] Improve "no bot available" errorhandling

---
 src/components/layout/NavBar.vue     |  2 +-
 src/router/index.ts                  | 10 +++-------
 src/store/modules/botStoreWrapper.ts |  8 ++++++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/layout/NavBar.vue b/src/components/layout/NavBar.vue
index a48b27c1..1cc093f9 100644
--- a/src/components/layout/NavBar.vue
+++ b/src/components/layout/NavBar.vue
@@ -30,7 +30,7 @@
         <b-navbar-nav class="ml-auto">
           <li class="nav-item text-secondary mr-2">
             <b-nav-text class="verticalCenter small mr-2">
-              {{ botName }}
+              {{ botName || 'No bot selected' }}
             </b-nav-text>
             <b-nav-text class="verticalCenter">
               {{ isBotOnline ? 'Online' : 'Offline' }}
diff --git a/src/router/index.ts b/src/router/index.ts
index a11ac593..48dbd1ef 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -2,8 +2,7 @@ import Vue from 'vue';
 import VueRouter, { RouteConfig } from 'vue-router';
 import Home from '@/views/Home.vue';
 import Error404 from '@/views/Error404.vue';
-
-import userService from '@/shared/userService';
+import store from '@/store';
 
 Vue.use(VueRouter);
 
@@ -68,11 +67,8 @@ const router = new VueRouter({
 });
 
 router.beforeEach((to, from, next) => {
-  if (to.name === 'Login' && userService.loggedIn()) {
-    // No login if already logged in
-    next({ path: '/' });
-  }
-  if (!to.meta?.allowAnonymous && !userService.loggedIn()) {
+  const hasBots = store.getters['ftbot/hasBots'];
+  if (!to.meta?.allowAnonymous && !hasBots) {
     // Forward to login if login is required
     next({
       path: '/login',
diff --git a/src/store/modules/botStoreWrapper.ts b/src/store/modules/botStoreWrapper.ts
index ebb5f26c..4769a2ca 100644
--- a/src/store/modules/botStoreWrapper.ts
+++ b/src/store/modules/botStoreWrapper.ts
@@ -71,8 +71,12 @@ export default function createBotStore(store) {
   };
   // Autocreate Actions
   Object.keys(BotStoreActions).forEach((e) => {
-    actions[e] = ({ state, dispatch }, ...args) => {
-      return dispatch(`${state.selectedBot}/${e}`, ...args);
+    actions[e] = ({ state, dispatch, getters }, ...args) => {
+      if (getters.hasBots) {
+        return dispatch(`${state.selectedBot}/${e}`, ...args);
+      }
+      console.warn(`bot ${state.selectedBot} is not registered.`);
+      return {};
     };
   });