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

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>;

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.archiveInvoicingCatalogSubFamilyEpic = exports.createInvoicingCatalogSubFamilyEpic = void 0;
+exports.archiveInvoicingCatalogSubFamilyEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
 const responsePayload_1 = require("../../../responsePayload");
-const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
-const catalogDetailEditPayload_1 = require("./catalogDetailEditPayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const subFamilySuccessActions = (parentItemId, subFamilyPayload) => [
     (0, planReducer_1.mergeInvoicingPlanSubFamily)(parentItemId, subFamilyPayload),
@@ -15,24 +13,6 @@ const subFamilySuccessActions = (parentItemId, subFamilyPayload) => [
         kind: 'plan',
     }),
 ];
-const createInvoicingCatalogSubFamilyEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.createInvoicingCatalogSubFamily.match), (0, operators_1.mergeMap)((action) => {
-    const { itemType, parentItemId, values } = action.payload;
-    const state = state$.value;
-    // Built here so the dialog can stay in picked ids: resolving one to the
-    // account record the payload carries needs the shared account list.
-    const data = (0, catalogDetailEditPayload_1.createSubFamilyFormToPayload)(parentItemId, itemType, values, (0, invoicingQboViewSelector_1.getInvoicingCatalogAccountingLookup)(state));
-    const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
-    return zeniAPI
-        .postAndGetJSON(`${baseUrl}/catalog/products`, data)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-            return subFamilySuccessActions(parentItemId, response.data);
-        }
-        return (0, rxjs_1.of)((0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)(response.status));
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Create sub-family REST API call errored out ' +
-        JSON.stringify(error))))));
-}));
-exports.createInvoicingCatalogSubFamilyEpic = createInvoicingCatalogSubFamilyEpic;
 const archiveInvoicingCatalogSubFamilyEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(editInvoicingCatalogItemDetailViewReducer_1.archiveInvoicingCatalogSubFamily.match), (0, operators_1.mergeMap)((action) => {
     const { parentItemId, subFamilyId } = action.payload;
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
@@ -44,7 +24,7 @@ const archiveInvoicingCatalogSubFamilyEpic = (actions$, _state$, zeniAPI) => act
             return subFamilySuccessActions(parentItemId, response.data);
         }
         return (0, rxjs_1.of)((0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)(response.status));
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Archive sub-family REST API call errored out ' +
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Archive price point REST API call errored out ' +
         JSON.stringify(error))))));
 }));
 exports.archiveInvoicingCatalogSubFamilyEpic = archiveInvoicingCatalogSubFamilyEpic;

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

@@ -6,6 +6,6 @@ import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
-import { saveInvoicingCatalogItem, submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
-export type ActionType = ReturnType<typeof submitInvoicingCatalogItemForm> | ReturnType<typeof saveInvoicingCatalogItem> | ReturnType<typeof submitInvoicingCatalogItemFormSuccess> | ReturnType<typeof submitInvoicingCatalogItemFormFailure> | ReturnType<typeof updateInvoicingPlans> | ReturnType<typeof updateInvoicingProducts> | ReturnType<typeof mergeInvoicingPlanSubFamily> | ReturnType<typeof addInvoicingCatalogItem> | ReturnType<typeof openSnackbar>;
+import { submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess } from './editInvoicingCatalogItemDetailViewReducer';
+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,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveInvoicingCatalogItemEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const planReducer_1 = require("../../../entity/invoicing/plan/planReducer");
 const productReducer_1 = require("../../../entity/invoicing/product/productReducer");
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
@@ -11,34 +10,19 @@ const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListView/invoicingCatalogListViewReducer");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
-const catalogDetailEditPayload_1 = require("./catalogDetailEditPayload");
 const editInvoicingCatalogItemDetailViewPayload_1 = require("./editInvoicingCatalogItemDetailViewPayload");
-const editInvoicingCatalogItemDetailViewSelector_1 = require("./editInvoicingCatalogItemDetailViewSelector");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
-const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemForm.match(action) ||
-    editInvoicingCatalogItemDetailViewReducer_1.saveInvoicingCatalogItem.match(action)), (0, operators_1.mergeMap)((action) => {
+const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemForm.match(action)), (0, operators_1.mergeMap)((action) => {
     const { id } = action.payload;
     const state = state$.value;
     const accountingLookup = (0, invoicingQboViewSelector_1.getInvoicingCatalogAccountingLookup)(state);
-    // Both sources are form values, turned into request bodies here so the
-    // picked account and class become the records the service stores: the
-    // detail page's edit form, or the create/edit form's draft.
-    let data;
-    let editProductUpdates;
-    if (editInvoicingCatalogItemDetailViewReducer_1.saveInvoicingCatalogItem.match(action)) {
-        const plan = id != null
-            ? (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id)
-            : undefined;
-        const savePayload = (0, catalogDetailEditPayload_1.catalogDetailEditValuesToSavePayload)((0, editInvoicingCatalogItemDetailViewSelector_1.getInvoicingCatalogItemDetailEditLocalData)(state, id), accountingLookup, plan?.type ?? plan?.itemType, plan?.subFamilies);
-        data = savePayload.planData;
-        editProductUpdates = savePayload.productUpdates;
-    }
-    else {
-        const viewState = state.editInvoicingCatalogItemDetailViewState;
-        const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
-            viewState.newItemDraft;
-        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, accountingLookup);
-    }
+    // Form values, turned into a request body here so the picked account and
+    // class become the records the service stores. Price points ride along
+    // nested, so the detail page and the create/edit form share one request.
+    const viewState = state.editInvoicingCatalogItemDetailViewState;
+    const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
+        viewState.newItemDraft;
+    const data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, accountingLookup);
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null
         ? `${baseUrl}/catalog/plans/${encodeURIComponent(id)}`
@@ -99,13 +83,7 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 }));
                 return resultActions;
             };
-            const productUpdates = editInvoicingCatalogItemDetailViewReducer_1.saveInvoicingCatalogItem.match(action)
-                ? (editProductUpdates ?? [])
-                : [];
-            if (productUpdates.length === 0) {
-                return completeSave([]);
-            }
-            return (0, rxjs_1.forkJoin)(productUpdates.map((productUpdate) => zeniAPI.putAndGetJSON(`${baseUrl}/catalog/products/${encodeURIComponent(productUpdate.id)}`, productUpdate.data))).pipe((0, operators_1.mergeMap)(completeSave));
+            return completeSave([]);
         }
         return (0, rxjs_1.from)([
             (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)(response.status),

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.d.ts

@@ -1,4 +1,4 @@
-import { FetchState, ID } from '../../../commonStateTypes/common';
+import { FetchState, FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { InvoicingCoupon } from '../../../entity/invoicing/coupon/couponState';
 import { InvoicingDiscountLifecycleActionOption, InvoicingFieldHelpByCode, InvoicingFormOption } from '../../../entity/invoicing/invoicingCommonPayload';
@@ -8,6 +8,17 @@ export interface EditInvoicingCouponDetailView extends SelectorView {
     /** Config-owned; folded in so the screen reads one selector. */
     configFetchState: FetchState;
     discountLifecycleActionOptions: InvoicingDiscountLifecycleActionOption[];
+    /**
+     * 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.
+     */
+    fieldHelp: InvoicingFieldHelpByCode;
+    /**
+     * Loading the coupon, as distinct from this view's own `fetchState`, which
+     * tracks the save. Folded in from the read view so a screen reads one
+     * selector rather than pairing this one with it.
+     */
+    recordState: FetchStateAndError;
     coupon?: InvoicingCoupon;
     savedCouponId?: ID;
 }

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

@@ -4,6 +4,7 @@ exports.getInvoicingCouponFormView = exports.getEditInvoicingCouponDetailViewSta
 const couponSelector_1 = require("../../../entity/invoicing/coupon/couponSelector");
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
+const invoicingCouponRecordViewSelector_1 = require("../invoicingCouponRecordView/invoicingCouponRecordViewSelector");
 const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetailViewState");
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
@@ -13,9 +14,17 @@ const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetai
 const getEditInvoicingCouponDetailViewState = (state, couponId) => {
     const { error, fetchState, savedCouponId } = state.editInvoicingCouponDetailViewState;
     const { discountLifecycleActionOptions, fetchState: configFetchState } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
+    // In create mode there is no record to load, so the read view is only
+    // consulted when editing an existing coupon.
+    const readView = couponId != null ? (0, invoicingCouponRecordViewSelector_1.getInvoicingCouponRecord)(state, couponId) : undefined;
     return {
         configFetchState,
         discountLifecycleActionOptions,
+        fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'discount'),
+        recordState: {
+            error: readView?.error,
+            fetchState: readView?.fetchState ?? 'Not-Started',
+        },
         coupon: couponId != null
             ? (0, couponSelector_1.getInvoicingCouponById)(state.invoicingCouponState, couponId)
             : undefined,
@@ -41,7 +50,6 @@ const getInvoicingCouponFormView = (state, couponId) => {
         : newCouponDraft;
     const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
-        fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'discount'),
         ...base,
         applyOnOptions: discountApplyOnOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),

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

@@ -2,6 +2,7 @@ import { ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { InvoicingFieldHelpByCode, InvoicingNamedOption } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../rootStateTypes';
+import { type InvoicingCustomerRecordView } from '../invoicingCustomerRecordView/invoicingCustomerRecordViewSelector';
 import { InvoicingCustomerFormLocalData } from './editInvoicingCustomerDetailViewState';
 export interface InvoicingCustomerFormView extends SelectorView {
     customerTypeOptions: InvoicingNamedOption[];
@@ -13,6 +14,13 @@ export interface InvoicingCustomerFormView extends SelectorView {
     localData: InvoicingCustomerFormLocalData;
     mode: 'create' | 'edit';
     netTermDayOptions: InvoicingNamedOption[];
+    /**
+     * The record and everything the detail page renders alongside it — invoices,
+     * payment methods, branding, Stripe state. Nested rather than flattened: it
+     * is a page's worth of state, and spreading it here would bury this view's
+     * own form fields. Screens read one selector and reach through this.
+     */
+    record: InvoicingCustomerRecordView;
     taxabilityOptions: InvoicingNamedOption[];
     billingAddressId?: ID;
     billingAddressLabel?: string;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCustomerFormView = void 0;
 const invoicingCustomerSelector_1 = require("../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
+const invoicingCustomerRecordViewSelector_1 = require("../invoicingCustomerRecordView/invoicingCustomerRecordViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingCustomerFormConfig_1 = require("./invoicingCustomerFormConfig");
 /**
@@ -32,6 +33,7 @@ const getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
         : undefined;
     const { customerTypeOptions, netTermDayOptions, taxabilityOptions } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
+        record: (0, invoicingCustomerRecordViewSelector_1.getInvoicingCustomerRecord)(state, invoicingCustomerID ?? ''),
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'customer'),
         customerTypeOptions,
         localData,

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

@@ -2,7 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
 import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingCustomerDetail } from '../invoicingCustomerDetailView/invoicingCustomerDetailViewReducer';
+import { updateInvoicingCustomerDetail } from '../invoicingCustomerRecordView/invoicingCustomerRecordViewReducer';
 import { initializeInvoicingCustomerAddress } from './editInvoicingCustomerDetailViewReducer';
 export type ActionType = ReturnType<typeof initializeInvoicingCustomerAddress> | ReturnType<typeof updateInvoicingCustomerDetail> | ReturnType<typeof newAddressInLocalStore>;
 /**

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

@@ -6,7 +6,7 @@ const operators_1 = require("rxjs/operators");
 const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoicingCustomerSelector_1 = require("../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
-const invoicingCustomerDetailViewReducer_1 = require("../invoicingCustomerDetailView/invoicingCustomerDetailViewReducer");
+const invoicingCustomerRecordViewReducer_1 = require("../invoicingCustomerRecordView/invoicingCustomerRecordViewReducer");
 const editInvoicingCustomerDetailViewReducer_1 = require("./editInvoicingCustomerDetailViewReducer");
 const invoicingCustomerFormConfig_1 = require("./invoicingCustomerFormConfig");
 /**
@@ -18,7 +18,7 @@ const invoicingCustomerFormConfig_1 = require("./invoicingCustomerFormConfig");
  * `initializeVendorAddressEpic`.
  */
 const initializeInvoicingCustomerAddressEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCustomerDetailViewReducer_1.initializeInvoicingCustomerAddress.match(action) ||
-    invoicingCustomerDetailViewReducer_1.updateInvoicingCustomerDetail.match(action)), (0, operators_1.mergeMap)((action) => {
+    invoicingCustomerRecordViewReducer_1.updateInvoicingCustomerDetail.match(action)), (0, operators_1.mergeMap)((action) => {
     const { id } = action.payload;
     const rootState = state$.value;
     const existingDraft = rootState.addressViewState.newAddressState?.[invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;

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

@@ -1,7 +1,7 @@
-import { ID } from '../../../commonStateTypes/common';
+import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { InvoicingCoupon } from '../../../entity/invoicing/coupon/couponState';
-import { InvoicingFieldHelpByCode, InvoicingSubscriptionLifecycleActionOption } from '../../../entity/invoicing/invoicingCommonPayload';
+import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingSubscriptionLifecycleActionOption } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingCustomer } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerState';
 import { InvoicingSubscription } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionState';
 import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
@@ -30,6 +30,10 @@ export interface EditInvoicingSubscriptionDetailView extends SelectorView {
  * to its own option shapes, so this stays free of any web-components dependency.
  */
 export interface InvoicingSubscriptionFormView extends SelectorView {
+    /** Lifecycle action in flight, folded in from the record view. */
+    actionState: FetchStateAndError;
+    /** Cancel reasons from `/1.0/config`, so the dialog hardcodes nothing. */
+    cancelReasonCodeOptions: InvoicingNamedOption[];
     coupons: InvoicingCoupon[];
     customers: InvoicingCustomer[];
     /**
@@ -41,6 +45,11 @@ export interface InvoicingSubscriptionFormView extends SelectorView {
     mode: 'create' | 'edit';
     plans: InvoicingProduct[];
     products: InvoicingProduct[];
+    /**
+     * Loading the subscription, as distinct from this view's own `fetchState`,
+     * which tracks the save. Folded in so a screen reads one selector.
+     */
+    recordState: FetchStateAndError;
     savedSubscriptionId?: ID;
     shippingAddressLabel?: string;
     subscription?: InvoicingSubscription;

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

@@ -5,6 +5,7 @@ const invoicingSubscriptionSelector_1 = require("../../../entity/invoicing/invoi
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const couponViewSelector_1 = require("../couponView/couponViewSelector");
 const invoicingCatalogListViewSelector_1 = require("../invoicingCatalogListView/invoicingCatalogListViewSelector");
+const invoicingSubscriptionRecordViewSelector_1 = require("../invoicingSubscriptionRecordView/invoicingSubscriptionRecordViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingCustomerListViewSelector_1 = require("../invoicingCustomerListView/invoicingCustomerListViewSelector");
 const invoicingSubscriptionFormConfig_1 = require("./invoicingSubscriptionFormConfig");
@@ -45,7 +46,21 @@ const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
     const catalogListView = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogListView)(state);
     const planPrices = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.plans);
     const addonAndChargePrices = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.products);
+    // In create mode there is no record to load, so the record view is only
+    // consulted when editing an existing subscription.
+    const recordView = invoicingSubscriptionID != null
+        ? (0, invoicingSubscriptionRecordViewSelector_1.getInvoicingSubscriptionRecord)(state, invoicingSubscriptionID)
+        : undefined;
     return {
+        actionState: recordView?.actionState ?? {
+            error: undefined,
+            fetchState: 'Not-Started',
+        },
+        cancelReasonCodeOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).subscriptionCancelReasonCodeOptions,
+        recordState: {
+            error: recordView?.error,
+            fetchState: recordView?.fetchState ?? 'Not-Started',
+        },
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'subscription'),
         coupons: (0, couponViewSelector_1.getInvoicingCouponListItems)(state),
         customers: (0, invoicingCustomerListViewSelector_1.getInvoicingCustomerListView)(state).customers,

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

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { fetchInvoicingCouponList } from '../couponView/couponViewReducer';
 import { fetchInvoicingCatalogPlanList } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { fetchInvoicingCustomerList } from '../invoicingCustomerListView/invoicingCustomerListViewReducer';
-import { fetchInvoicingSubscriptionDetail } from '../invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewReducer';
+import { fetchInvoicingSubscriptionDetail } from '../invoicingSubscriptionRecordView/invoicingSubscriptionRecordViewReducer';
 import { fetchInvoicingSubscriptionFormPage } from './editInvoicingSubscriptionDetailViewReducer';
 /**
  * Every action this epic can emit, plus the trigger it listens for. Wired into

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

@@ -6,7 +6,7 @@ const operators_1 = require("rxjs/operators");
 const couponViewReducer_1 = require("../couponView/couponViewReducer");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListView/invoicingCatalogListViewReducer");
 const invoicingCustomerListViewReducer_1 = require("../invoicingCustomerListView/invoicingCustomerListViewReducer");
-const invoicingSubscriptionDetailViewReducer_1 = require("../invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewReducer");
+const invoicingSubscriptionRecordViewReducer_1 = require("../invoicingSubscriptionRecordView/invoicingSubscriptionRecordViewReducer");
 const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSubscriptionDetailViewReducer");
 /**
  * Orchestrates the subscription create/edit form: on
@@ -26,7 +26,7 @@ const fetchInvoicingSubscriptionFormPageEpic = (actions$) => actions$.pipe((0, o
         (0, couponViewReducer_1.fetchInvoicingCouponList)({ filters: {}, keepExistingListItems: false }),
     ];
     if (subscriptionId != null) {
-        pageActions.push((0, invoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionDetail)({ id: subscriptionId }));
+        pageActions.push((0, invoicingSubscriptionRecordViewReducer_1.fetchInvoicingSubscriptionDetail)({ id: subscriptionId }));
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(pageActions));
 }));

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

@@ -2,7 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
 import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingSubscriptionDetail } from '../invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewReducer';
+import { updateInvoicingSubscriptionDetail } from '../invoicingSubscriptionRecordView/invoicingSubscriptionRecordViewReducer';
 import { initializeInvoicingSubscriptionAddress } from './editInvoicingSubscriptionDetailViewReducer';
 export type ActionType = ReturnType<typeof initializeInvoicingSubscriptionAddress> | ReturnType<typeof updateInvoicingSubscriptionDetail> | ReturnType<typeof newAddressInLocalStore>;
 /**