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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.7",
+  "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",