@zeniai/client-epic-state 4.8.53 → 4.8.54

package/lib/view/accountList/accountListSelector.d.ts

@@ -1,5 +1,5 @@
 import { NestedAccountHeirarchyForReport } from '../../commonStateTypes/accountView/nestedAccountID';
-import { FetchState } from '../../commonStateTypes/common';
+import { FetchState, ID } from '../../commonStateTypes/common';
 import { SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { AccountBase, AccountLabel, AccountState } from '../../entity/account/accountState';
 import { AccountListState, AccountListKeyType } from './accountListState';
@@ -27,3 +27,4 @@ export declare const getFilteredNestedAndAccountListsForLabel: (accountState: Ac
     accountList: AccountBase[];
     nestedAccountList: NestedAccountHeirarchyForReport[];
 };
+export declare const getAccountIdsForLabel: (accountListState: AccountListState, accountListKey: AccountListKeyType, accountLabel: AccountLabel) => ID[];

package/lib/view/accountList/accountListSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilteredNestedAndAccountListsForLabel = exports.getNestedAccountListHeirarchy = exports.getUncategorizedAccounts = exports.getAccountListFetchState = exports.getAccountList = void 0;
+exports.getAccountIdsForLabel = exports.getFilteredNestedAndAccountListsForLabel = exports.getNestedAccountListHeirarchy = exports.getUncategorizedAccounts = exports.getAccountListFetchState = exports.getAccountList = void 0;
 const accountSelector_1 = require("../../entity/account/accountSelector");
 const getAccountList = (accountState, accountListState, accountListKey) => {
     const accListState = accountListState.byReportId[accountListKey];
@@ -74,3 +74,10 @@ const getFilteredNestedAndAccountListsForLabel = (accountState, accountListState
     };
 };
 exports.getFilteredNestedAndAccountListsForLabel = getFilteredNestedAndAccountListsForLabel;
+const getAccountIdsForLabel = (accountListState, accountListKey, accountLabel) => {
+    if (accountListState.byReportId[accountListKey].fetchState === 'Completed') {
+        return accountListState.byReportId[accountListKey].accountIdsByLabel[accountLabel];
+    }
+    return [];
+};
+exports.getAccountIdsForLabel = getAccountIdsForLabel;

package/lib/view/scheduleView/scheduleDetailView/epics/updateAmountsInScheduleDetailEpic.js

@@ -7,7 +7,7 @@ const scheduleDetailReducer_1 = require("../scheduleDetailReducer");
 const jeSchedulesSelector_1 = require("../../../../entity/jeSchedules/jeSchedulesSelector");
 const scheduleDetailLocalDataHelper_1 = require("../scheduleDetailLocalDataHelper");
 const updateAmountsInScheduleDetailEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(scheduleDetailReducer_1.updateAmountsInScheduleDetail.match), (0, operators_1.mergeMap)((action) => {
-    var _a;
+    var _a, _b;
     const actions = [];
     const state = state$.value;
     const { scheduleDetailState } = state;
@@ -16,12 +16,17 @@ const updateAmountsInScheduleDetailEpic = (actions$, state$) => actions$.pipe((0
         const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(selectedJEScheduleKey, state);
         const jeScheduleDetailId = action.payload.jeScheduleDetailId;
         const totalAmount = jeScheduleTransactionState.baseTransaction.amount.amount;
-        const jeScheduleLocalDataUpdated = (0, scheduleDetailLocalDataHelper_1.updateAmountsInScheduleDetails)(scheduleDetailState.editScheduleStateById[jeScheduleDetailId]
-            .jeScheduleDetails, (_a = scheduleDetailState.editScheduleStateById[jeScheduleDetailId]
-            .selectedMonths) !== null && _a !== void 0 ? _a : 0, action.payload.rowId, totalAmount);
+        const jeScheduleLocalDataUpdated = jeScheduleDetailId != null
+            ? (0, scheduleDetailLocalDataHelper_1.updateAmountsInScheduleDetails)(scheduleDetailState.editScheduleStateById[jeScheduleDetailId]
+                .jeScheduleDetails, (_a = scheduleDetailState.editScheduleStateById[jeScheduleDetailId]
+                .selectedMonths) !== null && _a !== void 0 ? _a : 0, action.payload.rowId, totalAmount)
+            : (0, scheduleDetailLocalDataHelper_1.updateAmountsInScheduleDetails)(scheduleDetailState.newScheduleState.jeScheduleDetails, (_b = scheduleDetailState.newScheduleState.selectedMonths) !== null && _b !== void 0 ? _b : 0, action.payload.rowId, totalAmount);
+        const originalLocalData = jeScheduleDetailId != null
+            ? scheduleDetailState.editScheduleStateById[jeScheduleDetailId]
+            : scheduleDetailState.newScheduleState;
         actions.push((0, scheduleDetailReducer_1.updateScheduleDetailsLocalData)({
             selectedJeScheduleDetailId: jeScheduleDetailId,
-            localData: Object.assign(Object.assign({}, scheduleDetailState.editScheduleStateById[jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated }),
+            localData: Object.assign(Object.assign({}, originalLocalData), { jeScheduleDetails: jeScheduleLocalDataUpdated }),
         }));
     }
     return (0, rxjs_1.from)(actions);

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailReducer.d.ts

@@ -29,9 +29,9 @@ export declare const createNewSchedules: import("@reduxjs/toolkit").ActionCreato
     jeScheduleDetailId: ID;
     rowId: number;
     jeLink: ZeniUrl;
-}, string>, updateAmountsInScheduleDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[rowId: number, jeScheduleDetailId: string], {
+}, string>, updateAmountsInScheduleDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[rowId: number, jeScheduleDetailId?: string | undefined], {
     rowId: number;
-    jeScheduleDetailId: string;
+    jeScheduleDetailId: string | undefined;
 }, string, never, never>, updateScheduleDetailNewStateLocalData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedJeScheduleDetailId: string], {
     selectedJeScheduleDetailId: string;
 }, string, never, never>, updateSelectedJEScheduleKey: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/scheduleView/scheduleListView/epics/fetchScheduleListEpic.js

@@ -10,10 +10,10 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const timeframeTick_1 = require("../../../../commonStateTypes/timeframeTick");
 const scheduleListHelper_1 = require("../scheduleListHelper");
 const scheduleListTypes_1 = require("../scheduleListTypes");
-const accountSelector_1 = require("../../../../entity/account/accountSelector");
+const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchScheduleList.match), (0, operators_1.mergeMap)((action) => {
     const { tab } = action.payload;
-    const { scheduleListState, accountState, accountListState } = state$.value;
+    const { scheduleListState, accountListState } = state$.value;
     // if parameters are provided, use those. else go to localdata
     const timeframe = action.payload.timeframeAndCategory != null
         ? action.payload.timeframeAndCategory.selectedTimeframe
@@ -29,8 +29,11 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
         action.payload.cacheOverride === false) {
         return (0, rxjs_1.from)([]);
     }
-    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab).allowedAccountList;
-    const scheduleListCurrentTabAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleListCurrentTabAccountTypes);
+    const accountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab);
+    const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)(scheduleListState.currentTab);
+    const scheduleListCurrentTabAccountIds = accountLabel != null
+        ? (0, accountListSelector_1.getAccountIdsForLabel)(accountListState, accountTypes.accountListKey, accountLabel)
+        : [];
     let categoryIds = [categoryId];
     if (categoryId === 'all') {
         categoryIds = (0, exports.getAllAccountIdsForTab)(scheduleListState.currentTab, accountListState, scheduleListCurrentTabAccountIds);

package/lib/view/scheduleView/scheduleListView/scheduleListHelper.d.ts

@@ -2,7 +2,7 @@ import { NestedAccountHeirarchyForReport } from '../../../commonStateTypes/accou
 import { Amount } from '../../../commonStateTypes/amount';
 import { COABalance, COABalanceGroupedByPeriod } from '../../../commonStateTypes/coaBalance/coaBalance';
 import { TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
-import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { AccountBase, AccountLabel, AccountType } from '../../../entity/account/accountState';
 import { JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { AccountListKeyType } from '../../accountList/accountListState';
@@ -85,6 +85,7 @@ declare type AccountListTypesPayload = {
  * @returns
  */
 export declare const getAccountsTypesForScheduleList: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
+export declare const getAccountLabelForScheduleType: (scheduleType: SchedulesTypes) => AccountLabel | undefined;
 /**
  * Function to get accountListKey and allowedAccountList for a given tab
  * @param scheduleType

package/lib/view/scheduleView/scheduleListView/scheduleListHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountsTypesForScheduleEpics = exports.getAccountsTypesForScheduleList = exports.getDurationOfMonthOutTotalMonth = exports.calculateCOABalanceGroupedByPeriod = exports.mapScheduleJournalToCOABalance = exports.calculateTotalBalanceTimeframeTick = exports.setDefaultTotalBalanceTimeframeTicks = exports.mapTotalBalanceTimeframeTickToCOAGroupedBalance = exports.getAllTimeframeTicks = exports.getAllAccountNested = exports.getAllAccountBase = exports.getAccountListKeyForSchedulesTab = exports.getCalculatedScheduleTotals = void 0;
+exports.getAccountsTypesForScheduleEpics = exports.getAccountLabelForScheduleType = exports.getAccountsTypesForScheduleList = exports.getDurationOfMonthOutTotalMonth = exports.calculateCOABalanceGroupedByPeriod = exports.mapScheduleJournalToCOABalance = exports.calculateTotalBalanceTimeframeTick = exports.setDefaultTotalBalanceTimeframeTicks = exports.mapTotalBalanceTimeframeTickToCOAGroupedBalance = exports.getAllTimeframeTicks = exports.getAllAccountNested = exports.getAllAccountBase = exports.getAccountListKeyForSchedulesTab = exports.getCalculatedScheduleTotals = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const formatZeniDateFY_1 = require("../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const getFYMonths_1 = require("../../../commonStateTypes/fiscalYearHelpers/getFYMonths");
@@ -225,6 +225,15 @@ const getAccountsTypesForScheduleList = (scheduleType) => {
     }
 };
 exports.getAccountsTypesForScheduleList = getAccountsTypesForScheduleList;
+const getAccountLabelForScheduleType = (scheduleType) => {
+    switch (scheduleType) {
+        case 'prepaid_expenses':
+            return 'prepaid_expenses';
+        default:
+            return undefined;
+    }
+};
+exports.getAccountLabelForScheduleType = getAccountLabelForScheduleType;
 /**
  * Function to get accountListKey and allowedAccountList for a given tab
  * @param scheduleType

package/lib/view/scheduleView/scheduleListView/scheduleListSelector.js

@@ -12,7 +12,6 @@ const scheduleListReducer_1 = require("./scheduleListReducer");
 const scheduleListTypes_1 = require("./scheduleListTypes");
 const amount_1 = require("../../../commonStateTypes/amount");
 const scheduleListHelper_1 = require("./scheduleListHelper");
-const accountSelector_1 = require("../../../entity/account/accountSelector");
 const sortedJETransactionsView = (jeTransactions, sortKey, sortOrder) => {
     return (0, orderBy_1.default)(jeTransactions, (jeTransaction) => {
         var _a;
@@ -70,10 +69,13 @@ const getScheduleListReport = (state) => {
     const allScheduleAccounts = (0, accountListSelector_1.getAccountList)(accountState, accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab));
     let allNestedAccounts = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab));
     let allAccounts = allScheduleAccounts.accounts;
-    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab).allowedAccountList;
-    const scheduleListCurrentTabAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleListCurrentTabAccountTypes);
-    if (scheduleListState.currentTab === 'prepaid_expenses') {
-        const filteredList = (0, accountListSelector_1.getFilteredNestedAndAccountListsForLabel)(accountState, accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab), 'prepaid_expenses');
+    const accountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab);
+    const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)(scheduleListState.currentTab);
+    const scheduleListCurrentTabAccountIds = accountLabel != null
+        ? (0, accountListSelector_1.getAccountIdsForLabel)(accountListState, accountTypes.accountListKey, accountLabel)
+        : [];
+    if (accountLabel != null) {
+        const filteredList = (0, accountListSelector_1.getFilteredNestedAndAccountListsForLabel)(accountState, accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab), accountLabel);
         // Use this list only if there is some account in it.
         if (filteredList.accountList.length > 0) {
             allAccounts = filteredList.accountList.filter((account) => scheduleListCurrentTabAccountIds.includes(account.accountId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.8.53",
+  "version": "4.8.54",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",