@zeniai/client-epic-state 5.2.52-betaRD1 → 5.2.53

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

@@ -6,34 +6,60 @@ const operators_1 = require("rxjs/operators");
 const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoicingCustomerSelector_1 = require("../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
-const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
-const editInvoicingCustomerDetailViewReducer_2 = require("./editInvoicingCustomerDetailViewReducer");
+const editInvoicingCustomerDetailViewReducer_1 = require("./editInvoicingCustomerDetailViewReducer");
 const invoicingCustomerFormConfig_1 = require("./invoicingCustomerFormConfig");
 /**
- * Seed the shared Address screen with an existing customer's saved billing
- * address (looked up in the address entity store by `billingAddressId`). Runs
- * both when the customer 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
- * `initializeVendorAddressEpic`.
+ * Seed the shared Address screen with the customer's saved billing address, and
+ * record that the slot is this customer'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 customer's draft. Only a draft this customer 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 customer'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 initializeInvoicingCustomerAddressEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCustomerDetailViewReducer_2.initializeInvoicingCustomerAddress.match(action) ||
-    editInvoicingCustomerDetailViewReducer_1.updateInvoicingCustomerDetail.match(action)), (0, operators_1.mergeMap)((action) => {
+const initializeInvoicingCustomerAddressEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCustomerDetailViewReducer_1.initializeInvoicingCustomerAddress.match(action) ||
+    editInvoicingCustomerDetailViewReducer_1.updateInvoicingCustomerDetail.match(action) ||
+    editInvoicingCustomerDetailViewReducer_1.fetchInvoicingCustomerDetailPage.match(action) ||
+    editInvoicingCustomerDetailViewReducer_1.fetchInvoicingCustomerDetail.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?.[invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
-    if (existingDraft != null || id == null) {
+    const pending = rootState.addressViewState.newAddressState?.[invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
+    const ownerId = rootState.editInvoicingCustomerDetailViewState.billingAddressOwnerId;
+    // 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 (editInvoicingCustomerDetailViewReducer_1.updateInvoicingCustomerDetail.match(action) &&
+        ownerId != null &&
+        ownerId !== id) {
+        return rxjs_1.EMPTY;
+    }
+    if (pending != null && ownerId === id) {
         return rxjs_1.EMPTY;
     }
     const customer = (0, invoicingCustomerSelector_1.getInvoicingCustomerById)(rootState.invoicingCustomerState, id);
     const address = customer?.billingAddressId != null
         ? (0, addressSelector_1.getAddressByAddressId)(rootState.addressState, customer.billingAddressId)
         : undefined;
-    return address != null
-        ? (0, rxjs_1.of)((0, addressViewReducer_1.newAddressInLocalStore)({
+    const actions = [];
+    if (address != null) {
+        actions.push((0, addressViewReducer_1.newAddressInLocalStore)({
             addressType: invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE,
             addressToCreate: address,
-        }))
-        : rxjs_1.EMPTY;
+        }));
+    }
+    else if (pending != null) {
+        actions.push((0, addressViewReducer_1.removeNewAddressDataInLocalStore)(invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE));
+    }
+    actions.push((0, editInvoicingCustomerDetailViewReducer_1.claimInvoicingCustomerBillingAddress)({ id }));
+    return (0, rxjs_1.from)(actions);
 }));
 exports.initializeInvoicingCustomerAddressEpic = initializeInvoicingCustomerAddressEpic;

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

@@ -26,9 +26,13 @@ const seedInvoicingCustomerFormDraftEpic = (actions$, state$) => actions$.pipe((
     // 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.
+    // A forced refetch is the caller asking for fresh data: the response will
+    // seed, and seeding first from the entity as it stands would mark the
+    // draft loaded and lock that response out.
     if (editInvoicingCustomerDetailViewReducer_1.fetchInvoicingCustomerDetailPage.match(action) &&
-        state.editInvoicingCustomerDetailViewState.recordStateById[id]
-            ?.fetchState !== 'Completed') {
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCustomerDetailViewState.recordStateById[id]
+                ?.fetchState !== 'Completed')) {
         return rxjs_1.EMPTY;
     }
     // Nothing to seed from on a cold open; the detail response triggers this

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

@@ -57,6 +57,8 @@ export declare const runInvoicingSubscriptionAction: import("@reduxjs/toolkit").
     subscriptionId: ID;
 }, "editInvoicingSubscriptionDetailView/submitInvoicingSubscriptionFormSuccess">, submitInvoicingSubscriptionFormFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "editInvoicingSubscriptionDetailView/submitInvoicingSubscriptionFormFailure">, resetEditInvoicingSubscriptionDetailView: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<{
     id?: ID;
-} | undefined, "editInvoicingSubscriptionDetailView/resetEditInvoicingSubscriptionDetailView">, initializeInvoicingSubscriptionAddress: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: InitializeInvoicingSubscriptionAddressPayload], InitializeInvoicingSubscriptionAddressPayload, "editInvoicingSubscriptionDetailView/initializeInvoicingSubscriptionAddress", never, never>, syncInvoicingSubscriptionCoupons: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SyncInvoicingSubscriptionCouponsPayload], SyncInvoicingSubscriptionCouponsPayload, "editInvoicingSubscriptionDetailView/syncInvoicingSubscriptionCoupons", never, never>;
+} | undefined, "editInvoicingSubscriptionDetailView/resetEditInvoicingSubscriptionDetailView">, initializeInvoicingSubscriptionAddress: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: InitializeInvoicingSubscriptionAddressPayload], InitializeInvoicingSubscriptionAddressPayload, "editInvoicingSubscriptionDetailView/initializeInvoicingSubscriptionAddress", never, never>, claimInvoicingSubscriptionShippingAddress: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    id: ID;
+}, "editInvoicingSubscriptionDetailView/claimInvoicingSubscriptionShippingAddress">, syncInvoicingSubscriptionCoupons: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: SyncInvoicingSubscriptionCouponsPayload], SyncInvoicingSubscriptionCouponsPayload, "editInvoicingSubscriptionDetailView/syncInvoicingSubscriptionCoupons", never, never>;
 declare const _default: import("redux").Reducer<EditInvoicingSubscriptionDetailViewState>;
 export default _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncInvoicingSubscriptionCoupons = exports.initializeInvoicingSubscriptionAddress = exports.resetEditInvoicingSubscriptionDetailView = exports.submitInvoicingSubscriptionFormFailure = exports.submitInvoicingSubscriptionFormSuccess = exports.submitInvoicingSubscriptionForm = exports.updateInvoicingSubscriptionFormDraft = exports.updateInvoicingSubscriptionDetailFailure = exports.updateInvoicingSubscriptionDetail = exports.seedInvoicingSubscriptionFormDraft = exports.fetchInvoicingSubscriptionFormPage = exports.fetchInvoicingSubscriptionDetailPage = exports.fetchInvoicingSubscriptionDetail = exports.runInvoicingSubscriptionActionSuccess = exports.runInvoicingSubscriptionActionFailure = exports.runInvoicingSubscriptionAction = exports.initialState = void 0;
+exports.syncInvoicingSubscriptionCoupons = exports.claimInvoicingSubscriptionShippingAddress = exports.initializeInvoicingSubscriptionAddress = exports.resetEditInvoicingSubscriptionDetailView = exports.submitInvoicingSubscriptionFormFailure = exports.submitInvoicingSubscriptionFormSuccess = exports.submitInvoicingSubscriptionForm = exports.updateInvoicingSubscriptionFormDraft = exports.updateInvoicingSubscriptionDetailFailure = exports.updateInvoicingSubscriptionDetail = exports.seedInvoicingSubscriptionFormDraft = exports.fetchInvoicingSubscriptionFormPage = exports.fetchInvoicingSubscriptionDetailPage = exports.fetchInvoicingSubscriptionDetail = exports.runInvoicingSubscriptionActionSuccess = exports.runInvoicingSubscriptionActionFailure = exports.runInvoicingSubscriptionAction = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
 const invoicingFormDraft_1 = require("../invoicingFormDraft");
@@ -12,6 +12,7 @@ exports.initialState = {
     editDraftById: {},
     actionStateById: {},
     recordStateById: {},
+    shippingAddressOwnerId: undefined,
     newSubscriptionDraft: { ...invoicingSubscriptionFormConfig_1.initialInvoicingSubscriptionFormLocalData },
     savedSubscriptionId: undefined,
     hasValidState() {
@@ -109,6 +110,9 @@ const editInvoicingSubscriptionDetailView = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedSubscriptionId = action.payload.subscriptionId;
+            // An edit is refetched on success; keep the saved values on screen until
+            // that lands, and let it replace them.
+            (0, invoicingFormDraft_1.applyInvoicingFormDraftSaved)(draft.editDraftById, action.payload.subscriptionId);
         },
         submitInvoicingSubscriptionFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -140,6 +144,10 @@ const editInvoicingSubscriptionDetailView = (0, toolkit_1.createSlice)({
                 return { payload };
             },
         },
+        /** Record which subscription the shared shipping-address slot now belongs to. */
+        claimInvoicingSubscriptionShippingAddress(draft, action) {
+            draft.shippingAddressOwnerId = action.payload.id;
+        },
         // Trigger only — handled by syncInvoicingSubscriptionCouponsEpic.
         syncInvoicingSubscriptionCoupons: {
             reducer() { },
@@ -154,5 +162,5 @@ const editInvoicingSubscriptionDetailView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editInvoicingSubscriptionDetailView.actions, exports.runInvoicingSubscriptionAction = _a.runInvoicingSubscriptionAction, exports.runInvoicingSubscriptionActionFailure = _a.runInvoicingSubscriptionActionFailure, exports.runInvoicingSubscriptionActionSuccess = _a.runInvoicingSubscriptionActionSuccess, exports.fetchInvoicingSubscriptionDetail = _a.fetchInvoicingSubscriptionDetail, exports.fetchInvoicingSubscriptionDetailPage = _a.fetchInvoicingSubscriptionDetailPage, exports.fetchInvoicingSubscriptionFormPage = _a.fetchInvoicingSubscriptionFormPage, exports.seedInvoicingSubscriptionFormDraft = _a.seedInvoicingSubscriptionFormDraft, exports.updateInvoicingSubscriptionDetail = _a.updateInvoicingSubscriptionDetail, exports.updateInvoicingSubscriptionDetailFailure = _a.updateInvoicingSubscriptionDetailFailure, exports.updateInvoicingSubscriptionFormDraft = _a.updateInvoicingSubscriptionFormDraft, exports.submitInvoicingSubscriptionForm = _a.submitInvoicingSubscriptionForm, exports.submitInvoicingSubscriptionFormSuccess = _a.submitInvoicingSubscriptionFormSuccess, exports.submitInvoicingSubscriptionFormFailure = _a.submitInvoicingSubscriptionFormFailure, exports.resetEditInvoicingSubscriptionDetailView = _a.resetEditInvoicingSubscriptionDetailView, exports.initializeInvoicingSubscriptionAddress = _a.initializeInvoicingSubscriptionAddress, exports.syncInvoicingSubscriptionCoupons = _a.syncInvoicingSubscriptionCoupons;
+_a = editInvoicingSubscriptionDetailView.actions, exports.runInvoicingSubscriptionAction = _a.runInvoicingSubscriptionAction, exports.runInvoicingSubscriptionActionFailure = _a.runInvoicingSubscriptionActionFailure, exports.runInvoicingSubscriptionActionSuccess = _a.runInvoicingSubscriptionActionSuccess, exports.fetchInvoicingSubscriptionDetail = _a.fetchInvoicingSubscriptionDetail, exports.fetchInvoicingSubscriptionDetailPage = _a.fetchInvoicingSubscriptionDetailPage, exports.fetchInvoicingSubscriptionFormPage = _a.fetchInvoicingSubscriptionFormPage, exports.seedInvoicingSubscriptionFormDraft = _a.seedInvoicingSubscriptionFormDraft, exports.updateInvoicingSubscriptionDetail = _a.updateInvoicingSubscriptionDetail, exports.updateInvoicingSubscriptionDetailFailure = _a.updateInvoicingSubscriptionDetailFailure, exports.updateInvoicingSubscriptionFormDraft = _a.updateInvoicingSubscriptionFormDraft, exports.submitInvoicingSubscriptionForm = _a.submitInvoicingSubscriptionForm, exports.submitInvoicingSubscriptionFormSuccess = _a.submitInvoicingSubscriptionFormSuccess, exports.submitInvoicingSubscriptionFormFailure = _a.submitInvoicingSubscriptionFormFailure, exports.resetEditInvoicingSubscriptionDetailView = _a.resetEditInvoicingSubscriptionDetailView, exports.initializeInvoicingSubscriptionAddress = _a.initializeInvoicingSubscriptionAddress, exports.claimInvoicingSubscriptionShippingAddress = _a.claimInvoicingSubscriptionShippingAddress, exports.syncInvoicingSubscriptionCoupons = _a.syncInvoicingSubscriptionCoupons;
 exports.default = editInvoicingSubscriptionDetailView.reducer;

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

@@ -70,6 +70,13 @@ export interface InvoicingSubscriptionFormView extends SelectorView {
     subscriptionCommercialEditAllowedFromStatuses: string[];
     subscriptionLifecycleActionOptions: InvoicingSubscriptionLifecycleActionOption[];
     subscriptionMetadataEditAllowedFromStatuses: string[];
+    /**
+     * A shipping address entered on the Address screen that the subscription has
+     * not saved yet. The inline-edit form cannot see it — the address lives in the
+     * shared address store, not in a field — so the detail page reads this to
+     * offer Save, or the address could never be linked.
+     */
+    hasUnsavedShippingAddress?: boolean;
     savedSubscriptionId?: ID;
     shippingAddressLabel?: string;
     subscription?: InvoicingSubscription;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingSubscriptionFormView = exports.getEditInvoicingSubscriptionDetailViewState = void 0;
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoicingSubscriptionSelector_1 = require("../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const couponViewSelector_1 = require("../couponView/couponViewSelector");
@@ -28,6 +29,37 @@ const getEditInvoicingSubscriptionDetailViewState = (state, invoicingSubscriptio
     };
 };
 exports.getEditInvoicingSubscriptionDetailViewState = getEditInvoicingSubscriptionDetailViewState;
+/**
+ * Whether the shipping address entered on the Address screen is a change the
+ * subscription has not saved. Presence alone cannot say so: the detail page seeds
+ * the address store with the saved address on load so the Address screen opens
+ * prefilled. Only a pending address that differs from the saved one — or one
+ * where nothing is saved yet — is an unsaved change. Compared on what the user
+ * enters; a saved address's coordinates and timestamps are left out.
+ */
+const isShippingAddressUnsaved = (state, id, savedShippingAddressId) => {
+    // The slot is keyed by address type alone; only a draft this subscription owns counts.
+    if (id == null ||
+        state.editInvoicingSubscriptionDetailViewState.shippingAddressOwnerId !== id) {
+        return false;
+    }
+    const pending = state.addressViewState.newAddressState?.[invoicingSubscriptionFormConfig_2.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
+    if (pending == null) {
+        return false;
+    }
+    const saved = savedShippingAddressId != null
+        ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedShippingAddressId)
+        : undefined;
+    if (saved == null) {
+        return true;
+    }
+    return !(pending.street.join('\u0000') === saved.street.join('\u0000') &&
+        pending.city === saved.city &&
+        pending.state === saved.state &&
+        pending.postalCode === saved.postalCode &&
+        pending.country === saved.country &&
+        (pending.countryCode ?? '') === (saved.countryCode ?? ''));
+};
 const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
     const { editDraftById, error, fetchState, newSubscriptionDraft, savedSubscriptionId, } = state.editInvoicingSubscriptionDetailViewState;
     const mode = invoicingSubscriptionID != null ? 'edit' : 'create';
@@ -47,6 +79,7 @@ const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
     const shippingAddressLabel = newAddress?.addressToCreate != null
         ? (0, addressViewSelector_1.getFormattedAddress)(newAddress.addressToCreate)
         : undefined;
+    const hasUnsavedShippingAddress = isShippingAddressUnsaved(state, invoicingSubscriptionID, subscription?.shippingAddressId);
     const catalogListView = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogListView)(state);
     const planPrices = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.plans);
     const addonAndChargePrices = (0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(catalogListView.products);
@@ -79,6 +112,7 @@ const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
         products: addonAndChargePrices,
         savedSubscriptionId,
         shippingAddressLabel,
+        hasUnsavedShippingAddress,
         subscription,
         fetchState,
         error,

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

@@ -47,4 +47,10 @@ export interface EditInvoicingSubscriptionDetailViewState extends FetchedState {
     /** Detail-load state per subscription id. */
     recordStateById: Record<ID, FetchStateAndError>;
     savedSubscriptionId?: ID;
+    /**
+     * The subscription whose shipping address currently occupies the shared address
+     * store slot. That slot is keyed by address type alone, so without this a
+     * draft seeded or edited for one subscription would pass for the next one's.
+     */
+    shippingAddressOwnerId?: ID;
 }

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

@@ -1,17 +1,21 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
-import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingSubscriptionDetail } from './editInvoicingSubscriptionDetailViewReducer';
-import { initializeInvoicingSubscriptionAddress } from './editInvoicingSubscriptionDetailViewReducer';
-export type ActionType = ReturnType<typeof initializeInvoicingSubscriptionAddress> | ReturnType<typeof updateInvoicingSubscriptionDetail> | ReturnType<typeof newAddressInLocalStore>;
+import { newAddressInLocalStore, removeNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
+import { claimInvoicingSubscriptionShippingAddress, fetchInvoicingSubscriptionDetail, fetchInvoicingSubscriptionDetailPage, initializeInvoicingSubscriptionAddress, updateInvoicingSubscriptionDetail } from './editInvoicingSubscriptionDetailViewReducer';
+export type ActionType = ReturnType<typeof initializeInvoicingSubscriptionAddress> | ReturnType<typeof updateInvoicingSubscriptionDetail> | ReturnType<typeof fetchInvoicingSubscriptionDetailPage> | ReturnType<typeof fetchInvoicingSubscriptionDetail> | ReturnType<typeof claimInvoicingSubscriptionShippingAddress> | ReturnType<typeof newAddressInLocalStore> | ReturnType<typeof removeNewAddressDataInLocalStore>;
 /**
- * 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.
  */
 export declare const initializeInvoicingSubscriptionAddressEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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/invoicingFormDraft.d.ts

@@ -8,7 +8,9 @@ import { FetchState, ID } from '../../commonStateTypes/common';
  * 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` — written by the form, never filled from a record.
+ * `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.
@@ -41,6 +43,13 @@ export declare function applyInvoicingFormDraftSeed<TLocalData>(draftById: Invoi
  * 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;
 /**

package/lib/view/invoicing/invoicingFormDraft.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyInvoicingFormDraftEdit = applyInvoicingFormDraftEdit;
 exports.applyInvoicingFormDraftSeed = applyInvoicingFormDraftSeed;
 exports.applyInvoicingFormDraftFailure = applyInvoicingFormDraftFailure;
+exports.applyInvoicingFormDraftSaved = applyInvoicingFormDraftSaved;
 exports.getInvoicingFormDraftLocalData = getInvoicingFormDraftLocalData;
 exports.isInvoicingFormDraftPending = isInvoicingFormDraftPending;
 /**
@@ -48,6 +49,19 @@ function applyInvoicingFormDraftFailure(draftById, id, blankLocalData) {
     }
     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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.52-betaRD1",
+  "version": "5.2.53",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",