@zeniai/client-epic-state 5.2.83 → 5.2.84

package/lib/esm/view/invoicing/createInvoice/epics/fetchCreateInvoiceFormPageEpic.js

@@ -2,7 +2,7 @@ import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList, } from '../../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { fetchInvoicingCustomerList } from '../../invoicingCustomerListView/invoicingCustomerListViewReducer';
-import { INVOICING_LIST_ALL_TAB, getInvoicingListTab, } from '../../invoicingListTabCache';
+import { INVOICING_LIST_ALL_TAB, getInvoicingListTab, shouldFetchFullInvoicingList, } from '../../invoicingListTabCache';
 import { fetchInvoicingSettings } from '../../settingsView/settingsViewReducer';
 import { fetchCreateInvoiceFormPage } from '../createInvoiceReducer';
 /**
@@ -13,6 +13,8 @@ import { fetchCreateInvoiceFormPage } from '../createInvoiceReducer';
 const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
     (fetchStateAndError.fetchState !== 'Completed' &&
         fetchStateAndError.fetchState !== 'In-Progress');
+const PICKER_PLAN_FILTERS = { type: 'plan' };
+const PICKER_PRODUCT_FILTERS = { type: 'addon|charge' };
 /**
  * Orchestrates the create-invoice form's option sources: on
  * `fetchCreateInvoiceFormPage`, fans out to the customer, catalog plan, catalog
@@ -34,15 +36,27 @@ export const fetchCreateInvoiceFormPageEpic = (actions$, state$) => actions$.pip
             tabId: INVOICING_LIST_ALL_TAB,
         }));
     }
-    if (shouldFetch({ fetchState: catalogState.fetchState, error: catalogState.error }, cacheOverride)) {
+    if (shouldFetchFullInvoicingList({
+        fetchState: catalogState.fetchState,
+        filters: catalogState.planFilters,
+        nextCursor: catalogState.planNextCursor,
+        sort: catalogState.planSort,
+    }, PICKER_PLAN_FILTERS, cacheOverride)) {
         pageActions.push(fetchInvoicingCatalogPlanList({
-            filters: { type: 'plan' },
+            fetchAll: true,
+            filters: PICKER_PLAN_FILTERS,
             keepExistingListItems: false,
         }));
     }
-    if (shouldFetch(catalogState.productFetchState, cacheOverride)) {
+    if (shouldFetchFullInvoicingList({
+        fetchState: catalogState.productFetchState.fetchState,
+        filters: catalogState.productFilters,
+        nextCursor: catalogState.productNextCursor,
+        sort: catalogState.productSort,
+    }, PICKER_PRODUCT_FILTERS, cacheOverride)) {
         pageActions.push(fetchInvoicingCatalogProductList({
-            filters: { type: 'addon|charge' },
+            fetchAll: true,
+            filters: PICKER_PRODUCT_FILTERS,
             keepExistingListItems: false,
         }));
     }

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewPayload.js

@@ -17,22 +17,25 @@ import { invoicingSubscriptionTodayIso, toInvoicingSubscriptionBillingCycles, to
  * Sending them made every price point whose cadence the form could not express
  * — a daily plan, for instance — fail with a 422.
  */
-export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress) => {
+export const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress, flatFeePriceCodes = new Set()) => {
+    const itemQuantity = (priceCode, quantity) => flatFeePriceCodes.has(priceCode)
+        ? 1
+        : toInvoicingSubscriptionQuantity(quantity);
     const items = [
         {
             item_price_code: localData.planPriceCode,
             item_type: 'plan',
-            quantity: toInvoicingSubscriptionQuantity(localData.planQuantity),
+            quantity: itemQuantity(localData.planPriceCode, localData.planQuantity),
         },
         ...localData.addonPriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'addon',
-            quantity: toInvoicingSubscriptionQuantity(localData.addonQuantities[priceCode]),
+            quantity: itemQuantity(priceCode, localData.addonQuantities[priceCode]),
         })),
         ...localData.chargePriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'charge',
-            quantity: toInvoicingSubscriptionQuantity(localData.chargeQuantities[priceCode]),
+            quantity: itemQuantity(priceCode, localData.chargeQuantities[priceCode]),
         })),
     ];
     const setupFee = localData.setupFee?.amount;

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

@@ -7,7 +7,7 @@ import { getInvoicingCatalogListView, getInvoicingCatalogPrices, } from '../invo
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingAllCustomers } from '../invoicingCustomerListView/invoicingCustomerListViewSelector';
 import { getInvoicingFormDraftLocalData, isInvoicingFormDraftPending, } from '../invoicingFormDraft';
-import { initialInvoicingSubscriptionFormLocalData } from './invoicingSubscriptionFormConfig';
+import { initialInvoicingSubscriptionFormLocalData, invoicingPriceHasQuantity, } from './invoicingSubscriptionFormConfig';
 import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE } from './invoicingSubscriptionFormConfig';
 const notStartedEstimateView = {
     creditsMayChange: false,
@@ -175,6 +175,7 @@ const toInvoicingPlanOption = (plan) => ({
     // price point and rejects a subscription that claims a different one.
     billingPeriod: plan.period,
     billingPeriodUnit: plan.periodUnit,
+    hasQuantity: invoicingPriceHasQuantity(plan.pricingModel),
     label: plan.name ?? plan.id,
     price: invoicingUnitPrice(plan),
     productCode: plan.productCode,
@@ -186,6 +187,7 @@ const toInvoicingCatalogItemOption = (product) => ({
     // A one-time charge has no cadence, so its price is quoted flat rather than
     // per period.
     billingPeriodUnit: product.itemType === 'charge' ? undefined : product.periodUnit,
+    hasQuantity: invoicingPriceHasQuantity(product.pricingModel),
     label: product.name ?? product.id,
     price: invoicingUnitPrice(product),
     productCode: product.productCode,

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/fetchInvoicingSubscriptionDetailPageEpic.js

@@ -4,7 +4,7 @@ import { fetchInvoicingCouponList } from '../couponView/couponViewReducer';
 import { getInvoicingCouponListFetchState } from '../couponView/couponViewSelector';
 import { fetchInvoicingCatalogPlanList } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { fetchInvoicingConfig } from '../invoicingConfigView/invoicingConfigViewReducer';
-import { INVOICING_LIST_ALL_TAB } from '../invoicingListTabCache';
+import { INVOICING_LIST_ALL_TAB, shouldFetchFullInvoicingList, } from '../invoicingListTabCache';
 import { fetchInvoicingSubscriptionDetail, fetchInvoicingSubscriptionDetailPage, } from './editInvoicingSubscriptionDetailViewReducer';
 /**
  * Fetch unless the endpoint is already loaded or in flight — or always when the
@@ -40,11 +40,14 @@ export const fetchInvoicingSubscriptionDetailPageEpic = (actions$, state$) => ac
     // Plan and coupon lists back the names the page renders for its line
     // items; both list slices cache, so this only refetches when asked to.
     const catalogListState = state.invoicingCatalogListViewState;
-    if (shouldFetch({
-        error: catalogListState.error,
+    if (shouldFetchFullInvoicingList({
         fetchState: catalogListState.fetchState,
-    }, cacheOverride)) {
+        filters: catalogListState.planFilters,
+        nextCursor: catalogListState.planNextCursor,
+        sort: catalogListState.planSort,
+    }, { type: 'plan' }, cacheOverride)) {
         pageActions.push(fetchInvoicingCatalogPlanList({
+            fetchAll: true,
             filters: { type: 'plan' },
             keepExistingListItems: false,
         }));

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/fetchInvoicingSubscriptionFormPageEpic.js

@@ -20,6 +20,7 @@ export const fetchInvoicingSubscriptionFormPageEpic = (actions$) => actions$.pip
         // unfiltered list would replace the store's plans with every catalog
         // item.
         fetchInvoicingCatalogPlanList({
+            fetchAll: true,
             filters: { type: 'plan' },
             keepExistingListItems: false,
         }),

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/invoicingSubscriptionFormConfig.js

@@ -22,6 +22,8 @@ const subscriptionItemQuantities = (subscription, itemType) => {
  * their day gets their own calendar date rather than yesterday's.
  */
 export const invoicingSubscriptionTodayIso = () => dateNow().format('YYYY-MM-DD');
+/** A flat fee bills its price once, so its quantity is always 1. */
+export const invoicingPriceHasQuantity = (pricingModel) => pricingModel !== 'flat_fee';
 /**
  * Clamp a subscription-item quantity to the minimum the API accepts. Shared by
  * the plan, add-on and charge items so none of them can bill a 0 or a fraction.

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

@@ -9,10 +9,11 @@ import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
 import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
 import { invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
+import { getInvoicingCatalogPrices } from '../invoicingCatalogListView/invoicingCatalogListViewSelector';
 import { addInvoicingSubscriptionToList } from '../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
 import { localDataToSaveInvoicingSubscriptionPayload, } from './editInvoicingSubscriptionDetailViewPayload';
 import { submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormFailure, submitInvoicingSubscriptionFormSuccess, syncInvoicingSubscriptionCoupons, } from './editInvoicingSubscriptionDetailViewReducer';
-import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE } from './invoicingSubscriptionFormConfig';
+import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE, invoicingPriceHasQuantity, } from './invoicingSubscriptionFormConfig';
 const normalizeCouponCode = (value) => (value ?? '').trim().toUpperCase();
 export const isInvoicingSubscriptionCouponChanged = (previousCouponCode, nextCouponCode) => normalizeCouponCode(previousCouponCode) !==
     normalizeCouponCode(nextCouponCode);
@@ -25,7 +26,10 @@ export const invoicingSubscriptionSaveRequest = (rootState, id) => {
     // Shipping address captured via the shared Address screen is sent as an
     // object in the payload (same pattern as the customer save flow).
     const shippingAddress = rootState.addressViewState.newAddressState?.[INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
-    const data = localDataToSaveInvoicingSubscriptionPayload(localData, shippingAddress);
+    const flatFeePriceCodes = new Set(getInvoicingCatalogPrices(Object.values(rootState.invoicingCatalogState.itemByID))
+        .filter((price) => !invoicingPriceHasQuantity(price.pricingModel))
+        .flatMap((price) => price.priceCode ?? []));
+    const data = localDataToSaveInvoicingSubscriptionPayload(localData, shippingAddress, flatFeePriceCodes);
     if (id != null) {
         delete data.coupon_ids;
     }

package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js

@@ -23,19 +23,30 @@ const buildPlanQuery = (filters, cursor, sort) => {
     return params;
 };
 export const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingCatalogPlanList.match), switchMap((action) => {
-    const { filters, cursor, keepExistingListItems, sort } = action.payload;
+    const { filters, cursor, fetchAll, keepExistingListItems, sort } = action.payload;
     const apiUrl = withQuery(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/catalog/plans`, buildPlanQuery(filters, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
-            return [
+            const nextCursor = response.data?.next_cursor ?? null;
+            const pageActions = [
                 updateInvoicingCatalogItems(items, 'merge'),
                 updateInvoicingCatalogPlanList({
                     ids: items.map((item) => item.id),
-                    nextCursor: response.data?.next_cursor ?? null,
+                    nextCursor,
                     keepExistingListItems,
                 }),
             ];
+            if (fetchAll && nextCursor != null && nextCursor !== cursor) {
+                pageActions.push(fetchInvoicingCatalogPlanList({
+                    cursor: nextCursor,
+                    fetchAll,
+                    filters,
+                    keepExistingListItems: true,
+                    sort,
+                }));
+            }
+            return pageActions;
         }
         return of(updateInvoicingCatalogPlanListFailure(response.status));
     }), catchError((error) => of(updateInvoicingCatalogPlanListFailure(createZeniAPIStatus('Unexpected Error', 'Fetch catalog plan list REST API call errored out ' +

package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js

@@ -23,19 +23,30 @@ const buildProductQuery = (filters, cursor, sort) => {
     return params;
 };
 export const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingCatalogProductList.match), switchMap((action) => {
-    const { filters, cursor, keepExistingListItems, sort } = action.payload;
+    const { filters, cursor, fetchAll, keepExistingListItems, sort } = action.payload;
     const apiUrl = withQuery(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/catalog/plans`, buildProductQuery(filters, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
-            return [
+            const nextCursor = response.data?.next_cursor ?? null;
+            const pageActions = [
                 updateInvoicingCatalogItems(items, 'merge'),
                 updateInvoicingCatalogProductList({
                     ids: items.map((item) => item.id),
-                    nextCursor: response.data?.next_cursor ?? null,
+                    nextCursor,
                     keepExistingListItems,
                 }),
             ];
+            if (fetchAll && nextCursor != null && nextCursor !== cursor) {
+                pageActions.push(fetchInvoicingCatalogProductList({
+                    cursor: nextCursor,
+                    fetchAll,
+                    filters,
+                    keepExistingListItems: true,
+                    sort,
+                }));
+            }
+            return pageActions;
         }
         return of(updateInvoicingCatalogProductListFailure(response.status));
     }), catchError((error) => of(updateInvoicingCatalogProductListFailure(createZeniAPIStatus('Unexpected Error', 'Fetch catalog product list REST API call errored out ' +

package/lib/esm/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewReducer.js

@@ -36,6 +36,7 @@ const invoicingCatalogListView = createSlice({
                     payload: {
                         filters: payload.filters ?? {},
                         cursor: payload.cursor,
+                        fetchAll: payload.fetchAll ?? false,
                         keepExistingListItems: payload.keepExistingListItems ?? false,
                         sort: payload.sort,
                     },
@@ -70,6 +71,7 @@ const invoicingCatalogListView = createSlice({
                     payload: {
                         filters: payload.filters ?? {},
                         cursor: payload.cursor,
+                        fetchAll: payload.fetchAll ?? false,
                         keepExistingListItems: payload.keepExistingListItems ?? false,
                         sort: payload.sort,
                     },

package/lib/esm/view/invoicing/invoicingListTabCache.js

@@ -33,6 +33,14 @@ export const isSameInvoicingListQuery = (a, b) => {
         a.sort?.field === b.sort?.field &&
         a.sort?.dir === b.sort?.dir);
 };
+/**
+ * For a picker that searches client-side: reuse only a complete list fetched
+ * with the picker's own query, else load every page of it.
+ */
+export const shouldFetchFullInvoicingList = (list, pickerFilters, cacheOverride) => cacheOverride ||
+    list.fetchState !== 'Completed' ||
+    list.nextCursor != null ||
+    !isSameInvoicingListQuery({ filters: list.filters, sort: list.sort }, { filters: pickerFilters });
 /**
  * Fetch a tab that is empty or failed; top up one that holds less than a page
  * while the server says there is more; leave a full or complete one cached.

package/lib/view/invoicing/createInvoice/epics/fetchCreateInvoiceFormPageEpic.js

@@ -16,6 +16,8 @@ const createInvoiceReducer_1 = require("../createInvoiceReducer");
 const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
     (fetchStateAndError.fetchState !== 'Completed' &&
         fetchStateAndError.fetchState !== 'In-Progress');
+const PICKER_PLAN_FILTERS = { type: 'plan' };
+const PICKER_PRODUCT_FILTERS = { type: 'addon|charge' };
 /**
  * Orchestrates the create-invoice form's option sources: on
  * `fetchCreateInvoiceFormPage`, fans out to the customer, catalog plan, catalog
@@ -37,15 +39,27 @@ const fetchCreateInvoiceFormPageEpic = (actions$, state$) => actions$.pipe((0, o
             tabId: invoicingListTabCache_1.INVOICING_LIST_ALL_TAB,
         }));
     }
-    if (shouldFetch({ fetchState: catalogState.fetchState, error: catalogState.error }, cacheOverride)) {
+    if ((0, invoicingListTabCache_1.shouldFetchFullInvoicingList)({
+        fetchState: catalogState.fetchState,
+        filters: catalogState.planFilters,
+        nextCursor: catalogState.planNextCursor,
+        sort: catalogState.planSort,
+    }, PICKER_PLAN_FILTERS, cacheOverride)) {
         pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList)({
-            filters: { type: 'plan' },
+            fetchAll: true,
+            filters: PICKER_PLAN_FILTERS,
             keepExistingListItems: false,
         }));
     }
-    if (shouldFetch(catalogState.productFetchState, cacheOverride)) {
+    if ((0, invoicingListTabCache_1.shouldFetchFullInvoicingList)({
+        fetchState: catalogState.productFetchState.fetchState,
+        filters: catalogState.productFilters,
+        nextCursor: catalogState.productNextCursor,
+        sort: catalogState.productSort,
+    }, PICKER_PRODUCT_FILTERS, cacheOverride)) {
         pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogProductList)({
-            filters: { type: 'addon|charge' },
+            fetchAll: true,
+            filters: PICKER_PRODUCT_FILTERS,
             keepExistingListItems: false,
         }));
     }

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

@@ -18,7 +18,7 @@ export type SaveInvoicingSubscriptionResponse = ZeniAPIResponse<InvoicingSubscri
  * Sending them made every price point whose cadence the form could not express
  * — a daily plan, for instance — fail with a 422.
  */
-export declare const localDataToSaveInvoicingSubscriptionPayload: (localData: InvoicingSubscriptionFormLocalData, shippingAddress?: AddressUpdatableInfo) => Record<string, unknown>;
+export declare const localDataToSaveInvoicingSubscriptionPayload: (localData: InvoicingSubscriptionFormLocalData, shippingAddress?: AddressUpdatableInfo, flatFeePriceCodes?: ReadonlySet<string>) => Record<string, unknown>;
 export type RunInvoicingSubscriptionActionResponse = ZeniAPIResponse<InvoicingSubscriptionPayload>;
 /** Snake_case request bodies for subscription action endpoints. */
 export type ApplyCouponBody = {

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

@@ -20,22 +20,25 @@ const invoicingSubscriptionFormConfig_1 = require("./invoicingSubscriptionFormCo
  * Sending them made every price point whose cadence the form could not express
  * — a daily plan, for instance — fail with a 422.
  */
-const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress) => {
+const localDataToSaveInvoicingSubscriptionPayload = (localData, shippingAddress, flatFeePriceCodes = new Set()) => {
+    const itemQuantity = (priceCode, quantity) => flatFeePriceCodes.has(priceCode)
+        ? 1
+        : (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionQuantity)(quantity);
     const items = [
         {
             item_price_code: localData.planPriceCode,
             item_type: 'plan',
-            quantity: (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionQuantity)(localData.planQuantity),
+            quantity: itemQuantity(localData.planPriceCode, localData.planQuantity),
         },
         ...localData.addonPriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'addon',
-            quantity: (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionQuantity)(localData.addonQuantities[priceCode]),
+            quantity: itemQuantity(priceCode, localData.addonQuantities[priceCode]),
         })),
         ...localData.chargePriceCodes.map((priceCode) => ({
             item_price_code: priceCode,
             item_type: 'charge',
-            quantity: (0, invoicingSubscriptionFormConfig_1.toInvoicingSubscriptionQuantity)(localData.chargeQuantities[priceCode]),
+            quantity: itemQuantity(priceCode, localData.chargeQuantities[priceCode]),
         })),
     ];
     const setupFee = localData.setupFee?.amount;

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

@@ -147,6 +147,8 @@ export interface InvoicingSubscriptionOption {
     billingCycles?: number;
     billingPeriod?: number;
     billingPeriodUnit?: string;
+    /** Catalog options only: false for a flat fee, which takes no quantity. */
+    hasQuantity?: boolean;
     price?: Amount;
     productCode?: string;
     subtitle?: string;

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

@@ -182,6 +182,7 @@ const toInvoicingPlanOption = (plan) => ({
     // price point and rejects a subscription that claims a different one.
     billingPeriod: plan.period,
     billingPeriodUnit: plan.periodUnit,
+    hasQuantity: (0, invoicingSubscriptionFormConfig_1.invoicingPriceHasQuantity)(plan.pricingModel),
     label: plan.name ?? plan.id,
     price: invoicingUnitPrice(plan),
     productCode: plan.productCode,
@@ -193,6 +194,7 @@ const toInvoicingCatalogItemOption = (product) => ({
     // A one-time charge has no cadence, so its price is quoted flat rather than
     // per period.
     billingPeriodUnit: product.itemType === 'charge' ? undefined : product.periodUnit,
+    hasQuantity: (0, invoicingSubscriptionFormConfig_1.invoicingPriceHasQuantity)(product.pricingModel),
     label: product.name ?? product.id,
     price: invoicingUnitPrice(product),
     productCode: product.productCode,

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

@@ -43,11 +43,14 @@ const fetchInvoicingSubscriptionDetailPageEpic = (actions$, state$) => actions$.
     // Plan and coupon lists back the names the page renders for its line
     // items; both list slices cache, so this only refetches when asked to.
     const catalogListState = state.invoicingCatalogListViewState;
-    if (shouldFetch({
-        error: catalogListState.error,
+    if ((0, invoicingListTabCache_1.shouldFetchFullInvoicingList)({
         fetchState: catalogListState.fetchState,
-    }, cacheOverride)) {
+        filters: catalogListState.planFilters,
+        nextCursor: catalogListState.planNextCursor,
+        sort: catalogListState.planSort,
+    }, { type: 'plan' }, cacheOverride)) {
         pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList)({
+            fetchAll: true,
             filters: { type: 'plan' },
             keepExistingListItems: false,
         }));

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

@@ -23,6 +23,7 @@ const fetchInvoicingSubscriptionFormPageEpic = (actions$) => actions$.pipe((0, o
         // unfiltered list would replace the store's plans with every catalog
         // item.
         (0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList)({
+            fetchAll: true,
             filters: { type: 'plan' },
             keepExistingListItems: false,
         }),

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

@@ -8,6 +8,8 @@ export declare const INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE: "invoicing_su
  * their day gets their own calendar date rather than yesterday's.
  */
 export declare const invoicingSubscriptionTodayIso: () => string;
+/** A flat fee bills its price once, so its quantity is always 1. */
+export declare const invoicingPriceHasQuantity: (pricingModel?: string) => boolean;
 /**
  * Clamp a subscription-item quantity to the minimum the API accepts. Shared by
  * the plan, add-on and charge items so none of them can bill a 0 or a fraction.

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.entityToInvoicingSubscriptionFormLocalData = exports.initialInvoicingSubscriptionFormLocalData = exports.toInvoicingSubscriptionBillingCycles = exports.toInvoicingSubscriptionQuantity = exports.invoicingSubscriptionTodayIso = exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = void 0;
+exports.entityToInvoicingSubscriptionFormLocalData = exports.initialInvoicingSubscriptionFormLocalData = exports.toInvoicingSubscriptionBillingCycles = exports.toInvoicingSubscriptionQuantity = exports.invoicingPriceHasQuantity = exports.invoicingSubscriptionTodayIso = exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = void 0;
 const zeniDayJS_1 = require("../../../zeniDayJS");
 /** `AddressType` key used when the subscription form opens the shared Address screen. */
 exports.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE = 'invoicing_subscription_shipping_address';
@@ -26,6 +26,9 @@ const subscriptionItemQuantities = (subscription, itemType) => {
  */
 const invoicingSubscriptionTodayIso = () => (0, zeniDayJS_1.dateNow)().format('YYYY-MM-DD');
 exports.invoicingSubscriptionTodayIso = invoicingSubscriptionTodayIso;
+/** A flat fee bills its price once, so its quantity is always 1. */
+const invoicingPriceHasQuantity = (pricingModel) => pricingModel !== 'flat_fee';
+exports.invoicingPriceHasQuantity = invoicingPriceHasQuantity;
 /**
  * Clamp a subscription-item quantity to the minimum the API accepts. Shared by
  * the plan, add-on and charge items so none of them can bill a 0 or a fraction.

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

@@ -12,6 +12,7 @@ const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
 const editInvoicingCustomerDetailViewReducer_1 = require("../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer");
 const invoiceListReducer_1 = require("../invoiceList/invoiceListReducer");
+const invoicingCatalogListViewSelector_1 = require("../invoicingCatalogListView/invoicingCatalogListViewSelector");
 const invoicingSubscriptionListViewReducer_1 = require("../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer");
 const editInvoicingSubscriptionDetailViewPayload_1 = require("./editInvoicingSubscriptionDetailViewPayload");
 const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSubscriptionDetailViewReducer");
@@ -29,7 +30,10 @@ const invoicingSubscriptionSaveRequest = (rootState, id) => {
     // Shipping address captured via the shared Address screen is sent as an
     // object in the payload (same pattern as the customer save flow).
     const shippingAddress = rootState.addressViewState.newAddressState?.[invoicingSubscriptionFormConfig_1.INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
-    const data = (0, editInvoicingSubscriptionDetailViewPayload_1.localDataToSaveInvoicingSubscriptionPayload)(localData, shippingAddress);
+    const flatFeePriceCodes = new Set((0, invoicingCatalogListViewSelector_1.getInvoicingCatalogPrices)(Object.values(rootState.invoicingCatalogState.itemByID))
+        .filter((price) => !(0, invoicingSubscriptionFormConfig_1.invoicingPriceHasQuantity)(price.pricingModel))
+        .flatMap((price) => price.priceCode ?? []));
+    const data = (0, editInvoicingSubscriptionDetailViewPayload_1.localDataToSaveInvoicingSubscriptionPayload)(localData, shippingAddress, flatFeePriceCodes);
     if (id != null) {
         delete data.coupon_ids;
     }

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js

@@ -26,19 +26,30 @@ const buildPlanQuery = (filters, cursor, sort) => {
     return params;
 };
 const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList.match), (0, operators_1.switchMap)((action) => {
-    const { filters, cursor, keepExistingListItems, sort } = action.payload;
+    const { filters, cursor, fetchAll, keepExistingListItems, sort } = action.payload;
     const apiUrl = (0, invoicingApiHelper_1.withQuery)(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/catalog/plans`, buildPlanQuery(filters, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
-            return [
+            const nextCursor = response.data?.next_cursor ?? null;
+            const pageActions = [
                 (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogPlanList)({
                     ids: items.map((item) => item.id),
-                    nextCursor: response.data?.next_cursor ?? null,
+                    nextCursor,
                     keepExistingListItems,
                 }),
             ];
+            if (fetchAll && nextCursor != null && nextCursor !== cursor) {
+                pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogPlanList)({
+                    cursor: nextCursor,
+                    fetchAll,
+                    filters,
+                    keepExistingListItems: true,
+                    sort,
+                }));
+            }
+            return pageActions;
         }
         return (0, rxjs_1.of)((0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogPlanListFailure)(response.status));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogPlanListFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch catalog plan list REST API call errored out ' +

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js

@@ -26,19 +26,30 @@ const buildProductQuery = (filters, cursor, sort) => {
     return params;
 };
 const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingCatalogListViewReducer_1.fetchInvoicingCatalogProductList.match), (0, operators_1.switchMap)((action) => {
-    const { filters, cursor, keepExistingListItems, sort } = action.payload;
+    const { filters, cursor, fetchAll, keepExistingListItems, sort } = action.payload;
     const apiUrl = (0, invoicingApiHelper_1.withQuery)(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/catalog/plans`, buildProductQuery(filters, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
-            return [
+            const nextCursor = response.data?.next_cursor ?? null;
+            const pageActions = [
                 (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogProductList)({
                     ids: items.map((item) => item.id),
-                    nextCursor: response.data?.next_cursor ?? null,
+                    nextCursor,
                     keepExistingListItems,
                 }),
             ];
+            if (fetchAll && nextCursor != null && nextCursor !== cursor) {
+                pageActions.push((0, invoicingCatalogListViewReducer_1.fetchInvoicingCatalogProductList)({
+                    cursor: nextCursor,
+                    fetchAll,
+                    filters,
+                    keepExistingListItems: true,
+                    sort,
+                }));
+            }
+            return pageActions;
         }
         return (0, rxjs_1.of)((0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogProductListFailure)(response.status));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogProductListFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch catalog product list REST API call errored out ' +

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

@@ -6,12 +6,15 @@ import { InvoicingCatalogListViewState, InvoicingCatalogPlanFilters, InvoicingCa
 export declare const initialState: InvoicingCatalogListViewState;
 export declare const fetchInvoicingCatalogPlanList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: {
     cursor?: string;
+    /** Keep requesting the next page until the list is complete. */
+    fetchAll?: boolean;
     filters?: InvoicingCatalogPlanFilters;
     keepExistingListItems?: boolean;
     sort?: InvoicingListSort;
 }], {
     filters: InvoicingCatalogPlanFilters;
     cursor: string | undefined;
+    fetchAll: boolean;
     keepExistingListItems: boolean;
     sort: InvoicingListSort | undefined;
 }, "invoicingCatalogListView/fetchInvoicingCatalogPlanList", never, never>, updateInvoicingCatalogPlanList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -20,12 +23,15 @@ export declare const fetchInvoicingCatalogPlanList: import("@reduxjs/toolkit").A
     nextCursor: string | null;
 }, "invoicingCatalogListView/updateInvoicingCatalogPlanList">, updateInvoicingCatalogPlanListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingCatalogListView/updateInvoicingCatalogPlanListFailure">, fetchInvoicingCatalogProductList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: {
     cursor?: string;
+    /** Keep requesting the next page until the list is complete. */
+    fetchAll?: boolean;
     filters?: InvoicingCatalogProductFilters;
     keepExistingListItems?: boolean;
     sort?: InvoicingListSort;
 }], {
     filters: InvoicingCatalogProductFilters;
     cursor: string | undefined;
+    fetchAll: boolean;
     keepExistingListItems: boolean;
     sort: InvoicingListSort | undefined;
 }, "invoicingCatalogListView/fetchInvoicingCatalogProductList", never, never>, updateInvoicingCatalogProductList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

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

@@ -40,6 +40,7 @@ const invoicingCatalogListView = (0, toolkit_1.createSlice)({
                     payload: {
                         filters: payload.filters ?? {},
                         cursor: payload.cursor,
+                        fetchAll: payload.fetchAll ?? false,
                         keepExistingListItems: payload.keepExistingListItems ?? false,
                         sort: payload.sort,
                     },
@@ -74,6 +75,7 @@ const invoicingCatalogListView = (0, toolkit_1.createSlice)({
                     payload: {
                         filters: payload.filters ?? {},
                         cursor: payload.cursor,
+                        fetchAll: payload.fetchAll ?? false,
                         keepExistingListItems: payload.keepExistingListItems ?? false,
                         sort: payload.sort,
                     },

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

@@ -1,4 +1,4 @@
-import { FetchStateAndError, ID } from '../../commonStateTypes/common';
+import { FetchState, FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus } from '../../responsePayload';
 import { InvoicingListSort } from './invoicingApiHelper';
 /**
@@ -42,6 +42,16 @@ export declare const isSameInvoicingListQuery: (a: {
     filters: object;
     sort?: InvoicingListSort;
 }) => boolean;
+/**
+ * For a picker that searches client-side: reuse only a complete list fetched
+ * with the picker's own query, else load every page of it.
+ */
+export declare const shouldFetchFullInvoicingList: (list: {
+    fetchState: FetchState;
+    filters: object;
+    nextCursor: string | null;
+    sort?: InvoicingListSort;
+}, pickerFilters: object, cacheOverride: boolean) => boolean;
 /** What opening a tab should fetch, if anything. */
 export type InvoicingListTabFetch = {
     kind: 'none';

package/lib/view/invoicing/invoicingListTabCache.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSameInvoicingListQuery = exports.invoicingListStatusParam = exports.invoicingListFetchTab = exports.invoicingListSourceTab = exports.getInvoicingListTab = exports.INVOICING_LIST_ALL_TAB = void 0;
+exports.shouldFetchFullInvoicingList = exports.isSameInvoicingListQuery = exports.invoicingListStatusParam = exports.invoicingListFetchTab = exports.invoicingListSourceTab = exports.getInvoicingListTab = exports.INVOICING_LIST_ALL_TAB = void 0;
 exports.planInvoicingListTabFetch = planInvoicingListTabFetch;
 exports.startInvoicingListTabFetch = startInvoicingListTabFetch;
 exports.completeInvoicingListTabFetch = completeInvoicingListTabFetch;
@@ -46,6 +46,15 @@ const isSameInvoicingListQuery = (a, b) => {
         a.sort?.dir === b.sort?.dir);
 };
 exports.isSameInvoicingListQuery = isSameInvoicingListQuery;
+/**
+ * For a picker that searches client-side: reuse only a complete list fetched
+ * with the picker's own query, else load every page of it.
+ */
+const shouldFetchFullInvoicingList = (list, pickerFilters, cacheOverride) => cacheOverride ||
+    list.fetchState !== 'Completed' ||
+    list.nextCursor != null ||
+    !(0, exports.isSameInvoicingListQuery)({ filters: list.filters, sort: list.sort }, { filters: pickerFilters });
+exports.shouldFetchFullInvoicingList = shouldFetchFullInvoicingList;
 /**
  * Fetch a tab that is empty or failed; top up one that holds less than a page
  * while the server says there is more; leave a full or complete one cached.

package/package.json

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