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

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
-import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
+import { getInvoicingCatalogItemById, getInvoicingCatalogItemsByIds, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingFormDraftLocalData, isInvoicingFormDraftPending, } from '../invoicingFormDraft';
 import { INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES, INVOICING_INCOME_ACCOUNT_MAPPING_SLOT, NO_INVOICING_ACCOUNT_HIERARCHY, NO_INVOICING_ACCOUNT_IDS, NO_INVOICING_CLASS_HIERARCHY, getInvoicingQboAccountOptions, getInvoicingQboView, invoicingQboAccountIdsForMappingSlot, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
@@ -36,7 +36,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
  * Kept referentially stable across unrelated dispatches; the form view filters
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
  */
-export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingPlansByIds(planState, [
+export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingCatalogItemsByIds(catalogState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -61,7 +61,9 @@ const getInvoicingCatalogIncomeAccountIds = createSelector([
     : NO_INVOICING_ACCOUNT_IDS);
 export const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
-    const plan = id != null ? getInvoicingPlanById(state.invoicingPlanState, id) : undefined;
+    const plan = id != null
+        ? getInvoicingCatalogItemById(state.invoicingCatalogState, id)
+        : undefined;
     const kind = plan != null ? 'plan' : undefined;
     // No entity fallback: the draft is the one source of form values, seeded from
     // the record by `seedInvoicingCatalogItemFormDraftEpic` when the detail load

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/fetchInvoicingCatalogItemDetailEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure, } from './editInvoicingCatalogItemDetailViewReducer';
 export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingCatalogItemDetail.match), switchMap((action) => {
@@ -9,7 +9,7 @@ export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI)
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingPlans([response.data], 'merge'),
+                updateInvoicingCatalogItems([response.data], 'merge'),
                 updateInvoicingCatalogItemDetail({ id: response.data.id, kind }),
             ];
         }

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogPlanActionEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogPlanAction.match), mergeMap((action) => {
@@ -12,7 +12,7 @@ export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) =>
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingPlans([response.data], 'merge'),
+                updateInvoicingCatalogItems([response.data], 'merge'),
                 runInvoicingCatalogPlanActionSuccess({ id }),
             ];
         }

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/runInvoicingCatalogProductActionEpic.js

@@ -1,7 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
-import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
+import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogProductAction.match), mergeMap((action) => {
@@ -16,9 +15,10 @@ export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingProducts([response.data], 'merge'),
                 ...(parentItemId != null
-                    ? [mergeInvoicingPlanSubFamily(parentItemId, response.data)]
+                    ? [
+                        mergeInvoicingCatalogPricePoint(parentItemId, response.data),
+                    ]
                     : []),
                 runInvoicingCatalogProductActionSuccess({ id: stateKey }),
             ];

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

@@ -1,7 +1,6 @@
 import { forkJoin, from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingPlanSubFamily, updateInvoicingPlans, } from '../../../entity/invoicing/plan/planReducer';
-import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
+import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
@@ -51,11 +50,8 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
-                    updateInvoicingPlans([savedItem], 'merge'),
-                    ...(savedProducts.length > 0
-                        ? [updateInvoicingProducts(savedProducts, 'merge')]
-                        : []),
-                    ...savedProducts.map((product) => mergeInvoicingPlanSubFamily(savedItem.id, product)),
+                    updateInvoicingCatalogItems([savedItem], 'merge'),
+                    ...savedProducts.map((product) => mergeInvoicingCatalogPricePoint(savedItem.id, product)),
                     submitInvoicingCatalogItemFormSuccess({
                         itemId: savedItem.id,
                         kind: 'plan',

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

@@ -1,6 +1,6 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
-import { getInvoicingPlanById } from '../../../entity/invoicing/plan/planSelector';
+import { getInvoicingCatalogItemById } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 import { fetchInvoicingCatalogItemDetailPage, seedInvoicingCatalogItemFormDraft, updateInvoicingCatalogItemDetail, } from './editInvoicingCatalogItemDetailViewReducer';
 import { entityToInvoicingCatalogItemFormLocalData } from './invoicingCatalogItemFormHelper';
 /**
@@ -34,7 +34,7 @@ export const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actio
     }
     // Nothing to seed from on a cold open; the detail response triggers this
     // again once it lands.
-    const plan = getInvoicingPlanById(state.invoicingPlanState, id);
+    const plan = getInvoicingCatalogItemById(state.invoicingCatalogState, id);
     if (plan == null) {
         return EMPTY;
     }

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

@@ -95,6 +95,10 @@ const editInvoicingCustomerDetailView = createSlice({
                 error: undefined,
             };
         },
+        // Makes the page epic refetch a record that changed server-side (e.g. a new subscription).
+        invalidateInvoicingCustomerDetail(draft, action) {
+            delete draft.recordStateById[action.payload.id];
+        },
         fetchInvoicingCustomerDetail(draft, action) {
             draft.recordStateById[action.payload.id] = {
                 fetchState: 'In-Progress',
@@ -198,5 +202,5 @@ const editInvoicingCustomerDetailView = createSlice({
         });
     },
 });
-export const { fetchInvoicingPaymentLinkEmailPreview, fetchInvoicingPaymentLinkEmailPreviewPage, updateInvoicingPaymentLinkEmailPreview, updateInvoicingPaymentLinkEmailPreviewFailure, addPromotionalCreditsFailure, addPromotionalCreditsSuccess, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, seedInvoicingCustomerFormDraft, updateInvoicingCustomerDetail, resetPromotionalCreditAction, submitAddPromotionalCredits, updateInvoicingCustomerDetailFailure, updateInvoicingCustomerFormDraft, submitInvoicingCustomerForm, submitInvoicingCustomerFormSuccess, submitInvoicingCustomerFormFailure, resetEditInvoicingCustomerDetailView, initializeInvoicingCustomerAddress, claimInvoicingCustomerBillingAddress, } = editInvoicingCustomerDetailView.actions;
+export const { fetchInvoicingPaymentLinkEmailPreview, fetchInvoicingPaymentLinkEmailPreviewPage, updateInvoicingPaymentLinkEmailPreview, updateInvoicingPaymentLinkEmailPreviewFailure, addPromotionalCreditsFailure, addPromotionalCreditsSuccess, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, invalidateInvoicingCustomerDetail, seedInvoicingCustomerFormDraft, updateInvoicingCustomerDetail, resetPromotionalCreditAction, submitAddPromotionalCredits, updateInvoicingCustomerDetailFailure, updateInvoicingCustomerFormDraft, submitInvoicingCustomerForm, submitInvoicingCustomerFormSuccess, submitInvoicingCustomerFormFailure, resetEditInvoicingCustomerDetailView, initializeInvoicingCustomerAddress, claimInvoicingCustomerBillingAddress, } = editInvoicingCustomerDetailView.actions;
 export default editInvoicingCustomerDetailView.reducer;

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

@@ -86,6 +86,27 @@ export const getInvoicingItemsAllowedForPlan = (products, plan) => {
     }
     return products.filter((product) => product.itemID != null && allowedItemIDs.includes(product.itemID));
 };
+// Years count as months so they compare; any other unit only meets itself.
+const billingPeriodInCommonUnit = (pricePoint) => {
+    const { period, periodUnit } = pricePoint;
+    if (period == null || periodUnit == null || periodUnit === '') {
+        return undefined;
+    }
+    return periodUnit === 'year'
+        ? { count: period * 12, unit: 'month' }
+        : { count: period, unit: periodUnit };
+};
+// The add-on's period must divide the plan's (create 422s otherwise); fails open when they cannot be compared.
+export const isInvoicingAddonPeriodCompatible = (addon, plan) => {
+    const addonPeriod = billingPeriodInCommonUnit(addon);
+    const planPeriod = plan != null ? billingPeriodInCommonUnit(plan) : undefined;
+    if (addonPeriod == null ||
+        planPeriod == null ||
+        addonPeriod.unit !== planPeriod.unit) {
+        return true;
+    }
+    return addonPeriod.count > 0 && planPeriod.count % addonPeriod.count === 0;
+};
 /**
  * A price row can only be subscribed by its price code, so one without a code
  * is not an option the form can offer.
@@ -174,7 +195,12 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
     // pickers offer only those: subscription create rejects the rest with a 422,
     // and an option that can only fail is not a choice. The applicability rides
     // on the price rows already in the store, so this is a join, not a refetch.
-    const allowedCatalogPrices = getInvoicingItemsAllowedForPlan(getInvoicingCatalogPrices(catalogListView.products), planPrices.find((plan) => plan.priceCode === localData.planPriceCode)).filter(hasInvoicingPriceCode);
+    const selectedPlanPrice = planPrices.find((plan) => plan.priceCode === localData.planPriceCode);
+    // Add-ons also have to bill on the plan's cadence; charges are one-time.
+    const allowedCatalogPrices = getInvoicingItemsAllowedForPlan(getInvoicingCatalogPrices(catalogListView.products), selectedPlanPrice)
+        .filter(hasInvoicingPriceCode)
+        .filter((product) => product.itemType !== 'addon' ||
+        isInvoicingAddonPeriodCompatible(product, selectedPlanPrice));
     const catalogItemOptionsOfType = (itemType) => allowedCatalogPrices
         .filter((product) => product.itemType === itemType)
         .map(toInvoicingCatalogItemOption);

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

@@ -7,6 +7,8 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
+import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
+import { invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
 import { addInvoicingSubscriptionToList } from '../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
 import { localDataToSaveInvoicingSubscriptionPayload, } from './editInvoicingSubscriptionDetailViewPayload';
 import { submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormFailure, submitInvoicingSubscriptionFormSuccess, syncInvoicingSubscriptionCoupons, } from './editInvoicingSubscriptionDetailViewReducer';
@@ -86,7 +88,9 @@ export const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => acti
             resultActions.push(addInvoicingSubscriptionToList({
                 id: saved.id,
                 status: saved.status,
-            }));
+            }), 
+            // The service may bill the first invoice on create.
+            invalidateInvoicingCustomerDetail({ id: saved.customer_id }), invalidateInvoiceListForCustomer({ customerId: saved.customer_id }));
         }
         resultActions.push(openSnackbar({
             messageSection: 'invoicing_subscription_saved',

package/lib/esm/view/invoicing/invoiceList/invoiceListReducer.js

@@ -124,6 +124,13 @@ const invoiceList = createSlice({
             draft.kpisFetchState.fetchState = 'Error';
             draft.kpisFetchState.error = action.payload;
         },
+        // Counts are fetched under the same customer filter, so they go stale with the tabs.
+        invalidateInvoiceListForCustomer(draft, action) {
+            if (draft.filters.customerId === action.payload.customerId) {
+                draft.invoiceByTab = makeInvoiceByTab();
+                draft.countsFetchState = { fetchState: 'Not-Started', error: undefined };
+            }
+        },
         updateInvoiceListFilters(draft, action) {
             draft.filters = action.payload;
         },
@@ -166,5 +173,5 @@ const invoiceList = createSlice({
         });
     },
 });
-export const { fetchInvoiceList, fetchInvoiceListPage, updateInvoiceList, updateInvoiceListFailure, fetchInvoiceCounts, updateInvoiceCounts, updateInvoiceCountsFailure, fetchInvoiceKPIs, updateInvoiceKPIs, updateInvoiceKPIsFailure, updateInvoiceListFilters, setInvoiceActiveTab, addInvoiceToList, } = invoiceList.actions;
+export const { fetchInvoiceList, fetchInvoiceListPage, updateInvoiceList, updateInvoiceListFailure, fetchInvoiceCounts, updateInvoiceCounts, updateInvoiceCountsFailure, fetchInvoiceKPIs, updateInvoiceKPIs, updateInvoiceKPIsFailure, updateInvoiceListFilters, setInvoiceActiveTab, addInvoiceToList, invalidateInvoiceListForCustomer, } = invoiceList.actions;
 export default invoiceList.reducer;

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

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../../invoicingApiHelper';
 import { fetchInvoicingCatalogPlanList, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure, } from '../invoicingCatalogListViewReducer';
@@ -29,7 +29,7 @@ export const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) =>
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
             return [
-                updateInvoicingPlans(items, 'merge'),
+                updateInvoicingCatalogItems(items, 'merge'),
                 updateInvoicingCatalogPlanList({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

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

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../../invoicingApiHelper';
 import { fetchInvoicingCatalogProductList, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure, } from '../invoicingCatalogListViewReducer';
@@ -29,7 +29,7 @@ export const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI)
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
             return [
-                updateInvoicingPlans(items, 'merge'),
+                updateInvoicingCatalogItems(items, 'merge'),
                 updateInvoicingCatalogProductList({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

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

@@ -1,7 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getInvoicingPlansByIds } from '../../../entity/invoicing/plan/planSelector';
-import { runningInvoicingActionId } from '../runningInvoicingActionId';
-import { INVOICING_PRODUCT_COLUMNS, } from './invoicingCatalogListViewState';
+import { getInvoicingCatalogItemsByIds, invoicingPricePointDisplayAmount, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 /**
  * Flatten catalog items into the price rows the pickers render.
  *
@@ -22,28 +20,63 @@ export const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (ite
     priceCode: subFamily.priceCode,
     productCode: item.productCode,
 })));
+const lowestStartingTier = (tiers) => tiers.reduce((lowest, tier) => lowest == null || tier.startingUnit < lowest.startingUnit ? tier : lowest, undefined);
+export 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: invoicingPricePointDisplayAmount(pricePoint),
+        pricingModel: pricePoint.pricingModel,
+        productFamily: item.name,
+        status: pricePoint.status,
+        tierCount: pricePoint.tiers?.length ?? 0,
+        firstTier: lowestStartingTier(pricePoint.tiers ?? []),
+    }));
+});
 /**
  * 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`.
  */
-export const getInvoicingCatalogListView = createSelector((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (planState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
-    catalogItemLifecycleActionOptions,
-    runningActionId: runningInvoicingActionId(actionStateById),
-    plans: getInvoicingPlansByIds(planState, listViewState.planIds),
-    planSort: listViewState.planSort,
-    productColumns: INVOICING_PRODUCT_COLUMNS,
-    products: 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,
-}));
+export const getInvoicingCatalogListView = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => {
+    const plans = getInvoicingCatalogItemsByIds(catalogState, listViewState.planIds);
+    const products = getInvoicingCatalogItemsByIds(catalogState, listViewState.productIds);
+    return {
+        planRows: getInvoicingCatalogPlanRows(plans),
+        plans,
+        planSort: listViewState.planSort,
+        productRows: 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/esm/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewState.js

@@ -1,20 +1 @@
-import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
-export const ALL_INVOICING_PRODUCT_SORT_KEYS = [
-    'product_name',
-    'product_code',
-    'type',
-    'pricing',
-    'usage',
-    'updated',
-    'status',
-];
-export const toInvoicingProductSortKey = (v) => stringToUnion(v, ALL_INVOICING_PRODUCT_SORT_KEYS);
-export const 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 },
-];
+export {};

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

@@ -16,7 +16,7 @@ import { toBusinessVerificationCompanyDataPayload, toBusinessVerificationOfficer
 import { updateCurrentStep, updateOnboardingCustomerView, updateOnboardingCustomerViewFailure, updateOnboardingCustomerViewLocalStoreData, updateOnboardingCustomerViewSuccess, } from '../../onboardingCustomerViewReducer';
 import { getOnboardingCustomerView } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateOnboardingCustomerView.match), 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;
@@ -28,12 +28,17 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
     }
     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 = 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
@@ -56,7 +61,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
         // 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),
@@ -70,7 +75,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
-        const section = isBillingAddressUpdate === true
+        const section = isSetupBillingSave
             ? 'setup_billing'
             : isOfficerSave
                 ? 'company_officer'
@@ -85,12 +90,12 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 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) {
@@ -173,13 +178,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 = toAddressUpdatableInfoPayload(address);
     return {
         company: {
             sync_token: syncToken,
-            subscription_billing_address: addressPayload,
+            ...(address != null && {
+                subscription_billing_address: toAddressUpdatableInfoPayload(address),
+            }),
+            ...businessProfilePayload,
         },
     };
 };

package/lib/esm/view/onboardingView/customerView/onboardingCustomerViewReducer.js

@@ -523,7 +523,7 @@ const onboardingCustomerView = createSlice({
             reducer(draft) {
                 draft.saveStatus = { fetchState: 'In-Progress', error: undefined };
             },
-            prepare(companyId, sendForVerification, reCalculateCurrentStep, isBillingAddressUpdate, officerType) {
+            prepare(companyId, sendForVerification, reCalculateCurrentStep, isBillingAddressUpdate, officerType, businessProfile) {
                 return {
                     payload: {
                         companyId,
@@ -531,6 +531,7 @@ const onboardingCustomerView = createSlice({
                         reCalculateCurrentStep,
                         isBillingAddressUpdate,
                         officerType,
+                        businessProfile,
                     },
                 };
             },

package/lib/esm/view/spendManagement/commonSetup/epic/setup/resetKycKybEpic.js

@@ -0,0 +1,37 @@
+import { from } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { resetKycKyb, resetKycKybFailure, resetKycKybSuccess, } from '../../setupViewReducer';
+export const resetKycKybEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(resetKycKyb.match), mergeMap(() => zeniAPI
+    .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/kyc-kyb-reset`, { is_reset_company_officers: false })
+    .pipe(mergeMap((response) => {
+    if (isSuccessResponse(response)) {
+        return from([
+            resetKycKybSuccess(),
+            openSnackbar({
+                messageSection: 'kyc_kyb_reset',
+                messageText: 'success',
+                type: 'success',
+            }),
+        ]);
+    }
+    return from([
+        resetKycKybFailure(response.status),
+        openSnackbar({
+            messageSection: 'kyc_kyb_reset',
+            messageText: 'failed',
+            type: 'error',
+        }),
+    ]);
+}), catchError((error) => from([
+    resetKycKybFailure(createZeniAPIStatus('Unexpected error', 'Reset KYC/KYB errored out: ' +
+        (error instanceof Error
+            ? error.message
+            : JSON.stringify(error)))),
+    openSnackbar({
+        messageSection: 'kyc_kyb_reset',
+        messageText: 'failed',
+        type: 'error',
+    }),
+])))));

package/lib/esm/view/spendManagement/commonSetup/setupViewReducer.js

@@ -13,6 +13,7 @@ const emptyOfficerSlot = {
 };
 export const initialState = {
     updateStatus: { fetchState: 'Not-Started', error: undefined },
+    kycKybResetStatus: { fetchState: 'Not-Started', error: undefined },
     parsingDocumentFileIds: [],
     companyDetails: { autoFilledFields: [] },
     companyOfficerUpdateStatus: {
@@ -84,6 +85,25 @@ const setupView = createSlice({
                 };
             },
         },
+        resetKycKyb(draft) {
+            draft.kycKybResetStatus = { fetchState: 'In-Progress', error: undefined };
+        },
+        resetKycKybSuccess(draft) {
+            draft.kycKybResetStatus = { fetchState: 'Completed', error: undefined };
+        },
+        resetKycKybFailure: {
+            reducer(draft, action) {
+                draft.kycKybResetStatus = { fetchState: 'Error', error: action.payload };
+            },
+            prepare(error) {
+                return {
+                    payload: error,
+                };
+            },
+        },
+        clearKycKybResetStatus(draft) {
+            draft.kycKybResetStatus = { fetchState: 'Not-Started', error: undefined };
+        },
         updateSelectedCompanyOfficer: {
             reducer(draft, action) {
                 const { selectedOfficerType } = action.payload;
@@ -359,5 +379,5 @@ const setupView = createSlice({
         });
     },
 });
-export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, } = setupView.actions;
+export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, resetKycKyb, resetKycKybSuccess, resetKycKybFailure, clearKycKybResetStatus, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, } = setupView.actions;
 export default setupView.reducer;

package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js

@@ -85,7 +85,7 @@ function getPrimaryAccountForTheProduct(state, companyId, setupViewType) {
 }
 export function getBusinessVerificationDetails(state, companyId) {
     const { setupViewState, countryListState } = state;
-    const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, updateStatus, } = setupViewState;
+    const { companyDetails, companyOfficerUpdateStatus, kycKybResetStatus, primaryContactDetails, updateStatus, } = setupViewState;
     const companyView = getCompanyView(state, companyId, []);
     const { companyDetailsLocalData, companyOfficerLocalData, parsingDocumentFileIds, } = getCompanyAndIdentityDetails(state, companyId, {
         companyDetails,
@@ -100,6 +100,7 @@ export function getBusinessVerificationDetails(state, companyId) {
         parsingDocumentFileIds,
         companyView,
         updateStatus,
+        kycKybResetStatus,
         allNationalityCountries,
     };
 }