@zeniai/client-epic-state 4.8.86 → 4.8.87

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailReducer.js

@@ -6,11 +6,36 @@ const toolkit_1 = require("@reduxjs/toolkit");
 const scheduleDetailLocalDataHelper_1 = require("./scheduleDetailLocalDataHelper");
 const transactionDetailState_1 = require("../../transactionDetail/transactionDetailState");
 exports.initialScheduleDetailsLocalData = {
-    jeScheduleDetails: [],
+    prepaid_expenses: {
+        scheduleType: 'prepaid_expenses',
+        jeScheduleDetails: [],
+    },
+    fixed_assets: {
+        scheduleType: 'fixed_assets',
+        jeScheduleDetails: [],
+    },
+    accrued_expenses: {
+        scheduleType: 'accrued_expenses',
+        jeScheduleDetails: [],
+    },
+    deferred_revenue: {
+        scheduleType: 'deferred_revenue',
+        jeScheduleDetails: [],
+    },
 };
 exports.initialState = {
-    newScheduleState: exports.initialScheduleDetailsLocalData,
-    editScheduleStateById: {},
+    newScheduleState: {
+        prepaid_expenses: exports.initialScheduleDetailsLocalData.prepaid_expenses,
+        fixed_assets: exports.initialScheduleDetailsLocalData.fixed_assets,
+        deferred_revenue: exports.initialScheduleDetailsLocalData.deferred_revenue,
+        accrued_expenses: exports.initialScheduleDetailsLocalData.accrued_expenses,
+    },
+    editScheduleStateByDetailId: {
+        prepaid_expenses: {},
+        fixed_assets: {},
+        deferred_revenue: {},
+        accrued_expenses: {},
+    },
     saveStatus: {
         fetchState: 'Not-Started',
         error: undefined,
@@ -27,13 +52,17 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
     name: 'scheduleDetailView',
     initialState: exports.initialState,
     reducers: {
-        createNewSchedules: () => {
+        createNewSchedules: (
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        _draft, 
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        _action) => {
             // nothing to do here
         },
         fetchScheduleDetailsPage: {
-            prepare(tab, selectedJeScheduleDetailId) {
+            prepare(scheduleType, selectedJeScheduleDetailId) {
                 return {
-                    payload: { tab, selectedJeScheduleDetailId },
+                    payload: { scheduleType, selectedJeScheduleDetailId },
                 };
             },
             reducer() {
@@ -41,21 +70,21 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
             },
         },
         fetchScheduleDetails: {
-            prepare(tab, selectedJeScheduleDetailId) {
+            prepare(scheduleType, selectedJeScheduleDetailId) {
                 return {
-                    payload: { tab, selectedJeScheduleDetailId },
+                    payload: { scheduleType, selectedJeScheduleDetailId },
                 };
             },
             reducer(draft, action) {
                 const selectedJeScheduleDetailId = action.payload.selectedJeScheduleDetailId;
                 if (selectedJeScheduleDetailId != null) {
-                    if (draft.editScheduleStateById[selectedJeScheduleDetailId] == null) {
-                        draft.editScheduleStateById[selectedJeScheduleDetailId] =
-                            exports.initialScheduleDetailsLocalData;
+                    if (draft.editScheduleStateByDetailId[action.payload.scheduleType][selectedJeScheduleDetailId] == null) {
+                        draft.editScheduleStateByDetailId[action.payload.scheduleType][selectedJeScheduleDetailId] = exports.initialScheduleDetailsLocalData[action.payload.scheduleType];
                     }
                 }
                 else {
-                    draft.newScheduleState = exports.initialScheduleDetailsLocalData;
+                    draft.newScheduleState[action.payload.scheduleType] =
+                        exports.initialScheduleDetailsLocalData[action.payload.scheduleType];
                 }
                 draft.fetchState = 'In-Progress';
                 draft.error = undefined;
@@ -71,9 +100,9 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
         },
         // Fire this action to save the latest schedule data in local store in ZENI Platform.
         saveScheduleDetails: {
-            prepare(selectedJeScheduleDetailId) {
+            prepare(scheduleType, selectedJeScheduleDetailId) {
                 return {
-                    payload: { selectedJeScheduleDetailId },
+                    payload: { scheduleType, selectedJeScheduleDetailId },
                 };
             },
             reducer(draft) {
@@ -100,16 +129,17 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
             },
         },
         updateScheduleDetailsLocalData(draft, action) {
-            const { selectedJeScheduleDetailId, localData } = action.payload;
-            updateNewOrEditScheduleDetailLocalData(draft, localData, selectedJeScheduleDetailId);
+            const { selectedJeScheduleDetailId, localData, scheduleType } = action.payload;
+            updateNewOrEditScheduleDetailLocalData(draft, scheduleType, localData, selectedJeScheduleDetailId);
         },
         initializeScheduleDetailLocalData: {
             reducer() {
                 //do nothing
             },
-            prepare(selectedJEScheduleKey, selectedJeScheduleDetailId) {
+            prepare(scheduleType, selectedJEScheduleKey, selectedJeScheduleDetailId) {
                 return {
                     payload: {
+                        scheduleType,
                         selectedJEScheduleKey,
                         selectedJeScheduleDetailId,
                     },
@@ -120,17 +150,17 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
             draft.selectedJEScheduleKey = action.payload.selectedJEScheduleKey;
         },
         updateScheduleDetailNewStateLocalData: {
-            prepare(selectedJeScheduleDetailId) {
+            prepare(scheduleType, selectedJeScheduleDetailId) {
                 return {
-                    payload: { selectedJeScheduleDetailId },
+                    payload: { scheduleType, selectedJeScheduleDetailId },
                 };
             },
             reducer(draft, action) {
                 // This is a special case - when we save, we need the newSchedule state to move to the
                 // edit state
                 const selectedJeScheduleDetailId = action.payload.selectedJeScheduleDetailId;
-                if (draft.editScheduleStateById[selectedJeScheduleDetailId] == null) {
-                    draft.editScheduleStateById[selectedJeScheduleDetailId] = Object.assign({}, draft.newScheduleState);
+                if (draft.editScheduleStateByDetailId[action.payload.scheduleType][selectedJeScheduleDetailId] == null) {
+                    draft.editScheduleStateByDetailId[action.payload.scheduleType][selectedJeScheduleDetailId] = Object.assign({}, draft.newScheduleState[action.payload.scheduleType]);
                 }
             },
         },
@@ -139,47 +169,48 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
         },
         updatedJELinkInLocalData(draft, action) {
             const jeScheduleDetailId = action.payload.jeScheduleDetailId;
-            if (draft.editScheduleStateById[jeScheduleDetailId] == null) {
+            if (draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] == null) {
                 console.error('Cannot attempt to link a JE for non existing JESchedule Detail');
             }
             else {
-                const jeScheduleDetailsLocalData = draft.editScheduleStateById[jeScheduleDetailId].jeScheduleDetails;
+                const jeScheduleDetailsLocalData = draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId].jeScheduleDetails;
                 // put the link into the right record
                 const jeScheduleLocalDataUpdated = updateJELinkInScheduleDetails(jeScheduleDetailsLocalData, action.payload.rowId, action.payload.jeLink);
-                draft.editScheduleStateById[jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateById[jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
+                draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
             }
         },
         updatedJELinkWithRecommendedLocalData(draft, action) {
             const jeScheduleDetailId = action.payload.jeScheduleDetailId;
-            if (draft.editScheduleStateById[jeScheduleDetailId] == null) {
+            if (draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] == null) {
                 console.error('Cannot attempt to link a JE for non existing JESchedule Detail');
             }
             else {
-                const jeScheduleDetailsLocalData = draft.editScheduleStateById[jeScheduleDetailId].jeScheduleDetails;
+                const jeScheduleDetailsLocalData = draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId].jeScheduleDetails;
                 // put the link into the right record
                 const jeScheduleLocalDataUpdated = updateJELinkInWithRecommendedScheduleDetails(jeScheduleDetailsLocalData, action.payload.rowId);
-                draft.editScheduleStateById[jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateById[jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
+                draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
             }
         },
         resetJELinkInLocalData(draft, action) {
             const jeScheduleDetailId = action.payload.jeScheduleDetailId;
-            if (draft.editScheduleStateById[jeScheduleDetailId] == null) {
+            if (draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] == null) {
                 console.error('Cannot attempt to link a JE for non existing JESchedule Detail');
             }
             else {
-                const jeScheduleDetailsLocalData = draft.editScheduleStateById[jeScheduleDetailId].jeScheduleDetails;
+                const jeScheduleDetailsLocalData = draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId].jeScheduleDetails;
                 // put the old link into the right record
                 const jeScheduleLocalDataUpdated = resetJELinkInScheduleDetails(jeScheduleDetailsLocalData, action.payload.rowId, action.payload.originalScheduledJE);
-                draft.editScheduleStateById[jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateById[jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
+                draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateByDetailId[action.payload.scheduleType][jeScheduleDetailId]), { jeScheduleDetails: jeScheduleLocalDataUpdated });
             }
         },
         updateAmountsInScheduleDetail: {
             reducer() {
                 //do nothing
             },
-            prepare(rowId, jeScheduleDetailId) {
+            prepare(scheduleType, rowId, jeScheduleDetailId) {
                 return {
                     payload: {
+                        scheduleType,
                         rowId,
                         jeScheduleDetailId,
                     },
@@ -230,11 +261,11 @@ const resetJELinkInScheduleDetails = (jeScheduleDetailsLocalData, rowId, origina
             return jeScheduleDetail;
     });
 };
-const updateNewOrEditScheduleDetailLocalData = (draft, updates, selectedJeScheduleDetailId) => {
+const updateNewOrEditScheduleDetailLocalData = (draft, scheduleType, updates, selectedJeScheduleDetailId) => {
     if (selectedJeScheduleDetailId == null) {
-        draft.newScheduleState = Object.assign(Object.assign({}, draft.newScheduleState), updates);
+        draft.newScheduleState[scheduleType] = Object.assign(Object.assign({}, draft.newScheduleState[scheduleType]), updates);
     }
-    else if (draft.editScheduleStateById[selectedJeScheduleDetailId] != null) {
-        draft.editScheduleStateById[selectedJeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateById[selectedJeScheduleDetailId]), updates);
+    else if (draft.editScheduleStateByDetailId[scheduleType][selectedJeScheduleDetailId] != null) {
+        draft.editScheduleStateByDetailId[scheduleType][selectedJeScheduleDetailId] = Object.assign(Object.assign({}, draft.editScheduleStateByDetailId[scheduleType][selectedJeScheduleDetailId]), updates);
     }
 };

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

@@ -5,19 +5,28 @@ import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
-import { ScheduleDetailUIState, ScheduleDetailsLocalData } from './scheduleDetailState';
+import { ScheduleDetailUIState, ScheduleDetailsLocalData, ScheduleDetailsLocalDataFixedAssets } from './scheduleDetailState';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 export interface ScheduleDetailsView extends SelectorView {
+    scheduleType: ScheduleTypes;
     allAccountList: AccountBase[];
     uncategorizedAccounts: UncategorizedAccounts;
     accountListNestedAccountHierarchy: NestedAccountHeirarchyForReport[];
     allClassList: ClassBase[];
     classListNestedAccountHierarchy: NestedClassHeirarchyForReport[];
+    allDepreciationAccountList: AccountBase[];
+    allDepreciationAccountListNestedAccountHeirarchy: NestedAccountHeirarchyForReport[];
     uiState: ScheduleDetailUIState;
     saveStatus: FetchStateAndError;
-    scheduleDetailsLocalData: ScheduleDetailsLocalData;
+    scheduleDetailsLocalData: {
+        prepaid_expenses: ScheduleDetailsLocalData;
+        deferred_revenue: ScheduleDetailsLocalData;
+        accrued_expenses: ScheduleDetailsLocalData;
+        fixed_assets: ScheduleDetailsLocalDataFixedAssets;
+    };
     selectedJEScheduleTransaction?: JEScheduledTransaction;
     selectedJELinkRowIndex?: number;
 }
-export declare const getScheduleDetailsView: (state: RootState) => ScheduleDetailsView;
+export declare const getScheduleDetailsView: (state: RootState, scheduleType: ScheduleTypes) => ScheduleDetailsView;

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js

@@ -12,22 +12,25 @@ const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState")
 const scheduleDetailReducer_1 = require("./scheduleDetailReducer");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const scheduleDetailLocalDataHelper_1 = require("./scheduleDetailLocalDataHelper");
-const getScheduleDetailsView = (state) => {
+const scheduleListHelper_1 = require("../scheduleListView/scheduleListHelper");
+const getScheduleDetailsView = (state, scheduleType) => {
     const { accountState, accountListState, classState, classListState, scheduleDetailState, } = state;
     const jeScheduleKey = scheduleDetailState.selectedJEScheduleKey;
-    const uncategorizedAccounts = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'prepaidExpenseAccountList');
+    const accountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleType);
+    const uncategorizedAccounts = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, accountTypes.accountListKey);
     if (jeScheduleKey == null) {
         return {
+            scheduleType,
             uiState: scheduleDetailState.uiState,
             selectedJEScheduleTransaction: undefined,
             allAccountList: [],
             allClassList: [],
+            allDepreciationAccountList: [],
             uncategorizedAccounts,
             accountListNestedAccountHierarchy: [],
             classListNestedAccountHierarchy: [],
-            scheduleDetailsLocalData: {
-                jeScheduleDetails: [],
-            },
+            allDepreciationAccountListNestedAccountHeirarchy: [],
+            scheduleDetailsLocalData: scheduleDetailReducer_1.initialScheduleDetailsLocalData,
             fetchState: 'Not-Started',
             error: undefined,
             saveStatus: {
@@ -37,28 +40,39 @@ const getScheduleDetailsView = (state) => {
         };
     }
     const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(jeScheduleKey, state);
-    const scheduleDetailAccountTypes = (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)('prepaid_expenses');
+    const scheduleDetailAccountTypes = (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)(scheduleType);
     const scheduleDetailAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleDetailAccountTypes);
-    const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'prepaidExpenseAccountList');
+    const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, accountTypes.accountListKey);
     const filteredAccounts = allAccountList.accounts.filter((account) => scheduleDetailAccountIds.includes(account.accountId));
+    const depreciationCategoryIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, ['fixed_assets'] // This will always be for fixed assets list
+    );
+    const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)('fixed_assets');
+    const fixedAssetLabelAccountIds = accountLabel != null
+        ? (0, accountListSelector_1.getAccountIdsForLabel)(accountListState, accountTypes.accountListKey, accountLabel)
+        : [];
+    const filteredDepAccounts = allAccountList.accounts.filter((account) => depreciationCategoryIds.includes(account.accountId) &&
+        !fixedAssetLabelAccountIds.includes(account.accountId));
     const allClassList = (0, classListSelector_1.getClassList)(classState, classListState);
     const allClasses = allClassList.classes.map((classData) => {
         return (0, omit_1.default)(classData, ['accountIds', 'key']);
     });
-    const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'prepaidExpenseAccountList').filter((account) => account.accountId[0] != null &&
+    const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
         scheduleDetailAccountIds.includes(account.accountId[0]));
+    const depAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
+        depreciationCategoryIds.includes(account.accountId[0]) &&
+        !fixedAssetLabelAccountIds.includes(account.accountId[0]));
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHeirarchy)(classListState);
     const selectedJeScheduleDetailId = jeScheduleTransactionState.jeScheduleId;
-    let scheduleDetailsLocalData = Object.assign({}, scheduleDetailReducer_1.initialScheduleDetailsLocalData);
+    const scheduleDetailsLocalData = Object.assign({}, scheduleDetailReducer_1.initialScheduleDetailsLocalData);
     if (selectedJeScheduleDetailId != null) {
-        if (scheduleDetailState.editScheduleStateById[selectedJeScheduleDetailId] !=
-            null) {
-            scheduleDetailsLocalData =
-                scheduleDetailState.editScheduleStateById[selectedJeScheduleDetailId];
+        if (scheduleDetailState.editScheduleStateByDetailId[scheduleType][selectedJeScheduleDetailId] != null) {
+            scheduleDetailsLocalData[scheduleType] =
+                scheduleDetailState.editScheduleStateByDetailId[scheduleType][selectedJeScheduleDetailId];
         }
     }
     else {
-        scheduleDetailsLocalData = scheduleDetailState.newScheduleState;
+        scheduleDetailsLocalData[scheduleType] =
+            scheduleDetailState.newScheduleState[scheduleType];
     }
     const fetchState = (0, reduceFetchState_1.reduceAllFetchState)([
         scheduleDetailState,
@@ -66,10 +80,13 @@ const getScheduleDetailsView = (state) => {
         allClassList,
     ]);
     return {
+        scheduleType,
         uiState: scheduleDetailState.uiState,
         selectedJEScheduleTransaction: jeScheduleTransactionState,
         allAccountList: filteredAccounts,
         allClassList: allClasses,
+        allDepreciationAccountList: filteredDepAccounts,
+        allDepreciationAccountListNestedAccountHeirarchy: depAccountListNestedAccountHierarchy,
         uncategorizedAccounts,
         accountListNestedAccountHierarchy,
         classListNestedAccountHierarchy,

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

@@ -2,12 +2,10 @@ import { Amount } from '../../../commonStateTypes/amount';
 import { ID, FetchStateAndError } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { ScheduleDaysOfMonth } from '../../../commonStateTypes/timePeriod';
-import { JEScheduleKey, ScheduleJournalEntryStatusCodeType, SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduleKey, ScheduleJournalEntryStatusCodeType, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { TransactionID } from '../../../entity/transaction/stateTypes/transaction';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ScheduleDetailSortKey } from './scheduleDetailTypes';
-export declare const getScheduleDetailKey: (tab: SchedulesTypes, scheduleId: ID) => `prepaid_expenses-${string}` | `fixed_assets-${string}` | `accured_expenses-${string}` | `deferred_revenue-${string}`;
-export declare type ScheduleListKey = ReturnType<typeof getScheduleDetailKey>;
 export declare type JELinkType = 'recommended' | 'linked' | 'unknown' | 'qbourl';
 export interface JETransactionLink {
     type: JELinkType;
@@ -29,6 +27,7 @@ export interface JEScheduleDetailsLocalData {
     jeLink: JETransactionLink;
 }
 export interface ScheduleDetailsLocalData {
+    scheduleType: ScheduleTypes;
     jeScheduleDetails: JEScheduleDetailsLocalData[];
     selectedDate?: ZeniDate;
     selectedMonths?: number;
@@ -37,11 +36,26 @@ export interface ScheduleDetailsLocalData {
     selectedDayOfMonth?: ScheduleDaysOfMonth;
     lastDayOfMonth?: boolean;
 }
+export interface ScheduleDetailsLocalDataFixedAssets extends ScheduleDetailsLocalData {
+    selectedAccumulatedDepreciationCategory?: ID;
+    assetId?: string;
+}
 export interface ScheduleDetailViewState extends FetchStateAndError {
-    newScheduleState: ScheduleDetailsLocalData;
-    editScheduleStateById: Record<ID, ScheduleDetailsLocalData>;
+    newScheduleState: {
+        prepaid_expenses: ScheduleDetailsLocalData;
+        deferred_revenue: ScheduleDetailsLocalData;
+        accrued_expenses: ScheduleDetailsLocalData;
+        fixed_assets: ScheduleDetailsLocalDataFixedAssets;
+    };
+    editScheduleStateByDetailId: {
+        prepaid_expenses: Record<ID, ScheduleDetailsLocalData>;
+        deferred_revenue: Record<ID, ScheduleDetailsLocalData>;
+        accrued_expenses: Record<ID, ScheduleDetailsLocalData>;
+        fixed_assets: Record<ID, ScheduleDetailsLocalDataFixedAssets>;
+    };
     saveStatus: FetchStateAndError;
     uiState: ScheduleDetailUIState;
+    selectedDetailScheduleType?: ScheduleTypes;
     selectedJEScheduleKey?: JEScheduleKey;
     selectedJELinkRowIndex?: number;
 }

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailState.js

@@ -1,5 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScheduleDetailKey = void 0;
-const getScheduleDetailKey = (tab, scheduleId) => `${tab}-${scheduleId}`;
-exports.getScheduleDetailKey = getScheduleDetailKey;

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

@@ -13,13 +13,14 @@ const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
     const { tab, downloadCategories } = action.payload;
     const scheduleListState = state$.value.scheduleListState;
     // if parameters are provided, use those. else go to localdata
+    const scheduleState = (0, scheduleListReducer_1.getState)(scheduleListState, tab);
     const timeframe = action.payload.timeframeAndCategory != null
         ? action.payload.timeframeAndCategory.selectedTimeframe
-        : scheduleListState.scheduleListLocalData.selectedTimeframe;
+        : scheduleState.selectedTimeframe;
     const categoryId = action.payload.timeframeAndCategory.selectedCategoryId;
     const timePeriod = (0, timeframeTick_1.toTimePeriod)(timeframe);
-    const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, categoryId, timeframe);
-    const record = scheduleListState.byScheduleListKey[key];
+    const key = (0, scheduleListTypes_1.getScheduleListKey)(categoryId, timeframe);
+    const record = scheduleState.jeScheduleKeysByListKey[key];
     if (record != null && record.fetchState === 'Completed') {
         return (0, rxjs_1.from)([]);
     }

package/lib/view/scheduleView/scheduleListView/epics/fetchScheduleListEpic.d.ts

@@ -4,9 +4,6 @@ import { fetchScheduleList, updateScheduleListFailure, updateScheduleListSuccess
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { updateJESchedules, updateJESchedulesDetails } from '../../../../entity/jeSchedules/jeSchedulesReducer';
-import { SchedulesTypes } from '../../../../entity/jeSchedules/jeSchedulesTypes';
-import { AccountListState } from '../../../accountList/accountListState';
-import { ID } from '../../../../commonStateTypes/common';
 export declare type ActionType = ReturnType<typeof fetchScheduleList> | ReturnType<typeof updateJESchedules> | ReturnType<typeof updateJESchedulesDetails> | ReturnType<typeof updateScheduleListSuccess> | ReturnType<typeof updateScheduleListFailure>;
 export declare const fetchScheduleListEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export interface ScheduleListQueryParam {
@@ -18,10 +15,3 @@ export interface ScheduleListQueryParam {
     je_schedule_type: string;
     filter: string;
 }
-/**
- * Based on the tab this will return all IDs
- * @param tab
- * @param accountListState
- * @returns
- */
-export declare const getAllAccountIdsForTab: (tab: SchedulesTypes, accountListState: AccountListState, filterAccountIds: ID[]) => ID[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllAccountIdsForTab = exports.fetchScheduleListEpic = void 0;
+exports.fetchScheduleListEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const scheduleListReducer_1 = require("../scheduleListReducer");
@@ -15,15 +15,16 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
     const { tab } = action.payload;
     const { scheduleListState, accountListState } = state$.value;
     // if parameters are provided, use those. else go to localdata
+    const scheduleState = (0, scheduleListReducer_1.getState)(scheduleListState, tab);
     const timeframe = action.payload.timeframeAndCategory != null
         ? action.payload.timeframeAndCategory.selectedTimeframe
-        : scheduleListState.scheduleListLocalData.selectedTimeframe;
+        : scheduleState.selectedTimeframe;
     const categoryId = action.payload.timeframeAndCategory != null
         ? action.payload.timeframeAndCategory.selectedCategoryId
-        : scheduleListState.scheduleListLocalData.selectedCategoryID;
+        : scheduleState.selectedCategoryId;
     const timePeriod = (0, timeframeTick_1.toTimePeriod)(timeframe);
-    const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, categoryId, timeframe);
-    const draft = scheduleListState.byScheduleListKey[key];
+    const key = (0, scheduleListTypes_1.getScheduleListKey)(categoryId, timeframe);
+    const draft = scheduleState.jeScheduleKeysByListKey[key];
     if (draft != null &&
         draft.fetchState === 'Completed' &&
         action.payload.cacheOverride === false) {
@@ -36,7 +37,7 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
         : [];
     let categoryIds = [categoryId];
     if (categoryId === 'all') {
-        categoryIds = (0, exports.getAllAccountIdsForTab)(scheduleListState.currentTab, accountListState, scheduleListCurrentTabAccountIds);
+        categoryIds = scheduleListCurrentTabAccountIds;
     }
     const queryParam = {
         start_date: (0, timePeriod_1.toString)(timePeriod.start),
@@ -63,21 +64,3 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
         JSON.stringify(error))))));
 }));
 exports.fetchScheduleListEpic = fetchScheduleListEpic;
-/**
- * Based on the tab this will return all IDs
- * @param tab
- * @param accountListState
- * @returns
- */
-const getAllAccountIdsForTab = (tab, accountListState, filterAccountIds) => {
-    const accountStateForReport = accountListState.byReportId[(0, scheduleListHelper_1.getAccountsTypesForScheduleList)(tab).accountListKey];
-    let accountIds = accountStateForReport.accountIds.filter((accountId) => filterAccountIds.includes(accountId));
-    if (tab === 'prepaid_expenses') {
-        const filteredList = accountStateForReport.accountIdsByLabel['prepaid_expenses'];
-        if (filteredList.length > 0) {
-            accountIds = filteredList;
-        }
-    }
-    return accountIds;
-};
-exports.getAllAccountIdsForTab = getAllAccountIdsForTab;

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

@@ -10,11 +10,8 @@ const fetchSchedulesAccountEpic = (actions$,
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 _state$) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchSchedulesAccount.match), (0, operators_1.mergeMap)(() => {
     const fetchScheduleListActions = [];
-    const scheduleTabIds = ['prepaid_expenses'];
-    scheduleTabIds.forEach((scheduleTab) => {
-        const accountType = (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)(scheduleTab);
-        fetchScheduleListActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, false, false, false, false, accountType.allowedAccountList));
-    });
+    const accountType = (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)();
+    fetchScheduleListActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, false, false, false, false, accountType.allowedAccountList));
     return (0, rxjs_1.from)(fetchScheduleListActions);
 }));
 exports.fetchSchedulesAccountEpic = fetchSchedulesAccountEpic;

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

@@ -4,9 +4,10 @@ import { COABalance, COABalanceGroupedByPeriod } from '../../../commonStateTypes
 import { TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
 import { AccountBase, AccountLabel, AccountType } from '../../../entity/account/accountState';
 import { JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/jeSchedules/jeSchedulesSelector';
-import { SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { AccountListKeyType } from '../../accountList/accountListState';
 import { JEScheduledTransactionWithBalance } from './scheduleListSelector';
+export declare const scheduleTypesAccountLabels: Record<ScheduleTypes, AccountType>;
 export declare type TimeframeTickBalances = Record<string, COABalance[]>;
 export interface ScheduleTotalType {
     totalAmount: Amount;
@@ -19,7 +20,8 @@ export interface ScheduleTotalType {
  * @returns
  */
 export declare const getCalculatedScheduleTotals: (jeTransactions: JEScheduledTransaction[]) => ScheduleTotalType;
-export declare const getAccountListKeyForSchedulesTab: (scheduleTab: SchedulesTypes) => "accountList" | "prepaidExpenseAccountList";
+export declare const getAccountListKeyForSchedules: () => AccountListKeyType;
+export declare const getAccountLabelForSchedulesTab: (tab: ScheduleTypes) => AccountLabel;
 export declare const getAllAccountBase: () => AccountBase;
 export declare const getAllAccountNested: () => NestedAccountHeirarchyForReport;
 /**
@@ -84,12 +86,12 @@ declare type AccountListTypesPayload = {
  * @param scheduleType
  * @returns
  */
-export declare const getAccountsTypesForScheduleList: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
-export declare const getAccountLabelForScheduleType: (scheduleType: SchedulesTypes) => AccountLabel | undefined;
+export declare const getAccountsTypesForScheduleList: (scheduleType: ScheduleTypes) => AccountListTypesPayload;
+export declare const getAccountLabelForScheduleType: (scheduleType: ScheduleTypes) => AccountLabel | undefined;
 /**
  * Function to get accountListKey and allowedAccountList for a given tab
  * @param scheduleType
  * @returns
  */
-export declare const getAccountsTypesForScheduleEpics: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
+export declare const getAccountsTypesForScheduleEpics: () => AccountListTypesPayload;
 export {};