@zeniai/client-epic-state 5.1.61 → 5.1.62-betaRD2

package/lib/view/settingsView/epic/fetchNotificationSettingsEpic.js

@@ -3,20 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNotificationSettingsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const notificationRegistryReducer_1 = require("../../../entity/notificationRegistry/notificationRegistryReducer");
 const responsePayload_1 = require("../../../responsePayload");
+const notificationPreferencesEndpoint_1 = require("../../notificationPreferencesView/notificationPreferencesEndpoint");
+const notificationPreferencesViewReducer_1 = require("../../notificationPreferencesView/notificationPreferencesViewReducer");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchNotificationSettings.match), (0, operators_1.switchMap)(() => {
     const state = state$.value;
-    const URL = `${zeniAPI.apiEndPoints.notificationMicroServiceBaseUrl}/1.0/notification-preferences`;
     const userEmail = state.tenantState.loggedInUser?.userEmail;
     if (userEmail == null) {
         return (0, rxjs_1.from)([]);
     }
-    return zeniAPI.getJSON(URL).pipe((0, operators_1.mergeMap)((response) => {
+    // Snapshot the save epoch at GET-dispatch time. The reducer compares
+    // the captured value against the current `saveEpoch` on response and
+    // skips the `preferences` replace when a save has landed in the
+    // meantime — the GET is carrying the pre-PUT snapshot and would
+    // otherwise clobber the fresh save. Cursor Bugbot 3632510237.
+    const saveEpochAtDispatch = state.notificationPreferencesViewState.saveEpoch;
+    // Snapshot the registry clear epoch at GET-dispatch time (same idiom as
+    // `saveEpochAtDispatch` above). The registry reducer compares it against
+    // the current `registryEpoch` and skips its write when a
+    // `clearAllNotificationRegistry` (tenant switch) has landed since — the
+    // GET is carrying the prior tenant's snapshot. Cursor Bugbot 67d6918e.
+    const registryEpochAtDispatch = state.notificationRegistryState.registryEpoch;
+    return zeniAPI
+        .getJSON((0, notificationPreferencesEndpoint_1.notificationPreferencesUrl)(zeniAPI))
+        .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [
                 (0, settingsViewReducer_1.updateNotificationSettingsOnSuccess)(response.data, userEmail),
             ];
+            // Always dispatch — an absent `task_checklist_registry` (gate
+            // off) must CLEAR the prior tenant's registry, not leave it in
+            // place. The reducer clears on `undefined` and full-replaces
+            // otherwise, both guarded by the registry epoch so a stale GET
+            // that lands after a tenant switch is skipped. Cursor Bugbot
+            // 67d6918e.
+            updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)({
+                registry: response.data.task_checklist_registry ?? undefined,
+                registryEpochAtDispatch,
+            }));
+            if (response.data.task_checklist_preferences != null) {
+                updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
+                    preferences: response.data.task_checklist_preferences,
+                    saveEpochAtDispatch,
+                }));
+            }
             return (0, rxjs_1.of)(...updateActions);
         }
         else {

package/lib/view/settingsView/epic/saveNotificationSettingsEpic.js

@@ -5,9 +5,10 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
+const notificationPreferencesEndpoint_1 = require("../../notificationPreferencesView/notificationPreferencesEndpoint");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 const saveNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveNotificationSettings.match), (0, operators_1.switchMap)(() => {
-    const URL = `${zeniAPI.apiEndPoints.notificationMicroServiceBaseUrl}/1.0/notification-preferences`;
+    const URL = (0, notificationPreferencesEndpoint_1.notificationPreferencesUrl)(zeniAPI);
     const { notificationSettings, notificationSettingsLocalData } = state$.value.settingsViewState.notification;
     const payload = toSaveNotificationSettingsPayload(notificationSettingsLocalData, notificationSettings);
     return zeniAPI

package/lib/view/settingsView/settingsViewHelpers.d.ts

@@ -14,4 +14,4 @@ export declare const isMyBankConnectionsTabVisible: (currentTenant: CurrentTenan
 export declare const isPerformanceTabVisible: (userRole: UserRoleType[], loggedInUser?: LoggedInUser) => boolean;
 export declare const isRemindersSectionVisibleOnSettingsPage: (reminderNotificationSettings: ReminderNotificationSettingsData) => boolean;
 export declare const isMonthEndNotificationsSectionVisibleOnSettingsPage: (monthEndInsightsNotificationSettings: MonthEndInsightsNotificationSettingsData, signedInUseEmail: string) => boolean;
-export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string, isDebitCardFlagEnabled: boolean, currentTenant: CurrentTenant | undefined) => boolean;
+export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string, isDebitCardFlagEnabled: boolean, currentTenant: CurrentTenant | undefined, hasTaskChecklistAccess: boolean) => boolean;

package/lib/view/settingsView/settingsViewHelpers.js

@@ -160,13 +160,14 @@ const isMonthEndNotificationsSectionVisibleOnSettingsPage = (monthEndInsightsNot
         monthEndInsightsNotificationSettings.recipientEmailIds.includes(signedInUseEmail));
 };
 exports.isMonthEndNotificationsSectionVisibleOnSettingsPage = isMonthEndNotificationsSectionVisibleOnSettingsPage;
-const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, isDebitCardFlagEnabled, currentTenant) => {
+const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, isDebitCardFlagEnabled, currentTenant, hasTaskChecklistAccess) => {
     if (currentTenant == null) {
         return false;
     }
     const { reminderNotificationSettings, monthEndInsightsNotificationSettings } = notificationSettings;
     return (((0, exports.isRemindersSectionVisibleOnSettingsPage)(reminderNotificationSettings) ||
-        (0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail)) &&
+        (0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail) ||
+        hasTaskChecklistAccess) &&
         ((0, tenantSelector_1.isTenantAccountingServicesEnabled)(currentTenant) ||
             ((0, tenantSelector_1.isTenantBankingOnly)(isDebitCardFlagEnabled, currentTenant) === false &&
                 (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false)));

package/lib/view/settingsView/settingsViewPayload.d.ts

@@ -1,9 +1,11 @@
 import { AddressPayload } from '../../entity/address/addressPayload';
 import { CompanyPayload } from '../../entity/company/companyPayload';
+import { NotificationRegistryPayload } from '../../entity/notificationRegistry/notificationRegistryPayload';
 import { UserPayload } from '../../entity/user/userPayload';
 import { UserRolePayload } from '../../entity/userRole/userRolePayload';
 import { ZeniAPIResponse } from '../../responsePayload';
 import { AddressUpdatableInfoPayload } from '../addressView/addressViewPayload';
+import { NotificationPreferencesPayload } from '../notificationPreferencesView/notificationPreferencesViewPayload';
 interface MyProfilePeoplePayload {
     user_roles: UserRolePayload[];
     users: UserPayload[];
@@ -36,6 +38,8 @@ export interface NotificationSettingsPayload {
     pending_reimbursement_approval_notification: RemindersPayload | null;
     uncategorized_transaction_notification: RemindersPayload | null;
     month_end_email_recipient_email_ids?: string[];
+    task_checklist_preferences?: NotificationPreferencesPayload;
+    task_checklist_registry?: NotificationRegistryPayload;
 }
 export type NotificationSettingsResponse = ZeniAPIResponse<NotificationSettingsPayload>;
 interface RefreshQBOPayload {

package/lib/view/settingsView/settingsViewState.d.ts

@@ -12,7 +12,7 @@ export interface IntegrationsSettings {
 export declare const REMINDER_NOTIFICATION_TYPES: readonly ["missingReceiptNotification", "uncategorizedTransactionNotification", "pendingBillApprovalNotification", "pendingReimbursementApprovalNotification"];
 declare const toReminderTypeKey: (v: string) => "missingReceiptNotification" | "uncategorizedTransactionNotification" | "pendingBillApprovalNotification" | "pendingReimbursementApprovalNotification";
 export type ReminderTypeKey = ReturnType<typeof toReminderTypeKey>;
-export declare const toRemindersFrequencyType: (v: string) => "weekly" | "monthly" | "daily" | "bi-weekly";
+export declare const toRemindersFrequencyType: (v: string) => "daily" | "weekly" | "monthly" | "bi-weekly";
 export type FrequencyTypeKey = ReturnType<typeof toRemindersFrequencyType>;
 export declare const NOTIFICATION_MODES: readonly ["email", "dashboard"];
 export declare const toNotificationMode: (v: string) => "dashboard" | "email";

package/package.json

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