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

package/lib/view/dashboard/dashboardReducer.d.ts

@@ -1,12 +1,12 @@
 import { DashboardState } from './dashboardState';
 export declare const initialState: DashboardState;
-export declare const fetchDashboard: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, companyId: string, tenantId: string, fetchFullReport?: any, cacheOverride?: any, excludeResources?: ("vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts")[] | undefined], {
+export declare const fetchDashboard: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, companyId: string, tenantId: string, fetchFullReport?: any, cacheOverride?: any, excludeResources?: ("vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "cash_flow_by_classes" | "cash_flow_by_projects" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts")[] | undefined], {
     userId: string;
     companyId: string;
     tenantId: string;
     fetchFullReport: any;
     cacheOverride: any;
-    excludeResources: ("vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts")[];
+    excludeResources: ("vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "cash_flow_by_classes" | "cash_flow_by_projects" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts")[];
 }, "dashboard/fetchDashboard", never, never>;
 declare const _default: import("redux").Reducer<DashboardState>;
 export default _default;

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

@@ -12,6 +12,18 @@ const rootActions_1 = require("../../../../rootActions");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const jeSchedulesPayload_1 = require("../../payload/jeSchedulesPayload");
 const jeSchedulesViewReducer_1 = require("../../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;
 const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(jeSchedulesViewReducer_1.fetchJeSchedules.match), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
@@ -33,15 +45,21 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
     const endDate = isClosePeriodTab || existingEndDate == null
         ? (0, timePeriod_2.toString)(period.end)
         : (0, timePeriod_2.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
-        ? (0, timePeriod_2.toString)(period.start)
-        : (0, zeniDayJS_1.date)(endDate)
-            .subtract(1, 'year')
-            .startOf('month')
-            .format(timePeriod_1.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 = (0, zeniDayJS_1.date)(endDate);
+    const accruedStartDate = parsedEndDate
+        .subtract(ACCRUED_LOOKBACK_MONTHS, 'month')
+        .startOf('month')
+        .format(timePeriod_1.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(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT);
     const queryParam = {
         base_transaction_end_date: endDate,
         end_date: endDate,
@@ -62,8 +80,8 @@ const fetchJeSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
                 filter_failed_je_postings_by_date: true,
             }
             : {
-                one_time_accrual_service_month_start: (0, zeniDayJS_1.date)(accruedStartDate).format(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT),
-                one_time_accrual_service_month_end: (0, zeniDayJS_1.date)(endDate).format(jeSchedulesPayload_1.SERVICE_MONTH_FORMAT),
+                one_time_accrual_service_month_start: oneTimeAccrualServiceMonthStart,
+                one_time_accrual_service_month_end: parsedEndDate.format(jeSchedulesPayload_1.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/view/financeStatement/financeStatementReducer.d.ts

@@ -17,7 +17,7 @@ export declare const fetchFinanceStatement: import("@reduxjs/toolkit").ActionCre
     firstMonthOfFY: Month;
     maxNumOfPeriodsToHighlight: number;
     thisPeriod: TimeframeTick;
-}, "financeStatement/updateFinanceStatementThisPeriod">, updateCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<COABalancesRange, "financeStatement/updateCOABalancesRange">, updateSelectedReportId: import("@reduxjs/toolkit").ActionCreatorWithPayload<"vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts", "financeStatement/updateSelectedReportId">, updateFinanceStatementAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "financeStatement/updateFinanceStatementThisPeriod">, updateCOABalancesRange: import("@reduxjs/toolkit").ActionCreatorWithPayload<COABalancesRange, "financeStatement/updateCOABalancesRange">, updateSelectedReportId: import("@reduxjs/toolkit").ActionCreatorWithPayload<"vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "cash_flow_by_classes" | "cash_flow_by_projects" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts", "financeStatement/updateSelectedReportId">, updateFinanceStatementAdditionalBalancesSelection: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     additionalBalances: COABalanceType[];
     coaBalances: COABalance[];
     firstMonthOfFY: Month;

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -9,6 +9,8 @@ import { BalanceSheetReport } from '../balanceSheet/balanceSheetSelectorTypes';
 import { BalanceSheetClassesViewReport } from '../balanceSheetClassesView/balanceSheetClassesViewSelectorTypes';
 import { BalanceSheetProjectViewReport } from '../balanceSheetProjectView/balanceSheetProjectViewSelectorTypes';
 import { CashFlowReport } from '../cashFlow/cashFlowSelectorTypes';
+import { CashFlowClassesViewReport } from '../cashFlowClassesView/cashFlowClassesViewSelectorTypes';
+import { CashFlowProjectViewReport } from '../cashFlowProjectView/cashFlowProjectViewSelectorTypes';
 import { ProfitAndLossReport } from '../profitAndLoss/profitAndLossSelector';
 import { ProfitAndLossByClassHorizontalReport } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes';
 import { ProfitAndLossClassesViewReport } from '../profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
@@ -19,6 +21,8 @@ export interface FinanceStatementReport extends SelectorReport {
     balanceSheetByProjectReport: BalanceSheetProjectViewReport;
     balanceSheetReport: BalanceSheetReport;
     balancesInTimeframe: COABalance[];
+    cashFlowByClassReport: CashFlowClassesViewReport;
+    cashFlowByProjectReport: CashFlowProjectViewReport;
     cashFlowReport: CashFlowReport;
     displayOrder: COABalancesOrder;
     downloadState: FetchState;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -14,6 +14,8 @@ const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const balanceSheetClassesViewSelector_1 = require("../balanceSheetClassesView/balanceSheetClassesViewSelector");
 const balanceSheetProjectViewSelector_1 = require("../balanceSheetProjectView/balanceSheetProjectViewSelector");
 const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
+const cashFlowClassesViewSelector_1 = require("../cashFlowClassesView/cashFlowClassesViewSelector");
+const cashFlowProjectViewSelector_1 = require("../cashFlowProjectView/cashFlowProjectViewSelector");
 const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector");
 const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
@@ -42,7 +44,7 @@ function getFirstMonthOfFY(profitAndLossState, balanceSheetState, cashFlowState)
         cashFlowState.firstMonthOfFY ??
         1);
 }
-exports.getFinanceStatement = (0, toolkit_1.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) => {
+exports.getFinanceStatement = (0, toolkit_1.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 = [];
@@ -84,6 +86,10 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const balanceSheetClassFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, balanceSheetClassesViewState.uiState.classesToFilterOut);
     const balanceSheetByClassReport = (0, balanceSheetClassesViewSelector_1.getBalanceSheetClassesView)(balanceSheetClassFilter, accountState, classState, sectionsState, balanceSheetClassesViewState);
+    const cashFlowClassFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, cashFlowClassesViewState.uiState.classesToFilterOut);
+    const cashFlowByClassReport = (0, cashFlowClassesViewSelector_1.getCashFlowClassesView)(cashFlowClassFilter, accountState, classState, sectionsState, cashFlowClassesViewState);
+    const cashFlowProjectFilter = (0, coaBalancesFilterProjectView_1.newBalancesFilterProjectView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, cashFlowProjectViewState.uiState.projectsToFilterOut);
+    const cashFlowByProjectReport = (0, cashFlowProjectViewSelector_1.getCashFlowProjectView)(cashFlowProjectFilter, accountState, projectState, sectionProjectViewState, cashFlowProjectViewState);
     const balanceSheetProjectFilter = (0, coaBalancesFilterProjectView_1.newBalancesFilterProjectView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, balanceSheetProjectViewState.uiState.projectsToFilterOut);
     const balanceSheetByProjectReport = (0, balanceSheetProjectViewSelector_1.getBalanceSheetProjectView)(balanceSheetProjectFilter, accountState, projectState, sectionProjectViewState, balanceSheetProjectViewState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
@@ -132,6 +138,18 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
                 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;
     }
@@ -154,6 +172,8 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         balanceSheetByClassReport,
+        cashFlowByClassReport,
+        cashFlowByProjectReport,
         balanceSheetByProjectReport,
         cashFlowReport,
         filter,

package/lib/view/globalMerchantView/globalMerchantViewReducer.d.ts

@@ -3,9 +3,9 @@ import { ZeniAPIStatus } from '../../responsePayload';
 import { VendorReviewViewAllRecommendationsPayload } from '../vendorReviewView/common/payload/commonTypesPayloadShapes';
 import { GlobalMerchantViewState, GlobalRecommendationFetchSource, NewGlobalMerchantCurrentSelection } from './globalMerchantViewState';
 export declare const initialState: GlobalMerchantViewState;
-export declare const createGlobalMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[merchantId?: string | undefined, context?: "vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts" | undefined], {
+export declare const createGlobalMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[merchantId?: string | undefined, context?: "vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "cash_flow_by_classes" | "cash_flow_by_projects" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts" | undefined], {
     merchantId: string | undefined;
-    context: "vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts" | undefined;
+    context: "vendor" | "cash_balance" | "card_balance" | "expense_automation_card" | "operating_expenses" | "operating_expenses_by_classes" | "operating_expenses_by_projects" | "revenue" | "revenue_by_classes" | "revenue_by_projects" | "net_burn_or_income" | "net_burn_or_income_story_card" | "net_burn_or_income_by_classes" | "net_burn_or_income_by_projects" | "cash_position" | "top_expenses" | "profit_and_loss" | "profit_and_loss_by_classes" | "profit_and_loss_by_projects" | "balance_sheet" | "balance_sheet_by_classes" | "balance_sheet_by_projects" | "cash_flow" | "cash_flow_by_classes" | "cash_flow_by_projects" | "dashboard" | "finance_statement" | "transaction_list_of_account" | "transaction_list_missing_receipt" | "transaction_list_of_account_by_class" | "transaction_list_of_account_by_project" | "transaction_detail" | "cash_in_cash_out" | "insights_dashboard" | "company_details" | "class_list" | "account_list" | "account_list_by_type" | "task_card" | "bill_pay" | "reimbursement" | "bill_pay_card" | "reimbursement_card" | "bill_pay_promo_card" | "zeni_accounts" | "zeni_accounts_promo_card" | "zeni_treasury" | "charge_cards" | "other_connection" | "reimbursement_promo_card" | "onboarding" | "operating_expenses_by_vendor" | "operating_expenses_by_vendor_summary" | "vendors_tab" | "accounts_payable_aging" | "accounts_receivable_aging" | "vendor_global_review" | "prepaid_expenses" | "fixed_assets" | "notification" | "rewards_card" | "billing" | "flux_analysis_operating_expense" | "account_reconciliation" | "zeni_credit_promo_card" | "treasury_promo_card" | "excluded_account_reconciliation" | "transfer_accounts" | "credit_card_transfer_accounts" | undefined;
 }, "globalMerchantView/createGlobalMerchant", never, never>, createGlobalMerchantSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     merchantId: ID;
 }, "globalMerchantView/createGlobalMerchantSuccess">, createGlobalMerchantFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/invoicing/createInvoice/createInvoiceSelector.d.ts

@@ -7,8 +7,8 @@ import { RootState } from '../../../rootStateTypes';
 import { InvoicingCreateInvoiceFormLocalData } from './createInvoiceState';
 /**
  * One catalog plan price, split into its two naming parts so consumers can
- * compose the label themselves (the plan family name and the sub-family/price
- * name are separate columns in the catalog). `price` is the sub-family's
+ * compose the label themselves (the plan family name and the price point/price
+ * name are separate columns in the catalog). `price` is the price point's
  * catalog price in whole USD (never minor units), absent when the catalog
  * carries no price for it.
  */

package/lib/view/invoicing/customerPaymentMethod/customerPaymentMethodEpic.d.ts

@@ -2,7 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
-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 type ActionType = ReturnType<typeof createInvoicingSetupIntent> | ReturnType<typeof createInvoicingSetupIntentSuccess> | ReturnType<typeof createInvoicingSetupIntentFailure> | ReturnType<typeof fetchInvoicingPlaidLinkToken> | ReturnType<typeof fetchInvoicingPlaidLinkTokenSuccess> | ReturnType<typeof fetchInvoicingPlaidLinkTokenFailure> | ReturnType<typeof saveInvoicingPaymentMethod> | ReturnType<typeof saveInvoicingPaymentMethodSuccess> | ReturnType<typeof saveInvoicingPaymentMethodFailure> | ReturnType<typeof sendInvoicingPaymentLink> | ReturnType<typeof sendInvoicingPaymentLinkSuccess> | ReturnType<typeof sendInvoicingPaymentLinkFailure> | ReturnType<typeof fetchInvoicingCustomerDetail>;
 export declare const createInvoicingSetupIntentEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -4,7 +4,7 @@ exports.sendInvoicingPaymentLinkEpic = exports.saveInvoicingPaymentMethodEpic =
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../responsePayload");
-const invoicingCustomerDetailViewReducer_1 = require("../invoicingCustomerDetailView/invoicingCustomerDetailViewReducer");
+const invoicingCustomerRecordViewReducer_1 = require("../invoicingCustomerRecordView/invoicingCustomerRecordViewReducer");
 const customerPaymentMethodReducer_1 = require("./customerPaymentMethodReducer");
 const createInvoicingSetupIntentEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(customerPaymentMethodReducer_1.createInvoicingSetupIntent.match), (0, operators_1.mergeMap)((action) => {
     const { customerId } = action.payload;
@@ -41,7 +41,7 @@ const saveInvoicingPaymentMethodEpic = (actions$, _state$, zeniAPI) => actions$.
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
                 (0, customerPaymentMethodReducer_1.saveInvoicingPaymentMethodSuccess)(),
-                (0, invoicingCustomerDetailViewReducer_1.fetchInvoicingCustomerDetail)({ id: customerId }),
+                (0, invoicingCustomerRecordViewReducer_1.fetchInvoicingCustomerDetail)({ id: customerId }),
             ];
         }
         return (0, rxjs_1.of)((0, customerPaymentMethodReducer_1.saveInvoicingPaymentMethodFailure)(response.status));

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.d.ts

@@ -22,6 +22,6 @@ export interface InvoicingCatalogAccountingFields {
 export declare const buildAccountingDetail: (subFamily: InvoicingCatalogAccountingFields, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown> | undefined;
 /**
  * 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 declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown>;

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

@@ -96,7 +96,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.
  */
 const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewReducer.d.ts

@@ -1,8 +1,7 @@
 import { ID } from '../../../commonStateTypes/common';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { InvoicingCatalogItemKind } from '../invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewState';
-import type { CreateSubFamilyFormValues } from './catalogDetailEditPayload';
-import { type CatalogDetailEditValues, EditInvoicingCatalogItemDetailViewState, InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
+import { InvoicingCatalogItemKind } from '../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewState';
+import { EditInvoicingCatalogItemDetailViewState, InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 /** Push the full form draft into CES (edit tree when `id` is present). */
 export interface UpdateInvoicingCatalogItemFormDraftPayload {
     localData: InvoicingCatalogItemFormLocalData;
@@ -12,11 +11,6 @@ export interface UpdateInvoicingCatalogItemFormDraftPayload {
 export interface SubmitInvoicingCatalogItemFormPayload {
     id?: ID;
 }
-/** Push the detail page's inline-edit draft into CES. */
-export interface UpdateInvoicingCatalogItemDetailEditDraftPayload {
-    id: ID;
-    localData: CatalogDetailEditValues;
-}
 /**
  * Save the catalog detail page's inline edit. Carries no form data: the draft,
  * the saved price points and the item type all come off state in the epic, so
@@ -26,22 +20,12 @@ export interface SaveInvoicingCatalogItemPayload {
     kind: InvoicingCatalogItemKind;
     id?: ID;
 }
-export interface CreateInvoicingCatalogSubFamilyPayload {
-    itemType: string;
-    parentItemId: ID;
-    /**
-     * The dialog's form values. The request body is built in the epic, which can
-     * resolve a picked account id to the record the payload carries — the page
-     * holds ids and never needs to know the wire shape.
-     */
-    values: CreateSubFamilyFormValues;
-}
 export interface ArchiveInvoicingCatalogSubFamilyPayload {
     parentItemId: ID;
     subFamilyId: ID;
 }
 export declare const initialState: EditInvoicingCatalogItemDetailViewState;
-export declare const updateInvoicingCatalogItemDetailEditDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdateInvoicingCatalogItemDetailEditDraftPayload, "editInvoicingCatalogItemDetailView/updateInvoicingCatalogItemDetailEditDraft">, updateInvoicingCatalogItemFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdateInvoicingCatalogItemFormDraftPayload, "editInvoicingCatalogItemDetailView/updateInvoicingCatalogItemFormDraft">, submitInvoicingCatalogItemForm: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SubmitInvoicingCatalogItemFormPayload], SubmitInvoicingCatalogItemFormPayload, "editInvoicingCatalogItemDetailView/submitInvoicingCatalogItemForm", never, never>, saveInvoicingCatalogItem: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveInvoicingCatalogItemPayload, "editInvoicingCatalogItemDetailView/saveInvoicingCatalogItem">, createInvoicingCatalogSubFamily: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: CreateInvoicingCatalogSubFamilyPayload], CreateInvoicingCatalogSubFamilyPayload, "editInvoicingCatalogItemDetailView/createInvoicingCatalogSubFamily", never, never>, archiveInvoicingCatalogSubFamily: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: ArchiveInvoicingCatalogSubFamilyPayload], ArchiveInvoicingCatalogSubFamilyPayload, "editInvoicingCatalogItemDetailView/archiveInvoicingCatalogSubFamily", never, never>, submitInvoicingCatalogItemFormSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+export declare const updateInvoicingCatalogItemFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdateInvoicingCatalogItemFormDraftPayload, "editInvoicingCatalogItemDetailView/updateInvoicingCatalogItemFormDraft">, submitInvoicingCatalogItemForm: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SubmitInvoicingCatalogItemFormPayload], SubmitInvoicingCatalogItemFormPayload, "editInvoicingCatalogItemDetailView/submitInvoicingCatalogItemForm", never, never>, archiveInvoicingCatalogSubFamily: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: ArchiveInvoicingCatalogSubFamilyPayload], ArchiveInvoicingCatalogSubFamilyPayload, "editInvoicingCatalogItemDetailView/archiveInvoicingCatalogSubFamily", never, never>, submitInvoicingCatalogItemFormSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     itemId: ID;
     kind: InvoicingCatalogItemKind;
 }, "editInvoicingCatalogItemDetailView/submitInvoicingCatalogItemFormSuccess">, submitInvoicingCatalogItemFormFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "editInvoicingCatalogItemDetailView/submitInvoicingCatalogItemFormFailure">, resetEditInvoicingCatalogItemDetailView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"editInvoicingCatalogItemDetailView/resetEditInvoicingCatalogItemDetailView">;

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

@@ -1,14 +1,13 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetEditInvoicingCatalogItemDetailView = exports.submitInvoicingCatalogItemFormFailure = exports.submitInvoicingCatalogItemFormSuccess = exports.archiveInvoicingCatalogSubFamily = exports.createInvoicingCatalogSubFamily = exports.saveInvoicingCatalogItem = exports.submitInvoicingCatalogItemForm = exports.updateInvoicingCatalogItemFormDraft = exports.updateInvoicingCatalogItemDetailEditDraft = exports.initialState = void 0;
+exports.resetEditInvoicingCatalogItemDetailView = exports.submitInvoicingCatalogItemFormFailure = exports.submitInvoicingCatalogItemFormSuccess = exports.archiveInvoicingCatalogSubFamily = exports.submitInvoicingCatalogItemForm = exports.updateInvoicingCatalogItemFormDraft = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 exports.initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    detailEditDraftById: {},
     editDraftById: {},
     newItemDraft: { ...invoicingCatalogItemFormConfig_1.initialInvoicingCatalogItemFormLocalData },
     savedItemId: undefined,
@@ -30,10 +29,6 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
                 draft.newItemDraft = localData;
             }
         },
-        updateInvoicingCatalogItemDetailEditDraft(draft, action) {
-            const { id, localData } = action.payload;
-            draft.detailEditDraftById[id] = localData;
-        },
         submitInvoicingCatalogItemForm: {
             reducer(draft) {
                 draft.fetchState = 'In-Progress';
@@ -44,22 +39,6 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.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';
@@ -75,7 +54,6 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.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';
@@ -86,7 +64,6 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
             draft.error = undefined;
             draft.savedItemId = undefined;
             draft.savedKind = undefined;
-            draft.detailEditDraftById = {};
             draft.editDraftById = {};
             draft.newItemDraft = { ...invoicingCatalogItemFormConfig_1.initialInvoicingCatalogItemFormLocalData };
         },
@@ -97,5 +74,5 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editInvoicingCatalogItemDetailView.actions, exports.updateInvoicingCatalogItemDetailEditDraft = _a.updateInvoicingCatalogItemDetailEditDraft, exports.updateInvoicingCatalogItemFormDraft = _a.updateInvoicingCatalogItemFormDraft, exports.submitInvoicingCatalogItemForm = _a.submitInvoicingCatalogItemForm, exports.saveInvoicingCatalogItem = _a.saveInvoicingCatalogItem, exports.createInvoicingCatalogSubFamily = _a.createInvoicingCatalogSubFamily, exports.archiveInvoicingCatalogSubFamily = _a.archiveInvoicingCatalogSubFamily, exports.submitInvoicingCatalogItemFormSuccess = _a.submitInvoicingCatalogItemFormSuccess, exports.submitInvoicingCatalogItemFormFailure = _a.submitInvoicingCatalogItemFormFailure, exports.resetEditInvoicingCatalogItemDetailView = _a.resetEditInvoicingCatalogItemDetailView;
+_a = editInvoicingCatalogItemDetailView.actions, exports.updateInvoicingCatalogItemFormDraft = _a.updateInvoicingCatalogItemFormDraft, exports.submitInvoicingCatalogItemForm = _a.submitInvoicingCatalogItemForm, exports.archiveInvoicingCatalogSubFamily = _a.archiveInvoicingCatalogSubFamily, exports.submitInvoicingCatalogItemFormSuccess = _a.submitInvoicingCatalogItemFormSuccess, exports.submitInvoicingCatalogItemFormFailure = _a.submitInvoicingCatalogItemFormFailure, exports.resetEditInvoicingCatalogItemDetailView = _a.resetEditInvoicingCatalogItemDetailView;
 exports.default = editInvoicingCatalogItemDetailView.reducer;

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.d.ts

@@ -5,17 +5,9 @@ import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndRep
 import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import { RootState } from '../../../rootStateTypes';
-import { InvoicingCatalogItemKind } from '../invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewState';
-import { type CatalogDetailEditValues, InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
-/** An unsaved item's inline-edit draft, before the record has loaded. */
-export declare const initialCatalogDetailEditValues: () => CatalogDetailEditValues;
-/**
- * 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 declare const getInvoicingCatalogItemDetailEditLocalData: (state: RootState, id: ID | undefined) => CatalogDetailEditValues;
+import { InvoicingCatalogItemKind } from '../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewState';
+import { type InvoicingCatalogItemRecordView } from '../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewSelector';
+import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 export declare const getEditInvoicingCatalogItemDetailViewState: (state: RootState) => FetchStateAndError;
 export declare const getSavedInvoicingCatalogItemId: (state: RootState) => ID | undefined;
 export declare const getSavedInvoicingCatalogItemKind: (state: RootState) => InvoicingCatalogItemKind | undefined;
@@ -41,6 +33,9 @@ export declare const getInvoicingApplicableCatalogItemOptions: (state: RootState
 export interface InvoicingCatalogItemFormView extends SelectorView {
     applicabilityValues: readonly string[];
     applicableItemOptions: ApplicableCatalogItemOption[];
+    /** Lifecycle option lists, folded in from the record view. */
+    catalogItemLifecycleActionOptions: InvoicingCatalogItemRecordView['catalogItemLifecycleActionOptions'];
+    catalogProductLifecycleActionOptions: InvoicingCatalogItemRecordView['catalogProductLifecycleActionOptions'];
     /**
      * Backend help copy for this screen's field group, keyed by field code.
      * Folded in here so the screen never reaches for the config view itself.
@@ -64,6 +59,11 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      */
     qboAccountHierarchy: NestedAccountHierarchyForReport[];
     qboClassHierarchy: NestedClassHierarchyForReport[];
+    /**
+     * Loading the item, as distinct from this view's own `fetchState`, which
+     * tracks the save.
+     */
+    recordState: FetchStateAndError;
     tierTypeValues: readonly string[];
     trialEndActionOptions: InvoicingNamedOption[];
     trialUnitOptions: InvoicingNamedOption[];

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

@@ -1,48 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = exports.getInvoicingCatalogItemDetailEditLocalData = exports.initialCatalogDetailEditValues = void 0;
+exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
+const invoicingCatalogItemRecordViewSelector_1 = require("../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
-const catalogDetailEditPayload_1 = require("./catalogDetailEditPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
-/** An unsaved item's inline-edit draft, before the record has loaded. */
-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',
-});
-exports.initialCatalogDetailEditValues = initialCatalogDetailEditValues;
-/**
- * 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.
- */
-exports.getInvoicingCatalogItemDetailEditLocalData = (0, toolkit_1.createSelector)([
-    (state, id) => id != null
-        ? state.editInvoicingCatalogItemDetailViewState.detailEditDraftById[id]
-        : undefined,
-    (state, id) => id != null
-        ? (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id)
-        : undefined,
-], (storedDraft, plan) => storedDraft ??
-    (plan != null
-        ? (0, catalogDetailEditPayload_1.planToCatalogDetailEditValues)(plan)
-        : (0, exports.initialCatalogDetailEditValues)()));
 const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
     error: state.editInvoicingCatalogItemDetailViewState.error,
@@ -96,7 +60,16 @@ const getInvoicingCatalogItemFormView = (state, id) => {
         ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state)
         : undefined;
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = (0, invoicingConfigViewSelector_1.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 ? (0, invoicingCatalogItemRecordViewSelector_1.getInvoicingCatalogItemRecord)(state, 'plan', id) : undefined;
     return {
+        catalogItemLifecycleActionOptions: recordView?.catalogItemLifecycleActionOptions ?? [],
+        catalogProductLifecycleActionOptions: recordView?.catalogProductLifecycleActionOptions ?? [],
+        recordState: {
+            error: recordView?.error,
+            fetchState: recordView?.fetchState ?? 'Not-Started',
+        },
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'catalog'),
         isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
         qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewState.d.ts

@@ -1,7 +1,7 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { FetchedState, ID } from '../../../commonStateTypes/common';
-import { InvoicingCatalogItemKind } from '../invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewState';
-/** A single pricing tier within a sub-family (values kept as raw strings). */
+import { InvoicingCatalogItemKind } from '../invoicingCatalogItemRecordView/invoicingCatalogItemRecordViewState';
+/** A single pricing tier within a price point (values kept as raw strings). */
 export interface InvoicingCatalogItemFormTier {
     endingUnit: string;
     packageSize: string;
@@ -10,9 +10,9 @@ export interface InvoicingCatalogItemFormTier {
     /** Unset until entered, so a blank field is distinguishable from a real 0. */
     price?: Amount;
 }
-/** A sub-family (price point) of a catalog item. */
+/** A price point (price point) of a catalog item. */
 export interface InvoicingCatalogItemFormSubFamily {
-    /** Accounting integration is per sub-family: the API carries
+    /** Accounting integration is per price point: the API carries
      * `accounting_detail` on each product, not on the parent item. */
     accountingCategory: string;
     accountingCode: string;
@@ -55,31 +55,8 @@ export interface InvoicingCatalogItemFormLocalData {
     subFamilies: InvoicingCatalogItemFormSubFamily[];
     unit: string;
 }
-/**
- * Draft form state for the detail page's inline edit. Separate from
- * {@link InvoicingCatalogItemFormLocalData}: the inline editor exposes the
- * portal/checkout/gifting fields the create form does not.
- */
-export interface CatalogDetailEditValues {
-    applicableItems: string[];
-    description: string;
-    enabledForCheckout: boolean;
-    enabledInPortal: boolean;
-    giftClaimRedirectUrl: string;
-    includedInMrr: boolean;
-    isGiftable: boolean;
-    isShippable: boolean;
-    itemApplicability: string;
-    metered: boolean;
-    name: string;
-    productCode: string;
-    subFamilies: InvoicingCatalogItemFormSubFamily[];
-    unit: string;
-    usageCalculation: string;
-}
 export interface EditInvoicingCatalogItemDetailViewState extends FetchedState {
     /** Inline-edit drafts, keyed by catalog item id. */
-    detailEditDraftById: Record<ID, CatalogDetailEditValues>;
     editDraftById: Record<ID, InvoicingCatalogItemFormLocalData>;
     newItemDraft: InvoicingCatalogItemFormLocalData;
     savedItemId?: ID;

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/invoicingCatalogSubFamilyEpics.d.ts

@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
-import { archiveInvoicingCatalogSubFamily, createInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof createInvoicingCatalogSubFamily> | ReturnType<typeof archiveInvoicingCatalogSubFamily> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure>;
-export declare const createInvoicingCatalogSubFamilyEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+import { archiveInvoicingCatalogSubFamily, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
+export type ActionType = ReturnType<typeof archiveInvoicingCatalogSubFamily> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure>;
 export declare const archiveInvoicingCatalogSubFamilyEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;