@zeniai/client-epic-state 5.2.30 → 5.2.32-betaAK0

package/lib/esm/view/cashFlowProjectView/cashFlowProjectViewEpic.js

@@ -0,0 +1,30 @@
+import { from } from 'rxjs';
+import { filter, switchMap } from 'rxjs/operators';
+import { fetchCashFlowForTimeframeProjectView, fetchCashFlowProjectView, } from './cashFlowProjectViewReducer';
+export const fetchCashFlowProjectViewEpic = (actions$, state) => actions$.pipe(filter(fetchCashFlowProjectView.match), switchMap((action) => {
+    const { cacheOverride } = action.payload;
+    if (cacheOverride === true) {
+        return from([
+            fetchCashFlowForTimeframeProjectView('month', true),
+            fetchCashFlowForTimeframeProjectView('quarter', true),
+            fetchCashFlowForTimeframeProjectView('year', true),
+        ]);
+    }
+    else {
+        const fetchActions = [];
+        const projectFetchState = state.value.cashFlowProjectViewState.fetchState;
+        if (projectFetchState['month'].fetchState !== 'In-Progress' &&
+            projectFetchState['month'].fetchState !== 'Completed') {
+            fetchActions.push(fetchCashFlowForTimeframeProjectView('month'));
+        }
+        if (projectFetchState['quarter'].fetchState !== 'In-Progress' &&
+            projectFetchState['quarter'].fetchState !== 'Completed') {
+            fetchActions.push(fetchCashFlowForTimeframeProjectView('quarter'));
+        }
+        if (projectFetchState['year'].fetchState !== 'In-Progress' &&
+            projectFetchState['year'].fetchState !== 'Completed') {
+            fetchActions.push(fetchCashFlowForTimeframeProjectView('year'));
+        }
+        return from(fetchActions);
+    }
+}));

package/lib/esm/view/cashFlowProjectView/cashFlowProjectViewReducer.js

@@ -0,0 +1,125 @@
+import { createSlice } from '@reduxjs/toolkit';
+import { mapReportPayloadV2ToReportV2 } from '../../commonPayloadTypes/v2/viewAndReportPayloadv2';
+import { clearAll } from '../../rootActions';
+export const initialState = {
+    bookCloseDate: undefined,
+    fetchState: {
+        month: {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
+        quarter: {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
+        year: {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
+    },
+    firstMonthOfFY: 1,
+    projectIds: [],
+    reportId: 'cash_flow_by_projects',
+    reportTitle: 'cash_flow_by_projects',
+    uiState: {
+        accountViewMode: 'account_group',
+        nodeCollapseState: {},
+        projectsToFilterOut: [],
+        scrollPosition: undefined,
+    },
+};
+const cashFlowProjectView = createSlice({
+    name: 'cashFlowProjectView',
+    initialState,
+    reducers: {
+        fetchCashFlowProjectView: {
+            prepare(cacheOverride = false) {
+                return { payload: { cacheOverride } };
+            },
+            reducer(
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            _draft, 
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            _action) {
+                // nothing to do here
+            },
+        },
+        fetchCashFlowForTimeframeProjectView: {
+            prepare(timeframe, cacheOverride = false) {
+                return { payload: { timeframe, cacheOverride } };
+            },
+            reducer(draft, action) {
+                const timeframe = action.payload.timeframe;
+                draft.fetchState[timeframe].fetchState = 'In-Progress';
+                draft.fetchState[timeframe].error = undefined;
+            },
+        },
+        updateCashFlowForTimeframeProjectView(draft, action) {
+            doUpdateCashFlowProjectView(draft, action.payload.timeframe, action.payload.report);
+        },
+        updateCashFlowForTimeframeProjectViewFailure: {
+            prepare(error, timeframe) {
+                return {
+                    payload: {
+                        error,
+                        timeframe,
+                    },
+                };
+            },
+            reducer(draft, action) {
+                draft.fetchState[action.payload.timeframe] = {
+                    fetchState: 'Error',
+                    error: action.payload.error,
+                };
+            },
+        },
+        updateCashFlowProjectsToFilterOut(draft, action) {
+            draft.uiState.projectsToFilterOut = action.payload.projectsToFilterOut;
+        },
+        updateCashFlowProjectViewUIState(draft, action) {
+            const { nodeCollapseState, scrollPosition, resetLeftScroll } = action.payload;
+            if (nodeCollapseState != null) {
+                draft.uiState.nodeCollapseState = Object.assign({}, draft.uiState.nodeCollapseState, {
+                    [nodeCollapseState.nodeId]: nodeCollapseState.isCollapsed,
+                });
+            }
+            // Mutually exclusive: resetLeftScroll clears only scrollLeft from the
+            // recorded position, scrollPosition replaces the whole record.
+            if (resetLeftScroll === true && draft.uiState.scrollPosition != null) {
+                draft.uiState.scrollPosition.scrollLeft = undefined;
+            }
+            else if (scrollPosition != null) {
+                draft.uiState.scrollPosition = scrollPosition;
+            }
+        },
+        updateCashFlowProjectViewAccountViewMode(draft, action) {
+            draft.uiState.accountViewMode = action.payload.viewMode;
+        },
+        resetCashFlowProjectNodeCollapseState(draft) {
+            draft.uiState.nodeCollapseState = {};
+        },
+    },
+    extraReducers: (builder) => {
+        builder.addCase(clearAll, (draft) => {
+            Object.assign(draft, initialState);
+        });
+    },
+});
+export const { fetchCashFlowProjectView, fetchCashFlowForTimeframeProjectView, updateCashFlowForTimeframeProjectView, updateCashFlowForTimeframeProjectViewFailure, updateCashFlowProjectsToFilterOut, updateCashFlowProjectViewUIState, updateCashFlowProjectViewAccountViewMode, resetCashFlowProjectNodeCollapseState, } = cashFlowProjectView.actions;
+export default cashFlowProjectView.reducer;
+const doUpdateCashFlowProjectView = (draft, timeframe, cashFlowReport) => {
+    const report = mapReportPayloadV2ToReportV2(cashFlowReport.report);
+    draft.currency = report.currency;
+    draft.dataAvailable = report.dataAvailable;
+    draft.firstMonthOfFY = report.firstMonthOfFY;
+    draft.bookCloseDate = report.bookCloseDate;
+    draft.status = report.status;
+    draft.fetchState[timeframe].fetchState = 'Completed';
+    draft.fetchState[timeframe].error = undefined;
+    // Populated once, as with classHierarchy in the classes view: a project added
+    // mid-session is not picked up until the store is cleared, even by a hard
+    // refresh. Matches profitAndLossProjectViewReducer.
+    if (draft.projectIds.length <= 0) {
+        draft.projectIds = cashFlowReport.report.projects.map((project) => project.accounting_project_id);
+    }
+};

package/lib/esm/view/cashFlowProjectView/cashFlowProjectViewSelector.js

@@ -0,0 +1,54 @@
+import { getCOABalances } from '../../commonStateTypes/coaBalance/getCOABalancesSlice';
+import { reduceFetchStateParallelTimeframes } from '../../commonStateTypes/reduceFetchState';
+import { getProjectsByIds } from '../../entity/project/projectSelector';
+import { getSectionProjectViewReport } from '../../entity/sectionProjectView/sectionProjectViewSelector';
+import { CASH_FLOW_GROUPED_BREAKDOWN_IDS, CASH_FLOW_GROUPED_CALCULATED_IDS, CASH_FLOW_GROUPED_FINANCING_IDS_IN_ORDER, CASH_FLOW_GROUPED_IDS_IN_ORDER, CASH_FLOW_GROUPED_INVESTING_IDS_IN_ORDER, CASH_FLOW_GROUPED_OPERATING_IDS_IN_ORDER, } from '../cashFlow/cashFlowGroupedSectionOrder';
+export const getCashFlowProjectView = (filter, accountState, projectState, sectionsState, cashFlowProjectViewState) => {
+    const fetchState = reduceFetchStateParallelTimeframes([
+        cashFlowProjectViewState.fetchState.month,
+        cashFlowProjectViewState.fetchState.quarter,
+        cashFlowProjectViewState.fetchState.year,
+    ]);
+    const reportId = 'cash_flow_by_projects';
+    const sections = {};
+    const calculatedSections = {};
+    if (fetchState.fetchState === 'Completed') {
+        CASH_FLOW_GROUPED_BREAKDOWN_IDS.forEach((sectionId) => {
+            sections[sectionId] = getSectionProjectViewReport(accountState, projectState, sectionsState, cashFlowProjectViewState.projectIds, { reportId, sectionId }, filter);
+        });
+        // These come back grouped, so each figure is read through the section layer
+        // and arrives already pruned by the class/project picker — the same source
+        // the breakdown rows above render from, so the two can never disagree.
+        CASH_FLOW_GROUPED_CALCULATED_IDS.forEach((calculatedSectionId) => {
+            calculatedSections[calculatedSectionId] = getCOABalances(
+            // Already built by the breakdown loop above; rebuilding it would repeat
+            // the whole section walk on every recompute.
+            sections[calculatedSectionId].sectionBalancesTotalByPeriod, filter);
+        });
+        calculatedSections['investingActivitiesTotal'] = getCOABalances(sections['investingActivities'].sectionBalancesTotalByPeriod, filter);
+        calculatedSections['financingActivitiesTotal'] = getCOABalances(sections['financingActivities'].sectionBalancesTotalByPeriod, filter);
+    }
+    return {
+        sections,
+        calculatedSections,
+        fetchState: fetchState.fetchState,
+        error: fetchState.error,
+        filter,
+        uiState: cashFlowProjectViewState.uiState,
+        projects: getProjectsByIds(projectState, cashFlowProjectViewState.projectIds),
+        projectsToFilterOut: cashFlowProjectViewState.uiState.projectsToFilterOut,
+        reportId: cashFlowProjectViewState.reportId,
+        reportTitle: cashFlowProjectViewState.reportTitle,
+        firstMonthOfFY: cashFlowProjectViewState.firstMonthOfFY,
+        dataAvailable: cashFlowProjectViewState.dataAvailable,
+        bookCloseDate: cashFlowProjectViewState.bookCloseDate,
+        version: cashFlowProjectViewState.version,
+        status: cashFlowProjectViewState.status,
+        idsInOrder: CASH_FLOW_GROUPED_IDS_IN_ORDER,
+        rootSectionsWithSubSectionIds: {
+            operatingActivities: CASH_FLOW_GROUPED_OPERATING_IDS_IN_ORDER,
+            investingActivities: CASH_FLOW_GROUPED_INVESTING_IDS_IN_ORDER,
+            financingActivities: CASH_FLOW_GROUPED_FINANCING_IDS_IN_ORDER,
+        },
+    };
+};

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js

@@ -9,6 +9,18 @@ import { clearAll } from '../../../../rootActions';
 import { date } from '../../../../zeniDayJS';
 import { SERVICE_MONTH_FORMAT, } from '../../payload/jeSchedulesPayload';
 import { fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesSuccess, initializeJeScheduleLocalData, } from '../../reducers/jeSchedulesViewReducer';
+/**
+ * How far back to look for accrued schedules, matching the Vendors page
+ * (`getDefaultSelectedTimeframeForScheduleType`, 'accrued_expenses'), which queries the same
+ * start_date filter through /1.0/schedules.
+ */
+const ACCRUED_LOOKBACK_MONTHS = 24;
+/**
+ * One-time accruals keep their own, narrower lookback. Unlike an accrued schedule they belong to
+ * exactly one service month and never span months, so the reason the accrued window has to reach
+ * back does not apply to them -- widening it would only add older history to the Existing tab.
+ */
+const ONE_TIME_ACCRUAL_LOOKBACK_MONTHS = 12;
 export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchJeSchedules.match), mergeMap((action) => {
     const state = state$.value;
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
@@ -30,15 +42,21 @@ export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe
     const endDate = isClosePeriodTab || existingEndDate == null
         ? toString(period.end)
         : toString(existingEndDate);
-    // Accrued rows are windowed on the schedule's own start_date rather than a transaction date,
-    // so they get their own bounds. Review wants the month being closed; Existing wants the year
-    // up to endDate, snapped to the 1st — the same window the server used to compute for itself.
-    const accruedStartDate = isClosePeriodTab
-        ? toString(period.start)
-        : date(endDate)
-            .subtract(1, 'year')
-            .startOf('month')
-            .format(DEFAULT_DATE_FORMAT);
+    // Accrued rows are windowed on the schedule's own start_date -- its FIRST posting date --
+    // rather than a transaction date, so the lower bound has to reach back past the start of
+    // every accrual still running in this period, not just the ones that began in it. Review
+    // used to send the close month itself, which returned only accruals whose first posting fell
+    // in that month and hid every longer-running one.
+    const parsedEndDate = date(endDate);
+    const accruedStartDate = parsedEndDate
+        .subtract(ACCRUED_LOOKBACK_MONTHS, 'month')
+        .startOf('month')
+        .format(DEFAULT_DATE_FORMAT);
+    // Formatted as a service month, not a date: that is the only thing it is sent as.
+    const oneTimeAccrualServiceMonthStart = parsedEndDate
+        .subtract(ONE_TIME_ACCRUAL_LOOKBACK_MONTHS, 'month')
+        .startOf('month')
+        .format(SERVICE_MONTH_FORMAT);
     const queryParam = {
         base_transaction_end_date: endDate,
         end_date: endDate,
@@ -59,8 +77,8 @@ export const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe
                 filter_failed_je_postings_by_date: true,
             }
             : {
-                one_time_accrual_service_month_start: date(accruedStartDate).format(SERVICE_MONTH_FORMAT),
-                one_time_accrual_service_month_end: date(endDate).format(SERVICE_MONTH_FORMAT),
+                one_time_accrual_service_month_start: oneTimeAccrualServiceMonthStart,
+                one_time_accrual_service_month_end: parsedEndDate.format(SERVICE_MONTH_FORMAT),
                 // Existing lists what actually reached the books.
                 one_time_accrual_statuses: ['posted'],
                 // A failed posting from an earlier month still needs to surface here, so this list

package/lib/esm/view/financeStatement/financeStatementSelector.js

@@ -11,6 +11,8 @@ import { getBalanceSheet } from '../balanceSheet/balanceSheetSelector';
 import { getBalanceSheetClassesView } from '../balanceSheetClassesView/balanceSheetClassesViewSelector';
 import { getBalanceSheetProjectView } from '../balanceSheetProjectView/balanceSheetProjectViewSelector';
 import { getCashFlow } from '../cashFlow/cashFlowSelector';
+import { getCashFlowClassesView } from '../cashFlowClassesView/cashFlowClassesViewSelector';
+import { getCashFlowProjectView } from '../cashFlowProjectView/cashFlowProjectViewSelector';
 import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector';
 import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
 import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
@@ -39,7 +41,7 @@ function getFirstMonthOfFY(profitAndLossState, balanceSheetState, cashFlowState)
         cashFlowState.firstMonthOfFY ??
         1);
 }
-export const getFinanceStatement = createSelector((state) => state.accountState, (state) => state.accountGroupState, (state) => state.classState, (state) => state.sectionClassesViewStateV2, (state) => state.profitAndLossState, (state) => state.profitAndLossClassesViewState, (state) => state.projectState, (state) => state.sectionProjectViewState, (state) => state.profitAndLossProjectViewState, (state) => state.balanceSheetState, (state) => state.balanceSheetClassesViewState, (state) => state.balanceSheetProjectViewState, (state) => state.cashFlowState, (state) => state.financeStatementState, (state) => state.sectionAccountsViewState, (state) => state.forecastState, (accountState, accountGroupState, classState, sectionsState, profitAndLossState, profitAndLossClassesViewState, projectState, sectionProjectViewState, profitAndLossProjectViewState, balanceSheetState, balanceSheetClassesViewState, balanceSheetProjectViewState, cashFlowState, financeStatementState, sectionAccountsViewState, forecastState) => {
+export const getFinanceStatement = createSelector((state) => state.accountState, (state) => state.accountGroupState, (state) => state.classState, (state) => state.sectionClassesViewStateV2, (state) => state.profitAndLossState, (state) => state.profitAndLossClassesViewState, (state) => state.projectState, (state) => state.sectionProjectViewState, (state) => state.profitAndLossProjectViewState, (state) => state.balanceSheetState, (state) => state.balanceSheetClassesViewState, (state) => state.balanceSheetProjectViewState, (state) => state.cashFlowState, (state) => state.cashFlowClassesViewState, (state) => state.cashFlowProjectViewState, (state) => state.financeStatementState, (state) => state.sectionAccountsViewState, (state) => state.forecastState, (accountState, accountGroupState, classState, sectionsState, profitAndLossState, profitAndLossClassesViewState, projectState, sectionProjectViewState, profitAndLossProjectViewState, balanceSheetState, balanceSheetClassesViewState, balanceSheetProjectViewState, cashFlowState, cashFlowClassesViewState, cashFlowProjectViewState, financeStatementState, sectionAccountsViewState, forecastState) => {
     // to get min and max dates across three reports
     let allTimeframeTicks = [];
     let balancesInTimeframe = [];
@@ -81,6 +83,10 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     const balanceSheetReport = getBalanceSheet(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const balanceSheetClassFilter = newBalancesFilterClassesView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, balanceSheetClassesViewState.uiState.classesToFilterOut);
     const balanceSheetByClassReport = getBalanceSheetClassesView(balanceSheetClassFilter, accountState, classState, sectionsState, balanceSheetClassesViewState);
+    const cashFlowClassFilter = newBalancesFilterClassesView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, cashFlowClassesViewState.uiState.classesToFilterOut);
+    const cashFlowByClassReport = getCashFlowClassesView(cashFlowClassFilter, accountState, classState, sectionsState, cashFlowClassesViewState);
+    const cashFlowProjectFilter = newBalancesFilterProjectView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, cashFlowProjectViewState.uiState.projectsToFilterOut);
+    const cashFlowByProjectReport = getCashFlowProjectView(cashFlowProjectFilter, accountState, projectState, sectionProjectViewState, cashFlowProjectViewState);
     const balanceSheetProjectFilter = newBalancesFilterProjectView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, balanceSheetProjectViewState.uiState.projectsToFilterOut);
     const balanceSheetByProjectReport = getBalanceSheetProjectView(balanceSheetProjectFilter, accountState, projectState, sectionProjectViewState, balanceSheetProjectViewState);
     const cashFlowReport = getCashFlow(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
@@ -129,6 +135,18 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
                 error: cashFlowReport.error,
             };
             break;
+        case 'cash_flow_by_classes':
+            selectedReportAndTimeframeFetchState = {
+                fetchState: cashFlowByClassReport.fetchState,
+                error: cashFlowByClassReport.error,
+            };
+            break;
+        case 'cash_flow_by_projects':
+            selectedReportAndTimeframeFetchState = {
+                fetchState: cashFlowByProjectReport.fetchState,
+                error: cashFlowByProjectReport.error,
+            };
+            break;
         default:
             break;
     }
@@ -151,6 +169,8 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         balanceSheetByClassReport,
+        cashFlowByClassReport,
+        cashFlowByProjectReport,
         balanceSheetByProjectReport,
         cashFlowReport,
         filter,

package/lib/esm/view/invoicing/customerPaymentMethod/customerPaymentMethodEpic.js

@@ -1,7 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
-import { fetchInvoicingCustomerDetail } from '../invoicingCustomerDetailView/invoicingCustomerDetailViewReducer';
+import { fetchInvoicingCustomerDetail } from '../invoicingCustomerRecordView/invoicingCustomerRecordViewReducer';
 import { createInvoicingSetupIntent, createInvoicingSetupIntentFailure, createInvoicingSetupIntentSuccess, fetchInvoicingPlaidLinkToken, fetchInvoicingPlaidLinkTokenFailure, fetchInvoicingPlaidLinkTokenSuccess, saveInvoicingPaymentMethod, saveInvoicingPaymentMethodFailure, saveInvoicingPaymentMethodSuccess, sendInvoicingPaymentLink, sendInvoicingPaymentLinkFailure, sendInvoicingPaymentLinkSuccess, } from './customerPaymentMethodReducer';
 export const createInvoicingSetupIntentEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(createInvoicingSetupIntent.match), mergeMap((action) => {
     const { customerId } = action.payload;

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js

@@ -92,7 +92,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) =
 const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit
- * both parent and sub-family IDs; edits retain returned sub-family IDs.
+ * both parent and price point IDs; edits retain returned price point IDs.
  */
 export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewReducer.js

@@ -4,7 +4,6 @@ import { initialInvoicingCatalogItemFormLocalData } from './invoicingCatalogItem
 export const initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    detailEditDraftById: {},
     editDraftById: {},
     newItemDraft: { ...initialInvoicingCatalogItemFormLocalData },
     savedItemId: undefined,
@@ -26,10 +25,6 @@ const editInvoicingCatalogItemDetailView = createSlice({
                 draft.newItemDraft = localData;
             }
         },
-        updateInvoicingCatalogItemDetailEditDraft(draft, action) {
-            const { id, localData } = action.payload;
-            draft.detailEditDraftById[id] = localData;
-        },
         submitInvoicingCatalogItemForm: {
             reducer(draft) {
                 draft.fetchState = 'In-Progress';
@@ -40,22 +35,6 @@ const editInvoicingCatalogItemDetailView = createSlice({
                 return { payload };
             },
         },
-        saveInvoicingCatalogItem(draft, action) {
-            draft.fetchState = 'In-Progress';
-            draft.error = undefined;
-            draft.savedItemId = undefined;
-            draft.savedKind = action.payload.kind;
-        },
-        createInvoicingCatalogSubFamily: {
-            reducer(draft) {
-                draft.fetchState = 'In-Progress';
-                draft.error = undefined;
-                draft.savedItemId = undefined;
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
         archiveInvoicingCatalogSubFamily: {
             reducer(draft) {
                 draft.fetchState = 'In-Progress';
@@ -71,7 +50,6 @@ const editInvoicingCatalogItemDetailView = createSlice({
             draft.error = undefined;
             draft.savedItemId = action.payload.itemId;
             draft.savedKind = action.payload.kind;
-            delete draft.detailEditDraftById[action.payload.itemId];
         },
         submitInvoicingCatalogItemFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -82,7 +60,6 @@ const editInvoicingCatalogItemDetailView = createSlice({
             draft.error = undefined;
             draft.savedItemId = undefined;
             draft.savedKind = undefined;
-            draft.detailEditDraftById = {};
             draft.editDraftById = {};
             draft.newItemDraft = { ...initialInvoicingCatalogItemFormLocalData };
         },
@@ -93,5 +70,5 @@ const editInvoicingCatalogItemDetailView = createSlice({
         });
     },
 });
-export const { updateInvoicingCatalogItemDetailEditDraft, updateInvoicingCatalogItemFormDraft, submitInvoicingCatalogItemForm, saveInvoicingCatalogItem, createInvoicingCatalogSubFamily, archiveInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormSuccess, submitInvoicingCatalogItemFormFailure, resetEditInvoicingCatalogItemDetailView, } = editInvoicingCatalogItemDetailView.actions;
+export const { updateInvoicingCatalogItemFormDraft, submitInvoicingCatalogItemForm, archiveInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormSuccess, submitInvoicingCatalogItemFormFailure, resetEditInvoicingCatalogItemDetailView, } = editInvoicingCatalogItemDetailView.actions;
 export default editInvoicingCatalogItemDetailView.reducer;

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js

@@ -1,44 +1,9 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
+import { getInvoicingCatalogItemRecord, } from '../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingQboView, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
-import { planToCatalogDetailEditValues } from './catalogDetailEditPayload';
 import { INVOICING_CATALOG_APPLICABILITY_VALUES, INVOICING_CATALOG_PRICING_MODEL_VALUES, INVOICING_CATALOG_PRORATION_VALUES, INVOICING_CATALOG_TIER_TYPE_VALUES, entityToInvoicingCatalogItemFormLocalData, } from './invoicingCatalogItemFormConfig';
-/** An unsaved item's inline-edit draft, before the record has loaded. */
-export const initialCatalogDetailEditValues = () => ({
-    applicableItems: [],
-    description: '',
-    enabledForCheckout: true,
-    enabledInPortal: true,
-    giftClaimRedirectUrl: '',
-    includedInMrr: true,
-    isGiftable: false,
-    isShippable: false,
-    itemApplicability: 'all',
-    metered: false,
-    name: '',
-    productCode: '',
-    subFamilies: [],
-    unit: '',
-    usageCalculation: 'sum_of_usages',
-});
-/**
- * The detail page's inline-edit form data: the stored draft once the user has
- * touched the form, seeded from the loaded record until then. Memoized so the
- * page receives a stable value — recomputing it per store change would reseed
- * the form mid-edit and drop what the user had typed.
- */
-export const getInvoicingCatalogItemDetailEditLocalData = createSelector([
-    (state, id) => id != null
-        ? state.editInvoicingCatalogItemDetailViewState.detailEditDraftById[id]
-        : undefined,
-    (state, id) => id != null
-        ? getInvoicingPlanById(state.invoicingPlanState, id)
-        : undefined,
-], (storedDraft, plan) => storedDraft ??
-    (plan != null
-        ? planToCatalogDetailEditValues(plan)
-        : initialCatalogDetailEditValues()));
 export const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
     error: state.editInvoicingCatalogItemDetailViewState.error,
@@ -89,7 +54,16 @@ export const getInvoicingCatalogItemFormView = (state, id) => {
         ? getInvoicingQboView(state)
         : undefined;
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = getInvoicingConfigView(state);
+    // In create mode there is no record to load, so the record view is only
+    // consulted when editing an existing item.
+    const recordView = id != null ? getInvoicingCatalogItemRecord(state, 'plan', id) : undefined;
     return {
+        catalogItemLifecycleActionOptions: recordView?.catalogItemLifecycleActionOptions ?? [],
+        catalogProductLifecycleActionOptions: recordView?.catalogProductLifecycleActionOptions ?? [],
+        recordState: {
+            error: recordView?.error,
+            fetchState: recordView?.fetchState ?? 'Not-Started',
+        },
         fieldHelp: invoicingFieldHelpForGroup(state, 'catalog'),
         isQboPickerDataLoading: isInvoicingAccountingPickerDataLoading(state),
         qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/invoicingCatalogSubFamilyEpics.js

@@ -2,9 +2,7 @@ import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../responsePayload';
-import { getInvoicingCatalogAccountingLookup } from '../invoicingQboView/invoicingQboViewSelector';
-import { createSubFamilyFormToPayload } from './catalogDetailEditPayload';
-import { archiveInvoicingCatalogSubFamily, createInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
+import { archiveInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 const subFamilySuccessActions = (parentItemId, subFamilyPayload) => [
     mergeInvoicingPlanSubFamily(parentItemId, subFamilyPayload),
     submitInvoicingCatalogItemFormSuccess({
@@ -12,23 +10,6 @@ const subFamilySuccessActions = (parentItemId, subFamilyPayload) => [
         kind: 'plan',
     }),
 ];
-export const createInvoicingCatalogSubFamilyEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(createInvoicingCatalogSubFamily.match), mergeMap((action) => {
-    const { itemType, parentItemId, values } = action.payload;
-    const state = state$.value;
-    // Built here so the dialog can stay in picked ids: resolving one to the
-    // account record the payload carries needs the shared account list.
-    const data = createSubFamilyFormToPayload(parentItemId, itemType, values, getInvoicingCatalogAccountingLookup(state));
-    const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
-    return zeniAPI
-        .postAndGetJSON(`${baseUrl}/catalog/products`, data)
-        .pipe(mergeMap((response) => {
-        if (isSuccessResponse(response) && response.data != null) {
-            return subFamilySuccessActions(parentItemId, response.data);
-        }
-        return of(submitInvoicingCatalogItemFormFailure(response.status));
-    }), catchError((error) => of(submitInvoicingCatalogItemFormFailure(createZeniAPIStatus('Unexpected Error', 'Create sub-family REST API call errored out ' +
-        JSON.stringify(error))))));
-}));
 export const archiveInvoicingCatalogSubFamilyEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(archiveInvoicingCatalogSubFamily.match), mergeMap((action) => {
     const { parentItemId, subFamilyId } = action.payload;
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
@@ -40,6 +21,6 @@ export const archiveInvoicingCatalogSubFamilyEpic = (actions$, _state$, zeniAPI)
             return subFamilySuccessActions(parentItemId, response.data);
         }
         return of(submitInvoicingCatalogItemFormFailure(response.status));
-    }), catchError((error) => of(submitInvoicingCatalogItemFormFailure(createZeniAPIStatus('Unexpected Error', 'Archive sub-family REST API call errored out ' +
+    }), catchError((error) => of(submitInvoicingCatalogItemFormFailure(createZeniAPIStatus('Unexpected Error', 'Archive price point REST API call errored out ' +
         JSON.stringify(error))))));
 }));

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -1,6 +1,5 @@
-import { forkJoin, from } from 'rxjs';
+import { from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { getInvoicingPlanById } from '../../../entity/invoicing/plan/planSelector';
 import { mergeInvoicingPlanSubFamily, updateInvoicingPlans, } from '../../../entity/invoicing/plan/planReducer';
 import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
@@ -8,34 +7,19 @@ import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { getInvoicingCatalogAccountingLookup } from '../invoicingQboView/invoicingQboViewSelector';
-import { catalogDetailEditValuesToSavePayload, } from './catalogDetailEditPayload';
 import { localDataToSaveInvoicingCatalogItemPayload, } from './editInvoicingCatalogItemDetailViewPayload';
-import { getInvoicingCatalogItemDetailEditLocalData } from './editInvoicingCatalogItemDetailViewSelector';
-import { saveInvoicingCatalogItem, submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
-export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCatalogItemForm.match(action) ||
-    saveInvoicingCatalogItem.match(action)), mergeMap((action) => {
+import { submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
+export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCatalogItemForm.match(action)), mergeMap((action) => {
     const { id } = action.payload;
     const state = state$.value;
     const accountingLookup = getInvoicingCatalogAccountingLookup(state);
-    // Both sources are form values, turned into request bodies here so the
-    // picked account and class become the records the service stores: the
-    // detail page's edit form, or the create/edit form's draft.
-    let data;
-    let editProductUpdates;
-    if (saveInvoicingCatalogItem.match(action)) {
-        const plan = id != null
-            ? getInvoicingPlanById(state.invoicingPlanState, id)
-            : undefined;
-        const savePayload = catalogDetailEditValuesToSavePayload(getInvoicingCatalogItemDetailEditLocalData(state, id), accountingLookup, plan?.type ?? plan?.itemType, plan?.subFamilies);
-        data = savePayload.planData;
-        editProductUpdates = savePayload.productUpdates;
-    }
-    else {
-        const viewState = state.editInvoicingCatalogItemDetailViewState;
-        const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
-            viewState.newItemDraft;
-        data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null, accountingLookup);
-    }
+    // Form values, turned into a request body here so the picked account and
+    // class become the records the service stores. Price points ride along
+    // nested, so the detail page and the create/edit form share one request.
+    const viewState = state.editInvoicingCatalogItemDetailViewState;
+    const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
+        viewState.newItemDraft;
+    const data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null, accountingLookup);
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null
         ? `${baseUrl}/catalog/plans/${encodeURIComponent(id)}`
@@ -96,13 +80,7 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                 }));
                 return resultActions;
             };
-            const productUpdates = saveInvoicingCatalogItem.match(action)
-                ? (editProductUpdates ?? [])
-                : [];
-            if (productUpdates.length === 0) {
-                return completeSave([]);
-            }
-            return forkJoin(productUpdates.map((productUpdate) => zeniAPI.putAndGetJSON(`${baseUrl}/catalog/products/${encodeURIComponent(productUpdate.id)}`, productUpdate.data))).pipe(mergeMap(completeSave));
+            return completeSave([]);
         }
         return from([
             submitInvoicingCatalogItemFormFailure(response.status),

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.js

@@ -1,6 +1,7 @@
 import { getInvoicingCouponById } from '../../../entity/invoicing/coupon/couponSelector';
 import { toInvoicingFormOption, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
+import { getInvoicingCouponRecord } from '../invoicingCouponRecordView/invoicingCouponRecordViewSelector';
 import { entityToInvoicingCouponFormLocalData, } from './editInvoicingCouponDetailViewState';
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
@@ -10,9 +11,17 @@ import { entityToInvoicingCouponFormLocalData, } from './editInvoicingCouponDeta
 export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
     const { error, fetchState, savedCouponId } = state.editInvoicingCouponDetailViewState;
     const { discountLifecycleActionOptions, fetchState: configFetchState } = getInvoicingConfigView(state);
+    // In create mode there is no record to load, so the read view is only
+    // consulted when editing an existing coupon.
+    const readView = couponId != null ? getInvoicingCouponRecord(state, couponId) : undefined;
     return {
         configFetchState,
         discountLifecycleActionOptions,
+        fieldHelp: invoicingFieldHelpForGroup(state, 'discount'),
+        recordState: {
+            error: readView?.error,
+            fetchState: readView?.fetchState ?? 'Not-Started',
+        },
         coupon: couponId != null
             ? getInvoicingCouponById(state.invoicingCouponState, couponId)
             : undefined,
@@ -37,7 +46,6 @@ export const getInvoicingCouponFormView = (state, couponId) => {
         : newCouponDraft;
     const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = getInvoicingConfigView(state);
     return {
-        fieldHelp: invoicingFieldHelpForGroup(state, 'discount'),
         ...base,
         applyOnOptions: discountApplyOnOptions.map(toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(toInvoicingFormOption),