@zeniai/client-epic-state 5.2.44-betaAK0 → 5.2.45

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.js

@@ -1,9 +1,9 @@
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { getInvoicingCouponById } from '../../../entity/invoicing/coupon/couponSelector';
-import { toInvoicingFormOption, } from '../../../entity/invoicing/invoicingCommonPayload';
+import { toInvoicingFormOption, toInvoicingQboAccountMappingSlot, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
-import { getInvoicingQboView, invoicingAccountsForQboAccountTypes, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
-import { getInvoicingSettings } from '../settingsView/settingsViewSelector';
+import { getInvoicingQboView, invoicingAccountsForQboAccountTypes, invoicingQboAccountByQboId, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
+import { getInvoicingSettings, getInvoicingSettingsFetchState, } from '../settingsView/settingsViewSelector';
 import { initialInvoicingCouponFormLocalData, invoicingCouponDiscountsAccountIdForCreate, } from './editInvoicingCouponDetailViewState';
 /**
  * Bundled view for the discount create/edit form: the save fetch state/error,
@@ -25,6 +25,9 @@ export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             fetchState: 'Not-Started',
         })
         : { error: undefined, fetchState: 'Completed' };
+    const coupon = couponId != null
+        ? getInvoicingCouponById(state.invoicingCouponState, couponId)
+        : undefined;
     return {
         actionState: couponId != null
             ? (state.editInvoicingCouponDetailViewState.actionStateById[couponId] ??
@@ -38,9 +41,8 @@ export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             { error: undefined, fetchState: configFetchState },
         ]),
         recordState,
-        coupon: couponId != null
-            ? getInvoicingCouponById(state.invoicingCouponState, couponId)
-            : undefined,
+        coupon,
+        discountsAccountName: invoicingQboAccountByQboId(state, coupon?.discountsAccountId)?.accountName,
         savedCouponId,
         fetchState,
         error,
@@ -53,6 +55,8 @@ export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
  * account; offering every account instead would let a save be rejected.
  */
 const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
+/** The account-mapping slot a coupon's discounts account shares with settings. */
+const DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -71,17 +75,48 @@ export const getInvoicingCouponFormView = (state, couponId) => {
     const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = getInvoicingConfigView(state);
     const isQboConnected = isInvoicingQboConnected(state);
     const qboView = isQboConnected ? getInvoicingQboView(state) : undefined;
+    const isQboPickerDataLoading = isInvoicingAccountingPickerDataLoading(state);
+    const settingsFetchState = getInvoicingSettingsFetchState(state).fetchState;
+    // Only a create reads the settings, and only until they arrive: an `Error`
+    // is a create that starts on no account, not a page that never renders.
+    const isCreateSeedPending = couponId == null &&
+        (settingsFetchState === 'Not-Started' ||
+            settingsFetchState === 'In-Progress');
     // The account types the discounts slot accepts come from the same config the
     // QBO settings page reads, so the two pickers offer the same accounts and
-    // widening the slot stays a config change.
-    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => kindOption.code === 'discounts_account')?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
+    // widening the slot stays a config change. Matched on the slot rather than
+    // the code as written: a config that names the kind `discounts_account_id`
+    // is the same slot, and missing it here would quietly fall back to the
+    // default and offer a different set than the settings page does.
+    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => toInvoicingQboAccountMappingSlot(kindOption.code) ===
+        DISCOUNTS_ACCOUNT_MAPPING_SLOT)?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(toInvoicingFormOption),
         durationTypeOptions: discountDurationTypeOptions.map(toInvoicingFormOption),
         isQboConnected,
-        isQboPickerDataLoading: isInvoicingAccountingPickerDataLoading(state),
+        isQboPickerDataLoading,
+        // Widened past the record and config the detail page waits on: the form
+        // also renders from the account list, and seeds a create from the settings
+        // discounts account. A form that mounted before those landed would offer an
+        // empty picker and save a coupon with no account of its own — not wrong,
+        // since blank means "use the settings account", but not what the user was
+        // shown either. Widened here rather than on the base view, so the detail
+        // page does not start waiting on lists it never renders.
+        //
+        // Only while they are still coming, though, and the settings only on a
+        // create: a coupon saves fine without a discounts account, so neither is
+        // allowed to hold the form behind a skeleton once it has failed.
+        pageFetchState: reduceAllFetchState([
+            base.pageFetchState,
+            {
+                error: undefined,
+                fetchState: isQboPickerDataLoading || isCreateSeedPending
+                    ? 'In-Progress'
+                    : 'Completed',
+            },
+        ]),
         localData: couponId != null
             ? localData
             : {

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewState.js

@@ -57,6 +57,9 @@ export const entityToInvoicingCouponFormLocalData = (coupon) => {
  * Create only. An edit shows the coupon's stored account, so a coupon saved
  * without one keeps showing none.
  */
-export const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => discountsAccountId.trim() !== ''
-    ? discountsAccountId.trim()
-    : (getInvoicingQboAccountMappingId(accountMappings ?? undefined, 'discounts_account') ?? '');
+export const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => {
+    const pickedAccountId = discountsAccountId.trim();
+    return pickedAccountId !== ''
+        ? pickedAccountId
+        : (getInvoicingQboAccountMappingId(accountMappings ?? undefined, 'discounts_account') ?? '');
+};

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/fetchInvoicingCouponDetailPageEpic.js

@@ -1,6 +1,8 @@
 import { EMPTY, from } from 'rxjs';
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
 import { fetchInvoicingConfig } from '../invoicingConfigView/invoicingConfigViewReducer';
+import { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection, } from '../invoicingQboView/invoicingQboViewReducer';
+import { fetchInvoicingSettings } from '../settingsView/settingsViewReducer';
 import { fetchInvoicingCouponDetail, fetchInvoicingCouponDetailPage, } from './editInvoicingCouponDetailViewReducer';
 /**
  * Fetch unless the endpoint is already loaded or in flight — or always when the
@@ -10,10 +12,12 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
     (fetchStateAndError.fetchState !== 'Completed' &&
         fetchStateAndError.fetchState !== 'In-Progress');
 /**
- * Orchestrates the discount detail page: one action fans out to the coupon
- * record and the invoicing config behind its dropdowns and field help, each
- * skipped when already cached. The page reads a single reduced fetch state off
- * the view, so the form mounts once with real values.
+ * Orchestrates the discount pages: one action fans out to the coupon record,
+ * the invoicing config behind its dropdowns and field help, and the QuickBooks
+ * connection, account list and settings the form's Discounts account picker
+ * renders and seeds from — each skipped when already cached. The page reads a
+ * single reduced fetch state off the view, so the form mounts once with real
+ * values.
  */
 export const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$.pipe(filter(fetchInvoicingCouponDetailPage.match), withLatestFrom(state$), mergeMap(([action, state]) => {
     const { cacheOverride = false, id } = action.payload;
@@ -32,5 +36,19 @@ export const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$
     if (shouldFetch({ error: configState.error, fetchState: configState.fetchState }, cacheOverride)) {
         pageActions.push(fetchInvoicingConfig());
     }
+    const qboState = state.invoicingQboViewState;
+    if (shouldFetch(qboState.connectionFetchState, cacheOverride)) {
+        pageActions.push(fetchInvoicingQboConnection());
+    }
+    // The picker epic tops up the shared account list and skips what the
+    // store already holds, so this is safe to ask for on every open.
+    pageActions.push(fetchInvoicingAccountingPickers());
+    const settingsState = state.invoicingSettingsViewState;
+    if (shouldFetch({ error: settingsState.error, fetchState: settingsState.fetchState }, cacheOverride)) {
+        // A create seeds its Discounts account from the settings mapping, so
+        // the settings are page data here rather than a settings-screen
+        // concern.
+        pageActions.push(fetchInvoicingSettings());
+    }
     return pageActions.length > 0 ? from(pageActions) : EMPTY;
 }));

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.d.ts

@@ -31,6 +31,15 @@ export interface EditInvoicingCouponDetailView extends SelectorView {
      */
     recordState: FetchStateAndError;
     coupon?: InvoicingCoupon;
+    /**
+     * The name of the account the coupon's discount line posts to, resolved from
+     * the id the coupon stores against the shared QuickBooks account list.
+     * Resolved here rather than carried on the entity: the account is a record
+     * the accounting lists already own, and the coupon only ever stored a
+     * reference to it. Absent while the list is still loading, or when the id
+     * names an account this tenant can no longer see.
+     */
+    discountsAccountName?: string;
     savedCouponId?: ID;
 }
 export declare const getEditInvoicingCouponDetailViewState: (state: RootState, couponId?: ID) => EditInvoicingCouponDetailView;

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

@@ -28,6 +28,9 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             fetchState: 'Not-Started',
         })
         : { error: undefined, fetchState: 'Completed' };
+    const coupon = couponId != null
+        ? (0, couponSelector_1.getInvoicingCouponById)(state.invoicingCouponState, couponId)
+        : undefined;
     return {
         actionState: couponId != null
             ? (state.editInvoicingCouponDetailViewState.actionStateById[couponId] ??
@@ -41,9 +44,8 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
             { error: undefined, fetchState: configFetchState },
         ]),
         recordState,
-        coupon: couponId != null
-            ? (0, couponSelector_1.getInvoicingCouponById)(state.invoicingCouponState, couponId)
-            : undefined,
+        coupon,
+        discountsAccountName: (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, coupon?.discountsAccountId)?.accountName,
         savedCouponId,
         fetchState,
         error,
@@ -57,6 +59,8 @@ exports.getEditInvoicingCouponDetailViewState = getEditInvoicingCouponDetailView
  * account; offering every account instead would let a save be rejected.
  */
 const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
+/** The account-mapping slot a coupon's discounts account shares with settings. */
+const DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -75,17 +79,48 @@ const getInvoicingCouponFormView = (state, couponId) => {
     const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
     const qboView = isQboConnected ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state) : undefined;
+    const isQboPickerDataLoading = (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state);
+    const settingsFetchState = (0, settingsViewSelector_1.getInvoicingSettingsFetchState)(state).fetchState;
+    // Only a create reads the settings, and only until they arrive: an `Error`
+    // is a create that starts on no account, not a page that never renders.
+    const isCreateSeedPending = couponId == null &&
+        (settingsFetchState === 'Not-Started' ||
+            settingsFetchState === 'In-Progress');
     // The account types the discounts slot accepts come from the same config the
     // QBO settings page reads, so the two pickers offer the same accounts and
-    // widening the slot stays a config change.
-    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => kindOption.code === 'discounts_account')?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
+    // widening the slot stays a config change. Matched on the slot rather than
+    // the code as written: a config that names the kind `discounts_account_id`
+    // is the same slot, and missing it here would quietly fall back to the
+    // default and offer a different set than the settings page does.
+    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(kindOption.code) ===
+        DISCOUNTS_ACCOUNT_MAPPING_SLOT)?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         discountTypeOptions: discountTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         durationTypeOptions: discountDurationTypeOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
         isQboConnected,
-        isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
+        isQboPickerDataLoading,
+        // Widened past the record and config the detail page waits on: the form
+        // also renders from the account list, and seeds a create from the settings
+        // discounts account. A form that mounted before those landed would offer an
+        // empty picker and save a coupon with no account of its own — not wrong,
+        // since blank means "use the settings account", but not what the user was
+        // shown either. Widened here rather than on the base view, so the detail
+        // page does not start waiting on lists it never renders.
+        //
+        // Only while they are still coming, though, and the settings only on a
+        // create: a coupon saves fine without a discounts account, so neither is
+        // allowed to hold the form behind a skeleton once it has failed.
+        pageFetchState: (0, reduceFetchState_1.reduceAllFetchState)([
+            base.pageFetchState,
+            {
+                error: undefined,
+                fetchState: isQboPickerDataLoading || isCreateSeedPending
+                    ? 'In-Progress'
+                    : 'Completed',
+            },
+        ]),
         localData: couponId != null
             ? localData
             : {

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

@@ -61,7 +61,10 @@ exports.entityToInvoicingCouponFormLocalData = entityToInvoicingCouponFormLocalD
  * Create only. An edit shows the coupon's stored account, so a coupon saved
  * without one keeps showing none.
  */
-const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => discountsAccountId.trim() !== ''
-    ? discountsAccountId.trim()
-    : ((0, invoicingCommonPayload_1.getInvoicingQboAccountMappingId)(accountMappings ?? undefined, 'discounts_account') ?? '');
+const invoicingCouponDiscountsAccountIdForCreate = (discountsAccountId, accountMappings) => {
+    const pickedAccountId = discountsAccountId.trim();
+    return pickedAccountId !== ''
+        ? pickedAccountId
+        : ((0, invoicingCommonPayload_1.getInvoicingQboAccountMappingId)(accountMappings ?? undefined, 'discounts_account') ?? '');
+};
 exports.invoicingCouponDiscountsAccountIdForCreate = invoicingCouponDiscountsAccountIdForCreate;

package/lib/view/invoicing/editInvoicingCouponDetailView/fetchInvoicingCouponDetailPageEpic.d.ts

@@ -2,12 +2,16 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../rootStateTypes';
 import { fetchInvoicingConfig } from '../invoicingConfigView/invoicingConfigViewReducer';
+import { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection } from '../invoicingQboView/invoicingQboViewReducer';
+import { fetchInvoicingSettings } from '../settingsView/settingsViewReducer';
 import { fetchInvoicingCouponDetail, fetchInvoicingCouponDetailPage } from './editInvoicingCouponDetailViewReducer';
-export type ActionType = ReturnType<typeof fetchInvoicingCouponDetailPage> | ReturnType<typeof fetchInvoicingCouponDetail> | ReturnType<typeof fetchInvoicingConfig>;
+export type ActionType = ReturnType<typeof fetchInvoicingCouponDetailPage> | ReturnType<typeof fetchInvoicingCouponDetail> | ReturnType<typeof fetchInvoicingConfig> | ReturnType<typeof fetchInvoicingQboConnection> | ReturnType<typeof fetchInvoicingAccountingPickers> | ReturnType<typeof fetchInvoicingSettings>;
 /**
- * Orchestrates the discount detail page: one action fans out to the coupon
- * record and the invoicing config behind its dropdowns and field help, each
- * skipped when already cached. The page reads a single reduced fetch state off
- * the view, so the form mounts once with real values.
+ * Orchestrates the discount pages: one action fans out to the coupon record,
+ * the invoicing config behind its dropdowns and field help, and the QuickBooks
+ * connection, account list and settings the form's Discounts account picker
+ * renders and seeds from — each skipped when already cached. The page reads a
+ * single reduced fetch state off the view, so the form mounts once with real
+ * values.
  */
 export declare const fetchInvoicingCouponDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -4,6 +4,8 @@ exports.fetchInvoicingCouponDetailPageEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const invoicingConfigViewReducer_1 = require("../invoicingConfigView/invoicingConfigViewReducer");
+const invoicingQboViewReducer_1 = require("../invoicingQboView/invoicingQboViewReducer");
+const settingsViewReducer_1 = require("../settingsView/settingsViewReducer");
 const editInvoicingCouponDetailViewReducer_1 = require("./editInvoicingCouponDetailViewReducer");
 /**
  * Fetch unless the endpoint is already loaded or in flight — or always when the
@@ -13,10 +15,12 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
     (fetchStateAndError.fetchState !== 'Completed' &&
         fetchStateAndError.fetchState !== 'In-Progress');
 /**
- * Orchestrates the discount detail page: one action fans out to the coupon
- * record and the invoicing config behind its dropdowns and field help, each
- * skipped when already cached. The page reads a single reduced fetch state off
- * the view, so the form mounts once with real values.
+ * Orchestrates the discount pages: one action fans out to the coupon record,
+ * the invoicing config behind its dropdowns and field help, and the QuickBooks
+ * connection, account list and settings the form's Discounts account picker
+ * renders and seeds from — each skipped when already cached. The page reads a
+ * single reduced fetch state off the view, so the form mounts once with real
+ * values.
  */
 const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editInvoicingCouponDetailViewReducer_1.fetchInvoicingCouponDetailPage.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
     const { cacheOverride = false, id } = action.payload;
@@ -35,6 +39,20 @@ const fetchInvoicingCouponDetailPageEpic = (actions$, state$) => actions$.pipe((
     if (shouldFetch({ error: configState.error, fetchState: configState.fetchState }, cacheOverride)) {
         pageActions.push((0, invoicingConfigViewReducer_1.fetchInvoicingConfig)());
     }
+    const qboState = state.invoicingQboViewState;
+    if (shouldFetch(qboState.connectionFetchState, cacheOverride)) {
+        pageActions.push((0, invoicingQboViewReducer_1.fetchInvoicingQboConnection)());
+    }
+    // The picker epic tops up the shared account list and skips what the
+    // store already holds, so this is safe to ask for on every open.
+    pageActions.push((0, invoicingQboViewReducer_1.fetchInvoicingAccountingPickers)());
+    const settingsState = state.invoicingSettingsViewState;
+    if (shouldFetch({ error: settingsState.error, fetchState: settingsState.fetchState }, cacheOverride)) {
+        // A create seeds its Discounts account from the settings mapping, so
+        // the settings are page data here rather than a settings-screen
+        // concern.
+        pageActions.push((0, settingsViewReducer_1.fetchInvoicingSettings)());
+    }
     return pageActions.length > 0 ? (0, rxjs_1.from)(pageActions) : rxjs_1.EMPTY;
 }));
 exports.fetchInvoicingCouponDetailPageEpic = fetchInvoicingCouponDetailPageEpic;

package/package.json

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