@zeniai/client-epic-state 5.2.12 → 5.2.13-betaAK0

package/lib/view/expenseAutomationView/payload/reconciliationPayload.js

@@ -271,7 +271,7 @@ function transformConfirmStatementMappingConflictToState(response) {
 }
 function transformUpdateStatementInfoPayloadToState(payload) {
     if (isUpdateStatementInfoCombinedResponsePayload(payload) === true) {
-        const statementUploads = payload.statement_uploads.map(transformStatementUploadPayloadToState);
+        const statementUploads = payload.statement_uploads.map((item) => transformStatementUploadPayloadToState(item.statement_upload));
         const anchorUpload = statementUploads.find((upload) => upload.statementMeta.isCombinedStatementAnchor === true) ?? statementUploads[0];
         return {
             statementUpload: anchorUpload,

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -469,6 +469,7 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 accountRecon.confirmStatementMappingConflict = null;
                 if (accountRecon.localData != null) {
                     accountRecon.localData.statementUpdateLocalDataByUploadId = undefined;
+                    accountRecon.localData.combinedStatementAccountMappings = undefined;
                 }
                 if (statementAccountScope != null) {
                     accountRecon.localData = {
@@ -547,6 +548,7 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 accountRecon.confirmStatementMappingConflict = null;
                 if (accountRecon.localData != null) {
                     accountRecon.localData.statementUpdateLocalDataByUploadId = undefined;
+                    accountRecon.localData.combinedStatementAccountMappings = undefined;
                     accountRecon.localData.statementAccountScope = undefined;
                 }
             }
@@ -777,6 +779,9 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 };
                 accountRecon.confirmStatementMappingConflict = null;
                 accountRecon.confirmedCombinedStatementUploads = statementUploads;
+                if (accountRecon.localData != null) {
+                    accountRecon.localData.combinedStatementAccountMappings = undefined;
+                }
                 const combinedStatementDetails = accountRecon.parsedStatementData?.statementUpload
                     .combinedStatementDetails;
                 if (combinedStatementDetails != null) {

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.d.ts

@@ -5,6 +5,8 @@ import { RootState } from '../../../rootStateTypes';
 import { AccountReconciliationByAccount, ExpenseAutomationReconciliationViewSelector } from '../selectorTypes/reconciliationViewSelectorTypes';
 export declare const getExpenseAutomationReconciliationView: (state: RootState) => ExpenseAutomationReconciliationViewSelector;
 export declare const getReparseStatementStatusByAccountId: (state: RootState, accountId: ID) => import("../../../commonStateTypes/common").FetchStateAndError;
-export declare function getLedgerAccountsForCombinedStatementMapping(accountReconciliationsByAccountID: Record<ID, AccountReconciliationByAccount>): AccountBase[];
+export declare function getLedgerAccountsForCombinedStatementMapping(accountReconciliationsByAccountID: Record<ID, AccountReconciliationByAccount>, selectedAccountId: ID): AccountBase[];
 export declare function getUnavailableLedgerAccountIds(accountReconciliationsByAccountID: Record<ID, AccountReconciliationByAccount>): ID[];
+/** Selectable accounts that already have a statement — mapping will override that work. */
+export declare function getLedgerAccountIdsWithStatementOverrideWarning(accountReconciliationsByAccountID: Record<ID, AccountReconciliationByAccount>, selectedAccountId?: ID): ID[];
 export declare const isAccountReconReport: (reportId: ReportIDPlusForecastID) => boolean;

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAccountReconReport = exports.getReparseStatementStatusByAccountId = exports.getExpenseAutomationReconciliationView = void 0;
 exports.getLedgerAccountsForCombinedStatementMapping = getLedgerAccountsForCombinedStatementMapping;
 exports.getUnavailableLedgerAccountIds = getUnavailableLedgerAccountIds;
+exports.getLedgerAccountIdsWithStatementOverrideWarning = getLedgerAccountIdsWithStatementOverrideWarning;
 const toolkit_1 = require("@reduxjs/toolkit");
 const big_js_1 = __importDefault(require("big.js"));
 const keys_1 = __importDefault(require("lodash/keys"));
@@ -484,8 +485,18 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
 const getReparseStatementStatusByAccountId = (state, accountId) => (0, exports.getExpenseAutomationReconciliationView)(state)
     .accountReconciliationsByAccountID[accountId]?.reparseStatementStatus;
 exports.getReparseStatementStatusByAccountId = getReparseStatementStatusByAccountId;
-function getLedgerAccountsForCombinedStatementMapping(accountReconciliationsByAccountID) {
-    return Object.values(accountReconciliationsByAccountID).map((accountReconciliation) => accountReconciliation.accountReconEntity.account);
+function getLedgerAccountsForCombinedStatementMapping(accountReconciliationsByAccountID, selectedAccountId) {
+    const selectedAccountType = accountReconciliationsByAccountID[selectedAccountId]?.accountReconEntity
+        .account.accountType;
+    const shouldFilterByPaymentAccountType = selectedAccountType === 'bank' || selectedAccountType === 'credit_card';
+    return Object.values(accountReconciliationsByAccountID)
+        .map((accountReconciliation) => accountReconciliation.accountReconEntity.account)
+        .filter((account) => {
+        if (shouldFilterByPaymentAccountType !== true) {
+            return true;
+        }
+        return account.accountType === selectedAccountType;
+    });
 }
 const UNAVAILABLE_LEDGER_ACCOUNT_RECON_STATUSES = new Set(['in_progress', 'reconciled', 'reconciled_on_qbo']);
 function getUnavailableLedgerAccountIds(accountReconciliationsByAccountID) {
@@ -497,6 +508,27 @@ function getUnavailableLedgerAccountIds(accountReconciliationsByAccountID) {
     })
         .map((accountReconciliation) => accountReconciliation.accountReconEntity.account.accountId);
 }
+/** Selectable accounts that already have a statement — mapping will override that work. */
+function getLedgerAccountIdsWithStatementOverrideWarning(accountReconciliationsByAccountID, selectedAccountId) {
+    return Object.values(accountReconciliationsByAccountID)
+        .filter((accountReconciliation) => {
+        const entity = accountReconciliation.accountReconEntity;
+        const accountId = entity.account.accountId;
+        if (selectedAccountId != null && accountId === selectedAccountId) {
+            return false;
+        }
+        const hasUploadedStatement = entity.statementStatus?.code === 'uploaded' ||
+            entity.statementMetaData?.file != null ||
+            accountReconciliation.statementParseInProgress === true;
+        if (hasUploadedStatement !== true) {
+            return false;
+        }
+        const statusCode = entity.reconciliationStatus?.code;
+        return (statusCode == null ||
+            UNAVAILABLE_LEDGER_ACCOUNT_RECON_STATUSES.has(statusCode) !== true);
+    })
+        .map((accountReconciliation) => accountReconciliation.accountReconEntity.account.accountId);
+}
 const isAccountReconReport = (reportId) => {
     return reportId.endsWith('reconciliation');
 };

package/lib/view/expenseAutomationView/types/reconciliationViewState.d.ts

@@ -358,8 +358,14 @@ export declare const toStatementAccountScope: (v: string) => "single_account" |
 export type StatementAccountScope = ReturnType<typeof toStatementAccountScope>;
 export declare const toStatementAccountScopeStrict: (v: string | null | undefined) => StatementAccountScope | undefined;
 export declare const STATEMENT_ACCOUNT_SCOPES: readonly StatementAccountScope[];
+export interface CombinedStatementAccountMappingDraft {
+    accountId: ID;
+    ledgerIdentifier: string;
+}
 export interface AccountReconciliationLocalData {
     accountSource?: ReconciliationAccountSourceType;
+    /** Draft ledger mappings saved when continuing combined mapping in background. */
+    combinedStatementAccountMappings?: CombinedStatementAccountMappingDraft[];
     statementAccountScope?: StatementAccountScope;
     /** Confirm & Save drafts keyed by statementUploadId (single and combined). */
     statementUpdateLocalDataByUploadId?: Record<string, StatementUpdateLocalData>;

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

@@ -1,6 +1,7 @@
 import { Amount } from '../../../commonStateTypes/amount';
 import type { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
 import type { InvoicingProduct } from '../../../entity/invoicing/product/productState';
+import { type InvoicingCatalogAccountingLookup } from './editInvoicingCatalogItemDetailViewPayload';
 import type { InvoicingCatalogItemFormSubFamily, InvoicingCatalogItemFormTier } from './editInvoicingCatalogItemDetailViewState';
 export type CatalogDetailSubFamilyEditValues = InvoicingCatalogItemFormSubFamily;
 export interface CatalogDetailEditValues {
@@ -30,18 +31,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 +59,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,7 +1,8 @@
 import { ID } from '../../../commonStateTypes/common';
+import type { InvoicingProduct } from '../../../entity/invoicing/product/productState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { InvoicingCatalogItemKind } from '../invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewState';
-import type { CatalogDetailProductUpdate } from './catalogDetailEditPayload';
+import type { CatalogDetailEditValues, CreateSubFamilyFormValues } from './catalogDetailEditPayload';
 import { EditInvoicingCatalogItemDetailViewState, InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 /** Push the full form draft into CES (edit tree when `id` is present). */
 export interface UpdateInvoicingCatalogItemFormDraftPayload {
@@ -18,14 +19,28 @@ export interface SubmitInvoicingCatalogItemFormPayload {
  * `submitInvoicingCatalogItemForm` instead.
  */
 export interface SaveInvoicingCatalogItemPayload {
-    data: Record<string, unknown>;
+    /**
+     * The detail page's edit form values. The epic builds the parent body and the
+     * per-price-point updates from them, so it can resolve a picked account or
+     * class to the record the request carries — a page cannot.
+     */
+    editValues: CatalogDetailEditValues;
     kind: InvoicingCatalogItemKind;
     id?: ID;
-    productUpdates?: CatalogDetailProductUpdate[];
+    /** The catalog item's type, for the price-point bodies. */
+    itemType?: string;
+    /** The saved price points, so only changed fields are sent. */
+    originalSubFamilies?: readonly InvoicingProduct[];
 }
 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;

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

@@ -48,12 +48,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

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

@@ -10,25 +10,30 @@ 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 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 { editValues, itemType, originalSubFamilies } = action.payload;
+        const savePayload = (0, catalogDetailEditPayload_1.catalogDetailEditValuesToSavePayload)(editValues, accountingLookup, itemType, originalSubFamilies);
+        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 +96,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/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;

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
@@ -16,11 +16,6 @@ export declare const isInvoicingQboConnected: (state: RootState) => boolean;
 export declare const isInvoicingAccountingPickerDataLoading: (state: RootState) => boolean;
 /** The QBO connection fetch on its own, without building the bundled view. */
 export declare const getInvoicingQboConnectionFetchState: (state: RootState) => FetchStateAndError;
-/**
- * Account types that can back invoicing revenue. Named here so screens ask for
- * "income accounts" rather than repeating the accounting service's vocabulary.
- */
-export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
 /**
  * The account behind a picker value. The pickers submit the QuickBooks id, so
  * that is what callers hold; the payload builders need the whole entity to send
@@ -29,6 +24,17 @@ export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
 export declare const invoicingQboAccountByQboId: (state: RootState, qboId: string | undefined) => AccountBase | undefined;
 /** The class behind a picker value, for the same reason as the account above. */
 export declare const invoicingQboClassByQboId: (state: RootState, qboId: string | undefined) => ClassBase | undefined;
+/**
+ * The resolver every catalog and settings payload builder needs: a picked
+ * QuickBooks id turned back into the account or class record the request body
+ * carries. Memoized so callers get one stable object rather than a fresh pair of
+ * closures per store change, which in `mapStateToProps` would re-render on every
+ * unrelated action.
+ */
+export declare const getInvoicingCatalogAccountingLookup: (state: RootState) => {
+    accountByQboId: (qboId: string) => AccountBase | undefined;
+    classByQboId: (qboId: string) => ClassBase | undefined;
+};
 /** An account or class as the invoicing pickers render and submit it. */
 export interface InvoicingAccountingOption {
     id: string;
@@ -60,13 +66,6 @@ export interface InvoicingQboView {
  * required would post a mapping QuickBooks rejects.
  */
 export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
-/**
- * The account tree narrowed to the given account types. The tree itself carries
- * no account type, so the flat account list supplies that and the matching
- * `qboId`s are kept — which is why callers that only need "income accounts, as a
- * tree" do not have to hold a second flat list to filter with.
- */
-export declare const invoicingAccountHierarchyForTypes: (state: RootState, accountTypes: readonly AccountType[]) => NestedAccountHierarchyForReport[];
 /**
  * Single bundled view for the QBO integration settings screen — the
  * connection, the account and class options, sync health, and the fetch/action