@zeniai/client-epic-state 5.2.7-betaAK1 → 5.2.7-betaAK2

package/lib/entity/invoicing/invoicingCommonPayload.js

@@ -159,12 +159,16 @@ function toInvoicingQboCustomerMatchingMode(value) {
  * shows its placeholder rather than selecting nothing.
  */
 function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    const objectId = mappedAccount?.account_id ?? '';
-    if (objectId !== '') {
-        return objectId;
-    }
-    const flatId = legacyAccountId ?? '';
-    return flatId !== '' ? flatId : undefined;
+    // `qbo_id` first: the pickers key their options on the QuickBooks id, so an
+    // internal `account_id` would not select anything even when it is the same
+    // account. Both are read because the mapping arrives either way depending on
+    // how it was saved.
+    const candidates = [
+        mappedAccount?.qbo_id,
+        mappedAccount?.account_id,
+        legacyAccountId,
+    ];
+    return candidates.find((candidate) => candidate != null && candidate !== '');
 }
 /**
  * Read one account-mapping dropdown value by its config `code` (the codes in

package/lib/esm/entity/invoicing/invoicingCommonPayload.js

@@ -134,12 +134,16 @@ export function toInvoicingQboCustomerMatchingMode(value) {
  * shows its placeholder rather than selecting nothing.
  */
 function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    const objectId = mappedAccount?.account_id ?? '';
-    if (objectId !== '') {
-        return objectId;
-    }
-    const flatId = legacyAccountId ?? '';
-    return flatId !== '' ? flatId : undefined;
+    // `qbo_id` first: the pickers key their options on the QuickBooks id, so an
+    // internal `account_id` would not select anything even when it is the same
+    // account. Both are read because the mapping arrives either way depending on
+    // how it was saved.
+    const candidates = [
+        mappedAccount?.qbo_id,
+        mappedAccount?.account_id,
+        legacyAccountId,
+    ];
+    return candidates.find((candidate) => candidate != null && candidate !== '');
 }
 /**
  * Read one account-mapping dropdown value by its config `code` (the codes in

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

@@ -12,14 +12,23 @@ export const isInvoicingQboConnected = (state) => state.invoicingQboViewState.co
  * must not sit behind a skeleton waiting for lists it will never show.
  */
 export 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(getInvoicingQboConnectionFetchState(state).fetchState)) {
+        return true;
+    }
     if (!isInvoicingQboConnected(state)) {
         return false;
     }
     const accountList = state.accountListState.byReportId[INVOICING_ACCOUNT_LIST_KEY];
-    const isPending = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
     return (isPending(accountList.fetchState) ||
         isPending(state.classListState.fetchState));
 };
+/** The QBO connection fetch on its own, without building the bundled view. */
+export const getInvoicingQboConnectionFetchState = (state) => state.invoicingQboViewState.connectionFetchState;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.

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

@@ -13,6 +13,8 @@ export declare const isInvoicingQboConnected: (state: RootState) => boolean;
  * 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.

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = 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");
 // The shared bucket, fetched with the same arguments as the other consumers so
@@ -16,15 +16,25 @@ exports.isInvoicingQboConnected = isInvoicingQboConnected;
  * 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];
-    const isPending = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
     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.

package/package.json

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