@zeniai/client-epic-state 5.2.10 → 5.2.11-betaAM1

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJEScheduleMainTab = exports.toJEScheduleSortKey = void 0;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = exports.getJESchedulePeriodTabKey = exports.ALL_JE_PAGE_TABS = exports.toJEPageTab = exports.toJEScheduleSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const JE_SCHEDULE_SORT_KEYS = [
     'vendor',
@@ -20,10 +20,14 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_SCHEDULE_MAIN_TABS = [
-    'pending_review',
-    'ongoing',
-    'completed',
+const JE_PAGE_TABS = [
+    'schedules',
+    'actual_matching',
+    'existing_schedules',
 ];
-const toJEScheduleMainTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_MAIN_TABS);
-exports.toJEScheduleMainTab = toJEScheduleMainTab;
+const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
+exports.toJEPageTab = toJEPageTab;
+exports.ALL_JE_PAGE_TABS = JE_PAGE_TABS;
+const getJESchedulePeriodTabKey = (selectedPageTab, monthYearPeriodId) => `${selectedPageTab}_${monthYearPeriodId}`;
+exports.getJESchedulePeriodTabKey = getJESchedulePeriodTabKey;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;

package/lib/view/expenseAutomationView/types/reconciliationViewState.d.ts

@@ -200,7 +200,7 @@ export interface SaveReconciliationDetailFailurePayload {
 }
 export declare const toReconciliationTabsType: (v: string) => "review" | "reconcile";
 export declare type ReconciliationViewTabType = ReturnType<typeof toReconciliationTabsType>;
-declare const toReconReconcileSortKeysType: (v: string) => "type" | "date" | "amount" | "memo" | "account" | "clearedDate" | "payee" | "transactionDirection" | "recommended";
+declare const toReconReconcileSortKeysType: (v: string) => "type" | "date" | "amount" | "memo" | "account" | "recommended" | "clearedDate" | "payee" | "transactionDirection";
 export declare type ReconReconcileSortKey = ReturnType<typeof toReconReconcileSortKeysType>;
 export interface ReconciliationReconcileTabLocalData {
     selectedTransactionIds: ID[];

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

@@ -33,7 +33,7 @@ const fetchAccruedScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pip
         je_schedule_type: scheduleType,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: action.payload.statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

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

@@ -10,9 +10,14 @@ const responsePayload_1 = require("../../../../responsePayload");
 const scheduleListReducer_1 = require("../scheduleListReducer");
 const scheduleListTypes_1 = require("../scheduleListTypes");
 const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchDownloadSchedules.match), (0, operators_1.mergeMap)((action) => {
-    const { scheduleType, downloadCategories } = action.payload;
+    const { scheduleType, downloadCategories, statusFilter } = action.payload;
     const scheduleListState = state$.value.scheduleListState;
     // if parameters are provided, use those. else go to localdata
+    // Accrued is deliberately not served here. Its rows come back in a different shape, this
+    // epic writes them through updateJESchedules (the prepaid / fixed mapper), and
+    // doUpdateScheduleList never flips downloadState for accrued -- so a request would store the
+    // wrong data and then never report completion. Accrued downloads go through
+    // fetchAccruedScheduleList, which owns that shape end to end.
     let scheduleState;
     if (scheduleType !== 'accrued_expenses') {
         scheduleState = (0, scheduleListReducer_1.getState)(scheduleListState, scheduleType);
@@ -37,7 +42,7 @@ const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
         base_txn_account_ids: downloadCategories,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/download?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

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

@@ -16,7 +16,7 @@ export declare const initialState: ScheduleListViewState;
 export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-}, downloadCategories: string[], cacheOverride?: any], {
+}, downloadCategories: string[], statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined, cacheOverride?: any], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
@@ -24,16 +24,18 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
     downloadCategories: string[];
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchDownloadSchedules", never, never>, fetchAccruedScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-} | undefined, cacheOverride?: any], {
+} | undefined, cacheOverride?: any, statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
     } | undefined;
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchAccruedScheduleList", never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;

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

@@ -90,8 +90,8 @@ const scheduleListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
+                // Accrued is not downloaded through this action -- see fetchDownloadSchedulesEpic for why.
                 if (action.payload.scheduleType !== 'accrued_expenses') {
-                    //if condition added for type narrowing
                     const state = getState(draft, action.payload.scheduleType);
                     const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
                     const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
@@ -115,13 +115,14 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, downloadCategories, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, downloadCategories, statusFilter = 'all', cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
                         downloadCategories,
+                        statusFilter,
                     },
                 };
             },
@@ -157,12 +158,13 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, cacheOverride = false, statusFilter = 'all') {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
+                        statusFilter,
                     },
                 };
             },

package/package.json

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