@zeniai/client-epic-state 5.2.34-beta0ND → 5.2.35-beta0MM

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.js

@@ -3,27 +3,16 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toggleEventChannel = exports.setGroupFrequency = exports.setGroupChannelMaster = exports.saveNotificationPreferencesSuccess = exports.saveNotificationPreferencesFailure = exports.saveNotificationPreferences = exports.fetchNotificationPreferencesSuccess = exports.clearNotificationPreferencesLocalOverrides = exports.clearAllNotificationPreferencesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
 const rootActions_1 = require("../../rootActions");
 const notificationPreferencesViewPayload_1 = require("./notificationPreferencesViewPayload");
 const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
 exports.initialState = {
     cancelEpoch: 0,
-    localOverridesByDomain: {},
-    preferencesByDomain: {},
+    localOverrides: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
+    preferences: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
     saveEpoch: 0,
     savePreferencesState: { fetchState: 'Not-Started' },
 };
-// Lazy: a gate-off tenant never receives that domain's key at all.
-const overridesFor = (byDomain, domain) => {
-    const existing = byDomain[domain];
-    if (existing != null) {
-        return existing;
-    }
-    const created = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
-    byDomain[domain] = created;
-    return created;
-};
 const mergePreferences = (base, patch) => {
     const eventEnabledByChannel = {
         ...base.eventEnabledByChannel,
@@ -161,8 +150,7 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // Success/Failure never dispatches, subsequent legitimate saves
             // still work because their captured epoch matches the current one.
             draft.cancelEpoch += 1;
-            // One shared Save/Cancel footer, so Cancel discards every domain.
-            draft.localOverridesByDomain = {};
+            draft.localOverrides = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
             // Also drop `savePreferencesState` back to Not-Started so any
             // "Saving…" affordance bound to `getNotificationPreferencesSaveState`
             // clears on Cancel. Without this, a Cancel-during-save whose stale
@@ -179,6 +167,9 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // them; the save-success path is the only clearer.
             // A `null`/`undefined` payload isn't a snapshot at all (e.g. the
             // envelope key was omitted); no-op instead of wiping preferences.
+            if (action.payload.preferences == null) {
+                return;
+            }
             // Stale-GET guard (Cursor Bugbot 3632510237): if the fetch epic
             // captured a `saveEpoch` lower than the current one, a save has
             // succeeded since this GET dispatched — the response is carrying
@@ -188,13 +179,7 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             if (action.payload.saveEpochAtDispatch < draft.saveEpoch) {
                 return;
             }
-            Object.entries(action.payload.preferencesByDomain).forEach(([domain, payload]) => {
-                if (payload == null) {
-                    return;
-                }
-                draft.preferencesByDomain[domain] =
-                    (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(payload);
-            });
+            draft.preferences = (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(action.payload.preferences);
         },
         saveNotificationPreferences(draft) {
             draft.savePreferencesState = { fetchState: 'In-Progress' };
@@ -253,44 +238,33 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // skip the `preferences` replace. Cursor Bugbot 3632510237.
             draft.saveEpoch += 1;
             draft.savePreferencesState = { fetchState: 'Completed' };
-            Object.entries(action.payload.savedOverridesByDomain).forEach(([rawDomain, savedOverrides]) => {
-                if (savedOverrides == null) {
-                    return;
-                }
-                const domain = rawDomain;
-                const serverEcho = action.payload.serverEchoByDomain[domain];
-                const patch = serverEcho == null
-                    ? savedOverrides
-                    : (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(serverEcho);
-                draft.preferencesByDomain[domain] = mergePreferences(draft.preferencesByDomain[domain] ?? (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(), patch);
-                draft.localOverridesByDomain[domain] = subtractSavedOverrides(draft.localOverridesByDomain[domain] ??
-                    (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(), savedOverrides);
-            });
+            const patch = action.payload.serverEcho == null
+                ? action.payload.savedOverrides
+                : (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(action.payload.serverEcho);
+            draft.preferences = mergePreferences(draft.preferences, patch);
+            draft.localOverrides = subtractSavedOverrides(draft.localOverrides, action.payload.savedOverrides);
         },
         setGroupChannelMaster(draft, action) {
             // Mirror of `toggleEventChannel` but scoped to the group-channel master
             // held under `groupChannelEnabledByGroupId[groupId][channel]`.
             const { channel, enabled, groupId } = action.payload;
-            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
             const groupMap = {
-                ...(overrides.groupChannelEnabledByGroupId[groupId] ?? {}),
+                ...(draft.localOverrides.groupChannelEnabledByGroupId[groupId] ?? {}),
             };
             groupMap[channel] = enabled;
-            overrides.groupChannelEnabledByGroupId[groupId] = groupMap;
+            draft.localOverrides.groupChannelEnabledByGroupId[groupId] = groupMap;
         },
         setGroupFrequency(draft, action) {
-            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
-            overrides.groupFrequencyByGroupId[action.payload.groupId] =
+            draft.localOverrides.groupFrequencyByGroupId[action.payload.groupId] =
                 action.payload.frequency;
         },
         toggleEventChannel(draft, action) {
             const { channel, enabled, eventId } = action.payload;
-            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
             const eventMap = {
-                ...(overrides.eventEnabledByChannel[eventId] ?? {}),
+                ...(draft.localOverrides.eventEnabledByChannel[eventId] ?? {}),
             };
             eventMap[channel] = enabled;
-            overrides.eventEnabledByChannel[eventId] = eventMap;
+            draft.localOverrides.eventEnabledByChannel[eventId] = eventMap;
         },
     },
     extraReducers: (builder) => {

package/lib/view/notificationPreferencesView/notificationPreferencesViewSelector.d.ts

@@ -1,11 +1,7 @@
 import { FetchStateAndError } from '../../commonStateTypes/common';
-import { NotificationDomain } from '../../entity/notificationRegistry/notificationRegistryState';
 import { RootState } from '../../rootStateTypes';
 import { NotificationPreferences } from './notificationPreferencesViewState';
 export declare const getNotificationPreferencesSaveState: (state: RootState) => FetchStateAndError;
-export declare const getEffectiveNotificationPreferencesForDomain: (state: RootState, domain: NotificationDomain) => NotificationPreferences;
 export declare const getEffectiveNotificationPreferences: (state: RootState) => NotificationPreferences;
-export declare const getNotificationLocalOverridesForDomain: (state: RootState, domain: NotificationDomain) => NotificationPreferences;
 export declare const getNotificationLocalOverrides: (state: RootState) => NotificationPreferences;
-export declare const hasUnsavedNotificationPreferencesForDomain: (state: RootState, domain: NotificationDomain) => boolean;
 export declare const hasUnsavedNotificationPreferences: (state: RootState) => boolean;

package/lib/view/notificationPreferencesView/notificationPreferencesViewSelector.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasUnsavedNotificationPreferences = exports.hasUnsavedNotificationPreferencesForDomain = exports.getNotificationLocalOverrides = exports.getNotificationLocalOverridesForDomain = exports.getEffectiveNotificationPreferences = exports.getEffectiveNotificationPreferencesForDomain = exports.getNotificationPreferencesSaveState = void 0;
+exports.hasUnsavedNotificationPreferences = exports.getNotificationLocalOverrides = exports.getEffectiveNotificationPreferences = exports.getNotificationPreferencesSaveState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
-const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
 const getView = (state) => state.notificationPreferencesViewState;
 const getNotificationPreferencesSaveState = (state) => getView(state).savePreferencesState;
 exports.getNotificationPreferencesSaveState = getNotificationPreferencesSaveState;
@@ -11,12 +9,7 @@ exports.getNotificationPreferencesSaveState = getNotificationPreferencesSaveStat
 // stable reference while neither input changes — a plain function would
 // allocate a fresh object on every call and re-render every `useSelector`
 // consumer on any unrelated dispatch.
-const EMPTY_PREFERENCES = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
-// One per domain: a shared createSelector has a cache of one and would thrash across two.
-const effectivePreferencesSelectorByDomain = new Map();
-const createEffectivePreferencesSelector = (domain) => (0, toolkit_1.createSelector)((state) => getView(state).preferencesByDomain[domain], (state) => getView(state).localOverridesByDomain[domain], (storedPreferences, storedOverrides) => {
-    const preferences = storedPreferences ?? EMPTY_PREFERENCES;
-    const localOverrides = storedOverrides ?? EMPTY_PREFERENCES;
+exports.getEffectiveNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).preferences, (state) => getView(state).localOverrides, (preferences, localOverrides) => {
     const mergedEventEnabledByChannel = { ...preferences.eventEnabledByChannel };
     Object.entries(localOverrides.eventEnabledByChannel).forEach(([eventId, channels]) => {
         mergedEventEnabledByChannel[eventId] = {
@@ -40,26 +33,8 @@ const createEffectivePreferencesSelector = (domain) => (0, toolkit_1.createSelec
         },
     };
 });
-const getEffectiveNotificationPreferencesForDomain = (state, domain) => {
-    let selector = effectivePreferencesSelectorByDomain.get(domain);
-    if (selector == null) {
-        selector = createEffectivePreferencesSelector(domain);
-        effectivePreferencesSelectorByDomain.set(domain, selector);
-    }
-    return selector(state);
-};
-exports.getEffectiveNotificationPreferencesForDomain = getEffectiveNotificationPreferencesForDomain;
-const getEffectiveNotificationPreferences = (state) => (0, exports.getEffectiveNotificationPreferencesForDomain)(state, notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
-exports.getEffectiveNotificationPreferences = getEffectiveNotificationPreferences;
-const getNotificationLocalOverridesForDomain = (state, domain) => getView(state).localOverridesByDomain[domain] ?? EMPTY_PREFERENCES;
-exports.getNotificationLocalOverridesForDomain = getNotificationLocalOverridesForDomain;
-const getNotificationLocalOverrides = (state) => (0, exports.getNotificationLocalOverridesForDomain)(state, notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
+const getNotificationLocalOverrides = (state) => getView(state).localOverrides;
 exports.getNotificationLocalOverrides = getNotificationLocalOverrides;
-const isDirty = (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
+exports.hasUnsavedNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).localOverrides, (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
     Object.keys(localOverrides.groupChannelEnabledByGroupId).length > 0 ||
-    Object.keys(localOverrides.groupFrequencyByGroupId).length > 0;
-const hasUnsavedNotificationPreferencesForDomain = (state, domain) => isDirty((0, exports.getNotificationLocalOverridesForDomain)(state, domain));
-exports.hasUnsavedNotificationPreferencesForDomain = hasUnsavedNotificationPreferencesForDomain;
-// Drives the shared page-level Save/Cancel footer.
-const hasUnsavedNotificationPreferences = (state) => Object.values(getView(state).localOverridesByDomain).some((localOverrides) => localOverrides != null && isDirty(localOverrides));
-exports.hasUnsavedNotificationPreferences = hasUnsavedNotificationPreferences;
+    Object.keys(localOverrides.groupFrequencyByGroupId).length > 0);

package/lib/view/notificationPreferencesView/notificationPreferencesViewState.d.ts

@@ -1,5 +1,5 @@
 import { FetchStateAndError } from '../../commonStateTypes/common';
-import { NotificationChannel, NotificationDomain, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
+import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 export interface NotificationPreferences {
     eventEnabledByChannel: Record<string, Partial<Record<NotificationChannel, boolean>>>;
     groupChannelEnabledByGroupId: Record<string, Partial<Record<NotificationChannel, boolean>>>;
@@ -7,10 +7,9 @@ export interface NotificationPreferences {
 }
 export interface NotificationPreferencesViewState {
     cancelEpoch: number;
-    localOverridesByDomain: NotificationPreferencesByDomain;
-    preferencesByDomain: NotificationPreferencesByDomain;
+    localOverrides: NotificationPreferences;
+    preferences: NotificationPreferences;
     saveEpoch: number;
     savePreferencesState: FetchStateAndError;
 }
-export type NotificationPreferencesByDomain = Partial<Record<NotificationDomain, NotificationPreferences>>;
 export declare const emptyNotificationPreferences: () => NotificationPreferences;

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

@@ -41,21 +41,11 @@ const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pi
             // 67d6918e.
             updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)({
                 registry: response.data.task_checklist_registry ?? undefined,
-                // An absent `<domain>_registry` means that domain's gate is off.
-                registriesByDomain: {
-                    task_checklist: response.data.task_checklist_registry ?? undefined,
-                    commenting: response.data.commenting_registry ?? undefined,
-                },
                 registryEpochAtDispatch,
             }));
-            // One action so the domains cannot land on different store epochs.
-            const preferencesByDomain = {
-                task_checklist: response.data.task_checklist_preferences ?? undefined,
-                commenting: response.data.commenting_preferences ?? undefined,
-            };
-            if (Object.values(preferencesByDomain).some((preferences) => preferences != null)) {
+            if (response.data.task_checklist_preferences != null) {
                 updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
-                    preferencesByDomain,
+                    preferences: response.data.task_checklist_preferences,
                     saveEpochAtDispatch,
                 }));
             }

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

@@ -37,8 +37,6 @@ export interface NotificationSettingsPayload {
     pending_bill_approval_notification: RemindersPayload | null;
     pending_reimbursement_approval_notification: RemindersPayload | null;
     uncategorized_transaction_notification: RemindersPayload | null;
-    commenting_preferences?: NotificationPreferencesPayload;
-    commenting_registry?: NotificationRegistryPayload;
     month_end_email_recipient_email_ids?: string[];
     task_checklist_preferences?: NotificationPreferencesPayload;
     task_checklist_registry?: NotificationRegistryPayload;

package/package.json

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