@zeniai/client-epic-state 4.16.9 → 4.16.10

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

@@ -13,18 +13,11 @@ const responsePayload_1 = require("../../../../responsePayload");
 const helpers_1 = require("../../helpers/helpers");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const fetchFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(fluxAnalysisViewReducer_1.fetchFluxAnalysisView.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c;
-    const { expenseAutomationFluxAnalysisViewState: { groupsBySelectedPeriod, uiState, }, } = state$.value;
-    const { monthAndYear, cacheOverride, pageToken, fetchReimbursement, keepExistingListItems, } = action.payload;
-    const periodId = (0, timePeriod_1.toMonthYearPeriodId)(monthAndYear);
-    const periodGroup = groupsBySelectedPeriod[periodId];
-    const groupToBeFetched = fetchReimbursement === true
-        ? periodGroup === null || periodGroup === void 0 ? void 0 : periodGroup.reimbursement
-        : periodGroup === null || periodGroup === void 0 ? void 0 : periodGroup.generalExpense;
-    const operatingExpenseIds = (_a = groupToBeFetched === null || groupToBeFetched === void 0 ? void 0 : groupToBeFetched.operatingExpenseIds) !== null && _a !== void 0 ? _a : [];
-    const fetchState = (_c = (_b = groupToBeFetched === null || groupToBeFetched === void 0 ? void 0 : groupToBeFetched.fetchStatus) === null || _b === void 0 ? void 0 : _b.fetchState) !== null && _c !== void 0 ? _c : 'Not-Started';
+    var _a;
+    const { expenseAutomationFluxAnalysisViewState: { fetchState, operatingExpenseIdsBySelectedPeriod, uiState, }, } = state$.value;
+    const { monthAndYear, cacheOverride, pageToken, keepExistingListItems } = action.payload;
+    const operatingExpenseIds = (_a = operatingExpenseIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthAndYear)]) !== null && _a !== void 0 ? _a : [];
     if (cacheOverride === true ||
-        groupToBeFetched == null ||
         operatingExpenseIds.length === 0 ||
         fetchState === 'Not-Started') {
         const month = monthAndYear.month < 10
@@ -35,7 +28,6 @@ const fetchFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
             sort_by: (0, helpers_1.toVendorFluxAnalysisSortKeyPayload)(uiState.sortKey),
             sort_order: (0, sortOrderPayload_1.getSortOrder)(uiState.sortOrder),
             page_token: pageToken,
-            reimbursement_flag: fetchReimbursement,
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/month-close/flux-analysis?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
@@ -51,17 +43,14 @@ const fetchFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                     updateType: 'merge',
                 }));
                 updateActions.push((0, fluxAnalysisViewReducer_1.updateFluxAnalysisViewPageMetaData)({
-                    fetchReimbursement,
                     pageMetaData: response.data.page_metadata,
                 }));
                 if (((_a = response.data.flux_analysis_entities) === null || _a === void 0 ? void 0 : _a.operating_expenses) !=
                     null) {
                     updateActions.push((0, fluxAnalysisViewReducer_1.fetchFluxAnalysisViewSuccess)({
                         expensesPayload: (_b = response.data.flux_analysis_entities) === null || _b === void 0 ? void 0 : _b.operating_expenses,
-                        totalsPayload: response.data.total_operating_expenses,
                         currency: response.data.currency,
                         selectedPeriod: monthAndYear,
-                        fetchReimbursement,
                         keepExistingListItems,
                     }));
                 }
@@ -69,14 +58,13 @@ const fetchFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
             }
             else {
                 return (0, rxjs_1.of)((0, fluxAnalysisViewReducer_1.fetchFluxAnalysisViewFailure)({
-                    fetchReimbursement,
                     status: response.status,
                     selectedPeriod: monthAndYear,
                 }));
             }
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, fluxAnalysisViewReducer_1.fetchFluxAnalysisViewFailure)({
-            fetchReimbursement,
-            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', `fetch flux analysis view REST API call errored out: ${JSON.stringify(error)}`),
+            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'fetch flux analysis view REST API call errored out' +
+                JSON.stringify(error)),
             selectedPeriod: monthAndYear,
         }))));
     }

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

@@ -14,7 +14,7 @@ const monthEndCloseChecksViewReducer_1 = require("../../../monthEndCloseChecksVi
 const helpers_1 = require("../../helpers/helpers");
 const fluxAnalysisViewReducer_1 = require("../../reducers/fluxAnalysisViewReducer");
 const reviewFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(fluxAnalysisViewReducer_1.reviewFluxAnalysisView.match), (0, operators_1.mergeMap)((action) => {
-    const { actionType, operatingExpenseIds, selectedPeriod } = action.payload;
+    const { actionType, operatingExpenseIds, selectedPeriod, isBulk } = action.payload;
     const payload = Object.assign({}, getReviewFluxPayload(actionType, operatingExpenseIds));
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state$.value);
     return zeniAPI
@@ -33,6 +33,7 @@ const reviewFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                     expensesPayload: (_b = (_a = response.data.flux_analysis_entities) === null || _a === void 0 ? void 0 : _a.operating_expenses) !== null && _b !== void 0 ? _b : [],
                     currency: response.data.currency,
                     selectedPeriod: selectedPeriod,
+                    isBulk,
                 }));
             }
             if (currentTenant != null) {
@@ -65,12 +66,14 @@ const reviewFluxAnalysisViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(
             return (0, rxjs_1.of)((0, fluxAnalysisViewReducer_1.reviewFluxAnalysisViewFailure)({
                 operatingExpenseIds: operatingExpenseIds,
                 status: response.status,
+                isBulk,
             }));
         }
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, fluxAnalysisViewReducer_1.reviewFluxAnalysisViewFailure)({
         operatingExpenseIds: operatingExpenseIds,
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'review flux analysis view REST API call errored out' +
             JSON.stringify(error)),
+        isBulk,
     }))));
 }));
 exports.reviewFluxAnalysisViewEpic = reviewFluxAnalysisViewEpic;

package/lib/view/expenseAutomationView/helpers/helpers.js

@@ -41,10 +41,10 @@ const toVendorFluxAnalysisSortKeyPayload = (sortKey) => {
     switch (sortKey) {
         case 'vendor':
             return 'vendor_name';
-        case 'status':
-            return 'is_reviewed';
-        case 'variance':
-            return 'variance_amount';
+        case 'category':
+            return 'account_name';
+        case 'class':
+            return 'accounting_class_name';
     }
 };
 exports.toVendorFluxAnalysisSortKeyPayload = toVendorFluxAnalysisSortKeyPayload;

package/lib/view/expenseAutomationView/payload/fluxAnalysisPayload.d.ts

@@ -5,7 +5,7 @@ import { ClassBasePayload } from '../../../entity/class/classPayload';
 import { UserPayload } from '../../../entity/user/userPayload';
 import { VendorPayload } from '../../../entity/vendor/vendorPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
-declare const toFluxAnalysisQuerySortKey: (v: string) => "vendor_name" | "is_reviewed" | "variance_amount";
+declare const toFluxAnalysisQuerySortKey: (v: string) => "accounting_class_name" | "account_name" | "vendor_name";
 export type FluxAnalysisQuerySortKey = ReturnType<typeof toFluxAnalysisQuerySortKey>;
 export type FluxAnalysisActionQueryType = 'mark_as_reviewed' | 'mark_as_un_reviewed';
 export interface PageMetadataPayload {
@@ -17,7 +17,6 @@ export interface FluxAnalysisQueryPayload {
     sort_order: string;
     sort_by: string;
     page_token: string | null;
-    reimbursement_flag: boolean;
 }
 export interface FluxAnalysisReviewPayload {
     action: string;
@@ -29,23 +28,18 @@ export interface MonthBalancePayload extends AgingBalancePayload {
     label: string;
     start_date: string;
 }
-export interface MonthBalanceAndVariancePayload {
-    month_1: MonthBalancePayload;
-    month_2: MonthBalancePayload;
-    variance_amount: number;
-    variance_percentage: number;
-}
 export interface FluxAnalysisEntitiesPayload {
-    operating_expenses: FluxAnalysisOperatingExpensePayload[];
-}
-export interface FluxAccountAndClassPayload extends MonthBalanceAndVariancePayload {
-    accounting_class_id: string;
-    account_id: string;
+    operating_expenses?: FluxAnalysisOperatingExpensePayload[];
 }
-export interface FluxAnalysisOperatingExpensePayload extends MonthBalanceAndVariancePayload {
+export interface FluxAnalysisOperatingExpensePayload {
     flux_analysis_entity_id: string;
     vendor_id: string;
-    category_and_class_json: FluxAccountAndClassPayload[];
+    account_id: string | undefined;
+    accounting_class_id: string | undefined;
+    month_1: MonthBalancePayload;
+    month_2: MonthBalancePayload;
+    variance_amount: number;
+    variance_percentage: number;
     anomaly_reason: string;
     status: string;
     reviewed_by_user_id: string | null;
@@ -53,18 +47,12 @@ export interface FluxAnalysisOperatingExpensePayload extends MonthBalanceAndVari
     updated_at: string | null;
     is_reviewed: boolean | null;
 }
-export interface FluxAnalysisTotalPayload {
-    reimbursement: MonthBalanceAndVariancePayload;
-    general_expenses: MonthBalanceAndVariancePayload;
-    total: MonthBalanceAndVariancePayload;
-}
 export interface FluxAnalysisReportPayload {
     vendors: VendorPayload[];
     accounts: AccountBasePayload[];
     accounting_class: ClassBasePayload[];
     users: UserPayload[];
     flux_analysis_entities?: FluxAnalysisEntitiesPayload;
-    total_operating_expenses: FluxAnalysisTotalPayload;
     page_metadata?: PageMetadataPayload;
     currency: CurrencyPayload;
 }
@@ -74,7 +62,6 @@ export interface FluxAnalysisResponsePayload extends FluxAnalysisReportPayload {
         page_token: string;
         sort_by: string;
         sort_order: string;
-        reimbursement_flag: boolean;
     };
 }
 export interface ReviewFluxAnalysisResponsePayload extends FluxAnalysisReportPayload {

package/lib/view/expenseAutomationView/payload/fluxAnalysisPayload.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const FLUX_ANALYSIS_SORT_KEYS_QUERY = [
-    'is_reviewed',
-    'variance_amount',
+    'accounting_class_name',
+    'account_name',
     'vendor_name',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

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

@@ -3,32 +3,26 @@ import { ID } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { FluxAnalysisOperatingExpensePayload, FluxAnalysisTotalPayload, PageMetadataPayload } from '../payload/fluxAnalysisPayload';
-import { FluxAnalysisSectionType } from '../selectorTypes/fluxAnalysisViewSelectorTypes';
+import { FluxAnalysisOperatingExpensePayload, PageMetadataPayload } from '../payload/fluxAnalysisPayload';
 import { FluxAnalysisActionType, FluxAnalysisViewState, FluxAnalysisViewUIState } from '../types/fluxAnalysisViewState';
 export declare const initialState: FluxAnalysisViewState;
-export declare const fetchFluxAnalysisView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[monthAndYear: MonthYearPeriod, cacheOverride: boolean, refreshViewInBackground: boolean, pageToken: PageToken, fetchReimbursement?: any, keepExistingListItems?: boolean | undefined, resetListItems?: boolean | undefined], {
+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;
     cacheOverride: boolean;
     pageToken: PageToken;
-    fetchReimbursement: any;
     keepExistingListItems: boolean | undefined;
     resetListItems: boolean | undefined;
 }, "expenseAutomationFluxAnalysisView/fetchFluxAnalysisView", never, never>, fetchFluxAnalysisViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     expensesPayload: FluxAnalysisOperatingExpensePayload[];
     selectedPeriod: MonthYearPeriod;
     currency: CurrencyPayload;
-    fetchReimbursement: boolean;
-    totalsPayload?: FluxAnalysisTotalPayload;
     keepExistingListItems?: boolean;
 }, "expenseAutomationFluxAnalysisView/fetchFluxAnalysisViewSuccess">, fetchFluxAnalysisViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    fetchReimbursement: boolean;
     status: ZeniAPIStatus;
     selectedPeriod: MonthYearPeriod;
 }, "expenseAutomationFluxAnalysisView/fetchFluxAnalysisViewFailure">, clearExpenseAutomationFluxAnalysisView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationFluxAnalysisView/clearExpenseAutomationFluxAnalysisView">, updateOperatingExpensesIdsForReview: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     operatingExpenseIds: ID[];
-    selectedPeriod: MonthYearPeriod;
 }, "expenseAutomationFluxAnalysisView/updateOperatingExpensesIdsForReview">, reviewFluxAnalysisView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[actionType: FluxAnalysisActionType, operatingExpenseIds: string[], selectedPeriod: MonthYearPeriod, isBulk?: boolean | undefined], {
     actionType: FluxAnalysisActionType;
     operatingExpenseIds: string[];
@@ -38,15 +32,13 @@ export declare const fetchFluxAnalysisView: import("@reduxjs/toolkit").ActionCre
     expensesPayload: FluxAnalysisOperatingExpensePayload[];
     currency: CurrencyPayload;
     selectedPeriod: MonthYearPeriod;
+    isBulk?: boolean;
 }, "expenseAutomationFluxAnalysisView/reviewFluxAnalysisViewSuccess">, reviewFluxAnalysisViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     operatingExpenseIds: ID[];
     status: ZeniAPIStatus;
+    isBulk?: boolean;
 }, "expenseAutomationFluxAnalysisView/reviewFluxAnalysisViewFailure">, updateFluxAnalysisViewUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<FluxAnalysisViewUIState>, "expenseAutomationFluxAnalysisView/updateFluxAnalysisViewUIState">, updateFluxAnalysisViewPageMetaData: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    fetchReimbursement: boolean;
     pageMetaData?: PageMetadataPayload;
-}, "expenseAutomationFluxAnalysisView/updateFluxAnalysisViewPageMetaData">, updateSelectedSectionIdsForReview: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    sectionId: FluxAnalysisSectionType[];
-    selectedPeriod: MonthYearPeriod;
-}, "expenseAutomationFluxAnalysisView/updateSelectedSectionIdsForReview">;
+}, "expenseAutomationFluxAnalysisView/updateFluxAnalysisViewPageMetaData">;
 declare const _default: import("redux").Reducer<FluxAnalysisViewState>;
 export default _default;