@zeniai/client-epic-state 5.2.63 → 5.2.65

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

@@ -1,10 +1,11 @@
 import { getInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getFileByFileId } from '../../../entity/file/fileSelector';
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingQboView, isInvoicingAccountingPickerDataLoading, } from '../invoicingQboView/invoicingQboViewSelector';
 import { INVOICING_BUSINESS_ADDRESS_TYPE, entityToInvoicingBrandingFormLocalData, } from './invoicingBrandingFormConfig';
-import { initialInvoicingQboSettingsLocalData, } from './invoicingQboSettingsFormConfig';
+import { entityToInvoicingQboSettingsLocalData, initialInvoicingQboSettingsLocalData, } from './invoicingQboSettingsFormConfig';
 /**
  * Shared primitive: the raw invoicing settings. Consumed internally by other
  * CES selectors (create-invoice, customer-detail, overview) and by non-settings
@@ -118,6 +119,7 @@ export const getInvoicingQboSettingsFormView = (state) => {
         fieldHelp: invoicingFieldHelpForGroup(state, 'settings'),
         accountMappingKindOptions: qboAccountMappingKindOptions,
         accounts: qboView.accounts,
+        savedLocalData: entityToInvoicingQboSettingsLocalData(settings?.qbo),
         backfillState: qboView.backfillState,
         connection: qboView.connection,
         configFetchState,
@@ -143,20 +145,27 @@ export const getInvoicingQboSettingsFormView = (state) => {
 };
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 export const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
-    const newAddress = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE];
-    const addressLabel = newAddress?.addressToCreate != null
-        ? getFormattedAddress(newAddress.addressToCreate)
-        : undefined;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]
+        ?.addressToCreate ??
+        (savedAddressId != null
+            ? getAddressByAddressId(state.addressState, savedAddressId)
+            : undefined);
     return {
         fieldHelp: invoicingFieldHelpForGroup(state, 'settings'),
-        addressLabel,
+        address,
+        addressLabel: address != null ? getFormattedAddress(address) : undefined,
         dateFormatOptions: getInvoicingConfigView(state).dateFormatOptions,
         localData: brandingDraft ?? entityToInvoicingBrandingFormLocalData(settings),
         saveState: saveFetchState,

package/lib/esm/view/invoicing/settingsView/submitInvoicingBrandingFormEpic.js

@@ -1,6 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateAddresses } from '../../../entity/address/addressReducer';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { updateFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
@@ -16,7 +17,11 @@ export const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => ac
     const state = state$.value;
     const { brandingDraft, settings } = state.invoicingSettingsViewState;
     const localData = brandingDraft ?? entityToInvoicingBrandingFormLocalData(settings);
-    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate ??
+        (savedAddressId != null
+            ? getAddressByAddressId(state.addressState, savedAddressId)
+            : undefined);
     const data = brandingLocalDataToSettingsPayload(localData, address);
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     return zeniAPI
@@ -37,7 +42,11 @@ export const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => ac
                     ? [updateFiles({ files: [savedLogoFile] })]
                     : []),
                 saveInvoicingSettingsSuccess(response.data),
-                resetNewAddressDataInLocalStore(INVOICING_BUSINESS_ADDRESS_TYPE),
+                ...(savedAddress == null
+                    ? [
+                        resetNewAddressDataInLocalStore(INVOICING_BUSINESS_ADDRESS_TYPE),
+                    ]
+                    : []),
             ];
         }
         return of(saveInvoicingSettingsFailure(response.status));

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

@@ -4,6 +4,7 @@ import { InvoicingDunningActionOption, InvoicingFieldHelpByCode, InvoicingNamedO
 import { File } from '../../../entity/file/fileState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { RootState } from '../../../rootStateTypes';
+import { AddressUpdatableInfo } from '../../addressView/addressViewState';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from '../invoicingQboView/invoicingQboViewPayload';
 import { InvoicingAccountingOption } from '../invoicingQboView/invoicingQboViewSelector';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
@@ -113,6 +114,8 @@ export interface InvoicingQboSettingsFormView {
     localData: InvoicingQboSettingsLocalData;
     nestedAccountHierarchy: NestedAccountHierarchyForReport[];
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
+    /** The saved values the draft is compared against. */
+    savedLocalData: InvoicingQboSettingsLocalData;
     saveState: FetchStateAndError;
     settingsFetchState: FetchState;
     syncStatusOptions: InvoicingNamedOption[];
@@ -134,14 +137,20 @@ export interface InvoicingBrandingFormView {
     fieldHelp: InvoicingFieldHelpByCode;
     localData: InvoicingBrandingFormLocalData;
     saveState: FetchStateAndError;
+    /** The business address to show: the in-progress edit, else what is saved. */
+    address?: AddressUpdatableInfo;
     addressLabel?: string;
     settings?: InvoicingSettingsPayload;
 }
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 export declare const getInvoicingBrandingFormView: (state: RootState) => InvoicingBrandingFormView;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingBrandingFormView = exports.getInvoicingQboSettingsFormView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 exports.deriveInvoicingEnablePrerequisites = deriveInvoicingEnablePrerequisites;
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileSelector_1 = require("../../../entity/file/fileSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
@@ -126,6 +127,7 @@ const getInvoicingQboSettingsFormView = (state) => {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
         accountMappingKindOptions: qboAccountMappingKindOptions,
         accounts: qboView.accounts,
+        savedLocalData: (0, invoicingQboSettingsFormConfig_1.entityToInvoicingQboSettingsLocalData)(settings?.qbo),
         backfillState: qboView.backfillState,
         connection: qboView.connection,
         configFetchState,
@@ -152,20 +154,27 @@ const getInvoicingQboSettingsFormView = (state) => {
 exports.getInvoicingQboSettingsFormView = getInvoicingQboSettingsFormView;
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
-    const newAddress = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE];
-    const addressLabel = newAddress?.addressToCreate != null
-        ? (0, addressViewSelector_1.getFormattedAddress)(newAddress.addressToCreate)
-        : undefined;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]
+        ?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
-        addressLabel,
+        address,
+        addressLabel: address != null ? (0, addressViewSelector_1.getFormattedAddress)(address) : undefined,
         dateFormatOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).dateFormatOptions,
         localData: brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings),
         saveState: saveFetchState,

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

@@ -4,6 +4,7 @@ exports.submitInvoicingBrandingFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileReducer_1 = require("../../../entity/file/fileReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
@@ -19,7 +20,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
     const state = state$.value;
     const { brandingDraft, settings } = state.invoicingSettingsViewState;
     const localData = brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings);
-    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     const data = (0, invoicingBrandingFormConfig_1.brandingLocalDataToSettingsPayload)(localData, address);
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     return zeniAPI
@@ -40,7 +45,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
                     ? [(0, fileReducer_1.updateFiles)({ files: [savedLogoFile] })]
                     : []),
                 (0, settingsViewReducer_1.saveInvoicingSettingsSuccess)(response.data),
-                (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                ...(savedAddress == null
+                    ? [
+                        (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                    ]
+                    : []),
             ];
         }
         return (0, rxjs_1.of)((0, settingsViewReducer_1.saveInvoicingSettingsFailure)(response.status));

package/package.json

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