From 5868c3310e647ebf380fc1569af5cc66dafa4f23 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Thu, 10 Feb 2022 18:07:52 +0000 Subject: [PATCH] Fix Map.values() access and convert to array --- web/src/stores/budget-account.ts | 8 ++++---- web/src/stores/session.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/stores/budget-account.ts b/web/src/stores/budget-account.ts index 5f53e46..d352ad6 100644 --- a/web/src/stores/budget-account.ts +++ b/web/src/stores/budget-account.ts @@ -39,12 +39,12 @@ export const useAccountStore = defineStore("budget/account", { }), getters: { AccountsList(state) { - return state.Accounts.values(); + return [ ...state.Accounts.values() ]; }, CategoriesForMonth: (state) => (year : number, month : number) => { console.log("MTH", state.Months) const yearMap = state.Months.get(year); - return yearMap?.get(month)?.values(); + return [ ...yearMap?.get(month)?.values() || [] ]; }, CurrentAccount(state) : Account | undefined { if (state.CurrentAccountID == null) @@ -53,13 +53,13 @@ export const useAccountStore = defineStore("budget/account", { return state.Accounts.get(state.CurrentAccountID); }, OnBudgetAccounts(state) { - return Array.from(state.Accounts.values()).filter(x => x.OnBudget); + return [ ...state.Accounts.values() ].filter(x => x.OnBudget); }, OnBudgetAccountsBalance(state) : Number { return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); }, OffBudgetAccounts(state) { - return Array.from(state.Accounts.values()).filter(x => !x.OnBudget); + return [ ...state.Accounts.values() ].filter(x => !x.OnBudget); }, OffBudgetAccountsBalance(state) : Number { return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); diff --git a/web/src/stores/session.ts b/web/src/stores/session.ts index 19e1521..9163269 100644 --- a/web/src/stores/session.ts +++ b/web/src/stores/session.ts @@ -21,7 +21,7 @@ export const useSessionStore = defineStore('session', { Budgets: new Map(), }), getters: { - BudgetsList: (state) => state.Budgets.values(), + BudgetsList: (state) => [ ...state.Budgets.values() ], AuthHeaders: (state) => ({'Authorization': 'Bearer ' + state.Token}), LoggedIn: (state) => state.Token != null, },