@zeniai/client-epic-state 5.2.40 → 5.2.41-beta2MM

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.d.ts

@@ -12,7 +12,7 @@ import { ZeniDate } from '../../../zeniDayJS';
 import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
 export declare const toJEScheduleSortKey: (v: string) => "type" | "vendor" | "category" | "class" | "memo" | "jePostingDate" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths" | "totalAmount" | "transactionDate";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
+export declare const toJEPageTab: (v: string) => "schedules" | "actual_matching" | "existing_schedules";
 export type JEPageTab = ReturnType<typeof toJEPageTab>;
 export declare const ALL_JE_PAGE_TABS: readonly JEPageTab[];
 export type JESchedulePeriodTabKey = `${JEPageTab}_${MonthYearPeriodId}`;

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -20,7 +20,14 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+// `actual_matching` is chrome only: the JE tab bar includes it, but AM data is
+// `expenseAutomationActualMatchingViewState`, not the schedules period-tab
+// cache below. Walks of ALL_JE_PAGE_TABS that read schedule keys must skip it.
+const JE_PAGE_TABS = [
+    'schedules',
+    'actual_matching',
+    'existing_schedules',
+];
 const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
 exports.toJEPageTab = toJEPageTab;
 exports.ALL_JE_PAGE_TABS = JE_PAGE_TABS;

package/lib/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewSelector.js

@@ -39,7 +39,7 @@ const getInvoicingCustomerRecord = (state, invoicingCustomerID) => {
         brandingAccentColor: settings?.accent_color,
         brandingCompanyName: settings?.company_name,
         brandingEmail: settings?.email,
-        brandingLogoUrl: settings?.logo_url,
+        brandingLogoUrl: settings?.logo_file?.signed_url,
         stripeConnected: (0, invoicingSettingsHelpers_1.isStripeConnectedFromSettings)(settings),
         fetchState: invoicingCustomerDetail?.fetchState ?? 'Not-Started',
         error: invoicingCustomerDetail?.error,

package/lib/view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic.js

@@ -4,6 +4,7 @@ exports.fetchInvoicingSettingsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../../entity/address/addressReducer");
+const fileReducer_1 = require("../../../../entity/file/fileReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchInvoicingSettings.match), (0, operators_1.switchMap)(() => {
@@ -11,8 +12,13 @@ const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const address = response.data.address;
+            // The logo record goes to the file entity, like the address goes to
+            // the address entity: the settings view keeps only its id and reads
+            // the file back through the file selector, so one copy is canonical.
+            const logoFile = response.data.logo_file;
             return [
                 ...(address != null ? [(0, addressReducer_1.updateAddresses)([address])] : []),
+                ...(logoFile != null ? [(0, fileReducer_1.updateFiles)({ files: [logoFile] })] : []),
                 (0, settingsViewReducer_1.updateInvoicingSettings)(response.data),
             ];
         }

package/lib/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.js

@@ -7,6 +7,7 @@ const snackbarApiError_1 = require("../../../../entity/snackbar/snackbarApiError
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const settingsViewReducer_1 = require("../settingsViewReducer");
+const fileReducer_1 = require("../../../../entity/file/fileReducer");
 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;
@@ -25,7 +26,13 @@ const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(
         .putAndGetJSON(apiUrl, { ...settings })
         .pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            // Keep the file entity in step with what was persisted — the
+            // settings view resolves the logo by id, not from the response.
+            const savedLogoFile = response.data.logo_file;
             return (0, rxjs_1.from)([
+                ...(savedLogoFile != null
+                    ? [(0, fileReducer_1.updateFiles)({ files: [savedLogoFile] })]
+                    : []),
                 (0, settingsViewReducer_1.saveInvoicingSettingsSuccess)(response.data),
                 ...snackbar('success'),
             ]);

package/lib/view/invoicing/settingsView/epics/settingsViewActionType.d.ts

@@ -1,5 +1,6 @@
 import { updateAddresses } from '../../../../entity/address/addressReducer';
+import { updateFiles } from '../../../../entity/file/fileReducer';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { connectInvoicingStripe, disconnectInvoicingStripe, fetchInvoicingSettings, invoicingStripeConnectionFailure, saveInvoicingSettings, saveInvoicingSettingsFailure, saveInvoicingSettingsSuccess, submitInvoicingQboSettings, updateInvoicingSettings, updateInvoicingSettingsFailure, updateInvoicingStripeConnection } from '../settingsViewReducer';
 /** Every action the settings epics accept or emit. */
-export type InvoicingSettingsViewActionType = ReturnType<typeof fetchInvoicingSettings> | ReturnType<typeof updateInvoicingSettings> | ReturnType<typeof updateInvoicingSettingsFailure> | ReturnType<typeof saveInvoicingSettings> | ReturnType<typeof saveInvoicingSettingsSuccess> | ReturnType<typeof submitInvoicingQboSettings> | ReturnType<typeof saveInvoicingSettingsFailure> | ReturnType<typeof connectInvoicingStripe> | ReturnType<typeof disconnectInvoicingStripe> | ReturnType<typeof updateInvoicingStripeConnection> | ReturnType<typeof invoicingStripeConnectionFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof openSnackbar>;
+export type InvoicingSettingsViewActionType = ReturnType<typeof fetchInvoicingSettings> | ReturnType<typeof updateInvoicingSettings> | ReturnType<typeof updateInvoicingSettingsFailure> | ReturnType<typeof saveInvoicingSettings> | ReturnType<typeof saveInvoicingSettingsSuccess> | ReturnType<typeof submitInvoicingQboSettings> | ReturnType<typeof saveInvoicingSettingsFailure> | ReturnType<typeof connectInvoicingStripe> | ReturnType<typeof disconnectInvoicingStripe> | ReturnType<typeof updateInvoicingStripeConnection> | ReturnType<typeof invoicingStripeConnectionFailure> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateFiles> | ReturnType<typeof openSnackbar>;

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

@@ -25,7 +25,7 @@ const entityToInvoicingBrandingFormLocalData = (settings) => ({
     email: settings?.email ?? '',
     invoiceFooterText: settings?.invoice_footer_text ?? '',
     invoicePrefix: settings?.invoice_prefix ?? '',
-    logoFileId: settings?.logo_file_id ?? '',
+    logoFileId: settings?.logo_file?.file_id ?? '',
     phone: settings?.phone ?? '',
     taxId: settings?.tax_id ?? '',
 });

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

@@ -1,6 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchState, FetchStateAndError } from '../../../commonStateTypes/common';
 import { InvoicingDunningActionOption, InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingQboAccountMappingKindOption, InvoicingSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
+import { File } from '../../../entity/file/fileState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from '../invoicingQboView/invoicingQboViewPayload';
@@ -24,6 +25,13 @@ export interface InvoicingSettingsView {
     saveState: FetchStateAndError;
     stripeConnectState: FetchStateAndError;
     error?: ZeniAPIStatus;
+    /**
+     * The tenant's logo, read back out of the file entity the settings fetch
+     * stored it in. `undefined` when no logo is set — the settings response
+     * returns no record then, which is also how a logo deleted out from under a
+     * stale id reads, so the screen has nothing to show either way.
+     */
+    logoFile?: File;
     settings?: InvoicingSettingsPayload;
 }
 /**

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 fileSelector_1 = require("../../../entity/file/fileSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
 const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
@@ -31,10 +32,14 @@ exports.getInvoicingSettingsFetchState = getInvoicingSettingsFetchState;
  */
 const getInvoicingSettingsView = (state) => {
     const { error, fetchState, saveFetchState, settings, stripeFetchState } = state.invoicingSettingsViewState;
+    const logoFileId = settings?.logo_file?.file_id ?? '';
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
         error,
         fetchState,
+        logoFile: logoFileId !== ''
+            ? (0, fileSelector_1.getFileByFileId)(state.fileState, logoFileId)
+            : undefined,
         saveState: saveFetchState,
         settings,
         stripeConnectState: stripeFetchState,

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

@@ -1,11 +1,12 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateAddresses } from '../../../entity/address/addressReducer';
+import { updateFiles } from '../../../entity/file/fileReducer';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniAPI } from '../../../zeniAPI';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
 import { saveInvoicingSettingsFailure, saveInvoicingSettingsSuccess, submitInvoicingBrandingForm } from './settingsViewReducer';
-export type SubmitActionType = ReturnType<typeof submitInvoicingBrandingForm> | ReturnType<typeof saveInvoicingSettingsSuccess> | ReturnType<typeof saveInvoicingSettingsFailure> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses>;
+export type SubmitActionType = ReturnType<typeof submitInvoicingBrandingForm> | ReturnType<typeof saveInvoicingSettingsSuccess> | ReturnType<typeof saveInvoicingSettingsFailure> | ReturnType<typeof resetNewAddressDataInLocalStore> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateFiles>;
 /**
  * On `submitInvoicingBrandingForm`, PUT the settings body built from the branding
  * draft + the business address captured via the shared Address screen. The

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 fileReducer_1 = require("../../../entity/file/fileReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
 const invoicingBrandingFormConfig_1 = require("./invoicingBrandingFormConfig");
@@ -26,10 +27,18 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const savedAddress = response.data.address;
+            // The saved logo goes to the file entity for the same reason the
+            // saved address goes to the address entity: the settings view
+            // resolves the file by id, so without this a save that changes
+            // the logo leaves the view resolving an id nothing holds.
+            const savedLogoFile = response.data.logo_file;
             return [
                 ...(savedAddress != null
                     ? [(0, addressReducer_1.updateAddresses)([savedAddress])]
                     : []),
+                ...(savedLogoFile != null
+                    ? [(0, fileReducer_1.updateFiles)({ files: [savedLogoFile] })]
+                    : []),
                 (0, settingsViewReducer_1.saveInvoicingSettingsSuccess)(response.data),
                 (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
             ];

package/package.json

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