From 1c4e2aed54761a330e2bdaf81bc833ff6a641bbd Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 29 Aug 2021 13:54:45 +0200 Subject: [PATCH] Store botlist as objects, not string list --- src/components/BotList.vue | 15 +++++---- src/components/Login.vue | 10 ++++-- src/shared/userService.ts | 15 ++++++++- src/store/index.ts | 4 +-- src/store/modules/botStoreWrapper.ts | 50 +++++++++++++++------------- src/types/auth.ts | 9 +++++ 6 files changed, 67 insertions(+), 36 deletions(-) diff --git a/src/components/BotList.vue b/src/components/BotList.vue index 9452978a..336ea7e8 100644 --- a/src/components/BotList.vue +++ b/src/components/BotList.vue @@ -4,12 +4,12 @@ - {{ bot }} + {{ bot.botName || bot.botId }} @@ -29,6 +29,7 @@ import { MultiBotStoreGetters } from '@/store/modules/botStoreWrapper'; import LoginModal from '@/views/LoginModal.vue'; import EditIcon from 'vue-material-design-icons/Cog.vue'; import DeleteIcon from 'vue-material-design-icons/Delete.vue'; +import { BotDescriptor, BotDescriptors } from '@/types'; const ftbot = namespace('ftbot'); @@ -36,17 +37,17 @@ const ftbot = namespace('ftbot'); export default class BotList extends Vue { @ftbot.Getter [MultiBotStoreGetters.selectedBot]: string; - @ftbot.Getter [MultiBotStoreGetters.allAvailableBots]: string[]; + @ftbot.Getter [MultiBotStoreGetters.allAvailableBots]: BotDescriptors; @ftbot.Action removeBot; @ftbot.Action selectBot; - clickRemoveBot(botId) { + clickRemoveBot(botId: BotDescriptor) { // this.$bvModal.msgBoxConfirm(`Really remove (logout) from ${botId}?`).then((value: boolean) => { if (value) { - this.removeBot(botId); + this.removeBot(botId.botId); } }); } diff --git a/src/components/Login.vue b/src/components/Login.vue index d891f764..2288a40b 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -73,7 +73,7 @@ import { Component, Vue, Emit, Prop } from 'vue-property-decorator'; import { Action, namespace } from 'vuex-class'; import { useUserService } from '@/shared/userService'; -import { AuthPayload } from '@/types'; +import { AuthPayload, BotDescriptor } from '@/types'; import { MultiBotStoreGetters } from '@/store/modules/botStoreWrapper'; const defaultURL = window.location.origin || 'http://localhost:8080'; @@ -85,7 +85,8 @@ export default class Login extends Vue { @ftbot.Getter [MultiBotStoreGetters.nextBotId]: string; - @ftbot.Action addBot; + // eslint-disable-next-line @typescript-eslint/no-unused-vars + @ftbot.Action addBot!: (payload: BotDescriptor) => void; @Prop({ default: false }) inModal!: boolean; @@ -148,7 +149,10 @@ export default class Login extends Vue { userService .login(this.auth) .then(() => { - this.addBot(this.nextBotId); + this.addBot({ + botName: this.auth.botName, + botId: this.nextBotId, + }); // TODO: Investigate how this needs to be done properly // setBaseUrl(userService.getAPIUrl()); diff --git a/src/shared/userService.ts b/src/shared/userService.ts index d49692c2..881e8702 100644 --- a/src/shared/userService.ts +++ b/src/shared/userService.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -import { AuthPayload, AuthStorage, AuthStorageMulti } from '@/types'; +import { AuthPayload, BotDescriptors, AuthStorage, AuthStorageMulti } from '@/types'; const AUTH_LOGIN_INFO = 'auth_login_info'; const APIBASE = '/api/v1'; @@ -63,6 +63,18 @@ export class UserService { }; } + public static getAvailableBots(): BotDescriptors { + const allInfo = UserService.getAllLoginInfos(); + const response: BotDescriptors = {}; + Object.entries(allInfo).forEach(([k, v]) => { + response[k] = { + botId: k, + botName: v.botName, + }; + }); + return response; + } + public static getAvailableBotList(): string[] { const allInfo = UserService.getAllLoginInfos(); return Object.keys(allInfo); @@ -158,6 +170,7 @@ export class UserService { * Call on startup to migrate old login info to new login */ public migrateLogin() { + // TODO: this is actually never called! const AUTH_REFRESH_TOKEN = 'auth_ref_token'; // Legacy key - do not use const AUTH_ACCESS_TOKEN = 'auth_access_token'; const AUTH_API_URL = 'auth_api_url'; diff --git a/src/store/index.ts b/src/store/index.ts index 68fbc3e7..2631825b 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -143,8 +143,8 @@ const store = new Vuex.Store({ }); store.registerModule('ftbot', createBotStore(store)); -UserService.getAvailableBotList().forEach((e) => { - store.dispatch('ftbot/addBot', e); +Object.entries(UserService.getAvailableBots()).forEach(([k, v]) => { + store.dispatch('ftbot/addBot', v); }); store.dispatch('ftbot/selectFirstBot'); export default store; diff --git a/src/store/modules/botStoreWrapper.ts b/src/store/modules/botStoreWrapper.ts index abc61adc..a5e835a6 100644 --- a/src/store/modules/botStoreWrapper.ts +++ b/src/store/modules/botStoreWrapper.ts @@ -1,8 +1,9 @@ +import { BotDescriptor, BotDescriptors } from '@/types'; import { BotStoreActions, BotStoreGetters, createBotSubStore } from './ftbot'; interface FTMultiBotState { selectedBot: string; - availableBots: string[]; + availableBots: BotDescriptors; } export enum MultiBotStoreGetters { @@ -15,29 +16,30 @@ export enum MultiBotStoreGetters { export default function createBotStore(store) { const state: FTMultiBotState = { selectedBot: '', - availableBots: [], + availableBots: {}, }; // All getters working on all bots should be prefixed with all. const getters = { [MultiBotStoreGetters.hasBots](state: FTMultiBotState): boolean { - return state.availableBots.length > 0; + return Object.keys(state.availableBots).length > 0; }, [MultiBotStoreGetters.selectedBot](state: FTMultiBotState): string { return state.selectedBot; }, - [MultiBotStoreGetters.allAvailableBots](state: FTMultiBotState): string[] { + [MultiBotStoreGetters.allAvailableBots](state: FTMultiBotState): BotDescriptors { return state.availableBots; }, [MultiBotStoreGetters.nextBotId](state: FTMultiBotState): string { - let botCount = state.availableBots.length; - while (state.availableBots.includes(`ftbot.${botCount}`)) { + let botCount = Object.keys(state.availableBots).length; + + while (`ftbot.${botCount}` in state.availableBots) { botCount += 1; } return `ftbot.${botCount}`; }, }; - // Autocreate getters + // Autocreate getters from botStores Object.keys(BotStoreGetters).forEach((e) => { getters[e] = (state, getters) => { return getters[`${state.selectedBot}/${e}`]; @@ -46,37 +48,37 @@ export default function createBotStore(store) { const mutations = { selectBot(state: FTMultiBotState, botId: string) { - if (state.availableBots.includes(botId)) { + if (botId in state.availableBots) { state.selectedBot = botId; } else { - console.warn(`Botid ${botId} not available, but selected`); + console.warn(`Botid ${botId} not available, but selected.`); } }, - addBot(state: FTMultiBotState, botId: string) { - state.availableBots = [...state.availableBots, botId]; + addBot(state: FTMultiBotState, bot: BotDescriptor) { + state.availableBots[bot.botId] = bot; }, removeBot(state: FTMultiBotState, botId: string) { - const index = state.availableBots.indexOf(botId); - if (index > -1) { - state.availableBots.splice(index, 1); - state.availableBots = [...state.availableBots]; + if (botId in state.availableBots) { + delete state.availableBots[botId]; } }, }; const actions = { // Actions automatically filled below - addBot({ getters, commit }, botId: string) { - if (getters.allAvailableBots.includes(botId)) { + addBot({ getters, commit }, bot: BotDescriptor) { + if (Object.keys(getters.allAvailableBots).includes(bot.botId)) { // throw 'Bot already present'; // TODO: handle error! + console.log('Bot already present'); + return; } - console.log('add bot', botId); - store.registerModule(['ftbot', botId], createBotSubStore(botId)); - commit('addBot', botId); + console.log('add bot', bot); + store.registerModule(['ftbot', bot.botId], createBotSubStore(bot.botId)); + commit('addBot', bot); }, removeBot({ commit, getters, dispatch }, botId: string) { - if (getters.allAvailableBots.includes(botId)) { + if (Object.keys(getters.allAvailableBots).includes(botId)) { dispatch(`${botId}/logout`); store.unregisterModule([`ftbot`, botId]); commit('removeBot', botId); @@ -86,14 +88,16 @@ export default function createBotStore(store) { }, selectFirstBot({ commit, getters }) { if (getters.hasBots) { - commit('selectBot', getters.allAvailableBots[0]); + const firstBot = Object.keys(getters.allAvailableBots)[0]; + console.log(firstBot); + commit('selectBot', getters.allAvailableBots[firstBot].botId); } }, selectBot({ commit }, botId: string) { commit('selectBot', botId); }, }; - // Autocreate Actions + // Autocreate Actions from botstores Object.keys(BotStoreActions).forEach((e) => { actions[e] = ({ state, dispatch, getters }, ...args) => { if (getters.hasBots) { diff --git a/src/types/auth.ts b/src/types/auth.ts index ae63561e..4de6158b 100644 --- a/src/types/auth.ts +++ b/src/types/auth.ts @@ -15,3 +15,12 @@ export interface AuthStorage { export interface AuthStorageMulti { [key: string]: AuthStorage; } + +export interface BotDescriptor { + botName: string; + botId: string; +} + +export interface BotDescriptors { + [key: string]: BotDescriptor; +}