@zeniai/client-epic-state 5.2.41-beta5MM → 5.2.41-beta7MM

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

@@ -7,34 +7,60 @@ const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoicingSubscriptionSelector_1 = require("../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
 const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSubscriptionDetailViewReducer");
-const editInvoicingSubscriptionDetailViewReducer_2 = require("./editInvoicingSubscriptionDetailViewReducer");
 const invoicingSubscriptionFormConfig_1 = require("./invoicingSubscriptionFormConfig");
 /**
- * Seed the shared Address screen with an existing subscription's saved shipping
- * address (looked up in the shared address store by `shippingAddressId`, same as
- * the customer billing-address flow).
- * Runs both when the subscription detail loads and on an explicit initialize
- * trigger. Skips when an in-progress draft already exists, so an address the
- * user just entered survives navigating between the form and the Address screen.
- * Mirrors `initializeInvoicingCustomerAddressEpic`.
+ * Seed the shared Address screen with the subscription's saved shipping address, and
+ * record that the slot is this subscription's. Runs when a detail request is issued
+ * (every path that loads a record issues one — the detail page when not cached,
+ * the create/edit form always), when the page opens, when the detail load
+ * lands, and on an explicit initialize trigger.
+ *
+ * The address store slot is keyed by address type alone, so it can still hold
+ * another subscription's draft. Only a draft this subscription owns is left alone —
+ * that is what lets an address the user just entered survive a trip to the
+ * Address screen. Anything else is replaced by this subscription's saved address,
+ * or cleared when it has none. Opening the page counts as a trigger because a
+ * record already loaded this session issues no detail request at all.
  */
-const initializeInvoicingSubscriptionAddressEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingSubscriptionDetailViewReducer_2.initializeInvoicingSubscriptionAddress.match(action) ||
-    editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action)), (0, operators_1.mergeMap)((action) => {
+const initializeInvoicingSubscriptionAddressEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingSubscriptionDetailViewReducer_1.initializeInvoicingSubscriptionAddress.match(action) ||
+    editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action) ||
+    editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionDetailPage.match(action) ||
+    editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionDetail.match(action)), (0, operators_1.mergeMap)((action) => {
     const { id } = action.payload;
+    if (id == null) {
+        return rxjs_1.EMPTY;
+    }
     const rootState = state$.value;
-    const existingDraft = rootState.addressViewState.newAddressState?.[invoicingSubscriptionFormConfig_1.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
-    if (existingDraft != null || id == null) {
+    const pending = rootState.addressViewState.newAddressState?.[invoicingSubscriptionFormConfig_1.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
+    const ownerId = rootState.editInvoicingSubscriptionDetailViewState
+        .shippingAddressOwnerId;
+    // A detail response speaks for the record it loaded, which may no longer
+    // be the one on screen: its request keeps running when the user moves on
+    // to a cached record, which issues no request of its own to cancel it.
+    // Only the page-open and explicit triggers define the current record.
+    if (editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action) &&
+        ownerId != null &&
+        ownerId !== id) {
+        return rxjs_1.EMPTY;
+    }
+    if (pending != null && ownerId === id) {
         return rxjs_1.EMPTY;
     }
     const subscription = (0, invoicingSubscriptionSelector_1.getInvoicingSubscriptionById)(rootState.invoicingSubscriptionState, id);
     const address = subscription?.shippingAddressId != null
         ? (0, addressSelector_1.getAddressByAddressId)(rootState.addressState, subscription.shippingAddressId)
         : undefined;
-    return address != null
-        ? (0, rxjs_1.of)((0, addressViewReducer_1.newAddressInLocalStore)({
+    const actions = [];
+    if (address != null) {
+        actions.push((0, addressViewReducer_1.newAddressInLocalStore)({
             addressType: invoicingSubscriptionFormConfig_1.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE,
             addressToCreate: address,
-        }))
-        : rxjs_1.EMPTY;
+        }));
+    }
+    else if (pending != null) {
+        actions.push((0, addressViewReducer_1.removeNewAddressDataInLocalStore)(invoicingSubscriptionFormConfig_1.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE));
+    }
+    actions.push((0, editInvoicingSubscriptionDetailViewReducer_1.claimInvoicingSubscriptionShippingAddress)({ id }));
+    return (0, rxjs_1.from)(actions);
 }));
 exports.initializeInvoicingSubscriptionAddressEpic = initializeInvoicingSubscriptionAddressEpic;

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

@@ -20,7 +20,7 @@ const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => actions$.pi
     const rootState = state$.value;
     const viewState = rootState.editInvoicingSubscriptionDetailViewState;
     const localData = (id != null
-        ? viewState.editDraftById[id]
+        ? viewState.editDraftById[id]?.localData
         : viewState.newSubscriptionDraft) ?? viewState.newSubscriptionDraft;
     // Shipping address captured via the shared Address screen is sent as an
     // object in the payload (same pattern as the customer save flow).

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

@@ -1,12 +1,16 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
-import { seedInvoicingSubscriptionFormDraft, updateInvoicingSubscriptionDetail } from './editInvoicingSubscriptionDetailViewReducer';
-export type ActionType = ReturnType<typeof updateInvoicingSubscriptionDetail> | ReturnType<typeof seedInvoicingSubscriptionFormDraft>;
+import { fetchInvoicingSubscriptionFormPage, seedInvoicingSubscriptionFormDraft, updateInvoicingSubscriptionDetail } from './editInvoicingSubscriptionDetailViewReducer';
+export type ActionType = ReturnType<typeof fetchInvoicingSubscriptionFormPage> | ReturnType<typeof updateInvoicingSubscriptionDetail> | ReturnType<typeof seedInvoicingSubscriptionFormDraft>;
 /**
- * Seeds the edit draft from the record the moment the detail fetch lands, so
- * the form has its values before it mounts. The reducer ignores the seed when a
- * draft already exists, which is what stops a background refetch from
- * overwriting edits in progress.
+ * Seeds the edit draft from the record, so the form has its values before it
+ * mounts. The reducer ignores a seed once the draft holds the record, which is
+ * what stops a background refetch from overwriting edits in progress.
+ *
+ * Opening the page counts as a trigger, not just the detail response: the page
+ * fetch is cache-guarded, so re-opening a form for a record already loaded this
+ * session issues no request at all — and a draft cleared in between (by a save
+ * or a cancel) would have nothing left to seed it.
  */
 export declare const seedInvoicingSubscriptionFormDraftEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -7,14 +7,35 @@ const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSub
 const invoicingSubscriptionDetailHelper_1 = require("./invoicingSubscriptionDetailHelper");
 const invoicingSubscriptionFormConfig_1 = require("./invoicingSubscriptionFormConfig");
 /**
- * Seeds the edit draft from the record the moment the detail fetch lands, so
- * the form has its values before it mounts. The reducer ignores the seed when a
- * draft already exists, which is what stops a background refetch from
- * overwriting edits in progress.
+ * Seeds the edit draft from the record, so the form has its values before it
+ * mounts. The reducer ignores a seed once the draft holds the record, which is
+ * what stops a background refetch from overwriting edits in progress.
+ *
+ * Opening the page counts as a trigger, not just the detail response: the page
+ * fetch is cache-guarded, so re-opening a form for a record already loaded this
+ * session issues no request at all — and a draft cleared in between (by a save
+ * or a cancel) would have nothing left to seed it.
  */
-const seedInvoicingSubscriptionFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
-    const { id } = action.payload;
-    const subscription = (0, invoicingSubscriptionDetailHelper_1.getInvoicingSubscriptionById)(state, id);
+const seedInvoicingSubscriptionFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action) ||
+    editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionFormPage.match(action)), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
+    const id = editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action)
+        ? action.payload.id
+        : action.payload.subscriptionId;
+    if (id == null) {
+        return rxjs_1.EMPTY;
+    }
+    // The entity alone does not say the whole record is loaded — the list
+    // endpoints merge their own list-shaped rows into the same store. Only a
+    // completed detail load does, which is also exactly when the page's
+    // cache-guarded fetch issues no request and this is the sole seed.
+    if (editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionFormPage.match(action) &&
+        state.editInvoicingSubscriptionDetailViewState.recordStateById[id]
+            ?.fetchState !== 'Completed') {
+        return rxjs_1.EMPTY;
+    }
+    // Nothing to seed from on a cold open; the detail response triggers this
+    // again once it lands.
+    const subscription = id != null ? (0, invoicingSubscriptionDetailHelper_1.getInvoicingSubscriptionById)(state, id) : undefined;
     if (subscription == null) {
         return rxjs_1.EMPTY;
     }

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

@@ -27,6 +27,16 @@ export interface InvoicingCatalogListView extends SelectorView {
      */
     runningActionId?: ID;
 }
+/**
+ * Flatten catalog items into the price rows the pickers render.
+ *
+ * The parent item's `applicableItems` / `itemApplicability` are carried onto
+ * every row it produces: applicability is a property of the catalog item, not
+ * of its price points, and a row that has lost it cannot be matched against the
+ * selected plan's allow-list (see `getInvoicingItemsAllowedForPlan`). Both are
+ * written after the spread so the item's own rule wins over any stale copy a
+ * price point payload may carry.
+ */
 export declare const getInvoicingCatalogPrices: (items: InvoicingPlan[]) => InvoicingProduct[];
 /**
  * Bundled read view for the single catalog page (plans + products tabs).

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

@@ -5,8 +5,20 @@ const toolkit_1 = require("@reduxjs/toolkit");
 const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const runningInvoicingActionId_1 = require("../runningInvoicingActionId");
 const invoicingCatalogListViewState_1 = require("./invoicingCatalogListViewState");
+/**
+ * Flatten catalog items into the price rows the pickers render.
+ *
+ * The parent item's `applicableItems` / `itemApplicability` are carried onto
+ * every row it produces: applicability is a property of the catalog item, not
+ * of its price points, and a row that has lost it cannot be matched against the
+ * selected plan's allow-list (see `getInvoicingItemsAllowedForPlan`). Both are
+ * written after the spread so the item's own rule wins over any stale copy a
+ * price point payload may carry.
+ */
 const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (item.subFamilies ?? []).map((subFamily) => ({
     ...subFamily,
+    applicableItems: item.applicableItems,
+    itemApplicability: item.itemApplicability,
     itemID: item.id,
     itemType: item.type ?? item.itemType,
     name: subFamily.name,

package/lib/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer.d.ts

@@ -26,6 +26,6 @@ export declare const fetchInvoicingDunningCaseList: import("@reduxjs/toolkit").A
     ids: ID[];
     keepExistingListItems: boolean;
     nextCursor: string | null;
-}, "invoicingDunningCaseListView/updateInvoicingDunningCaseList">, updateInvoicingDunningCaseListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingDunningCaseListView/updateInvoicingDunningCaseListFailure">, fetchInvoicingDunningCaseCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingDunningCaseListView/fetchInvoicingDunningCaseCounts">, updateInvoicingDunningCaseCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingDunningCaseListView/updateInvoicingDunningCaseCounts">, updateInvoicingDunningCaseCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingDunningCaseListView/updateInvoicingDunningCaseCountsFailure">, updateInvoicingDunningCaseFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingDunningCaseFilters, "invoicingDunningCaseListView/updateInvoicingDunningCaseFilters">, setInvoicingDunningCaseActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"Retrying" | "Scheduled" | "Manual Review" | "Resolved" | "Cancelled" | "Paused" | "all", "invoicingDunningCaseListView/setInvoicingDunningCaseActiveTab">;
+}, "invoicingDunningCaseListView/updateInvoicingDunningCaseList">, updateInvoicingDunningCaseListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingDunningCaseListView/updateInvoicingDunningCaseListFailure">, fetchInvoicingDunningCaseCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingDunningCaseListView/fetchInvoicingDunningCaseCounts">, updateInvoicingDunningCaseCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingDunningCaseListView/updateInvoicingDunningCaseCounts">, updateInvoicingDunningCaseCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingDunningCaseListView/updateInvoicingDunningCaseCountsFailure">, updateInvoicingDunningCaseFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingDunningCaseFilters, "invoicingDunningCaseListView/updateInvoicingDunningCaseFilters">, setInvoicingDunningCaseActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"cancelled" | "scheduled" | "retrying" | "manual_review" | "resolved" | "paused" | "all", "invoicingDunningCaseListView/setInvoicingDunningCaseActiveTab">;
 declare const _default: import("redux").Reducer<InvoicingDunningCaseListViewState>;
 export default _default;

package/lib/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewState.d.ts

@@ -19,8 +19,8 @@ export interface InvoicingDunningCaseColumnConfig {
     sortable: boolean;
 }
 export declare const INVOICING_DUNNING_CASE_COLUMNS: InvoicingDunningCaseColumnConfig[];
-export declare const ALL_INVOICING_DUNNING_CASE_TAB_IDS: readonly ["all", "Retrying", "Scheduled", "Manual Review", "Paused", "Resolved", "Cancelled"];
-export declare const toInvoicingDunningCaseTabId: (v: string) => "Retrying" | "Scheduled" | "Manual Review" | "Resolved" | "Cancelled" | "Paused" | "all";
+export declare const ALL_INVOICING_DUNNING_CASE_TAB_IDS: readonly ["all", "retrying", "scheduled", "manual_review", "paused", "resolved", "cancelled"];
+export declare const toInvoicingDunningCaseTabId: (v: string) => "cancelled" | "scheduled" | "retrying" | "manual_review" | "resolved" | "paused" | "all";
 export type InvoicingDunningCaseTabId = ReturnType<typeof toInvoicingDunningCaseTabId>;
 export interface InvoicingDunningCaseListViewState extends FetchedState {
     /** Selected status tab (CES-owned so it persists across page revisits). */

package/lib/view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewState.js

@@ -26,12 +26,12 @@ exports.INVOICING_DUNNING_CASE_COLUMNS = [
 ];
 exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS = [
     'all',
-    'Retrying',
-    'Scheduled',
-    'Manual Review',
-    'Paused',
-    'Resolved',
-    'Cancelled',
+    'retrying',
+    'scheduled',
+    'manual_review',
+    'paused',
+    'resolved',
+    'cancelled',
 ];
 const toInvoicingDunningCaseTabId = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS);
 exports.toInvoicingDunningCaseTabId = toInvoicingDunningCaseTabId;

package/lib/view/invoicing/invoicingFormDraft.d.ts

@@ -0,0 +1,63 @@
+import { FetchState, ID } from '../../commonStateTypes/common';
+/**
+ * A create/edit form's draft, plus where its values came from.
+ *
+ * The status is what lets an edit form tell "these are the record's values"
+ * from "these are whatever the form had at first render". It cannot be read off
+ * the presence of a draft, because the form writes drafts too: it pushes its
+ * whole state back on every change, so a change made before the record landed
+ * leaves a draft that looks seeded but holds nothing.
+ *
+ * `Not-Started` — not (or no longer) the loaded record's values: written by the
+ *                 form before the record landed, or just saved and awaiting the
+ *                 refetch that follows. A successful load replaces it.
+ * `Completed`   — filled from the loaded record; the form may have edited it since.
+ * `Error`       — the record's fetch failed, so the form starts blank and a
+ *                 later successful fetch is still allowed to seed it.
+ */
+export interface InvoicingFormDraft<TLocalData> {
+    fetchState: FetchState;
+    localData: TLocalData;
+}
+export type InvoicingFormDraftById<TLocalData> = Record<ID, InvoicingFormDraft<TLocalData>>;
+/**
+ * The form's own write. Keeps the status: an edit on top of a seeded draft is
+ * still the record's draft, and an edit made before the record arrived must not
+ * pass for one.
+ */
+export declare function applyInvoicingFormDraftEdit<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, localData: TLocalData): void;
+/**
+ * Fill the draft from the loaded record, once. A second seed is ignored so a
+ * late refetch cannot overwrite edits in progress — but a draft the form wrote
+ * before the record landed is replaced, since it was never the record's.
+ */
+export declare function applyInvoicingFormDraftSeed<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, localData: TLocalData): void;
+/**
+ * Record that the fetch failed, so the form renders instead of waiting behind a
+ * skeleton that will never resolve.
+ *
+ * Mirrors the seed: a draft holding the record is left alone, since a
+ * background refetch failing is no reason to discard it, and anything else is
+ * marked failed. A draft the form wrote before the record landed keeps its
+ * values — there is no reason to throw away what the user typed — but stops
+ * counting as still loading, and a later successful fetch can still seed it.
+ */
+export declare function applyInvoicingFormDraftFailure<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, blankLocalData: TLocalData): void;
+/**
+ * The record behind this draft was just saved and is about to be refetched.
+ * Keep the values on screen — dropping them would blank the form for the round
+ * trip, and the form remounts on the response anyway — but stop counting them
+ * as the loaded record's, so that response is allowed to replace them.
+ */
+export declare function applyInvoicingFormDraftSaved<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID): void;
+/** The draft's values, or the blank form when nothing is drafted yet. */
+export declare function getInvoicingFormDraftLocalData<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID | undefined, blankLocalData: TLocalData): TLocalData;
+/**
+ * Whether the form should still be showing its skeleton — the record has
+ * neither reached the draft nor failed trying.
+ *
+ * Settles once and stays settled, which is what keeps a later refetch from
+ * swapping a form the user is typing into back for a skeleton. Create mode
+ * (no id) has no record to wait for.
+ */
+export declare function isInvoicingFormDraftPending<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID | undefined): boolean;

package/lib/view/invoicing/invoicingFormDraft.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyInvoicingFormDraftEdit = applyInvoicingFormDraftEdit;
+exports.applyInvoicingFormDraftSeed = applyInvoicingFormDraftSeed;
+exports.applyInvoicingFormDraftFailure = applyInvoicingFormDraftFailure;
+exports.applyInvoicingFormDraftSaved = applyInvoicingFormDraftSaved;
+exports.getInvoicingFormDraftLocalData = getInvoicingFormDraftLocalData;
+exports.isInvoicingFormDraftPending = isInvoicingFormDraftPending;
+/**
+ * The form's own write. Keeps the status: an edit on top of a seeded draft is
+ * still the record's draft, and an edit made before the record arrived must not
+ * pass for one.
+ */
+function applyInvoicingFormDraftEdit(draftById, id, localData) {
+    draftById[id] = {
+        fetchState: draftById[id]?.fetchState ?? 'Not-Started',
+        localData,
+    };
+}
+/**
+ * Fill the draft from the loaded record, once. A second seed is ignored so a
+ * late refetch cannot overwrite edits in progress — but a draft the form wrote
+ * before the record landed is replaced, since it was never the record's.
+ */
+function applyInvoicingFormDraftSeed(draftById, id, localData) {
+    if (draftById[id]?.fetchState === 'Completed') {
+        return;
+    }
+    draftById[id] = { fetchState: 'Completed', localData };
+}
+/**
+ * Record that the fetch failed, so the form renders instead of waiting behind a
+ * skeleton that will never resolve.
+ *
+ * Mirrors the seed: a draft holding the record is left alone, since a
+ * background refetch failing is no reason to discard it, and anything else is
+ * marked failed. A draft the form wrote before the record landed keeps its
+ * values — there is no reason to throw away what the user typed — but stops
+ * counting as still loading, and a later successful fetch can still seed it.
+ */
+function applyInvoicingFormDraftFailure(draftById, id, blankLocalData) {
+    const existing = draftById[id];
+    if (existing == null) {
+        draftById[id] = { fetchState: 'Error', localData: blankLocalData };
+        return;
+    }
+    if (existing.fetchState === 'Completed') {
+        return;
+    }
+    existing.fetchState = 'Error';
+}
+/**
+ * The record behind this draft was just saved and is about to be refetched.
+ * Keep the values on screen — dropping them would blank the form for the round
+ * trip, and the form remounts on the response anyway — but stop counting them
+ * as the loaded record's, so that response is allowed to replace them.
+ */
+function applyInvoicingFormDraftSaved(draftById, id) {
+    const existing = draftById[id];
+    if (existing == null) {
+        return;
+    }
+    existing.fetchState = 'Not-Started';
+}
+/** The draft's values, or the blank form when nothing is drafted yet. */
+function getInvoicingFormDraftLocalData(draftById, id, blankLocalData) {
+    if (id == null) {
+        return blankLocalData;
+    }
+    return draftById[id]?.localData ?? blankLocalData;
+}
+/**
+ * Whether the form should still be showing its skeleton — the record has
+ * neither reached the draft nor failed trying.
+ *
+ * Settles once and stays settled, which is what keeps a later refetch from
+ * swapping a form the user is typing into back for a skeleton. Create mode
+ * (no id) has no record to wait for.
+ */
+function isInvoicingFormDraftPending(draftById, id) {
+    if (id == null) {
+        return false;
+    }
+    const fetchState = draftById[id]?.fetchState;
+    return fetchState !== 'Completed' && fetchState !== 'Error';
+}

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

@@ -3,6 +3,7 @@ import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classes
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
+import { InvoicingQboAccountMappingKindOption } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 export declare const INVOICING_ACCOUNT_LIST_KEY: "accountList";
@@ -60,6 +61,17 @@ export interface InvoicingQboView {
     connection?: InvoicingQboConnection;
     syncHealth?: InvoicingQboSyncHealth;
 }
+/**
+ * Accounts as the invoicing pickers need them, from the shared
+ * accounting-service list, so whatever another screen already loaded is reused.
+ * `qboId` is the submitted value because that is what the invoicing API stores;
+ * an account without one cannot be posted, so it is dropped rather than offered.
+ *
+ * Memoized on the two slices it reads: the pickers and the lists derived from
+ * them are handed straight to forms, and a fresh array on every store change
+ * re-seeds a form the user is editing.
+ */
+export declare const getInvoicingQboAccountOptions: (state: RootState) => InvoicingAccountingOption[];
 /**
  * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
  * comma-separated list of QuickBooks type names. An unrecognised list yields no
@@ -67,6 +79,43 @@ export interface InvoicingQboView {
  * required would post a mapping QuickBooks rejects.
  */
 export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
+/**
+ * The account-mapping slot a catalog price point's income account shares with
+ * the settings page, and the one a discount's account shares with it.
+ */
+export declare const INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = "default_income_account";
+export declare const INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = "discounts_account";
+/**
+ * The account types a slot falls back to when the config carries no kind for
+ * it. QuickBooks posts a product, a price and a discount line to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+export declare const INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = "Income";
+/**
+ * The QuickBooks ids a mapping slot's picker may offer, from the account types
+ * the config gives that slot — so every picker filling the same slot offers the
+ * same accounts, and widening one stays a config change.
+ *
+ * Ids rather than a filtered tree: the pickers flatten the tree into options by
+ * walking each node's children, so dropping a parent that is not itself of the
+ * wanted type would drop its matching descendants with it.
+ *
+ * Matched on the slot rather than the code as written, since a config naming
+ * the kind `discounts_account_id` means the same slot. A slot the config does
+ * not carry falls back to `defaultAccountTypes` rather than to every account.
+ */
+export declare const invoicingQboAccountIdsForMappingSlot: (accounts: InvoicingAccountingOption[], accountMappingKindOptions: InvoicingQboAccountMappingKindOption[], mappingSlot: string, defaultAccountTypes: string) => string[];
+/**
+ * Stable empties for a tenant with no QBO connection.
+ *
+ * `?? []` builds a fresh array per call, and the invoicing forms re-seed their
+ * fields whenever their option lists change identity — so a form open against a
+ * disconnected tenant would reset itself on every unrelated store change, until
+ * the first edit disarms the re-seed.
+ */
+export declare const NO_INVOICING_ACCOUNT_HIERARCHY: NestedAccountHierarchyForReport[];
+export declare const NO_INVOICING_CLASS_HIERARCHY: NestedClassHierarchyForReport[];
+export declare const NO_INVOICING_ACCOUNT_IDS: string[];
 /**
  * Single bundled view for the QBO integration settings screen — the
  * connection, the account and class options, sync health, and the fetch/action

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.getInvoicingCatalogAccountingLookup = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.NO_INVOICING_ACCOUNT_IDS = exports.NO_INVOICING_CLASS_HIERARCHY = exports.NO_INVOICING_ACCOUNT_HIERARCHY = exports.invoicingQboAccountIdsForMappingSlot = exports.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = exports.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = exports.INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = exports.invoicingAccountsForQboAccountTypes = exports.getInvoicingQboAccountOptions = exports.getInvoicingCatalogAccountingLookup = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 // The shared bucket, fetched with the same arguments as the other consumers so
@@ -91,14 +93,20 @@ const getInvoicingCatalogAccountingLookup = (state) => ({
 });
 exports.getInvoicingCatalogAccountingLookup = getInvoicingCatalogAccountingLookup;
 /**
- * Accounts and classes as the invoicing pickers need them. Both come from the
- * shared accounting-service lists, so whatever another screen already loaded
- * is reused. `qboId` is the submitted value because that is what the invoicing
- * API stores; an account without one cannot be posted, so it is dropped rather
- * than offered.
+ * Accounts as the invoicing pickers need them, from the shared
+ * accounting-service list, so whatever another screen already loaded is reused.
+ * `qboId` is the submitted value because that is what the invoicing API stores;
+ * an account without one cannot be posted, so it is dropped rather than offered.
+ *
+ * Memoized on the two slices it reads: the pickers and the lists derived from
+ * them are handed straight to forms, and a fresh array on every store change
+ * re-seeds a form the user is editing.
  */
-const invoicingAccountingOptions = (state) => {
-    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+exports.getInvoicingQboAccountOptions = (0, toolkit_1.createSelector)([
+    (state) => state.accountState,
+    (state) => state.accountListState,
+], (accountState, accountListState) => {
+    const { accounts } = (0, accountListSelector_1.getAccountList)(accountState, accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
     return accounts.flatMap((account) => {
         if (account.qboId == null || account.isDeleted === true) {
             return [];
@@ -111,7 +119,7 @@ const invoicingAccountingOptions = (state) => {
             },
         ];
     });
-};
+});
 /**
  * Normalises an account-type name for comparison. The config's mapping kinds
  * name QuickBooks types the way QuickBooks displays them ("Other Current
@@ -148,6 +156,47 @@ const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
         wanted.has(normalizeAccountTypeName(account.accountType)));
 };
 exports.invoicingAccountsForQboAccountTypes = invoicingAccountsForQboAccountTypes;
+/**
+ * The account-mapping slot a catalog price point's income account shares with
+ * the settings page, and the one a discount's account shares with it.
+ */
+exports.INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = 'default_income_account';
+exports.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
+/**
+ * The account types a slot falls back to when the config carries no kind for
+ * it. QuickBooks posts a product, a price and a discount line to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+exports.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = 'Income';
+/**
+ * The QuickBooks ids a mapping slot's picker may offer, from the account types
+ * the config gives that slot — so every picker filling the same slot offers the
+ * same accounts, and widening one stays a config change.
+ *
+ * Ids rather than a filtered tree: the pickers flatten the tree into options by
+ * walking each node's children, so dropping a parent that is not itself of the
+ * wanted type would drop its matching descendants with it.
+ *
+ * Matched on the slot rather than the code as written, since a config naming
+ * the kind `discounts_account_id` means the same slot. A slot the config does
+ * not carry falls back to `defaultAccountTypes` rather than to every account.
+ */
+const invoicingQboAccountIdsForMappingSlot = (accounts, accountMappingKindOptions, mappingSlot, defaultAccountTypes) => {
+    const accountTypes = accountMappingKindOptions.find((kindOption) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(kindOption.code) === mappingSlot)?.accountTypes ?? defaultAccountTypes;
+    return (0, exports.invoicingAccountsForQboAccountTypes)(accounts, accountTypes).map((account) => account.id);
+};
+exports.invoicingQboAccountIdsForMappingSlot = invoicingQboAccountIdsForMappingSlot;
+/**
+ * Stable empties for a tenant with no QBO connection.
+ *
+ * `?? []` builds a fresh array per call, and the invoicing forms re-seed their
+ * fields whenever their option lists change identity — so a form open against a
+ * disconnected tenant would reset itself on every unrelated store change, until
+ * the first edit disarms the re-seed.
+ */
+exports.NO_INVOICING_ACCOUNT_HIERARCHY = [];
+exports.NO_INVOICING_CLASS_HIERARCHY = [];
+exports.NO_INVOICING_ACCOUNT_IDS = [];
 /** Classes as the invoicing pickers need them, from the shared class list. */
 const invoicingAccountingClassOptions = (state) => {
     const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
@@ -169,7 +218,7 @@ const getInvoicingQboView = (state) => {
     const qboState = state.invoicingQboViewState;
     const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
     return {
-        accounts: invoicingAccountingOptions(state),
+        accounts: (0, exports.getInvoicingQboAccountOptions)(state),
         accountsFetchState: {
             fetchState: accountList.fetchState,
             error: accountList.error,

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer.d.ts

@@ -27,7 +27,7 @@ export declare const fetchInvoicingSubscriptionList: import("@reduxjs/toolkit").
     ids: ID[];
     keepExistingListItems: boolean;
     nextCursor: string | null;
-}, "invoicingSubscriptionListView/updateInvoicingSubscriptionList">, updateInvoicingSubscriptionListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingSubscriptionListView/updateInvoicingSubscriptionListFailure">, fetchInvoicingSubscriptionCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingSubscriptionListView/fetchInvoicingSubscriptionCounts">, updateInvoicingSubscriptionCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingSubscriptionListView/updateInvoicingSubscriptionCounts">, updateInvoicingSubscriptionCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingSubscriptionListView/updateInvoicingSubscriptionCountsFailure">, updateInvoicingSubscriptionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingSubscriptionFilters, "invoicingSubscriptionListView/updateInvoicingSubscriptionFilters">, setInvoicingSubscriptionActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"active" | "cancelled" | "future" | "in_trial" | "non_renewing" | "paused" | "all", "invoicingSubscriptionListView/setInvoicingSubscriptionActiveTab">, addInvoicingSubscriptionToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "invoicingSubscriptionListView/updateInvoicingSubscriptionList">, updateInvoicingSubscriptionListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingSubscriptionListView/updateInvoicingSubscriptionListFailure">, fetchInvoicingSubscriptionCounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingSubscriptionListView/fetchInvoicingSubscriptionCounts">, updateInvoicingSubscriptionCounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingListCounts, "invoicingSubscriptionListView/updateInvoicingSubscriptionCounts">, updateInvoicingSubscriptionCountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingSubscriptionListView/updateInvoicingSubscriptionCountsFailure">, updateInvoicingSubscriptionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingSubscriptionFilters, "invoicingSubscriptionListView/updateInvoicingSubscriptionFilters">, setInvoicingSubscriptionActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"active" | "cancelled" | "future" | "paused" | "in_trial" | "non_renewing" | "all", "invoicingSubscriptionListView/setInvoicingSubscriptionActiveTab">, addInvoicingSubscriptionToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     id: ID;
     status?: InvoicingSubscriptionStatus;
 }, "invoicingSubscriptionListView/addInvoicingSubscriptionToList">;

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.d.ts

@@ -23,7 +23,7 @@ export interface InvoicingSubscriptionColumnConfig {
 }
 export declare const INVOICING_SUBSCRIPTION_COLUMNS: InvoicingSubscriptionColumnConfig[];
 export declare const ALL_INVOICING_SUBSCRIPTION_TAB_IDS: readonly ["all", "active", "in_trial", "future", "non_renewing", "paused", "cancelled"];
-export declare const toInvoicingSubscriptionTabId: (v: string) => "active" | "cancelled" | "future" | "in_trial" | "non_renewing" | "paused" | "all";
+export declare const toInvoicingSubscriptionTabId: (v: string) => "active" | "cancelled" | "future" | "paused" | "in_trial" | "non_renewing" | "all";
 export type InvoicingSubscriptionTabId = ReturnType<typeof toInvoicingSubscriptionTabId>;
 export interface InvoicingSubscriptionListViewState extends FetchedState {
     /** Selected status tab (CES-owned so it persists across page revisits). */

package/lib/view/recommendation/recommendationPayload.d.ts

@@ -15,6 +15,7 @@ export type FetchRecommendationResponseWithCOT = ZeniAPIResponse<FetchRecommenda
 export type RecommendationFeedbackDimension = 'vendor' | 'category' | 'class';
 export type RecommendationFeedbackSource = 'primary' | 'alternate' | 'shadow' | 'qbo';
 export type RecommendationFeedbackOutcome = 'accepted' | 'override_ranked' | 'override_outside' | 'retracted';
+export declare const isPromptedRecommendationFeedback: (outcome: RecommendationFeedbackOutcome) => boolean;
 export interface RecommendationFeedbackValue {
     name: string;
     id?: string | null;

package/lib/view/recommendation/recommendationPayload.js

@@ -1,2 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPromptedRecommendationFeedback = void 0;
+// Only an override opens the feedback popup. Silent accepts and retractions post
+// in the background, so they must not drive the popup's loader or its toast.
+const isPromptedRecommendationFeedback = (outcome) => outcome === 'override_outside' || outcome === 'override_ranked';
+exports.isPromptedRecommendationFeedback = isPromptedRecommendationFeedback;