@zeniai/client-epic-state 5.2.69-betaAK0 → 5.2.70

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogItemDetailEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.fetchInvoicingCatalogItemDetail.match), (0, operators_1.switchMap)((action) => {
@@ -12,7 +12,7 @@ const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => acti
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
-                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
+                (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.updateInvoicingCatalogItemDetail)({ id: response.data.id, kind }),
             ];
         }

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

@@ -1,4 +1,5 @@
-import { InvoicingCatalogItem, InvoicingCatalogPricePoint, InvoicingCatalogPricingModel } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
+import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
+import { InvoicingCatalogPricingModel, InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { InvoicingCatalogItemFormLocalData, InvoicingCatalogItemFormSubFamily, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
 /**
  * Value sets the catalog item form still owns locally: the backend has no enum
@@ -12,9 +13,9 @@ export declare const INVOICING_CATALOG_APPLICABILITY_VALUES: readonly ["all", "r
 export declare const isTieredCatalogPricingModel: (model: string) => boolean;
 export declare const blankInvoicingCatalogTier: (startingUnit?: string) => InvoicingCatalogItemFormTier;
 export declare const blankInvoicingCatalogSubFamily: () => InvoicingCatalogItemFormSubFamily;
-export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingCatalogPricePoint) => InvoicingCatalogItemFormSubFamily;
+export declare const invoicingProductToCatalogItemFormSubFamily: (product?: InvoicingProduct) => InvoicingCatalogItemFormSubFamily;
 export declare const initialInvoicingCatalogItemFormLocalData: InvoicingCatalogItemFormLocalData;
 /**
  * Seed the form draft from a parent catalog item and its embedded Price points.
  */
-export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingCatalogItem) => InvoicingCatalogItemFormLocalData;
+export declare const entityToInvoicingCatalogItemFormLocalData: (item?: InvoicingPlan) => InvoicingCatalogItemFormLocalData;

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

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
+export type ActionType = ReturnType<typeof runInvoicingCatalogPlanAction> | ReturnType<typeof runInvoicingCatalogPlanActionSuccess> | ReturnType<typeof runInvoicingCatalogPlanActionFailure> | ReturnType<typeof updateInvoicingPlans>;
 export declare const runInvoicingCatalogPlanActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInvoicingCatalogPlanActionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogPlanAction.match), (0, operators_1.mergeMap)((action) => {
@@ -15,7 +15,7 @@ const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => action
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
-                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([response.data], 'merge'),
+                (0, planReducer_1.updateInvoicingPlans)([response.data], 'merge'),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogPlanActionSuccess)({ id }),
             ];
         }

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

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingCatalogPricePoint>;
+export type ActionType = ReturnType<typeof runInvoicingCatalogProductAction> | ReturnType<typeof runInvoicingCatalogProductActionSuccess> | ReturnType<typeof runInvoicingCatalogProductActionFailure> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof updateInvoicingProducts>;
 export declare const runInvoicingCatalogProductActionEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInvoicingCatalogProductActionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
+const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductAction.match), (0, operators_1.mergeMap)((action) => {
@@ -18,10 +19,9 @@ const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => act
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return [
+                (0, productReducer_1.updateInvoicingProducts)([response.data], 'merge'),
                 ...(parentItemId != null
-                    ? [
-                        (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(parentItemId, response.data),
-                    ]
+                    ? [(0, planReducer_1.mergeInvoicingPlanSubFamily)(parentItemId, response.data)]
                     : []),
                 (0, editInvoicingCatalogItemDetailViewReducer_1.runInvoicingCatalogProductActionSuccess)({ id: stateKey }),
             ];

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

@@ -1,10 +1,11 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily, updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingCatalogItems> | ReturnType<typeof mergeInvoicingCatalogPricePoint> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
+export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingPlans> | ReturnType<typeof updateInvoicingProducts> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
 export declare const saveInvoicingCatalogItemEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveInvoicingCatalogItemEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
+const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
@@ -53,8 +54,11 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
-                    (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)([savedItem], 'merge'),
-                    ...savedProducts.map((product) => (0, invoicingCatalogReducer_1.mergeInvoicingCatalogPricePoint)(savedItem.id, product)),
+                    (0, planReducer_1.updateInvoicingPlans)([savedItem], 'merge'),
+                    ...(savedProducts.length > 0
+                        ? [(0, productReducer_1.updateInvoicingProducts)(savedProducts, 'merge')]
+                        : []),
+                    ...savedProducts.map((product) => (0, planReducer_1.mergeInvoicingPlanSubFamily)(savedItem.id, product)),
                     (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormSuccess)({
                         itemId: savedItem.id,
                         kind: 'plan',

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.seedInvoicingCatalogItemFormDraftEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
+const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const invoicingCatalogItemFormHelper_1 = require("./invoicingCatalogItemFormHelper");
 /**
@@ -37,7 +37,7 @@ const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actions$.pip
     }
     // Nothing to seed from on a cold open; the detail response triggers this
     // again once it lands.
-    const plan = (0, invoicingCatalogSelector_1.getInvoicingCatalogItemById)(state.invoicingCatalogState, id);
+    const plan = (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id);
     if (plan == null) {
         return rxjs_1.EMPTY;
     }

package/lib/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.d.ts

@@ -44,9 +44,7 @@ export declare const fetchInvoicingPaymentLinkEmailPreview: import("@reduxjs/too
 }], {
     cacheOverride: boolean;
     id: string;
-}, "editInvoicingCustomerDetailView/fetchInvoicingCustomerDetailPage", never, never>, invalidateInvoicingCustomerDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    id: ID;
-}, "editInvoicingCustomerDetailView/invalidateInvoicingCustomerDetail">, seedInvoicingCustomerFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "editInvoicingCustomerDetailView/fetchInvoicingCustomerDetailPage", never, never>, seedInvoicingCustomerFormDraft: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     id: ID;
     localData: InvoicingCustomerFormLocalData;
 }, "editInvoicingCustomerDetailView/seedInvoicingCustomerFormDraft">, updateInvoicingCustomerDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimInvoicingCustomerBillingAddress = exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.invalidateInvoicingCustomerDetail = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = exports.initialState = void 0;
+exports.claimInvoicingCustomerBillingAddress = exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
 const invoicingFormDraft_1 = require("../invoicingFormDraft");
@@ -99,10 +99,6 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
                 error: undefined,
             };
         },
-        // Makes the page epic refetch a record that changed server-side (e.g. a new subscription).
-        invalidateInvoicingCustomerDetail(draft, action) {
-            delete draft.recordStateById[action.payload.id];
-        },
         fetchInvoicingCustomerDetail(draft, action) {
             draft.recordStateById[action.payload.id] = {
                 fetchState: 'In-Progress',
@@ -206,5 +202,5 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.invalidateInvoicingCustomerDetail = _a.invalidateInvoicingCustomerDetail, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress, exports.claimInvoicingCustomerBillingAddress = _a.claimInvoicingCustomerBillingAddress;
+_a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress, exports.claimInvoicingCustomerBillingAddress = _a.claimInvoicingCustomerBillingAddress;
 exports.default = editInvoicingCustomerDetailView.reducer;

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.d.ts

@@ -1,9 +1,9 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { InvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingSubscriptionLifecycleActionOption } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingSubscription } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionState';
+import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingSubscriptionFormLocalData } from './editInvoicingSubscriptionDetailViewState';
 /**
@@ -107,7 +107,7 @@ export declare const getEditInvoicingSubscriptionDetailViewState: (state: RootSt
  * Lives here rather than in a screen so the create/edit form and the detail
  * page's inline edit narrow their pickers by the same rule.
  */
-export declare const getInvoicingItemsAllowedForPlan: (products: InvoicingCatalogPricePoint[], plan: InvoicingCatalogPricePoint | undefined) => InvoicingCatalogPricePoint[];
+export declare const getInvoicingItemsAllowedForPlan: (products: InvoicingProduct[], plan: InvoicingProduct | undefined) => InvoicingProduct[];
 /**
  * One entry in a subscription-form picker, ready for the screen to render.
  *

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.d.ts

@@ -6,9 +6,7 @@ import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
-import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
 import { addInvoicingSubscriptionToList } from '../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
 import { submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormFailure, submitInvoicingSubscriptionFormSuccess, syncInvoicingSubscriptionCoupons } from './editInvoicingSubscriptionDetailViewReducer';
-export type ActionType = ReturnType<typeof submitInvoicingSubscriptionForm> | ReturnType<typeof submitInvoicingSubscriptionFormSuccess> | ReturnType<typeof submitInvoicingSubscriptionFormFailure> | ReturnType<typeof syncInvoicingSubscriptionCoupons> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions> | ReturnType<typeof addInvoicingSubscriptionToList> | ReturnType<typeof invalidateInvoicingCustomerDetail> | ReturnType<typeof invalidateInvoiceListForCustomer> | ReturnType<typeof openSnackbar>;
+export type ActionType = ReturnType<typeof submitInvoicingSubscriptionForm> | ReturnType<typeof submitInvoicingSubscriptionFormSuccess> | ReturnType<typeof submitInvoicingSubscriptionFormFailure> | ReturnType<typeof syncInvoicingSubscriptionCoupons> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateInvoicingSubscriptions> | ReturnType<typeof addInvoicingSubscriptionToList> | ReturnType<typeof openSnackbar>;
 export declare const saveInvoicingSubscriptionEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.js

@@ -10,8 +10,6 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
-const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
-const invoiceListReducer_1 = require("../invoiceList/invoiceListReducer");
 const invoicingSubscriptionListViewReducer_1 = require("../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer");
 const editInvoicingSubscriptionDetailViewPayload_1 = require("./editInvoicingSubscriptionDetailViewPayload");
 const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSubscriptionDetailViewReducer");
@@ -91,9 +89,7 @@ const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => actions$.pi
             resultActions.push((0, invoicingSubscriptionListViewReducer_1.addInvoicingSubscriptionToList)({
                 id: saved.id,
                 status: saved.status,
-            }), 
-            // The service may bill the first invoice on create.
-            (0, editInvoicingCustomerDetailViewReducer_1.invalidateInvoicingCustomerDetail)({ id: saved.customer_id }), (0, invoiceListReducer_1.invalidateInvoiceListForCustomer)({ customerId: saved.customer_id }));
+            }));
         }
         resultActions.push((0, snackbarReducer_1.openSnackbar)({
             messageSection: 'invoicing_subscription_saved',

package/lib/view/invoicing/invoiceList/invoiceListReducer.d.ts

@@ -45,8 +45,6 @@ export declare const fetchInvoiceList: import("@reduxjs/toolkit").ActionCreatorW
 }, "invoicingInvoiceList/updateInvoiceList">, updateInvoiceListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceListFailure">, fetchInvoiceCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingInvoiceList/fetchInvoiceCounts">, updateInvoiceCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingInvoiceList/updateInvoiceCounts">, updateInvoiceCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceCountsFailure">, fetchInvoiceKPIs: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingInvoiceList/fetchInvoiceKPIs">, updateInvoiceKPIs: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingInvoiceKPIs, "invoicingInvoiceList/updateInvoiceKPIs">, updateInvoiceKPIsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingInvoiceList/updateInvoiceKPIsFailure">, updateInvoiceListFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoiceListFilters, "invoicingInvoiceList/updateInvoiceListFilters">, setInvoiceActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "voided" | "partially_paid" | "payment_due" | "not_paid" | "all", "invoicingInvoiceList/setInvoiceActiveTab">, addInvoiceToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     id: ID;
     status: InvoicingInvoiceStatus;
-}, "invoicingInvoiceList/addInvoiceToList">, invalidateInvoiceListForCustomer: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    customerId: ID;
-}, "invoicingInvoiceList/invalidateInvoiceListForCustomer">;
+}, "invoicingInvoiceList/addInvoiceToList">;
 declare const _default: import("redux").Reducer<InvoiceListState>;
 export default _default;

package/lib/view/invoicing/invoiceList/invoiceListReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invalidateInvoiceListForCustomer = exports.addInvoiceToList = exports.setInvoiceActiveTab = exports.updateInvoiceListFilters = exports.updateInvoiceKPIsFailure = exports.updateInvoiceKPIs = exports.fetchInvoiceKPIs = exports.updateInvoiceCountsFailure = exports.updateInvoiceCounts = exports.fetchInvoiceCounts = exports.updateInvoiceListFailure = exports.updateInvoiceList = exports.fetchInvoiceListPage = exports.fetchInvoiceList = exports.initialState = exports.sameInvoiceListQuery = void 0;
+exports.addInvoiceToList = exports.setInvoiceActiveTab = exports.updateInvoiceListFilters = exports.updateInvoiceKPIsFailure = exports.updateInvoiceKPIs = exports.fetchInvoiceKPIs = exports.updateInvoiceCountsFailure = exports.updateInvoiceCounts = exports.fetchInvoiceCounts = exports.updateInvoiceListFailure = exports.updateInvoiceList = exports.fetchInvoiceListPage = exports.fetchInvoiceList = exports.initialState = exports.sameInvoiceListQuery = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
 const invoiceListState_1 = require("./invoiceListState");
@@ -129,13 +129,6 @@ const invoiceList = (0, toolkit_1.createSlice)({
             draft.kpisFetchState.fetchState = 'Error';
             draft.kpisFetchState.error = action.payload;
         },
-        // Counts are fetched under the same customer filter, so they go stale with the tabs.
-        invalidateInvoiceListForCustomer(draft, action) {
-            if (draft.filters.customerId === action.payload.customerId) {
-                draft.invoiceByTab = (0, invoiceListState_1.makeInvoiceByTab)();
-                draft.countsFetchState = { fetchState: 'Not-Started', error: undefined };
-            }
-        },
         updateInvoiceListFilters(draft, action) {
             draft.filters = action.payload;
         },
@@ -178,5 +171,5 @@ const invoiceList = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = invoiceList.actions, exports.fetchInvoiceList = _a.fetchInvoiceList, exports.fetchInvoiceListPage = _a.fetchInvoiceListPage, exports.updateInvoiceList = _a.updateInvoiceList, exports.updateInvoiceListFailure = _a.updateInvoiceListFailure, exports.fetchInvoiceCounts = _a.fetchInvoiceCounts, exports.updateInvoiceCounts = _a.updateInvoiceCounts, exports.updateInvoiceCountsFailure = _a.updateInvoiceCountsFailure, exports.fetchInvoiceKPIs = _a.fetchInvoiceKPIs, exports.updateInvoiceKPIs = _a.updateInvoiceKPIs, exports.updateInvoiceKPIsFailure = _a.updateInvoiceKPIsFailure, exports.updateInvoiceListFilters = _a.updateInvoiceListFilters, exports.setInvoiceActiveTab = _a.setInvoiceActiveTab, exports.addInvoiceToList = _a.addInvoiceToList, exports.invalidateInvoiceListForCustomer = _a.invalidateInvoiceListForCustomer;
+_a = invoiceList.actions, exports.fetchInvoiceList = _a.fetchInvoiceList, exports.fetchInvoiceListPage = _a.fetchInvoiceListPage, exports.updateInvoiceList = _a.updateInvoiceList, exports.updateInvoiceListFailure = _a.updateInvoiceListFailure, exports.fetchInvoiceCounts = _a.fetchInvoiceCounts, exports.updateInvoiceCounts = _a.updateInvoiceCounts, exports.updateInvoiceCountsFailure = _a.updateInvoiceCountsFailure, exports.fetchInvoiceKPIs = _a.fetchInvoiceKPIs, exports.updateInvoiceKPIs = _a.updateInvoiceKPIs, exports.updateInvoiceKPIsFailure = _a.updateInvoiceKPIsFailure, exports.updateInvoiceListFilters = _a.updateInvoiceListFilters, exports.setInvoiceActiveTab = _a.setInvoiceActiveTab, exports.addInvoiceToList = _a.addInvoiceToList;
 exports.default = invoiceList.reducer;

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogListPageEpic.d.ts

@@ -1,13 +1,13 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchInvoicingCatalogCounts, fetchInvoicingCatalogListPage, fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList, updateInvoicingCatalogCounts, updateInvoicingCatalogCountsFailure, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure } from '../invoicingCatalogListViewReducer';
 /**
  * Aggregate of every action emitted across the catalog list view epics. Wired
  * into the root action union for this view.
  */
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof fetchInvoicingCatalogListPage> | ReturnType<typeof fetchInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogCountsFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof fetchInvoicingCatalogListPage> | ReturnType<typeof fetchInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogCountsFailure> | ReturnType<typeof updateInvoicingPlans>;
 /**
  * Orchestrates the catalog page: on `fetchInvoicingCatalogListPage`, fans out to
  * the plan-list, product-list and counts fetches, skipping any whose data is

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchInvoicingCatalogPlanList, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure } from '../invoicingCatalogListViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingPlans>;
 export declare const fetchInvoicingCatalogPlanListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogPlanListEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../../entity/invoicing/plan/planReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const invoicingApiHelper_1 = require("../../invoicingApiHelper");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListViewReducer");
@@ -32,7 +32,7 @@ const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) => action
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
             return [
-                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
+                (0, planReducer_1.updateInvoicingPlans)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogPlanList)({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchInvoicingCatalogProductList, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure } from '../invoicingCatalogListViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingPlans>;
 export declare const fetchInvoicingCatalogProductListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogProductListEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCatalogReducer_1 = require("../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
+const planReducer_1 = require("../../../../entity/invoicing/plan/planReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const invoicingApiHelper_1 = require("../../invoicingApiHelper");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListViewReducer");
@@ -32,7 +32,7 @@ const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI) => act
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
             return [
-                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
+                (0, planReducer_1.updateInvoicingPlans)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogProductList)({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewPayload.d.ts

@@ -1,6 +1,6 @@
-import { InvoicingCatalogItemPayload } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogPayload';
 import { InvoicingListCounts, InvoicingPaginatedList } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
-export type InvoicingCatalogPlanListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingCatalogItemPayload>>;
-export type InvoicingCatalogProductListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingCatalogItemPayload>>;
+export type InvoicingCatalogPlanListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingPlanPayload>>;
+export type InvoicingCatalogProductListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingPlanPayload>>;
 export type InvoicingCatalogCountsResponse = ZeniAPIResponse<InvoicingListCounts>;

package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.d.ts

@@ -1,32 +1,11 @@
-import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { InvoicingCatalogItem, InvoicingCatalogPricePoint, InvoicingCatalogTier } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
 import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingListCounts } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
+import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingListSort } from '../invoicingApiHelper';
 import { InvoicingCatalogPlanFilters, InvoicingCatalogProductFilters, InvoicingProductColumnConfig } from './invoicingCatalogListViewState';
-/**
- * One row of the plans table: a price point under its catalog item, so an item
- * priced monthly and annually lists once per price. An item with no price
- * points still gets a row, from the item's own fields.
- */
-export interface InvoicingCatalogPlanRow {
-    /** The price point's id, or the item's when it has no price points. */
-    id: ID;
-    /** The row's catalog item: the row opens it and its menu acts on it. */
-    item: InvoicingCatalogItem;
-    tierCount: number;
-    /** The tier with the lowest starting unit — what "From" quotes. */
-    firstTier?: InvoicingCatalogTier;
-    period?: number;
-    periodUnit?: string;
-    planName?: string;
-    price?: Amount;
-    pricingModel?: string;
-    productFamily?: string;
-    status?: string;
-}
 export interface InvoicingCatalogListView extends SelectorView {
     /** Config-owned; folded in so the screen reads one selector. */
     catalogItemLifecycleActionOptions: InvoicingCatalogLifecycleActionOption<InvoicingCatalogItemLifecycleAction>[];
@@ -34,14 +13,12 @@ export interface InvoicingCatalogListView extends SelectorView {
     countsFetchState: FetchStateAndError;
     planFilters: InvoicingCatalogPlanFilters;
     planNextCursor: string | null;
-    /** The plans tab's rows: {@link plans} flattened to one per price point. */
-    planRows: InvoicingCatalogPlanRow[];
-    plans: InvoicingCatalogItem[];
+    plans: InvoicingPlan[];
     productColumns: InvoicingProductColumnConfig[];
     productFetchState: FetchStateAndError;
     productFilters: InvoicingCatalogProductFilters;
     productNextCursor: string | null;
-    products: InvoicingCatalogItem[];
+    products: InvoicingPlan[];
     planSort?: InvoicingListSort;
     productSort?: InvoicingListSort;
     /**
@@ -60,8 +37,7 @@ export interface InvoicingCatalogListView extends SelectorView {
  * written after the spread so the item's own rule wins over any stale copy a
  * price point payload may carry.
  */
-export declare const getInvoicingCatalogPrices: (items: InvoicingCatalogItem[]) => InvoicingCatalogPricePoint[];
-export declare const getInvoicingCatalogPlanRows: (items: InvoicingCatalogItem[]) => InvoicingCatalogPlanRow[];
+export declare const getInvoicingCatalogPrices: (items: InvoicingPlan[]) => InvoicingProduct[];
 /**
  * Bundled read view for the single catalog page (plans + products tabs).
  * Memoized over the plan + product entity slices and the list-view slice so the

package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingCatalogListView = exports.getInvoicingCatalogPlanRows = exports.getInvoicingCatalogPrices = void 0;
+exports.getInvoicingCatalogListView = exports.getInvoicingCatalogPrices = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
+const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const runningInvoicingActionId_1 = require("../runningInvoicingActionId");
 const invoicingCatalogListViewState_1 = require("./invoicingCatalogListViewState");
 /**
@@ -26,65 +26,28 @@ const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (item.subFa
     productCode: item.productCode,
 })));
 exports.getInvoicingCatalogPrices = getInvoicingCatalogPrices;
-const lowestStartingTier = (tiers) => tiers.reduce((lowest, tier) => lowest == null || tier.startingUnit < lowest.startingUnit ? tier : lowest, undefined);
-const getInvoicingCatalogPlanRows = (items) => items.flatMap((item) => {
-    const pricePoints = item.subFamilies ?? [];
-    if (pricePoints.length === 0) {
-        return [
-            {
-                id: item.id,
-                item,
-                period: item.period,
-                periodUnit: item.periodUnit,
-                price: item.price,
-                productFamily: item.name,
-                status: item.status,
-                tierCount: item.tiers?.length ?? 0,
-                firstTier: lowestStartingTier(item.tiers ?? []),
-            },
-        ];
-    }
-    return pricePoints.map((pricePoint) => ({
-        id: pricePoint.id,
-        item,
-        period: pricePoint.period,
-        periodUnit: pricePoint.periodUnit,
-        planName: pricePoint.name,
-        price: (0, invoicingCatalogSelector_1.invoicingPricePointDisplayAmount)(pricePoint),
-        pricingModel: pricePoint.pricingModel,
-        productFamily: item.name,
-        status: pricePoint.status,
-        tierCount: pricePoint.tiers?.length ?? 0,
-        firstTier: lowestStartingTier(pricePoint.tiers ?? []),
-    }));
-});
-exports.getInvoicingCatalogPlanRows = getInvoicingCatalogPlanRows;
 /**
  * Bundled read view for the single catalog page (plans + products tabs).
  * Memoized over the plan + product entity slices and the list-view slice so the
  * denormalized arrays keep referential identity. The base `fetchState`/`error`
  * track the plan list; the product list has its own `productFetchState`.
  */
-exports.getInvoicingCatalogListView = (0, toolkit_1.createSelector)((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (catalogState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => {
-    const plans = (0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, listViewState.planIds);
-    return {
-        catalogItemLifecycleActionOptions,
-        runningActionId: (0, runningInvoicingActionId_1.runningInvoicingActionId)(actionStateById),
-        planRows: (0, exports.getInvoicingCatalogPlanRows)(plans),
-        plans,
-        planSort: listViewState.planSort,
-        productColumns: invoicingCatalogListViewState_1.INVOICING_PRODUCT_COLUMNS,
-        products: (0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, listViewState.productIds),
-        productSort: listViewState.productSort,
-        count: listViewState.counts,
-        countsFetchState: listViewState.countsFetchState,
-        planFilters: listViewState.planFilters,
-        planNextCursor: listViewState.planNextCursor,
-        productFilters: listViewState.productFilters,
-        productNextCursor: listViewState.productNextCursor,
-        productFetchState: listViewState.productFetchState,
-        fetchState: listViewState.fetchState,
-        error: listViewState.error,
-        version: 1.0,
-    };
-});
+exports.getInvoicingCatalogListView = (0, toolkit_1.createSelector)((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (planState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
+    catalogItemLifecycleActionOptions,
+    runningActionId: (0, runningInvoicingActionId_1.runningInvoicingActionId)(actionStateById),
+    plans: (0, planSelector_1.getInvoicingPlansByIds)(planState, listViewState.planIds),
+    planSort: listViewState.planSort,
+    productColumns: invoicingCatalogListViewState_1.INVOICING_PRODUCT_COLUMNS,
+    products: (0, planSelector_1.getInvoicingPlansByIds)(planState, listViewState.productIds),
+    productSort: listViewState.productSort,
+    count: listViewState.counts,
+    countsFetchState: listViewState.countsFetchState,
+    planFilters: listViewState.planFilters,
+    planNextCursor: listViewState.planNextCursor,
+    productFilters: listViewState.productFilters,
+    productNextCursor: listViewState.productNextCursor,
+    productFetchState: listViewState.productFetchState,
+    fetchState: listViewState.fetchState,
+    error: listViewState.error,
+    version: 1.0,
+}));

package/lib/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewState.d.ts

@@ -7,7 +7,7 @@ export type InvoicingProductSortKey = ReturnType<typeof toInvoicingProductSortKe
 /**
  * Structural column descriptor owned by CES for the catalog product table
  * (add-ons / one-time charges), so the column set, order and sortability live
- * next to the `InvoicingCatalogPricePoint` model rather than being hardcoded in
+ * next to the `InvoicingProduct` model rather than being hardcoded in
  * web-components. Header labels, cell rendering and layout (alignment, widths)
  * stay in the view layer. (The plans table keeps its own columns in web-c.)
  */