@zeniai/client-epic-state 4.13.84 → 4.13.86

package/lib/view/expenseAutomationView/epics/fluxAnalysis/reviewFluxAnalysisEpic.js

@@ -11,7 +11,7 @@ const vendorReducer_1 = require("../../../../entity/vendor/vendorReducer");
 const userReducer_1 = require("../../../../entity/user/userReducer");
 const helpers_1 = require("../../helpers/helpers");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
-const reviewFluxAnalysisViewEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(fluxAnalysisViewReducer_1.reviewFluxAnalysisView.match), (0, operators_1.switchMap)((action) => {
+const reviewFluxAnalysisViewEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(fluxAnalysisViewReducer_1.reviewFluxAnalysisView.match), (0, operators_1.mergeMap)((action) => {
     const { actionType, operatingExpenseIds, selectedPeriod, isBulk } = action.payload;
     const payload = Object.assign({}, getReviewFluxPayload(actionType, operatingExpenseIds));
     return zeniAPI

package/lib/view/expenseAutomationView/reducers/fluxAnalysisViewReducer.d.ts

@@ -1,15 +1,11 @@
-import { FluxAnalysisActionType, FluxAnalysisOperatingExpense, FluxAnalysisViewState, FluxAnalysisViewUIState } from '../types/fluxAnalysisViewState';
+import { FluxAnalysisActionType, FluxAnalysisViewState, FluxAnalysisViewUIState } from '../types/fluxAnalysisViewState';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { FluxAnalysisOperatingExpensePayload, PageMetadataPayload } from '../payload/fluxAnalysisPayload';
-import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
+import { ID } from '../../../commonStateTypes/common';
 import { CurrencyPayload } from '../../../commonPayloadTypes/v2/viewAndReportPayloadv2';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 export declare const initialState: FluxAnalysisViewState;
-export declare const toFluxAnalysisiOperatingExpensesById: (operatingExpenses: FluxAnalysisOperatingExpensePayload[], currency: CurrencyPayload) => Record<ID, FluxAnalysisOperatingExpense>;
-export declare const toFluxAnalysisOperatingExpenses: (operatingExpensesPayload: FluxAnalysisOperatingExpensePayload[], currency: CurrencyPayload) => FluxAnalysisOperatingExpense[];
-export declare const toFluxAnalysisOperatingEexpense: (operatingExpensePayload: FluxAnalysisOperatingExpensePayload, currency: CurrencyPayload) => FluxAnalysisOperatingExpense;
-export declare const toReviewStatusById: (operatingExpenses: FluxAnalysisOperatingExpensePayload[]) => Record<ID, FetchStateAndError>;
 export declare const fetchFluxAnalysisView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[monthAndYear: MonthYearPeriod, cacheOverride: boolean, refreshViewInBackground: boolean, pageToken: PageToken, keepExistingListItems?: boolean | undefined, resetListItems?: boolean | undefined], {
     monthAndYear: MonthYearPeriod;
     refreshViewInBackground: boolean;

package/lib/view/expenseAutomationView/reducers/fluxAnalysisViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFluxAnalysisViewPageMetaData = exports.updateFluxAnalysisViewUIState = exports.reviewFluxAnalysisViewFailure = exports.reviewFluxAnalysisViewSuccess = exports.reviewFluxAnalysisView = exports.updateOperatingExpensesIdsForReview = exports.clearExpenseAutomationFluxAnalysisView = exports.fetchFluxAnalysisViewFailure = exports.fetchFluxAnalysisViewSuccess = exports.fetchFluxAnalysisView = exports.toReviewStatusById = exports.toFluxAnalysisOperatingEexpense = exports.toFluxAnalysisOperatingExpenses = exports.toFluxAnalysisiOperatingExpensesById = exports.initialState = void 0;
+exports.updateFluxAnalysisViewPageMetaData = exports.updateFluxAnalysisViewUIState = exports.reviewFluxAnalysisViewFailure = exports.reviewFluxAnalysisViewSuccess = exports.reviewFluxAnalysisView = exports.updateOperatingExpensesIdsForReview = exports.clearExpenseAutomationFluxAnalysisView = exports.fetchFluxAnalysisViewFailure = exports.fetchFluxAnalysisViewSuccess = exports.fetchFluxAnalysisView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const helpers_1 = require("../helpers/helpers");
@@ -77,13 +77,13 @@ const expenseAutomationFluxAnalysisView = (0, toolkit_1.createSlice)({
             else {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
             }
-            draft.reviewStatusById = Object.assign(Object.assign({}, draft.reviewStatusById), (0, exports.toReviewStatusById)(expensesPayload));
+            draft.reviewStatusById = Object.assign(Object.assign({}, draft.reviewStatusById), toReviewStatusById(expensesPayload));
             const fluxOpExEntityIds = expensesPayload.map((expense) => expense.flux_analysis_entity_id);
             if (keepExistingListItems === true) {
                 const allFluxAnalysisEntities = {
                     operatingExpenses: [
                         ...draft.fluxAnalysisEntities.operatingExpenses,
-                        ...(0, exports.toFluxAnalysisOperatingExpenses)(expensesPayload, currency),
+                        ...toFluxAnalysisOperatingExpenses(expensesPayload, currency),
                     ],
                 };
                 const allOperatingExpenseIdsBySelectedPeriod = [
@@ -97,7 +97,7 @@ const expenseAutomationFluxAnalysisView = (0, toolkit_1.createSlice)({
                 draft.operatingExpenseIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)] = fluxOpExEntityIds;
                 draft.fluxAnalysisEntities = {
                     operatingExpenses: [
-                        ...(0, exports.toFluxAnalysisOperatingExpenses)(expensesPayload, currency),
+                        ...toFluxAnalysisOperatingExpenses(expensesPayload, currency),
                         ...draft.fluxAnalysisEntities.operatingExpenses,
                     ],
                 };
@@ -149,7 +149,7 @@ const expenseAutomationFluxAnalysisView = (0, toolkit_1.createSlice)({
                 draft.reviewStatusById[opExPayload.flux_analysis_entity_id] = {
                     fetchState: 'Completed',
                 };
-                const fluxEntity = (0, exports.toFluxAnalysisOperatingEexpense)(opExPayload, currency);
+                const fluxEntity = toFluxAnalysisOperatingExpense(opExPayload, currency);
                 updatedFluxEntities = updatedFluxEntities.filter((fluxEntity) => fluxEntity.operatingExpenseId !==
                     opExPayload.flux_analysis_entity_id);
                 updatedFluxEntities.push(fluxEntity);
@@ -198,24 +198,14 @@ const expenseAutomationFluxAnalysisView = (0, toolkit_1.createSlice)({
         },
     },
 });
-const toFluxAnalysisiOperatingExpensesById = (operatingExpenses, currency) => {
-    const balancesByVendorKey = {};
-    operatingExpenses.forEach((operatingExpense) => {
-        const vendorFluxKey = operatingExpense.flux_analysis_entity_id;
-        balancesByVendorKey[vendorFluxKey] = (0, exports.toFluxAnalysisOperatingEexpense)(operatingExpense, currency);
-    });
-    return balancesByVendorKey;
-};
-exports.toFluxAnalysisiOperatingExpensesById = toFluxAnalysisiOperatingExpensesById;
 const toFluxAnalysisOperatingExpenses = (operatingExpensesPayload, currency) => {
     const operatingExpenses = [];
     operatingExpensesPayload.forEach((operatingExpensePayload) => {
-        operatingExpenses.push((0, exports.toFluxAnalysisOperatingEexpense)(operatingExpensePayload, currency));
+        operatingExpenses.push(toFluxAnalysisOperatingExpense(operatingExpensePayload, currency));
     });
     return operatingExpenses;
 };
-exports.toFluxAnalysisOperatingExpenses = toFluxAnalysisOperatingExpenses;
-const toFluxAnalysisOperatingEexpense = (operatingExpensePayload, currency) => {
+const toFluxAnalysisOperatingExpense = (operatingExpensePayload, currency) => {
     var _a;
     return {
         operatingExpenseId: operatingExpensePayload.flux_analysis_entity_id,
@@ -234,7 +224,6 @@ const toFluxAnalysisOperatingEexpense = (operatingExpensePayload, currency) => {
         balancesByMonth: (0, helpers_1.toBalancesByMonthFromPayload)(operatingExpensePayload.month_1, operatingExpensePayload.month_2, currency),
     };
 };
-exports.toFluxAnalysisOperatingEexpense = toFluxAnalysisOperatingEexpense;
 const toReviewStatusById = (operatingExpenses) => {
     const reviewStatusById = {};
     operatingExpenses.forEach((operatingExpense) => {
@@ -245,6 +234,5 @@ const toReviewStatusById = (operatingExpenses) => {
     });
     return reviewStatusById;
 };
-exports.toReviewStatusById = toReviewStatusById;
 _a = expenseAutomationFluxAnalysisView.actions, exports.fetchFluxAnalysisView = _a.fetchFluxAnalysisView, exports.fetchFluxAnalysisViewSuccess = _a.fetchFluxAnalysisViewSuccess, exports.fetchFluxAnalysisViewFailure = _a.fetchFluxAnalysisViewFailure, exports.clearExpenseAutomationFluxAnalysisView = _a.clearExpenseAutomationFluxAnalysisView, exports.updateOperatingExpensesIdsForReview = _a.updateOperatingExpensesIdsForReview, exports.reviewFluxAnalysisView = _a.reviewFluxAnalysisView, exports.reviewFluxAnalysisViewSuccess = _a.reviewFluxAnalysisViewSuccess, exports.reviewFluxAnalysisViewFailure = _a.reviewFluxAnalysisViewFailure, exports.updateFluxAnalysisViewUIState = _a.updateFluxAnalysisViewUIState, exports.updateFluxAnalysisViewPageMetaData = _a.updateFluxAnalysisViewPageMetaData;
 exports.default = expenseAutomationFluxAnalysisView.reducer;

package/lib/view/expenseAutomationView/selectors/fluxAnalysisViewSelector.js

@@ -68,8 +68,12 @@ function getExpenseAutomationFluxAnalysisView(state) {
     // If all operating expenses are fetched and reviewed, then the bulk review status should be 'complete'
     // If there are no operating expenses (after fetch state is completed), then the bulk review status should be 'complete'
     // If the flux analysis is complete and all operating expenses are reviewed (in our state), then the bulk review status should be 'complete'
-    const completionStatus = (isFetchStateCompleted && allOperatingExpensesReviewed) ||
-        (isFetchStateCompleted && operatingExpensesView.length === 0) ||
+    const completionStatus = (isFetchStateCompleted &&
+        allOperatingExpensesReviewed &&
+        uiState.hasMore === false) ||
+        (isFetchStateCompleted &&
+            operatingExpensesView.length === 0 &&
+            uiState.hasMore === false) ||
         (fluxCompletionStatus === 'complete' && allOperatingExpensesReviewed)
         ? 'complete'
         : 'incomplete';

package/package.json

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