@zeniai/client-epic-state 5.2.49 → 5.2.50-beta0ND

package/lib/view/invoicing/editInvoicingSubscriptionDetailView/seedInvoicingSubscriptionFormDraftEpic.js

@@ -7,14 +7,35 @@ const editInvoicingSubscriptionDetailViewReducer_1 = require("./editInvoicingSub
 const invoicingSubscriptionDetailHelper_1 = require("./invoicingSubscriptionDetailHelper");
 const invoicingSubscriptionFormConfig_1 = require("./invoicingSubscriptionFormConfig");
 /**
- * Seeds the edit draft from the record the moment the detail fetch lands, so
- * the form has its values before it mounts. The reducer ignores the seed when a
- * draft already exists, which is what stops a background refetch from
- * overwriting edits in progress.
+ * Seeds the edit draft from the record, so the form has its values before it
+ * mounts. The reducer ignores a seed once the draft holds the record, which is
+ * what stops a background refetch from overwriting edits in progress.
+ *
+ * Opening the page counts as a trigger, not just the detail response: the page
+ * fetch is cache-guarded, so re-opening a form for a record already loaded this
+ * session issues no request at all — and a draft cleared in between (by a save
+ * or a cancel) would have nothing left to seed it.
  */
-const seedInvoicingSubscriptionFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
-    const { id } = action.payload;
-    const subscription = (0, invoicingSubscriptionDetailHelper_1.getInvoicingSubscriptionById)(state, id);
+const seedInvoicingSubscriptionFormDraftEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action) ||
+    editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionFormPage.match(action)), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([action, state]) => {
+    const id = editInvoicingSubscriptionDetailViewReducer_1.updateInvoicingSubscriptionDetail.match(action)
+        ? action.payload.id
+        : action.payload.subscriptionId;
+    if (id == null) {
+        return rxjs_1.EMPTY;
+    }
+    // The entity alone does not say the whole record is loaded — the list
+    // endpoints merge their own list-shaped rows into the same store. Only a
+    // completed detail load does, which is also exactly when the page's
+    // cache-guarded fetch issues no request and this is the sole seed.
+    if (editInvoicingSubscriptionDetailViewReducer_1.fetchInvoicingSubscriptionFormPage.match(action) &&
+        state.editInvoicingSubscriptionDetailViewState.recordStateById[id]
+            ?.fetchState !== 'Completed') {
+        return rxjs_1.EMPTY;
+    }
+    // Nothing to seed from on a cold open; the detail response triggers this
+    // again once it lands.
+    const subscription = id != null ? (0, invoicingSubscriptionDetailHelper_1.getInvoicingSubscriptionById)(state, id) : undefined;
     if (subscription == null) {
         return rxjs_1.EMPTY;
     }

package/lib/view/invoicing/invoicingFormDraft.d.ts

@@ -0,0 +1,54 @@
+import { FetchState, ID } from '../../commonStateTypes/common';
+/**
+ * A create/edit form's draft, plus where its values came from.
+ *
+ * The status is what lets an edit form tell "these are the record's values"
+ * from "these are whatever the form had at first render". It cannot be read off
+ * the presence of a draft, because the form writes drafts too: it pushes its
+ * whole state back on every change, so a change made before the record landed
+ * leaves a draft that looks seeded but holds nothing.
+ *
+ * `Not-Started` — written by the form, never filled from a record.
+ * `Completed`   — filled from the loaded record; the form may have edited it since.
+ * `Error`       — the record's fetch failed, so the form starts blank and a
+ *                 later successful fetch is still allowed to seed it.
+ */
+export interface InvoicingFormDraft<TLocalData> {
+    fetchState: FetchState;
+    localData: TLocalData;
+}
+export type InvoicingFormDraftById<TLocalData> = Record<ID, InvoicingFormDraft<TLocalData>>;
+/**
+ * The form's own write. Keeps the status: an edit on top of a seeded draft is
+ * still the record's draft, and an edit made before the record arrived must not
+ * pass for one.
+ */
+export declare function applyInvoicingFormDraftEdit<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, localData: TLocalData): void;
+/**
+ * Fill the draft from the loaded record, once. A second seed is ignored so a
+ * late refetch cannot overwrite edits in progress — but a draft the form wrote
+ * before the record landed is replaced, since it was never the record's.
+ */
+export declare function applyInvoicingFormDraftSeed<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, localData: TLocalData): void;
+/**
+ * Record that the fetch failed, so the form renders instead of waiting behind a
+ * skeleton that will never resolve.
+ *
+ * Mirrors the seed: a draft holding the record is left alone, since a
+ * background refetch failing is no reason to discard it, and anything else is
+ * marked failed. A draft the form wrote before the record landed keeps its
+ * values — there is no reason to throw away what the user typed — but stops
+ * counting as still loading, and a later successful fetch can still seed it.
+ */
+export declare function applyInvoicingFormDraftFailure<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID, blankLocalData: TLocalData): void;
+/** The draft's values, or the blank form when nothing is drafted yet. */
+export declare function getInvoicingFormDraftLocalData<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID | undefined, blankLocalData: TLocalData): TLocalData;
+/**
+ * Whether the form should still be showing its skeleton — the record has
+ * neither reached the draft nor failed trying.
+ *
+ * Settles once and stays settled, which is what keeps a later refetch from
+ * swapping a form the user is typing into back for a skeleton. Create mode
+ * (no id) has no record to wait for.
+ */
+export declare function isInvoicingFormDraftPending<TLocalData>(draftById: InvoicingFormDraftById<TLocalData>, id: ID | undefined): boolean;

package/lib/view/invoicing/invoicingFormDraft.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyInvoicingFormDraftEdit = applyInvoicingFormDraftEdit;
+exports.applyInvoicingFormDraftSeed = applyInvoicingFormDraftSeed;
+exports.applyInvoicingFormDraftFailure = applyInvoicingFormDraftFailure;
+exports.getInvoicingFormDraftLocalData = getInvoicingFormDraftLocalData;
+exports.isInvoicingFormDraftPending = isInvoicingFormDraftPending;
+/**
+ * The form's own write. Keeps the status: an edit on top of a seeded draft is
+ * still the record's draft, and an edit made before the record arrived must not
+ * pass for one.
+ */
+function applyInvoicingFormDraftEdit(draftById, id, localData) {
+    draftById[id] = {
+        fetchState: draftById[id]?.fetchState ?? 'Not-Started',
+        localData,
+    };
+}
+/**
+ * Fill the draft from the loaded record, once. A second seed is ignored so a
+ * late refetch cannot overwrite edits in progress — but a draft the form wrote
+ * before the record landed is replaced, since it was never the record's.
+ */
+function applyInvoicingFormDraftSeed(draftById, id, localData) {
+    if (draftById[id]?.fetchState === 'Completed') {
+        return;
+    }
+    draftById[id] = { fetchState: 'Completed', localData };
+}
+/**
+ * Record that the fetch failed, so the form renders instead of waiting behind a
+ * skeleton that will never resolve.
+ *
+ * Mirrors the seed: a draft holding the record is left alone, since a
+ * background refetch failing is no reason to discard it, and anything else is
+ * marked failed. A draft the form wrote before the record landed keeps its
+ * values — there is no reason to throw away what the user typed — but stops
+ * counting as still loading, and a later successful fetch can still seed it.
+ */
+function applyInvoicingFormDraftFailure(draftById, id, blankLocalData) {
+    const existing = draftById[id];
+    if (existing == null) {
+        draftById[id] = { fetchState: 'Error', localData: blankLocalData };
+        return;
+    }
+    if (existing.fetchState === 'Completed') {
+        return;
+    }
+    existing.fetchState = 'Error';
+}
+/** The draft's values, or the blank form when nothing is drafted yet. */
+function getInvoicingFormDraftLocalData(draftById, id, blankLocalData) {
+    if (id == null) {
+        return blankLocalData;
+    }
+    return draftById[id]?.localData ?? blankLocalData;
+}
+/**
+ * Whether the form should still be showing its skeleton — the record has
+ * neither reached the draft nor failed trying.
+ *
+ * Settles once and stays settled, which is what keeps a later refetch from
+ * swapping a form the user is typing into back for a skeleton. Create mode
+ * (no id) has no record to wait for.
+ */
+function isInvoicingFormDraftPending(draftById, id) {
+    if (id == null) {
+        return false;
+    }
+    const fetchState = draftById[id]?.fetchState;
+    return fetchState !== 'Completed' && fetchState !== 'Error';
+}

package/lib/view/notificationPreferencesView/epics/saveNotificationPreferencesEpic.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveNotificationPreferencesEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const notificationRegistryState_1 = require("../../../entity/notificationRegistry/notificationRegistryState");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const notificationPreferencesEndpoint_1 = require("../notificationPreferencesEndpoint");
@@ -16,9 +17,19 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
 // ignored, so stale success/failure actions cannot clobber the newer
 // batch's state. Server-side ordering is arrival-order LWW.
 (0, operators_1.switchMap)(([, state]) => {
-    const overrides = (0, notificationPreferencesViewSelector_1.getNotificationLocalOverrides)(state);
-    const preferencesPatch = (0, notificationPreferencesViewPayload_1.mapPreferencesToPayload)(overrides);
-    if (Object.keys(preferencesPatch).length === 0) {
+    // A clean domain is omitted entirely: an empty patch is still a write against it.
+    const overridesByDomain = {};
+    const body = {};
+    notificationRegistryState_1.NOTIFICATION_DOMAINS.forEach((domain) => {
+        const overrides = (0, notificationPreferencesViewSelector_1.getNotificationLocalOverridesForDomain)(state, domain);
+        const preferencesPatch = (0, notificationPreferencesViewPayload_1.mapPreferencesToPayload)(overrides);
+        if (Object.keys(preferencesPatch).length === 0) {
+            return;
+        }
+        overridesByDomain[domain] = overrides;
+        body[`${domain}_preferences`] = preferencesPatch;
+    });
+    if (Object.keys(body).length === 0) {
         // No diff → do not dispatch a synthetic success (that would wipe
         // stored preferences via the reducer). Simply no-op.
         return rxjs_1.EMPTY;
@@ -31,7 +42,6 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
     // in-flight save's response (Success/Failure never dispatched, so
     // the counter never drained and future saves got their merge dropped).
     const cancelEpochAtDispatch = state.notificationPreferencesViewState.cancelEpoch;
-    const body = { task_checklist_preferences: preferencesPatch };
     // Suppress the error snackbar when the response lands AFTER the user
     // pressed Cancel — the Failure reducer already swallows the state
     // update, so the toast would be a stale error for a save the user
@@ -60,8 +70,11 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             return (0, rxjs_1.of)((0, notificationPreferencesViewReducer_1.saveNotificationPreferencesSuccess)({
                 cancelEpochAtDispatch,
-                savedOverrides: overrides,
-                serverEcho: response.data?.task_checklist_preferences,
+                savedOverridesByDomain: overridesByDomain,
+                serverEchoByDomain: {
+                    task_checklist: response.data?.task_checklist_preferences,
+                    commenting: response.data?.commenting_preferences,
+                },
             }));
         }
         const actions = [

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

@@ -1,30 +1,33 @@
-import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
+import { NotificationChannel, NotificationDomain, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 import { ZeniAPIStatus } from '../../responsePayload';
 import { NotificationPreferencesPayload } from './notificationPreferencesViewPayload';
-import { NotificationPreferences, NotificationPreferencesViewState } from './notificationPreferencesViewState';
+import { NotificationPreferencesByDomain, NotificationPreferencesViewState } from './notificationPreferencesViewState';
 export declare const initialState: NotificationPreferencesViewState;
 export interface SetFrequencyPayload {
     frequency: NotificationFrequency;
     groupId: string;
+    domain?: NotificationDomain;
 }
 export interface TogglePreferencePayload {
     channel: NotificationChannel;
     enabled: boolean;
     eventId: string;
+    domain?: NotificationDomain;
 }
 export interface SetGroupChannelMasterPayload {
     channel: NotificationChannel;
     enabled: boolean;
     groupId: string;
+    domain?: NotificationDomain;
 }
 export interface FetchNotificationPreferencesSuccessPayload {
-    preferences: NotificationPreferencesPayload | undefined;
+    preferencesByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
     saveEpochAtDispatch: number;
 }
 export interface SaveNotificationPreferencesSuccessPayload {
     cancelEpochAtDispatch: number;
-    savedOverrides: NotificationPreferences;
-    serverEcho: NotificationPreferencesPayload | undefined;
+    savedOverridesByDomain: NotificationPreferencesByDomain;
+    serverEchoByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
 }
 export interface SaveNotificationPreferencesFailurePayload {
     cancelEpochAtDispatch: number;

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.js

@@ -3,16 +3,27 @@ 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,
-    localOverrides: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
-    preferences: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
+    localOverridesByDomain: {},
+    preferencesByDomain: {},
     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,
@@ -150,7 +161,8 @@ 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;
-            draft.localOverrides = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
+            // One shared Save/Cancel footer, so Cancel discards every domain.
+            draft.localOverridesByDomain = {};
             // 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
@@ -167,9 +179,6 @@ 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
@@ -179,7 +188,13 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             if (action.payload.saveEpochAtDispatch < draft.saveEpoch) {
                 return;
             }
-            draft.preferences = (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(action.payload.preferences);
+            Object.entries(action.payload.preferencesByDomain).forEach(([domain, payload]) => {
+                if (payload == null) {
+                    return;
+                }
+                draft.preferencesByDomain[domain] =
+                    (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(payload);
+            });
         },
         saveNotificationPreferences(draft) {
             draft.savePreferencesState = { fetchState: 'In-Progress' };
@@ -238,33 +253,44 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // skip the `preferences` replace. Cursor Bugbot 3632510237.
             draft.saveEpoch += 1;
             draft.savePreferencesState = { fetchState: 'Completed' };
-            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);
+            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);
+            });
         },
         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 = {
-                ...(draft.localOverrides.groupChannelEnabledByGroupId[groupId] ?? {}),
+                ...(overrides.groupChannelEnabledByGroupId[groupId] ?? {}),
             };
             groupMap[channel] = enabled;
-            draft.localOverrides.groupChannelEnabledByGroupId[groupId] = groupMap;
+            overrides.groupChannelEnabledByGroupId[groupId] = groupMap;
         },
         setGroupFrequency(draft, action) {
-            draft.localOverrides.groupFrequencyByGroupId[action.payload.groupId] =
+            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
+            overrides.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 = {
-                ...(draft.localOverrides.eventEnabledByChannel[eventId] ?? {}),
+                ...(overrides.eventEnabledByChannel[eventId] ?? {}),
             };
             eventMap[channel] = enabled;
-            draft.localOverrides.eventEnabledByChannel[eventId] = eventMap;
+            overrides.eventEnabledByChannel[eventId] = eventMap;
         },
     },
     extraReducers: (builder) => {

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

@@ -1,7 +1,11 @@
 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,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasUnsavedNotificationPreferences = exports.getNotificationLocalOverrides = exports.getEffectiveNotificationPreferences = exports.getNotificationPreferencesSaveState = void 0;
+exports.hasUnsavedNotificationPreferences = exports.hasUnsavedNotificationPreferencesForDomain = exports.getNotificationLocalOverrides = exports.getNotificationLocalOverridesForDomain = exports.getEffectiveNotificationPreferences = exports.getEffectiveNotificationPreferencesForDomain = 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;
@@ -9,7 +11,12 @@ 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.
-exports.getEffectiveNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).preferences, (state) => getView(state).localOverrides, (preferences, localOverrides) => {
+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;
     const mergedEventEnabledByChannel = { ...preferences.eventEnabledByChannel };
     Object.entries(localOverrides.eventEnabledByChannel).forEach(([eventId, channels]) => {
         mergedEventEnabledByChannel[eventId] = {
@@ -33,8 +40,26 @@ exports.getEffectiveNotificationPreferences = (0, toolkit_1.createSelector)((sta
         },
     };
 });
-const getNotificationLocalOverrides = (state) => getView(state).localOverrides;
+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);
 exports.getNotificationLocalOverrides = getNotificationLocalOverrides;
-exports.hasUnsavedNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).localOverrides, (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
+const isDirty = (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
     Object.keys(localOverrides.groupChannelEnabledByGroupId).length > 0 ||
-    Object.keys(localOverrides.groupFrequencyByGroupId).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;

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

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

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

@@ -41,11 +41,21 @@ 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,
             }));
-            if (response.data.task_checklist_preferences != null) {
+            // 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)) {
                 updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
-                    preferences: response.data.task_checklist_preferences,
+                    preferencesByDomain,
                     saveEpochAtDispatch,
                 }));
             }

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

@@ -37,6 +37,8 @@ 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.49",
+  "version": "5.2.50-beta0ND",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",