@zeniai/client-epic-state 5.2.7-betaRD2 → 5.2.8-betaAK0

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localDataToSaveInvoicingCatalogItemPayload = void 0;
+const accountPayload_1 = require("../../../entity/account/accountPayload");
+const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
@@ -10,20 +12,26 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (subFamily) => {
+const buildAccountingDetail = (subFamily, lookup) => {
     const detail = {};
     if (subFamily.sku.trim() !== '') {
         detail.sku = subFamily.sku.trim();
     }
-    if (subFamily.accountingCode.trim() !== '') {
-        detail.accounting_code = subFamily.accountingCode.trim();
+    // The account and class travel as whole objects rather than bare codes, built
+    // by the same helpers the transaction and vendor payloads use. An id that no
+    // longer resolves is dropped: sending a code the service cannot expand is how
+    // a mapping silently lands on the wrong account.
+    const account = lookup.accountByQboId(subFamily.accountingCode.trim());
+    if (account != null) {
+        detail.account = (0, accountPayload_1.toAccountPayload)(account);
     }
-    if (subFamily.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = subFamily.accountingCategory.trim();
+    const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
+    if (accountingClass != null) {
+        detail.accounting_class = (0, classPayload_1.toClassBasePayload)(accountingClass);
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
-const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
+const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(subFamily.pricingModel);
     const name = subFamily.name.trim();
@@ -77,7 +85,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily);
+    const accountingDetail = buildAccountingDetail(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -89,7 +97,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
+const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
@@ -117,7 +125,7 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
         ? localData.subFamilies
         : [(0, invoicingCatalogItemFormConfig_1.blankInvoicingCatalogSubFamily)()];
     itemPayload.sub_family_details = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
+        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
             const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
             const detail = {
@@ -127,6 +135,13 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
                 price_code: priceCode,
                 show_description_in_invoices: subFamily.showDescriptionInInvoices,
             };
+            // Edits send a narrower body than creates, but the accounting mapping
+            // is editable on this form, so leaving it out dropped the account and
+            // class the user had just picked.
+            const accountingDetail = buildAccountingDetail(subFamily, lookup);
+            if (accountingDetail != null) {
+                detail.accounting_detail = accountingDetail;
+            }
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

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

@@ -37,6 +37,11 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      * Folded in here so the screen never reaches for the config view itself.
      */
     fieldHelp: InvoicingFieldHelpByCode;
+    /**
+     * True while the accounting lists are still loading, so the form can wait
+     * instead of mounting pickers whose options are not there yet.
+     */
+    isQboPickerDataLoading: boolean;
     localData: InvoicingCatalogItemFormLocalData;
     mode: 'create' | 'edit';
     periodUnitOptions: InvoicingNamedOption[];

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

@@ -59,6 +59,7 @@ const getInvoicingCatalogItemFormView = (state, id) => {
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'catalog'),
+        isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
         qboClassHierarchy: isQboConnected
             ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state).nestedClassHierarchy
             : [],

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

@@ -9,6 +9,7 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListView/invoicingCatalogListViewReducer");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const editInvoicingCatalogItemDetailViewPayload_1 = require("./editInvoicingCatalogItemDetailViewPayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemForm.match(action) ||
@@ -23,7 +24,11 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
         const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null);
+        const state = state$.value;
+        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, {
+            accountByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, qboId),
+            classByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboClassByQboId)(state, qboId),
+        });
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewSelector.d.ts

@@ -32,6 +32,7 @@ export interface InvoicingOnboardingGateView {
     acceptTermsState: FetchStateAndError;
     enableState: FetchStateAndError;
     fetchState: FetchState;
+    isQboConnected: boolean;
     status?: InvoicingOnboardingStatus;
 }
 export declare const getInvoicingOnboardingGateView: (state: RootState) => InvoicingOnboardingGateView;

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewSelector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invoicingFieldHelpForGroup = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = void 0;
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const invoicingConfigViewPayload_1 = require("./invoicingConfigViewPayload");
 const getInvoicingConfigView = (state) => {
     const { acceptTermsFetchState, enableFetchState, ...configState } = state.invoicingConfigViewState;
@@ -18,6 +19,7 @@ const getInvoicingOnboardingGateView = (state) => {
         acceptTermsState: acceptTermsFetchState,
         enableState: enableFetchState,
         fetchState,
+        isQboConnected: (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state),
         status: (0, invoicingConfigViewPayload_1.deriveInvoicingOnboardingStatus)(state.invoicingConfigViewState.isInvoicingTosAccepted, state.invoicingConfigViewState.isInvoicingEnabled),
     };
 };

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic.js

@@ -12,12 +12,17 @@ const invoicingQboViewSelector_1 = require("../invoicingQboViewSelector");
 const fetchInvoicingAccountingPickersEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingAccountingPickers.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([, state]) => {
     const actions = [];
     const accountList = state.accountListState.byReportId[invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY];
-    if (accountList.hasValidState() === false &&
+    // `hasValidState` only reports that a fetch finished, not that it
+    // returned anything usable. The shared bucket can be Completed and empty
+    // because a screen that needs fewer accounts filled it first, which would
+    // leave the invoicing pickers empty with no request in flight to fix it.
+    const isAccountListUsable = accountList.hasValidState() && accountList.accountIds.length > 0;
+    if (isAccountListUsable === false &&
         accountList.fetchState !== 'In-Progress') {
-        // AP/AR accounts cannot back an invoicing mapping, so they are excluded
-        // here — which is why this uses invoicing's own bucket rather than the
-        // general `accountList` other screens fill without those exclusions.
-        actions.push((0, accountListReducer_1.fetchAccountList)(invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY, true, true, true));
+        // Same arguments the vendor and categorization screens pass, so this
+        // shares their cached list rather than replacing it with a narrower one.
+        // Invoicing narrows to income accounts when it builds its options.
+        actions.push((0, accountListReducer_1.fetchAccountList)(invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY, true));
     }
     const classList = state.classListState;
     if (classList.hasValidState() === false &&

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -1,17 +1,34 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { AccountType } from '../../../entity/account/accountState';
+import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { ClassBase } from '../../../entity/class/classState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
-export declare const INVOICING_ACCOUNT_LIST_KEY: "invoicingAccountList";
+export declare const INVOICING_ACCOUNT_LIST_KEY: "accountList";
 /** Whether QBO is connected, without building the option lists to find out. */
 export declare const isInvoicingQboConnected: (state: RootState) => boolean;
+/**
+ * Whether the accounting pickers are still waiting on their data. Only true when
+ * QBO is connected: a tenant without it has no pickers to populate, so the form
+ * must not sit behind a skeleton waiting for lists it will never show.
+ */
+export declare const isInvoicingAccountingPickerDataLoading: (state: RootState) => boolean;
+/** The QBO connection fetch on its own, without building the bundled view. */
+export declare const getInvoicingQboConnectionFetchState: (state: RootState) => FetchStateAndError;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.
  */
 export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+export declare const invoicingQboAccountByQboId: (state: RootState, qboId: string | undefined) => AccountBase | undefined;
+/** The class behind a picker value, for the same reason as the account above. */
+export declare const invoicingQboClassByQboId: (state: RootState, qboId: string | undefined) => ClassBase | undefined;
 /** An account or class as the invoicing pickers render and submit it. */
 export interface InvoicingAccountingOption {
     id: string;

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,14 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
-// Its own bucket: invoicing needs the AP/AR exclusions that the vendor and
-// transaction screens sharing `accountList` do not pass.
-exports.INVOICING_ACCOUNT_LIST_KEY = 'invoicingAccountList';
+// The shared bucket, fetched with the same arguments as the other consumers so
+// whichever screen loads first satisfies the rest. Invoicing narrows to income
+// accounts when it builds its options, so it does not need its own copy.
+exports.INVOICING_ACCOUNT_LIST_KEY = 'accountList';
 /** Whether QBO is connected, without building the option lists to find out. */
 const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
 exports.isInvoicingQboConnected = isInvoicingQboConnected;
+/**
+ * Whether the accounting pickers are still waiting on their data. Only true when
+ * QBO is connected: a tenant without it has no pickers to populate, so the form
+ * must not sit behind a skeleton waiting for lists it will never show.
+ */
+const isInvoicingAccountingPickerDataLoading = (state) => {
+    const isPending = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
+    // The connection settles first and decides whether the lists are fetched at
+    // all, so it counts as loading too. Reporting "not loading" while it is in
+    // flight renders the form, then takes it away again the moment the tenant
+    // turns out to be connected.
+    if (isPending((0, exports.getInvoicingQboConnectionFetchState)(state).fetchState)) {
+        return true;
+    }
+    if (!(0, exports.isInvoicingQboConnected)(state)) {
+        return false;
+    }
+    const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
+    return (isPending(accountList.fetchState) ||
+        isPending(state.classListState.fetchState));
+};
+exports.isInvoicingAccountingPickerDataLoading = isInvoicingAccountingPickerDataLoading;
+/** The QBO connection fetch on its own, without building the bundled view. */
+const getInvoicingQboConnectionFetchState = (state) => state.invoicingQboViewState.connectionFetchState;
+exports.getInvoicingQboConnectionFetchState = getInvoicingQboConnectionFetchState;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.
@@ -17,6 +43,28 @@ exports.INVOICING_INCOME_ACCOUNT_TYPES = [
     'income',
     'other_income',
 ];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+const invoicingQboAccountByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.find((account) => String(account.qboId) === qboId);
+};
+exports.invoicingQboAccountByQboId = invoicingQboAccountByQboId;
+/** The class behind a picker value, for the same reason as the account above. */
+const invoicingQboClassByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
+    return classes.find((accountingClass) => String(accountingClass.qboId) === qboId);
+};
+exports.invoicingQboClassByQboId = invoicingQboClassByQboId;
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded

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

@@ -9,4 +9,4 @@ export type ActionType = ReturnType<typeof fetchInvoicingSettings> | ReturnType<
 export declare const fetchInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const connectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const disconnectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
-export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -4,9 +4,11 @@ exports.saveInvoicingSettingsEpic = exports.disconnectInvoicingStripeEpic = expo
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const settingsViewReducer_1 = require("./settingsViewReducer");
 const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchInvoicingSettings.match), (0, operators_1.switchMap)(() => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
@@ -63,9 +65,22 @@ const disconnectInvoicingStripeEpic = (actions$, _state$, zeniAPI) => actions$.p
         JSON.stringify(error))))));
 }));
 exports.disconnectInvoicingStripeEpic = disconnectInvoicingStripeEpic;
-const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
+const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     const { settings, snackbarSection } = action.payload;
+    // The QBO page edits mappings as picker ids; the service stores whole
+    // accounts. Expanded here, at the request boundary, so the page does not
+    // have to hold entities it only needs in order to save.
+    const qboSettings = settings.qbo;
+    const body = qboSettings?.account_mappings != null
+        ? {
+            ...settings,
+            qbo: {
+                ...qboSettings,
+                account_mappings: (0, invoicingCommonPayload_1.withInvoicingQboMappedAccounts)(qboSettings.account_mappings, (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state$.value, qboId)),
+            },
+        }
+        : settings;
     /** `status` surfaces the platform's error text; omit it to keep the generic copy. */
     const snackbar = (messageText, status) => snackbarSection == null
         ? []
@@ -78,7 +93,7 @@ const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(
             }),
         ];
     return zeniAPI
-        .putAndGetJSON(apiUrl, { ...settings })
+        .putAndGetJSON(apiUrl, { ...body })
         .pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([

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

@@ -1,7 +1,7 @@
 import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common';
 import { InvoicingDunningActionOption, InvoicingNamedOption, InvoicingQboAccountMappingKindOption, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
-import { RootState } from '../../../rootStateTypes';
 import { ZeniAPIStatus } from '../../../responsePayload';
+import { RootState } from '../../../rootStateTypes';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
 /**
  * Shared primitive: the raw invoicing settings. Consumed internally by other
@@ -53,6 +53,12 @@ export interface InvoicingSettingsHubView {
     configFetchState: FetchState;
     dunningScheduleActionOptions: InvoicingDunningActionOption[];
     isEnablingInvoicing: boolean;
+    /**
+     * Whether the tenant has already enabled invoicing. The enable footer is for
+     * tenants that have not, so this — not `canEnableInvoicing` — decides whether
+     * it renders at all.
+     */
+    isInvoicingEnabled: boolean;
     isQboConfigured: boolean;
     isStripeConnected: boolean;
     qboAccountMappingKindOptions: InvoicingQboAccountMappingKindOption[];
@@ -67,9 +73,10 @@ export interface InvoicingSettingsHubView {
  * two integration prerequisites kept separate so the hub can name the step still
  * outstanding instead of showing a dead button.
  *
- * `canEnableInvoicing` folds in the onboarding step, so the screen does not need
- * to re-check it: the footer is only offered mid-onboarding and only once both
- * integrations are ready.
+ * `isInvoicingEnabled` decides whether the footer renders; `canEnableInvoicing`
+ * whether its button is live, and it still requires the onboarding step so the
+ * terms cannot be skipped. A tenant partway through therefore sees the footer,
+ * disabled and naming what is left, rather than nothing at all.
  *
  * Deliberately not folded into `getInvoicingConfigView`: that selector gates
  * every invoicing route and stays a pure read of the config slice. The settings

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

@@ -70,9 +70,10 @@ function deriveInvoicingEnablePrerequisites(settings, isQboConnected, qboAccount
  * two integration prerequisites kept separate so the hub can name the step still
  * outstanding instead of showing a dead button.
  *
- * `canEnableInvoicing` folds in the onboarding step, so the screen does not need
- * to re-check it: the footer is only offered mid-onboarding and only once both
- * integrations are ready.
+ * `isInvoicingEnabled` decides whether the footer renders; `canEnableInvoicing`
+ * whether its button is live, and it still requires the onboarding step so the
+ * terms cannot be skipped. A tenant partway through therefore sees the footer,
+ * disabled and naming what is left, rather than nothing at all.
  *
  * Deliberately not folded into `getInvoicingConfigView`: that selector gates
  * every invoicing route and stays a pure read of the config slice. The settings
@@ -82,7 +83,10 @@ const getInvoicingSettingsHubView = (state) => {
     const { dunningScheduleActionOptions, enableState, error: configError, fetchState: configFetchState, qboAccountMappingKindOptions, qboCustomerMatchingOptions, qboSyncStatusOptions, status, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     const { canEnable, isQboConfigured, isStripeConnected } = deriveInvoicingEnablePrerequisites(state.invoicingSettingsViewState.settings, state.invoicingQboViewState.connection?.connected === true, qboAccountMappingKindOptions);
     return {
+        // Keeps the onboarding step in the gate: a tenant that has not accepted the
+        // terms cannot enable invoicing, whatever the integrations say.
         canEnableInvoicing: status === 'settings' && canEnable,
+        isInvoicingEnabled: state.invoicingConfigViewState.isInvoicingEnabled === true,
         configError,
         configFetchState,
         dunningScheduleActionOptions,

package/lib/view/scheduleView/scheduleListView/epics/fetchAccruedScheduleListEpic.js

@@ -33,7 +33,7 @@ const fetchAccruedScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pip
         je_schedule_type: scheduleType,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: action.payload.statusFilter,
+        filter: 'all',
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/view/scheduleView/scheduleListView/epics/fetchDownloadSchedulesEpic.js

@@ -10,14 +10,9 @@ const responsePayload_1 = require("../../../../responsePayload");
 const scheduleListReducer_1 = require("../scheduleListReducer");
 const scheduleListTypes_1 = require("../scheduleListTypes");
 const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchDownloadSchedules.match), (0, operators_1.mergeMap)((action) => {
-    const { scheduleType, downloadCategories, statusFilter } = action.payload;
+    const { scheduleType, downloadCategories } = action.payload;
     const scheduleListState = state$.value.scheduleListState;
     // if parameters are provided, use those. else go to localdata
-    // Accrued is deliberately not served here. Its rows come back in a different shape, this
-    // epic writes them through updateJESchedules (the prepaid / fixed mapper), and
-    // doUpdateScheduleList never flips downloadState for accrued -- so a request would store the
-    // wrong data and then never report completion. Accrued downloads go through
-    // fetchAccruedScheduleList, which owns that shape end to end.
     let scheduleState;
     if (scheduleType !== 'accrued_expenses') {
         scheduleState = (0, scheduleListReducer_1.getState)(scheduleListState, scheduleType);
@@ -42,7 +37,7 @@ const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
         base_txn_account_ids: downloadCategories,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: statusFilter,
+        filter: 'all',
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/download?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.d.ts

@@ -16,7 +16,7 @@ export declare const initialState: ScheduleListViewState;
 export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-}, downloadCategories: string[], statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined, cacheOverride?: any], {
+}, downloadCategories: string[], cacheOverride?: any], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
@@ -24,18 +24,16 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
     downloadCategories: string[];
-    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchDownloadSchedules", never, never>, fetchAccruedScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-} | undefined, cacheOverride?: any, statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined], {
+} | undefined, cacheOverride?: any], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
     } | undefined;
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
-    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchAccruedScheduleList", never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -90,8 +90,8 @@ const scheduleListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
-                // Accrued is not downloaded through this action -- see fetchDownloadSchedulesEpic for why.
                 if (action.payload.scheduleType !== 'accrued_expenses') {
+                    //if condition added for type narrowing
                     const state = getState(draft, action.payload.scheduleType);
                     const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
                     const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
@@ -115,14 +115,13 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, downloadCategories, statusFilter = 'all', cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, downloadCategories, cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
                         downloadCategories,
-                        statusFilter,
                     },
                 };
             },
@@ -158,13 +157,12 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, cacheOverride = false, statusFilter = 'all') {
+            prepare(scheduleType, timeframeAndCategory, cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
-                        statusFilter,
                     },
                 };
             },

package/package.json

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

package/lib/commonStateTypes/selectorTypes/pickAndMergeForecastSection.js

@@ -1 +0,0 @@
-"use strict";

package/lib/entity/invoicing/coupon/couponConstants.d.ts

@@ -1,11 +0,0 @@
-import { InvoicingFormOption } from '../invoicingCommonPayload';
-import { InvoicingCouponApplyOn, InvoicingCouponDurationType, InvoicingCouponPeriodUnit, InvoicingDiscountType } from './couponPayload';
-/**
- * Coupon form select options. Single source of truth (CES-owned) for the value
- * sets that back the coupon's string-union domain fields; surfaced to the form
- * via `getInvoicingCouponFormView` so web-components need not hardcode them.
- */
-export declare const INVOICING_DISCOUNT_TYPE_OPTIONS: readonly InvoicingFormOption<InvoicingDiscountType>[];
-export declare const INVOICING_COUPON_DURATION_TYPE_OPTIONS: readonly InvoicingFormOption<InvoicingCouponDurationType>[];
-export declare const INVOICING_COUPON_PERIOD_UNIT_OPTIONS: readonly InvoicingFormOption<InvoicingCouponPeriodUnit>[];
-export declare const INVOICING_COUPON_APPLY_ON_OPTIONS: readonly InvoicingFormOption<InvoicingCouponApplyOn>[];

package/lib/entity/invoicing/coupon/couponConstants.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.INVOICING_COUPON_APPLY_ON_OPTIONS = exports.INVOICING_COUPON_PERIOD_UNIT_OPTIONS = exports.INVOICING_COUPON_DURATION_TYPE_OPTIONS = exports.INVOICING_DISCOUNT_TYPE_OPTIONS = void 0;
-/**
- * Coupon form select options. Single source of truth (CES-owned) for the value
- * sets that back the coupon's string-union domain fields; surfaced to the form
- * via `getInvoicingCouponFormView` so web-components need not hardcode them.
- */
-exports.INVOICING_DISCOUNT_TYPE_OPTIONS = [
-    { label: 'Percentage', value: 'percentage' },
-    { label: 'Fixed amount', value: 'fixed_amount' },
-    { label: 'Offer quantity', value: 'offer_quantity' },
-];
-exports.INVOICING_COUPON_DURATION_TYPE_OPTIONS = [
-    { label: 'One time', value: 'one_time' },
-    { label: 'Forever', value: 'forever' },
-    { label: 'Limited period', value: 'limited_period' },
-];
-exports.INVOICING_COUPON_PERIOD_UNIT_OPTIONS = [
-    { label: 'Day', value: 'day' },
-    { label: 'Week', value: 'week' },
-    { label: 'Month', value: 'month' },
-    { label: 'Year', value: 'year' },
-];
-exports.INVOICING_COUPON_APPLY_ON_OPTIONS = [
-    { label: 'Invoice amount', value: 'invoice_amount' },
-    { label: 'Each specified item', value: 'each_specified_item' },
-    { label: 'Specified items total', value: 'specified_items_total' },
-];

package/lib/esm/commonStateTypes/selectorTypes/pickAndMergeForecastSection.js

@@ -1 +0,0 @@
-"use strict";

package/lib/esm/entity/invoicing/coupon/couponConstants.js

@@ -1,26 +0,0 @@
-/**
- * Coupon form select options. Single source of truth (CES-owned) for the value
- * sets that back the coupon's string-union domain fields; surfaced to the form
- * via `getInvoicingCouponFormView` so web-components need not hardcode them.
- */
-export const INVOICING_DISCOUNT_TYPE_OPTIONS = [
-    { label: 'Percentage', value: 'percentage' },
-    { label: 'Fixed amount', value: 'fixed_amount' },
-    { label: 'Offer quantity', value: 'offer_quantity' },
-];
-export const INVOICING_COUPON_DURATION_TYPE_OPTIONS = [
-    { label: 'One time', value: 'one_time' },
-    { label: 'Forever', value: 'forever' },
-    { label: 'Limited period', value: 'limited_period' },
-];
-export const INVOICING_COUPON_PERIOD_UNIT_OPTIONS = [
-    { label: 'Day', value: 'day' },
-    { label: 'Week', value: 'week' },
-    { label: 'Month', value: 'month' },
-    { label: 'Year', value: 'year' },
-];
-export const INVOICING_COUPON_APPLY_ON_OPTIONS = [
-    { label: 'Invoice amount', value: 'invoice_amount' },
-    { label: 'Each specified item', value: 'each_specified_item' },
-    { label: 'Specified items total', value: 'specified_items_total' },
-];