@zeniai/client-epic-state 5.2.70 → 5.2.72-beta0ND

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogListPageEpic.d.ts

@@ -1,13 +1,13 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { fetchInvoicingCatalogCounts, fetchInvoicingCatalogListPage, fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList, updateInvoicingCatalogCounts, updateInvoicingCatalogCountsFailure, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure } from '../invoicingCatalogListViewReducer';
 /**
  * Aggregate of every action emitted across the catalog list view epics. Wired
  * into the root action union for this view.
  */
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof fetchInvoicingCatalogListPage> | ReturnType<typeof fetchInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogCountsFailure> | ReturnType<typeof updateInvoicingPlans>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof fetchInvoicingCatalogListPage> | ReturnType<typeof fetchInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogCounts> | ReturnType<typeof updateInvoicingCatalogCountsFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
 /**
  * Orchestrates the catalog page: on `fetchInvoicingCatalogListPage`, fans out to
  * the plan-list, product-list and counts fetches, skipping any whose data is

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchInvoicingCatalogPlanList, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure } from '../invoicingCatalogListViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingPlans>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanList> | ReturnType<typeof updateInvoicingCatalogPlanListFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
 export declare const fetchInvoicingCatalogPlanListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogPlanListEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../../entity/invoicing/plan/planReducer");
+const invoicingCatalogReducer_1 = require("../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const invoicingApiHelper_1 = require("../../invoicingApiHelper");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListViewReducer");
@@ -32,7 +32,7 @@ const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) => action
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
             return [
-                (0, planReducer_1.updateInvoicingPlans)(items, 'merge'),
+                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogPlanList)({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchInvoicingCatalogProductList, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure } from '../invoicingCatalogListViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingPlans>;
+export type ActionType = ReturnType<typeof fetchInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductList> | ReturnType<typeof updateInvoicingCatalogProductListFailure> | ReturnType<typeof updateInvoicingCatalogItems>;
 export declare const fetchInvoicingCatalogProductListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchInvoicingCatalogProductListEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const planReducer_1 = require("../../../../entity/invoicing/plan/planReducer");
+const invoicingCatalogReducer_1 = require("../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const invoicingApiHelper_1 = require("../../invoicingApiHelper");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListViewReducer");
@@ -32,7 +32,7 @@ const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI) => act
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];
             return [
-                (0, planReducer_1.updateInvoicingPlans)(items, 'merge'),
+                (0, invoicingCatalogReducer_1.updateInvoicingCatalogItems)(items, 'merge'),
                 (0, invoicingCatalogListViewReducer_1.updateInvoicingCatalogProductList)({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

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

@@ -1,6 +1,6 @@
+import { InvoicingCatalogItemPayload } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogPayload';
 import { InvoicingListCounts, InvoicingPaginatedList } from '../../../entity/invoicing/invoicingCommonPayload';
-import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
-export type InvoicingCatalogPlanListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingPlanPayload>>;
-export type InvoicingCatalogProductListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingPlanPayload>>;
+export type InvoicingCatalogPlanListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingCatalogItemPayload>>;
+export type InvoicingCatalogProductListResponse = ZeniAPIResponse<InvoicingPaginatedList<InvoicingCatalogItemPayload>>;
 export type InvoicingCatalogCountsResponse = ZeniAPIResponse<InvoicingListCounts>;

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

@@ -1,31 +1,48 @@
+import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
-import { InvoicingCatalogItemLifecycleAction, InvoicingCatalogLifecycleActionOption, InvoicingListCounts } from '../../../entity/invoicing/invoicingCommonPayload';
-import { InvoicingPlan } from '../../../entity/invoicing/plan/planState';
-import { InvoicingProduct } from '../../../entity/invoicing/product/productState';
+import { InvoicingCatalogItem, InvoicingCatalogPricePoint, InvoicingCatalogTier } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogState';
+import { InvoicingListCounts } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingListSort } from '../invoicingApiHelper';
-import { InvoicingCatalogPlanFilters, InvoicingCatalogProductFilters, InvoicingProductColumnConfig } from './invoicingCatalogListViewState';
+import { InvoicingCatalogPlanFilters, InvoicingCatalogProductFilters } from './invoicingCatalogListViewState';
+/**
+ * One row of the catalog table: a price point under its catalog item, so an
+ * item priced monthly and annually lists once per price. An item with no price
+ * points still gets a row, from the item's own fields.
+ */
+export interface InvoicingCatalogPlanRow {
+    /** The price point's id, or the item's when it has no price points. */
+    id: ID;
+    /** The row's catalog item: the row opens it and its menu acts on it. */
+    item: InvoicingCatalogItem;
+    tierCount: number;
+    /** The tier with the lowest starting unit — what "From" quotes. */
+    firstTier?: InvoicingCatalogTier;
+    period?: number;
+    periodUnit?: string;
+    planName?: string;
+    price?: Amount;
+    pricingModel?: string;
+    productFamily?: string;
+    status?: string;
+}
 export interface InvoicingCatalogListView extends SelectorView {
-    /** Config-owned; folded in so the screen reads one selector. */
-    catalogItemLifecycleActionOptions: InvoicingCatalogLifecycleActionOption<InvoicingCatalogItemLifecycleAction>[];
     count: InvoicingListCounts;
     countsFetchState: FetchStateAndError;
     planFilters: InvoicingCatalogPlanFilters;
     planNextCursor: string | null;
-    plans: InvoicingPlan[];
-    productColumns: InvoicingProductColumnConfig[];
+    /** {@link plans} flattened to one row per price point. */
+    planRows: InvoicingCatalogPlanRow[];
+    plans: InvoicingCatalogItem[];
     productFetchState: FetchStateAndError;
     productFilters: InvoicingCatalogProductFilters;
     productNextCursor: string | null;
-    products: InvoicingPlan[];
+    /** The add-on / charge rows: {@link products} flattened the same way. */
+    productRows: InvoicingCatalogPlanRow[];
+    products: InvoicingCatalogItem[];
     planSort?: InvoicingListSort;
     productSort?: InvoicingListSort;
-    /**
-     * The catalog item whose lifecycle action is in flight, so the list disables
-     * that row's menu without reaching into the action slice itself.
-     */
-    runningActionId?: ID;
 }
 /**
  * Flatten catalog items into the price rows the pickers render.
@@ -37,7 +54,8 @@ export interface InvoicingCatalogListView extends SelectorView {
  * written after the spread so the item's own rule wins over any stale copy a
  * price point payload may carry.
  */
-export declare const getInvoicingCatalogPrices: (items: InvoicingPlan[]) => InvoicingProduct[];
+export declare const getInvoicingCatalogPrices: (items: InvoicingCatalogItem[]) => InvoicingCatalogPricePoint[];
+export declare const getInvoicingCatalogPlanRows: (items: InvoicingCatalogItem[]) => InvoicingCatalogPlanRow[];
 /**
  * Bundled read view for the single catalog page (plans + products tabs).
  * Memoized over the plan + product entity slices and the list-view slice so the

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

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingCatalogListView = exports.getInvoicingCatalogPrices = void 0;
+exports.getInvoicingCatalogListView = exports.getInvoicingCatalogPlanRows = exports.getInvoicingCatalogPrices = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
-const runningInvoicingActionId_1 = require("../runningInvoicingActionId");
-const invoicingCatalogListViewState_1 = require("./invoicingCatalogListViewState");
+const invoicingCatalogSelector_1 = require("../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector");
 /**
  * Flatten catalog items into the price rows the pickers render.
  *
@@ -26,28 +24,64 @@ const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (item.subFa
     productCode: item.productCode,
 })));
 exports.getInvoicingCatalogPrices = getInvoicingCatalogPrices;
+const lowestStartingTier = (tiers) => tiers.reduce((lowest, tier) => lowest == null || tier.startingUnit < lowest.startingUnit ? tier : lowest, undefined);
+const getInvoicingCatalogPlanRows = (items) => items.flatMap((item) => {
+    const pricePoints = item.subFamilies ?? [];
+    if (pricePoints.length === 0) {
+        return [
+            {
+                id: item.id,
+                item,
+                period: item.period,
+                periodUnit: item.periodUnit,
+                price: item.price,
+                productFamily: item.name,
+                status: item.status,
+                tierCount: item.tiers?.length ?? 0,
+                firstTier: lowestStartingTier(item.tiers ?? []),
+            },
+        ];
+    }
+    return pricePoints.map((pricePoint) => ({
+        id: pricePoint.id,
+        item,
+        period: pricePoint.period,
+        periodUnit: pricePoint.periodUnit,
+        planName: pricePoint.name,
+        price: (0, invoicingCatalogSelector_1.invoicingPricePointDisplayAmount)(pricePoint),
+        pricingModel: pricePoint.pricingModel,
+        productFamily: item.name,
+        status: pricePoint.status,
+        tierCount: pricePoint.tiers?.length ?? 0,
+        firstTier: lowestStartingTier(pricePoint.tiers ?? []),
+    }));
+});
+exports.getInvoicingCatalogPlanRows = getInvoicingCatalogPlanRows;
 /**
  * Bundled read view for the single catalog page (plans + products tabs).
  * Memoized over the plan + product entity slices and the list-view slice so the
  * denormalized arrays keep referential identity. The base `fetchState`/`error`
  * track the plan list; the product list has its own `productFetchState`.
  */
-exports.getInvoicingCatalogListView = (0, toolkit_1.createSelector)((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (planState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
-    catalogItemLifecycleActionOptions,
-    runningActionId: (0, runningInvoicingActionId_1.runningInvoicingActionId)(actionStateById),
-    plans: (0, planSelector_1.getInvoicingPlansByIds)(planState, listViewState.planIds),
-    planSort: listViewState.planSort,
-    productColumns: invoicingCatalogListViewState_1.INVOICING_PRODUCT_COLUMNS,
-    products: (0, planSelector_1.getInvoicingPlansByIds)(planState, listViewState.productIds),
-    productSort: listViewState.productSort,
-    count: listViewState.counts,
-    countsFetchState: listViewState.countsFetchState,
-    planFilters: listViewState.planFilters,
-    planNextCursor: listViewState.planNextCursor,
-    productFilters: listViewState.productFilters,
-    productNextCursor: listViewState.productNextCursor,
-    productFetchState: listViewState.productFetchState,
-    fetchState: listViewState.fetchState,
-    error: listViewState.error,
-    version: 1.0,
-}));
+exports.getInvoicingCatalogListView = (0, toolkit_1.createSelector)((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => {
+    const plans = (0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, listViewState.planIds);
+    const products = (0, invoicingCatalogSelector_1.getInvoicingCatalogItemsByIds)(catalogState, listViewState.productIds);
+    return {
+        planRows: (0, exports.getInvoicingCatalogPlanRows)(plans),
+        plans,
+        planSort: listViewState.planSort,
+        productRows: (0, exports.getInvoicingCatalogPlanRows)(products),
+        products,
+        productSort: listViewState.productSort,
+        count: listViewState.counts,
+        countsFetchState: listViewState.countsFetchState,
+        planFilters: listViewState.planFilters,
+        planNextCursor: listViewState.planNextCursor,
+        productFilters: listViewState.productFilters,
+        productNextCursor: listViewState.productNextCursor,
+        productFetchState: listViewState.productFetchState,
+        fetchState: listViewState.fetchState,
+        error: listViewState.error,
+        version: 1.0,
+    };
+});

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

@@ -1,21 +1,6 @@
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { InvoicingListCounts } from '../../../entity/invoicing/invoicingCommonPayload';
 import { InvoicingListSort } from '../invoicingApiHelper';
-export declare const ALL_INVOICING_PRODUCT_SORT_KEYS: readonly ["product_name", "product_code", "type", "pricing", "usage", "updated", "status"];
-export declare const toInvoicingProductSortKey: (v: string) => "type" | "status" | "product_name" | "product_code" | "pricing" | "usage" | "updated";
-export type InvoicingProductSortKey = ReturnType<typeof toInvoicingProductSortKey>;
-/**
- * Structural column descriptor owned by CES for the catalog product table
- * (add-ons / one-time charges), so the column set, order and sortability live
- * next to the `InvoicingProduct` model rather than being hardcoded in
- * web-components. Header labels, cell rendering and layout (alignment, widths)
- * stay in the view layer. (The plans table keeps its own columns in web-c.)
- */
-export interface InvoicingProductColumnConfig {
-    key: InvoicingProductSortKey;
-    sortable: boolean;
-}
-export declare const INVOICING_PRODUCT_COLUMNS: InvoicingProductColumnConfig[];
 export interface InvoicingCatalogPlanFilters {
     search?: string;
     status?: string;

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

@@ -1,24 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INVOICING_PRODUCT_COLUMNS = exports.toInvoicingProductSortKey = exports.ALL_INVOICING_PRODUCT_SORT_KEYS = void 0;
-const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
-exports.ALL_INVOICING_PRODUCT_SORT_KEYS = [
-    'product_name',
-    'product_code',
-    'type',
-    'pricing',
-    'usage',
-    'updated',
-    'status',
-];
-const toInvoicingProductSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_INVOICING_PRODUCT_SORT_KEYS);
-exports.toInvoicingProductSortKey = toInvoicingProductSortKey;
-exports.INVOICING_PRODUCT_COLUMNS = [
-    { key: 'product_name', sortable: true },
-    { key: 'product_code', sortable: true },
-    { key: 'type', sortable: true },
-    { key: 'pricing', sortable: false },
-    { key: 'usage', sortable: true },
-    { key: 'updated', sortable: true },
-    { key: 'status', sortable: true },
-];

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

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

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

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

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

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

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

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

package/lib/view/invoicing/settingsView/settingsViewSelector.d.ts

@@ -4,6 +4,7 @@ import { InvoicingDunningActionOption, InvoicingFieldHelpByCode, InvoicingNamedO
 import { File } from '../../../entity/file/fileState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { RootState } from '../../../rootStateTypes';
+import { AddressUpdatableInfo } from '../../addressView/addressViewState';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from '../invoicingQboView/invoicingQboViewPayload';
 import { InvoicingAccountingOption } from '../invoicingQboView/invoicingQboViewSelector';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
@@ -113,6 +114,8 @@ export interface InvoicingQboSettingsFormView {
     localData: InvoicingQboSettingsLocalData;
     nestedAccountHierarchy: NestedAccountHierarchyForReport[];
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
+    /** The saved values the draft is compared against. */
+    savedLocalData: InvoicingQboSettingsLocalData;
     saveState: FetchStateAndError;
     settingsFetchState: FetchState;
     syncStatusOptions: InvoicingNamedOption[];
@@ -134,14 +137,20 @@ export interface InvoicingBrandingFormView {
     fieldHelp: InvoicingFieldHelpByCode;
     localData: InvoicingBrandingFormLocalData;
     saveState: FetchStateAndError;
+    /** The business address to show: the in-progress edit, else what is saved. */
+    address?: AddressUpdatableInfo;
     addressLabel?: string;
     settings?: InvoicingSettingsPayload;
 }
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 export declare const getInvoicingBrandingFormView: (state: RootState) => InvoicingBrandingFormView;

package/lib/view/invoicing/settingsView/settingsViewSelector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingBrandingFormView = exports.getInvoicingQboSettingsFormView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 exports.deriveInvoicingEnablePrerequisites = deriveInvoicingEnablePrerequisites;
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileSelector_1 = require("../../../entity/file/fileSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
@@ -126,6 +127,7 @@ const getInvoicingQboSettingsFormView = (state) => {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
         accountMappingKindOptions: qboAccountMappingKindOptions,
         accounts: qboView.accounts,
+        savedLocalData: (0, invoicingQboSettingsFormConfig_1.entityToInvoicingQboSettingsLocalData)(settings?.qbo),
         backfillState: qboView.backfillState,
         connection: qboView.connection,
         configFetchState,
@@ -152,20 +154,27 @@ const getInvoicingQboSettingsFormView = (state) => {
 exports.getInvoicingQboSettingsFormView = getInvoicingQboSettingsFormView;
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
-    const newAddress = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE];
-    const addressLabel = newAddress?.addressToCreate != null
-        ? (0, addressViewSelector_1.getFormattedAddress)(newAddress.addressToCreate)
-        : undefined;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]
+        ?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
-        addressLabel,
+        address,
+        addressLabel: address != null ? (0, addressViewSelector_1.getFormattedAddress)(address) : undefined,
         dateFormatOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).dateFormatOptions,
         localData: brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings),
         saveState: saveFetchState,

package/lib/view/invoicing/settingsView/submitInvoicingBrandingFormEpic.js

@@ -4,6 +4,7 @@ exports.submitInvoicingBrandingFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileReducer_1 = require("../../../entity/file/fileReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
@@ -19,7 +20,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
     const state = state$.value;
     const { brandingDraft, settings } = state.invoicingSettingsViewState;
     const localData = brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings);
-    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     const data = (0, invoicingBrandingFormConfig_1.brandingLocalDataToSettingsPayload)(localData, address);
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     return zeniAPI
@@ -40,7 +45,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
                     ? [(0, fileReducer_1.updateFiles)({ files: [savedLogoFile] })]
                     : []),
                 (0, settingsViewReducer_1.saveInvoicingSettingsSuccess)(response.data),
-                (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                ...(savedAddress == null
+                    ? [
+                        (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                    ]
+                    : []),
             ];
         }
         return (0, rxjs_1.of)((0, settingsViewReducer_1.saveInvoicingSettingsFailure)(response.status));

package/lib/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -19,7 +19,7 @@ const updateBusinessVerificationDetailsEpic_1 = require("../../../../spendManage
 const onboardingCustomerViewReducer_1 = require("../../onboardingCustomerViewReducer");
 const onboardingCustomerViewSelector_1 = require("../../onboardingCustomerViewSelector");
 const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(onboardingCustomerViewReducer_1.updateOnboardingCustomerView.match), (0, operators_1.mergeMap)((action) => {
-    const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, } = action.payload;
+    const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, businessProfile, } = action.payload;
     const { onboardingCustomerViewState } = state$.value;
     const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
@@ -31,12 +31,17 @@ const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$
     }
     const { newAddressState } = state$.value.addressViewState;
     let payload = {};
+    const isSetupBillingSave = isBillingAddressUpdate === true || businessProfile != null;
     if (companyLocalData != null) {
-        if (isBillingAddressUpdate === true &&
-            newAddressState?.subscription_billing_address.addressToCreate != null) {
-            payload = prepareEditBillingAddressPayload(companyLocalData, newAddressState.subscription_billing_address.addressToCreate);
-        }
         const companyView = (0, getCompanyView_1.getCompanyView)(state$.value, companyId, []);
+        const billingAddressToCreate = isBillingAddressUpdate === true
+            ? newAddressState?.subscription_billing_address.addressToCreate
+            : undefined;
+        if (billingAddressToCreate != null || businessProfile != null) {
+            payload = prepareEditBillingAddressPayload(companyLocalData, billingAddressToCreate, businessProfile != null
+                ? toBusinessProfilePayload(businessProfile, companyView?.company.company.incInfo)
+                : {});
+        }
         const companyAddressToCreate = newAddressState?.company_address?.addressToCreate;
         const registeredAddressToCreate = newAddressState?.company_registered_address?.addressToCreate;
         const addressType = officerType
@@ -59,7 +64,7 @@ const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$
         // different payloads — currentSubStep is the source of truth here.
         const isOfficerSave = currentStep === 'verification' &&
             currentSubStep === 'company_officer';
-        if (isBillingAddressUpdate === false) {
+        if (isBillingAddressUpdate === false && businessProfile == null) {
             if (isOfficerSave) {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
@@ -73,7 +78,7 @@ const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$
                 };
             }
         }
-        const section = isBillingAddressUpdate === true
+        const section = isSetupBillingSave
             ? 'setup_billing'
             : isOfficerSave
                 ? 'company_officer'
@@ -88,12 +93,12 @@ const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$
                 save: 'onboarding_customer_business_verification_save',
             },
             setup_billing: {
-                save: 'billing_address_view',
-                sendForVerification: 'billing_address_view',
+                save: 'common',
+                sendForVerification: 'common',
             },
         };
         let messageSection;
-        if (isBillingAddressUpdate === true) {
+        if (isSetupBillingSave) {
             messageSection = messageSectionMapper[section].save;
         }
         else if (sendForVerification === true) {
@@ -177,13 +182,28 @@ const toBusinessVerificationMinimalCompanyDataPayload = (companyLocalData) => {
     }
     return company;
 };
-const prepareEditBillingAddressPayload = (companyDetailsLocalData, address) => {
+const toBusinessProfilePayload = (businessProfile, persistedIncInfo) => {
+    const isIndustryTypeChanged = businessProfile.companyIndustryType !==
+        persistedIncInfo?.companyIndustryType;
+    return {
+        company_business_model: businessProfile.companyBusinessModel,
+        company_industry_type: businessProfile.companyIndustryType,
+        // A sub-industry kept from the old industry would fail the backend subtype check on the next KYB save.
+        ...(isIndustryTypeChanged &&
+            persistedIncInfo?.companySubIndustry != null && {
+            company_industry_sub_type: null,
+        }),
+    };
+};
+const prepareEditBillingAddressPayload = (companyDetailsLocalData, address, businessProfilePayload) => {
     const { syncToken } = companyDetailsLocalData;
-    const addressPayload = (0, addressViewPayload_1.toAddressUpdatableInfoPayload)(address);
     return {
         company: {
             sync_token: syncToken,
-            subscription_billing_address: addressPayload,
+            ...(address != null && {
+                subscription_billing_address: (0, addressViewPayload_1.toAddressUpdatableInfoPayload)(address),
+            }),
+            ...businessProfilePayload,
         },
     };
 };