@zeniai/client-epic-state 5.2.13 → 5.2.14-betaRD1

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

@@ -1,25 +1,9 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import type { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import type { InvoicingProduct } from '../../../entity/invoicing/product/productState';
-import type { InvoicingCatalogItemFormSubFamily, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
-export type CatalogDetailSubFamilyEditValues = InvoicingCatalogItemFormSubFamily;
-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: CatalogDetailSubFamilyEditValues[];
-    unit: string;
-    usageCalculation: string;
-}
+import { type InvoicingCatalogAccountingLookup } from './editInvoicingCatalogItemDetailViewPayload';
+import type { CatalogDetailEditValues, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
+export type { CatalogDetailEditValues } from './editInvoicingCatalogItemDetailViewState';
 export interface CatalogDetailProductUpdate {
     data: Record<string, unknown>;
     id: string;
@@ -30,18 +14,26 @@ export interface CatalogDetailSavePayload {
 }
 /** Build default inline-edit form values from a loaded catalog item. */
 export declare const planToCatalogDetailEditValues: (plan: InvoicingPlan) => CatalogDetailEditValues;
-export declare const catalogDetailEditValuesToSavePayload: (values: CatalogDetailEditValues, itemType?: string, originalSubFamilies?: readonly InvoicingProduct[]) => CatalogDetailSavePayload;
+export declare const catalogDetailEditValuesToSavePayload: (values: CatalogDetailEditValues, lookup: InvoicingCatalogAccountingLookup, itemType?: string, originalSubFamilies?: readonly InvoicingProduct[]) => CatalogDetailSavePayload;
 export interface CreateSubFamilyFormValues {
+    /** The QuickBooks class id the price point posts to. */
+    accountingCategory: string;
+    /** The QuickBooks income account id the price point posts to. */
+    accountingCode: string;
     billingCycles: string;
     description: string;
     freeQuantity: string;
     invoiceNotes: string;
+    isTaxable: boolean;
     name: string;
     period: string;
     periodUnit: string;
     priceCode: string;
     pricingModel: string;
     prorationType: string;
+    showDescriptionInInvoices: boolean;
+    showDescriptionInQuotes: boolean;
+    sku: string;
     trialEndAction: string;
     trialPeriod: string;
     trialPeriodUnit: string;
@@ -50,5 +42,5 @@ export interface CreateSubFamilyFormValues {
     tiers?: InvoicingCatalogItemFormTier[];
 }
 /** Build POST /catalog/products body for Create sub-family. */
-export declare const createSubFamilyFormToPayload: (itemId: string, itemType: string, values: CreateSubFamilyFormValues) => Record<string, unknown>;
+export declare const createSubFamilyFormToPayload: (itemId: string, itemType: string, values: CreateSubFamilyFormValues, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown>;
 export declare const productToCreateSubFamilyFormValues: (product?: InvoicingProduct) => CreateSubFamilyFormValues;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.productToCreateSubFamilyFormValues = exports.createSubFamilyFormToPayload = exports.catalogDetailEditValuesToSavePayload = exports.planToCatalogDetailEditValues = void 0;
+const editInvoicingCatalogItemDetailViewPayload_1 = require("./editInvoicingCatalogItemDetailViewPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
 const trimOrNull = (value) => value.trim() !== '' ? value.trim() : null;
@@ -39,7 +40,7 @@ const tierToPayload = (tier) => ({
     pricing_type: tier.pricingType,
     starting_unit: Number(tier.startingUnit) || 1,
 });
-const subFamilyToProductUpdate = (subFamily, itemType) => {
+const subFamilyToProductUpdate = (subFamily, itemType, lookup) => {
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(subFamily.pricingModel);
     const data = {
         billing_cycles: hasValue(subFamily.billingCycles)
@@ -66,9 +67,12 @@ const subFamilyToProductUpdate = (subFamily, itemType) => {
     if (itemType === 'addon') {
         data.proration_type = subFamily.prorationType;
     }
+    // `null` rather than omitted when empty: an absent key on an update reads as
+    // "leave it alone", so a cleared account or class could never be saved.
+    data.accounting_detail = (0, editInvoicingCatalogItemDetailViewPayload_1.buildAccountingDetail)(subFamily, lookup) ?? null;
     return { data, id: subFamily.id };
 };
-const catalogDetailEditValuesToSavePayload = (values, itemType = 'plan', originalSubFamilies) => {
+const catalogDetailEditValuesToSavePayload = (values, lookup, itemType = 'plan', originalSubFamilies) => {
     const planData = {
         applicable_items: values.itemApplicability === 'restricted' ? values.applicableItems : [],
         enabled_for_checkout: values.enabledForCheckout,
@@ -100,12 +104,12 @@ const catalogDetailEditValuesToSavePayload = (values, itemType = 'plan', origina
         planData.unit = unit;
     }
     const productUpdates = values.subFamilies.flatMap((subFamily) => {
-        const update = subFamilyToProductUpdate(subFamily, itemType);
+        const update = subFamilyToProductUpdate(subFamily, itemType, lookup);
         const original = originalSubFamilies?.find((product) => product.id === subFamily.id);
         if (original == null) {
             return [update];
         }
-        const originalUpdate = subFamilyToProductUpdate(subFamilyToEditValues(original), itemType);
+        const originalUpdate = subFamilyToProductUpdate(subFamilyToEditValues(original), itemType, lookup);
         const changedData = Object.fromEntries(Object.entries(update.data).filter(([key, value]) => JSON.stringify(value) !== JSON.stringify(originalUpdate.data[key])));
         return Object.keys(changedData).length > 0
             ? [{ data: changedData, id: update.id }]
@@ -118,21 +122,28 @@ const catalogDetailEditValuesToSavePayload = (values, itemType = 'plan', origina
 };
 exports.catalogDetailEditValuesToSavePayload = catalogDetailEditValuesToSavePayload;
 /** Build POST /catalog/products body for Create sub-family. */
-const createSubFamilyFormToPayload = (itemId, itemType, values) => {
+const createSubFamilyFormToPayload = (itemId, itemType, values, lookup) => {
     const name = values.name.trim();
     const priceCode = trimOrUndefined(values.priceCode) ?? toProductCode(name);
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(values.pricingModel);
     const payload = {
         currency_code: 'USD',
         free_quantity: Number(values.freeQuantity) || 0,
-        is_taxable: true,
+        is_taxable: values.isTaxable,
         item_id: itemId,
         name,
         price: tiered ? 0 : (values.priceDollars?.amount ?? 0),
         price_code: priceCode,
         pricing_model: values.pricingModel || 'flat_fee',
-        show_description_in_invoices: true,
+        show_description_in_invoices: values.showDescriptionInInvoices,
+        show_description_in_quotes: values.showDescriptionInQuotes,
     };
+    // The same accounting body the item payload sends, so a price point created
+    // from the dialog carries the account and class the form would have given it.
+    const accountingDetail = (0, editInvoicingCatalogItemDetailViewPayload_1.buildAccountingDetail)(values, lookup);
+    if (accountingDetail != null) {
+        payload.accounting_detail = accountingDetail;
+    }
     if (tiered) {
         payload.tiers = (values.tiers ?? []).map(tierToPayload);
     }
@@ -163,10 +174,13 @@ const createSubFamilyFormToPayload = (itemId, itemType, values) => {
 };
 exports.createSubFamilyFormToPayload = createSubFamilyFormToPayload;
 const productToCreateSubFamilyFormValues = (product) => ({
+    accountingCategory: product?.accountingDetail?.accountingCategory1 ?? '',
+    accountingCode: product?.accountingDetail?.accountingCode ?? '',
     billingCycles: product?.billingCycles != null ? String(product.billingCycles) : '',
     description: product?.description ?? '',
     freeQuantity: product?.freeQuantity != null ? String(product.freeQuantity) : '0',
     invoiceNotes: product?.invoiceNotes ?? '',
+    isTaxable: product?.isTaxable ?? true,
     name: product?.name != null ? `${product.name} (copy)` : '',
     period: product?.period != null ? String(product.period) : '1',
     periodUnit: product?.periodUnit ?? 'month',
@@ -174,6 +188,9 @@ const productToCreateSubFamilyFormValues = (product) => ({
     priceDollars: product?.price,
     pricingModel: product?.pricingModel ?? 'flat_fee',
     prorationType: product?.prorationType ?? 'site_default',
+    showDescriptionInInvoices: product?.showDescriptionInInvoices ?? true,
+    showDescriptionInQuotes: product?.showDescriptionInQuotes ?? false,
+    sku: product?.accountingDetail?.sku ?? '',
     trialEndAction: product?.trialEndAction ?? 'site_default',
     trialPeriod: product?.trialPeriod != null ? String(product.trialPeriod) : '',
     trialPeriodUnit: product?.trialPeriodUnit ?? 'day',

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

@@ -13,6 +13,13 @@ export interface InvoicingCatalogAccountingLookup {
     accountByQboId: (qboId: string) => AccountBase | undefined;
     classByQboId: (qboId: string) => ClassBase | undefined;
 }
+/** The accounting fields any price-point form collects. */
+export interface InvoicingCatalogAccountingFields {
+    accountingCategory: string;
+    accountingCode: string;
+    sku: string;
+}
+export declare const buildAccountingDetail: (subFamily: InvoicingCatalogAccountingFields, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown> | undefined;
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localDataToSaveInvoicingCatalogItemPayload = void 0;
+exports.localDataToSaveInvoicingCatalogItemPayload = exports.buildAccountingDetail = void 0;
 const accountPayload_1 = require("../../../entity/account/accountPayload");
 const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
@@ -31,6 +31,7 @@ const buildAccountingDetail = (subFamily, lookup) => {
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
+exports.buildAccountingDetail = buildAccountingDetail;
 const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(subFamily.pricingModel);
@@ -85,7 +86,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) =
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily, lookup);
+    const accountingDetail = (0, exports.buildAccountingDetail)(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -142,7 +143,7 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup)
             // would make a cleared mapping impossible to save — the same reason
             // `description` and `invoice_notes` go through `trimOrNull`.
             detail.accounting_detail =
-                buildAccountingDetail(subFamily, lookup) ?? null;
+                (0, exports.buildAccountingDetail)(subFamily, lookup) ?? null;
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

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

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

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

@@ -1,13 +1,14 @@
 "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.initialState = void 0;
+exports.resetEditInvoicingCatalogItemDetailView = exports.submitInvoicingCatalogItemFormFailure = exports.submitInvoicingCatalogItemFormSuccess = exports.archiveInvoicingCatalogSubFamily = exports.createInvoicingCatalogSubFamily = exports.saveInvoicingCatalogItem = exports.submitInvoicingCatalogItemForm = exports.updateInvoicingCatalogItemFormDraft = exports.updateInvoicingCatalogItemDetailEditDraft = 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,
@@ -29,6 +30,10 @@ 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';
@@ -70,6 +75,7 @@ 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';
@@ -80,6 +86,7 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
             draft.error = undefined;
             draft.savedItemId = undefined;
             draft.savedKind = undefined;
+            draft.detailEditDraftById = {};
             draft.editDraftById = {};
             draft.newItemDraft = { ...invoicingCatalogItemFormConfig_1.initialInvoicingCatalogItemFormLocalData };
         },
@@ -90,5 +97,5 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editInvoicingCatalogItemDetailView.actions, 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.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;
 exports.default = editInvoicingCatalogItemDetailView.reducer;

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

@@ -6,7 +6,16 @@ import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsBy
 import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingCatalogItemKind } from '../invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewState';
-import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
+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;
 export declare const getEditInvoicingCatalogItemDetailViewState: (state: RootState) => FetchStateAndError;
 export declare const getSavedInvoicingCatalogItemId: (state: RootState) => ID | undefined;
 export declare const getSavedInvoicingCatalogItemKind: (state: RootState) => InvoicingCatalogItemKind | undefined;
@@ -48,12 +57,13 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
     pricingModelValues: readonly string[];
     prorationValues: readonly string[];
     /**
-     * Account and class trees for the price-point pickers, already narrowed to the
-     * income accounts a price may post to. Empty until QBO is connected — the form
-     * must not offer a mapping that cannot be pushed.
+     * Account and class trees for the price-point pickers, straight from the
+     * shared accounting lists — the pickers drop the nodes they cannot submit.
+     * Empty until QBO is connected: the form must not offer a mapping that cannot
+     * be pushed.
      */
+    qboAccountHierarchy: NestedAccountHierarchyForReport[];
     qboClassHierarchy: NestedClassHierarchyForReport[];
-    qboIncomeAccountHierarchy: NestedAccountHierarchyForReport[];
     tierTypeValues: readonly string[];
     trialEndActionOptions: InvoicingNamedOption[];
     trialUnitOptions: InvoicingNamedOption[];

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

@@ -1,11 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = void 0;
+exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogItemOptions = exports.getSavedInvoicingCatalogItemKind = exports.getSavedInvoicingCatalogItemId = exports.getEditInvoicingCatalogItemDetailViewState = exports.getInvoicingCatalogItemDetailEditLocalData = exports.initialCatalogDetailEditValues = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 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,
@@ -55,17 +92,15 @@ const getInvoicingCatalogItemFormView = (state, id) => {
     const applicableItemOptions = id != null
         ? allApplicableItemOptions.filter((option) => option.id !== id)
         : allApplicableItemOptions;
-    const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
+    const qboView = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state)
+        ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state)
+        : undefined;
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'catalog'),
         isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
-        qboClassHierarchy: isQboConnected
-            ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state).nestedClassHierarchy
-            : [],
-        qboIncomeAccountHierarchy: isQboConnected
-            ? (0, invoicingQboViewSelector_1.invoicingAccountHierarchyForTypes)(state, invoicingQboViewSelector_1.INVOICING_INCOME_ACCOUNT_TYPES)
-            : [],
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
+        qboClassHierarchy: qboView?.nestedClassHierarchy ?? [],
         applicabilityValues: invoicingCatalogItemFormConfig_1.INVOICING_CATALOG_APPLICABILITY_VALUES,
         applicableItemOptions,
         localData,

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

@@ -55,7 +55,31 @@ 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

@@ -5,5 +5,5 @@ 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>;
+export declare const createInvoicingCatalogSubFamilyEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const archiveInvoicingCatalogSubFamilyEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -5,6 +5,8 @@ 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),
@@ -13,8 +15,12 @@ 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 { data, parentItemId } = action.payload;
+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)

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

@@ -3,6 +3,7 @@ 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");
@@ -10,25 +11,33 @@ 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 { id } = action.payload;
-    // Draft-based create/edit form vs. detail-page inline edit (raw data).
+    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)) {
-        data = action.payload.data;
+        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$.value.editInvoicingCatalogItemDetailViewState;
+        const viewState = state.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        const state = state$.value;
-        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, {
-            accountByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, qboId),
-            classByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboClassByQboId)(state, qboId),
-        });
+        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, accountingLookup);
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null
@@ -91,7 +100,7 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 return resultActions;
             };
             const productUpdates = editInvoicingCatalogItemDetailViewReducer_1.saveInvoicingCatalogItem.match(action)
-                ? (action.payload.productUpdates ?? [])
+                ? (editProductUpdates ?? [])
                 : [];
             if (productUpdates.length === 0) {
                 return completeSave([]);

package/lib/view/invoicing/invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewSelector.d.ts

@@ -3,6 +3,7 @@ import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndRep
 import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingCatalogProductLifecycleAction, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import { RootState } from '../../../rootStateTypes';
+import type { CatalogDetailEditValues } from '../editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewState';
 import { InvoicingCatalogItemKind } from './invoicingCatalogItemDetailViewState';
 /**
  * Read-only view for the catalog item (plan or product) detail page. One screen
@@ -20,6 +21,11 @@ export interface InvoicingCatalogItemDetailView extends SelectorView {
     catalogItemLifecycleActionOptions: InvoicingCatalogLifecycleActionOption<InvoicingCatalogItemLifecycleAction>[];
     catalogProductLifecycleActionOptions: InvoicingCatalogLifecycleActionOption<InvoicingCatalogProductLifecycleAction>[];
     configFetchState: FetchState;
+    /**
+     * The inline editor's form data, seeded from the loaded record and updated on
+     * every change, so the page renders from CES rather than from its own reset.
+     */
+    editLocalData: CatalogDetailEditValues;
     /**
      * 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.

package/lib/view/invoicing/invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewSelector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCatalogItemDetail = void 0;
 const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
+const editInvoicingCatalogItemDetailViewSelector_1 = require("../editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector");
 const getInvoicingCatalogItemDetail = (state, _kind, id) => {
     const { error, fetchState } = state.invoicingCatalogItemDetailViewState;
     const { billingPeriodUnitOptions, catalogItemLifecycleActionOptions, catalogItemTypeOptions, catalogProductLifecycleActionOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, fetchState: configFetchState, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
@@ -13,6 +14,7 @@ const getInvoicingCatalogItemDetail = (state, _kind, id) => {
         catalogTierTypeOptionsByPricingModel,
         configFetchState,
         periodUnitOptions: billingPeriodUnitOptions,
+        editLocalData: (0, editInvoicingCatalogItemDetailViewSelector_1.getInvoicingCatalogItemDetailEditLocalData)(state, id),
         plan: (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id),
         trialEndActionOptions: catalogTrialEndActionOptions,
         trialUnitOptions: catalogTrialUnitOptions,

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic.js

@@ -21,7 +21,6 @@ const fetchInvoicingAccountingPickersEpic = (actions$, state$) => actions$.pipe(
         accountList.fetchState !== 'In-Progress') {
         // Same arguments the vendor and categorization screens pass, so this
         // shares their cached list rather than replacing it with a narrower one.
-        // Invoicing narrows to income accounts when it builds its options.
         actions.push((0, accountListReducer_1.fetchAccountList)(invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY, true));
     }
     const classList = state.classListState;