@zeniai/client-epic-state 5.2.50 → 5.2.51

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

@@ -7,10 +7,8 @@ import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDet
 export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
 /**
  * The price-point half of a save body. `InvoicingProductPayload` is the shape
- * the service returns; a save differs in two ways: a field is cleared by
- * sending an explicit `null` (an absent key reads as "leave it alone"), and a
- * price point the form has only just added carries a blank `id`, which the
- * update endpoint reads as "create this one".
+ * the service returns; a save differs in that a field is cleared by sending an
+ * explicit `null`, since an absent key reads as "leave it alone".
  */
 export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProductPayload>, 'accounting_detail' | 'description' | 'invoice_notes'> & {
     accounting_detail?: InvoicingAccountingDetailPayload | null;
@@ -19,8 +17,13 @@ export type InvoicingCatalogSubFamilySavePayload = Omit<Partial<InvoicingProduct
 };
 /**
  * The catalog-item save body: the item the service returns, minus the fields it
- * assigns itself. Price points keep the `sub_families` name they are read back
- * under, and differ only in allowing the cleared and blank-id forms above.
+ * assigns itself.
+ *
+ * Price points travel under `sub_families`, the name they are read back under,
+ * and differ only in allowing the cleared forms above. An update addresses them
+ * by id, so a price point added on the form — which has none yet — is created
+ * by its own request instead; see
+ * `localDataToCreateInvoicingCatalogProductPayloads`.
  */
 export type InvoicingCatalogItemSavePayload = Omit<Partial<InvoicingPlanPayload>, 'sub_families'> & {
     sub_families?: InvoicingCatalogSubFamilySavePayload[];
@@ -51,6 +54,19 @@ export declare const buildAccountingDetail: (subFamily: InvoicingCatalogAccounti
  * edit cannot overwrite them with a value nobody chose.
  */
 export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogItemSavePayload;
+/**
+ * The bodies that create the price points added on an edit form, one per
+ * request to `/catalog/products`.
+ *
+ * An update cannot carry them: it addresses price points by id, and these have
+ * none until the service assigns one. They are bound to their item by
+ * `item_id`, so this needs the saved item's id and runs after the item itself
+ * is saved.
+ *
+ * Empty values are left off rather than sent as `null`: there is nothing on a
+ * price point that does not exist yet to clear.
+ */
+export declare const localDataToCreateInvoicingCatalogProductPayloads: (localData: InvoicingCatalogItemFormLocalData, itemId: string, lookup: InvoicingCatalogAccountingLookup) => InvoicingCatalogSubFamilySavePayload[];
 export type RunInvoicingCatalogPlanActionResponse = ZeniAPIResponse<InvoicingPlanPayload>;
 export type RunInvoicingCatalogProductActionResponse = ZeniAPIResponse<InvoicingProductPayload>;
 export type InvoicingCatalogItemDetailResponse = ZeniAPIResponse<InvoicingPlanPayload>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localDataToSaveInvoicingCatalogItemPayload = exports.buildAccountingDetail = void 0;
+exports.localDataToCreateInvoicingCatalogProductPayloads = exports.localDataToSaveInvoicingCatalogItemPayload = exports.buildAccountingDetail = void 0;
 const accountPayload_1 = require("../../../entity/account/accountPayload");
 const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormHelper_1 = require("./invoicingCatalogItemFormHelper");
@@ -134,27 +134,52 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup)
     const subFamilies = localData.subFamilies.length > 0
         ? localData.subFamilies
         : [(0, invoicingCatalogItemFormHelper_1.blankInvoicingCatalogSubFamily)()];
-    itemPayload.sub_families = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
-        : subFamilies.map((subFamily) => {
-            // Edits send the same body a create does. The narrower hand-built one
-            // this replaces had to be kept in step by hand and was not: it dropped
-            // `accounting_detail` once, and `billing_cycles`, `price`,
-            // `pricing_model`, `period`, the trial fields, `proration_type`,
-            // `free_quantity`, `is_taxable` and `tiers` were never added at all, so
-            // editing any of them looked saved and changed nothing.
-            const detail = buildSubFamilyPayload(localData, subFamily, true, lookup);
-            // `null` rather than omitted when empty: an absent key on an update
-            // reads as "leave it alone", which would make a cleared mapping
-            // impossible to save — the same reason `description` and
-            // `invoice_notes` are cleared rather than dropped above.
-            detail.accounting_detail = detail.accounting_detail ?? null;
-            // A price point added on this form has no id yet, and travels with a
-            // blank one. The update endpoint reads that as "create this one", so it
-            // lands in the same request as the edits around it rather than a second
-            // call that could fail on its own.
-            return { ...detail, id: subFamily.id.trim() };
-        });
+    if (isCreate) {
+        itemPayload.sub_families = subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup));
+        return itemPayload;
+    }
+    // Only price points the service has already stored travel in an update: it
+    // addresses them by id, and a blank one has nothing to address. A price point
+    // added on the form is created by its own request once the item is saved,
+    // rather than riding along as a row the update cannot place.
+    itemPayload.sub_families = subFamilies
+        .filter((subFamily) => subFamily.id !== '')
+        .map((subFamily) => {
+        // Edits send the same body a create does. The narrower hand-built one
+        // this replaces had to be kept in step by hand and was not: it dropped
+        // `accounting_detail` once, and `billing_cycles`, `price`,
+        // `pricing_model`, `period`, the trial fields, `proration_type`,
+        // `free_quantity`, `is_taxable` and `tiers` were never added at all, so
+        // editing any of them looked saved and changed nothing.
+        const detail = buildSubFamilyPayload(localData, subFamily, true, lookup);
+        // `null` rather than omitted when empty: an absent key on an update
+        // reads as "leave it alone", which would make a cleared mapping
+        // impossible to save — the same reason `description` and
+        // `invoice_notes` are cleared rather than dropped above.
+        detail.accounting_detail = detail.accounting_detail ?? null;
+        // Never blank: the filter above leaves only price points the service has
+        // already stored, which is the only kind an update can address.
+        return { ...detail, id: subFamily.id };
+    });
     return itemPayload;
 };
 exports.localDataToSaveInvoicingCatalogItemPayload = localDataToSaveInvoicingCatalogItemPayload;
+/**
+ * The bodies that create the price points added on an edit form, one per
+ * request to `/catalog/products`.
+ *
+ * An update cannot carry them: it addresses price points by id, and these have
+ * none until the service assigns one. They are bound to their item by
+ * `item_id`, so this needs the saved item's id and runs after the item itself
+ * is saved.
+ *
+ * Empty values are left off rather than sent as `null`: there is nothing on a
+ * price point that does not exist yet to clear.
+ */
+const localDataToCreateInvoicingCatalogProductPayloads = (localData, itemId, lookup) => localData.subFamilies
+    .filter((subFamily) => subFamily.id === '')
+    .map((subFamily) => ({
+    ...buildSubFamilyPayload(localData, subFamily, false, lookup),
+    item_id: itemId,
+}));
+exports.localDataToCreateInvoicingCatalogProductPayloads = localDataToCreateInvoicingCatalogProductPayloads;

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

@@ -47,6 +47,9 @@ const editInvoicingCatalogItemDetailView = (0, toolkit_1.createSlice)({
             draft.error = undefined;
             draft.savedItemId = action.payload.itemId;
             draft.savedKind = action.payload.kind;
+            // 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.itemId);
         },
         submitInvoicingCatalogItemFormFailure(draft, action) {
             draft.fetchState = 'Error';

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

@@ -84,7 +84,20 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
                 }));
                 return resultActions;
             };
-            return completeSave([]);
+            // Price points added on an edit form cannot ride in the update:
+            // it addresses them by id and they have none yet. They are created
+            // against the item that was just saved, and their responses join
+            // the same success — one of them failing is the whole save
+            // failing, since the item on screen would otherwise claim price
+            // points the service never stored. A create needs none of this:
+            // its price points are nested in the item body.
+            const newProductPayloads = id != null
+                ? (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToCreateInvoicingCatalogProductPayloads)(localData, savedItem.id, accountingLookup)
+                : [];
+            if (newProductPayloads.length === 0) {
+                return completeSave([]);
+            }
+            return (0, rxjs_1.forkJoin)(newProductPayloads.map((productPayload) => zeniAPI.postAndGetJSON(`${baseUrl}/catalog/products`, productPayload))).pipe((0, operators_1.mergeMap)((productResponses) => completeSave(productResponses)));
         }
         return (0, rxjs_1.from)([
             (0, editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemFormFailure)(response.status),

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

@@ -26,9 +26,13 @@ const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actions$.pip
     // 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 (editInvoicingCatalogItemDetailViewReducer_1.fetchInvoicingCatalogItemDetailPage.match(action) &&
-        state.editInvoicingCatalogItemDetailViewState.recordStateById[id]
-            ?.fetchState !== 'Completed') {
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCatalogItemDetailViewState.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/editInvoicingCouponDetailView/editInvoicingCouponDetailViewReducer.js

@@ -55,6 +55,9 @@ const editInvoicingCouponDetailView = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedCouponId = action.payload.couponId;
+            // 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.couponId);
         },
         submitInvoicingCouponFormFailure(draft, action) {
             draft.fetchState = 'Error';

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

@@ -26,9 +26,13 @@ const seedInvoicingCouponFormDraftEpic = (actions$, state$) => actions$.pipe((0,
     // 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 (editInvoicingCouponDetailViewReducer_1.fetchInvoicingCouponDetailPage.match(action) &&
-        state.editInvoicingCouponDetailViewState.recordStateById[id]
-            ?.fetchState !== 'Completed') {
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCouponDetailViewState.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/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.d.ts

@@ -56,6 +56,8 @@ export declare const fetchInvoicingPaymentLinkEmailPreview: import("@reduxjs/too
     customerId: ID;
 }, "editInvoicingCustomerDetailView/submitInvoicingCustomerFormSuccess">, submitInvoicingCustomerFormFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "editInvoicingCustomerDetailView/submitInvoicingCustomerFormFailure">, resetEditInvoicingCustomerDetailView: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<{
     id?: ID;
-} | undefined, "editInvoicingCustomerDetailView/resetEditInvoicingCustomerDetailView">, initializeInvoicingCustomerAddress: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: InitializeInvoicingCustomerAddressPayload], InitializeInvoicingCustomerAddressPayload, "editInvoicingCustomerDetailView/initializeInvoicingCustomerAddress", never, never>;
+} | undefined, "editInvoicingCustomerDetailView/resetEditInvoicingCustomerDetailView">, initializeInvoicingCustomerAddress: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: InitializeInvoicingCustomerAddressPayload], InitializeInvoicingCustomerAddressPayload, "editInvoicingCustomerDetailView/initializeInvoicingCustomerAddress", never, never>, claimInvoicingCustomerBillingAddress: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    id: ID;
+}, "editInvoicingCustomerDetailView/claimInvoicingCustomerBillingAddress">;
 declare const _default: import("redux").Reducer<EditInvoicingCustomerDetailViewState>;
 export default _default;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = exports.initialState = void 0;
+exports.claimInvoicingCustomerBillingAddress = exports.initializeInvoicingCustomerAddress = exports.resetEditInvoicingCustomerDetailView = exports.submitInvoicingCustomerFormFailure = exports.submitInvoicingCustomerFormSuccess = exports.submitInvoicingCustomerForm = exports.updateInvoicingCustomerFormDraft = exports.updateInvoicingCustomerDetailFailure = exports.submitAddPromotionalCredits = exports.resetPromotionalCreditAction = exports.updateInvoicingCustomerDetail = exports.seedInvoicingCustomerFormDraft = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.addPromotionalCreditsSuccess = exports.addPromotionalCreditsFailure = exports.updateInvoicingPaymentLinkEmailPreviewFailure = exports.updateInvoicingPaymentLinkEmailPreview = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingPaymentLinkEmailPreview = 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 = {
     emailPreviewCustomerId: undefined,
     promotionalCreditSubmitState: { fetchState: 'Not-Started', error: undefined },
     recordStateById: {},
+    billingAddressOwnerId: undefined,
     fetchState: 'Not-Started',
     error: undefined,
     editDraftById: {},
@@ -158,6 +159,9 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedCustomerId = action.payload.customerId;
+            // 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.customerId);
         },
         submitInvoicingCustomerFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -187,6 +191,10 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
                 return { payload };
             },
         },
+        /** Record which customer the shared billing-address slot now belongs to. */
+        claimInvoicingCustomerBillingAddress(draft, action) {
+            draft.billingAddressOwnerId = action.payload.id;
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(rootActions_1.clearAll, (draft) => {
@@ -194,5 +202,5 @@ const editInvoicingCustomerDetailView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress;
+_a = editInvoicingCustomerDetailView.actions, exports.fetchInvoicingPaymentLinkEmailPreview = _a.fetchInvoicingPaymentLinkEmailPreview, exports.fetchInvoicingPaymentLinkEmailPreviewPage = _a.fetchInvoicingPaymentLinkEmailPreviewPage, exports.updateInvoicingPaymentLinkEmailPreview = _a.updateInvoicingPaymentLinkEmailPreview, exports.updateInvoicingPaymentLinkEmailPreviewFailure = _a.updateInvoicingPaymentLinkEmailPreviewFailure, exports.addPromotionalCreditsFailure = _a.addPromotionalCreditsFailure, exports.addPromotionalCreditsSuccess = _a.addPromotionalCreditsSuccess, exports.fetchInvoicingCustomerDetail = _a.fetchInvoicingCustomerDetail, exports.fetchInvoicingCustomerDetailPage = _a.fetchInvoicingCustomerDetailPage, exports.seedInvoicingCustomerFormDraft = _a.seedInvoicingCustomerFormDraft, exports.updateInvoicingCustomerDetail = _a.updateInvoicingCustomerDetail, exports.resetPromotionalCreditAction = _a.resetPromotionalCreditAction, exports.submitAddPromotionalCredits = _a.submitAddPromotionalCredits, exports.updateInvoicingCustomerDetailFailure = _a.updateInvoicingCustomerDetailFailure, exports.updateInvoicingCustomerFormDraft = _a.updateInvoicingCustomerFormDraft, exports.submitInvoicingCustomerForm = _a.submitInvoicingCustomerForm, exports.submitInvoicingCustomerFormSuccess = _a.submitInvoicingCustomerFormSuccess, exports.submitInvoicingCustomerFormFailure = _a.submitInvoicingCustomerFormFailure, exports.resetEditInvoicingCustomerDetailView = _a.resetEditInvoicingCustomerDetailView, exports.initializeInvoicingCustomerAddress = _a.initializeInvoicingCustomerAddress, exports.claimInvoicingCustomerBillingAddress = _a.claimInvoicingCustomerBillingAddress;
 exports.default = editInvoicingCustomerDetailView.reducer;

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

@@ -86,13 +86,13 @@ export interface InvoicingCustomerFormView extends SelectorView {
     billingAddressId?: ID;
     billingAddressLabel?: string;
     emailPreview?: InvoicingPaymentLinkEmailPreviewData;
+    /**
+     * A billing address entered on the Address screen that the customer 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.
+     */
+    hasUnsavedBillingAddress?: boolean;
     savedCustomerId?: ID;
 }
-/**
- * Bundled view for the customer create/edit form. Exposes the draft `localData`
- * (seeded from the existing customer entity in edit mode until the user edits),
- * the canonical option value sets (labels resolved in web-components), the save
- * fetch state/error, and the id of the customer last saved — so the form screen
- * depends on this single selector.
- */
 export declare const getInvoicingCustomerFormView: (state: RootState, invoicingCustomerID?: ID) => InvoicingCustomerFormView;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCustomerFormView = exports.getInvoicingCustomerRecord = void 0;
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const invoiceSelector_1 = require("../../../entity/invoicing/invoice/invoiceSelector");
 const invoicingCustomerSelector_1 = require("../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector");
 const invoicingCustomerSelector_2 = require("../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector");
@@ -54,6 +55,37 @@ exports.getInvoicingCustomerRecord = getInvoicingCustomerRecord;
  * fetch state/error, and the id of the customer last saved — so the form screen
  * depends on this single selector.
  */
+/**
+ * Whether the billing address entered on the Address screen is a change the
+ * customer 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 isBillingAddressUnsaved = (state, id, savedBillingAddressId) => {
+    // The slot is keyed by address type alone; only a draft this customer owns counts.
+    if (id == null ||
+        state.editInvoicingCustomerDetailViewState.billingAddressOwnerId !== id) {
+        return false;
+    }
+    const pending = state.addressViewState.newAddressState?.[invoicingCustomerFormConfig_1.INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
+    if (pending == null) {
+        return false;
+    }
+    const saved = savedBillingAddressId != null
+        ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedBillingAddressId)
+        : 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 getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
     const { editDraftById, error, fetchState, newCustomerDraft, savedCustomerId } = state.editInvoicingCustomerDetailViewState;
     const mode = invoicingCustomerID != null ? 'edit' : 'create';
@@ -105,6 +137,7 @@ const getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
         taxabilityOptions,
         billingAddressId,
         billingAddressLabel,
+        hasUnsavedBillingAddress: isBillingAddressUnsaved(state, invoicingCustomerID, customer?.billingAddressId),
         savedCustomerId,
         fetchState,
         error,

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

@@ -53,6 +53,12 @@ export interface EditInvoicingCustomerDetailViewState extends FetchedState {
     promotionalCreditSubmitState: FetchStateAndError;
     /** Detail-load state per customer id. */
     recordStateById: Record<ID, FetchStateAndError>;
+    /**
+     * The customer whose billing 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 customer would pass for the next one's.
+     */
+    billingAddressOwnerId?: ID;
     emailPreview?: InvoicingPaymentLinkEmailPreviewData;
     emailPreviewCustomerId?: ID;
     savedCustomerId?: ID;

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

@@ -1,16 +1,21 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
-import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { initializeInvoicingCustomerAddress } from './editInvoicingCustomerDetailViewReducer';
-export type ActionType = ReturnType<typeof initializeInvoicingCustomerAddress> | ReturnType<typeof updateInvoicingCustomerDetail> | ReturnType<typeof newAddressInLocalStore>;
+import { newAddressInLocalStore, removeNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
+import { claimInvoicingCustomerBillingAddress, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, initializeInvoicingCustomerAddress, updateInvoicingCustomerDetail } from './editInvoicingCustomerDetailViewReducer';
+export type ActionType = ReturnType<typeof initializeInvoicingCustomerAddress> | ReturnType<typeof updateInvoicingCustomerDetail> | ReturnType<typeof fetchInvoicingCustomerDetailPage> | ReturnType<typeof fetchInvoicingCustomerDetail> | ReturnType<typeof claimInvoicingCustomerBillingAddress> | ReturnType<typeof newAddressInLocalStore> | ReturnType<typeof removeNewAddressDataInLocalStore>;
 /**
- * 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.
  */
 export declare const initializeInvoicingCustomerAddressEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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;