@zeniai/client-epic-state 5.1.71 → 5.1.72-betaRD1

package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAiAccountantSchedule = void 0;
+exports.isAccruedScheduleRow = isAccruedScheduleRow;
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
@@ -10,6 +12,7 @@ const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState")
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
+const jeSchedulesTypes_1 = require("../../../entity/jeSchedules/jeSchedulesTypes");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
@@ -18,6 +21,32 @@ const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const jeAccountSettingsViewSelector_1 = require("./jeAccountSettingsViewSelector");
+const jeNewScheduleViewSelector_1 = require("./jeNewScheduleViewSelector");
+// Matches the AI-automation user addresses webc's schedule list row already
+// checks (JEScheduleReadOnlyListRow/JEScheduleDraftListRow "Method" column,
+// strings.ts aiBotEmail/botEmail) to determine whether a schedule was
+// created by the AI accountant vs. a human.
+const AI_BOT_EMAIL = 'ai@zeni.ai';
+const BOT_EMAIL = 'bot@zeni.ai';
+// Exported (rather than kept as a closure inside the selector) so it can be
+// unit-tested directly — confidenceScore is a separate, more narrowly
+// populated field that can be null on a schedule the bot user created,
+// which previously caused these schedules to display as "AI Accountant" in
+// the list but count under "Manual" in the KPI summary.
+const isAiAccountantSchedule = (schedule) => schedule.createdByUser?.email === AI_BOT_EMAIL ||
+    schedule.createdByUser?.email === BOT_EMAIL;
+exports.isAiAccountantSchedule = isAiAccountantSchedule;
+// Accrued schedules are structurally distinct — no baseTransaction, carrying recurringAmount and
+// memo in its place — so anything reading baseTransaction has to branch on this first.
+function isAccruedScheduleRow(schedule) {
+    return schedule.jeScheduleType === 'accrued_expenses';
+}
+function getScheduleAmount(schedule) {
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount.amount;
+    }
+    return schedule.baseTransaction.amount.amount;
+}
 function getJEScheduleSortAccessor(sortKey) {
     switch (sortKey) {
         case 'vendor':
@@ -29,7 +58,9 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? undefined
+                : s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -57,11 +88,13 @@ function getJEScheduleSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => s.baseTransaction.amount.amount;
+            return (s) => getScheduleAmount(s);
         case 'transactionDate':
-            return (s) => s.baseTransaction.date.valueOf();
+            return (s) => s.createTime?.valueOf();
         case 'memo':
-            return (s) => s.baseTransaction.memo?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? s.memo.toLowerCase()
+                : s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -73,9 +106,14 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
+    const accruedSchedules = [];
     const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriod, jeScheduleAccruedKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
+    const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
+        newSchedule.selectedDetailScheduleType === 'prepaid_expenses'
+        ? (0, jeNewScheduleViewSelector_1.getNewScheduleView)(state, newSchedule.selectedDetailScheduleType)
+        : undefined;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -111,19 +149,24 @@ function getExpenseAutomationJESchedulesView(state) {
         : null;
     const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
     const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
+    const jeScheduleAccruedKeys = (monthYearPeriodId != null
+        ? jeScheduleAccruedKeysByPeriod[monthYearPeriodId]
+        : null) ?? [];
     jeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         jeScheduledTransaction.push(jeScheduleDetails);
     });
+    jeScheduleAccruedKeys.forEach((jeAccruedScheduleKey) => {
+        const accruedScheduleDetails = (0, jeSchedulesSelector_1.getJEAccruedScheduleByJEScheduleKey)(jeAccruedScheduleKey, state);
+        if (accruedScheduleDetails != null) {
+            accruedSchedules.push(accruedScheduleDetails);
+        }
+    });
     failedJeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder } = uiState;
-    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
-    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
-    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
+    const { sortKey, sortOrder, selectedJETypeFilter } = uiState;
     const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -135,10 +178,46 @@ function getExpenseAutomationJESchedulesView(state) {
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
+    const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
+        schedule.jeScheduleType === selectedJETypeFilter;
+    const isCreatedStatus = (schedule) => schedule.status.code === 'ongoing' ||
+        schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed';
+    const allScheduleRows = [
+        ...jeScheduledTransaction,
+        ...accruedSchedules,
+    ];
     const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
+        ...allScheduleRows.filter((schedule) => schedule.status.code === 'draft' && matchesTypeFilter(schedule)),
         ...validResolveForPending,
     ], sortKey, sortOrder);
+    const createdSchedules = sortJEScheduledTransactions(allScheduleRows.filter((schedule) => isCreatedStatus(schedule) && matchesTypeFilter(schedule)), sortKey, sortOrder);
+    // KPI summary — derived from unfiltered schedules so counts are always accurate
+    const allSchedules = allScheduleRows;
+    const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
+    const pendingReviewTotal = sumAmount(pendingReviewSchedules);
+    const createdTotal = sumAmount(createdSchedules);
+    const aiAccountantSchedules = allSchedules.filter(exports.isAiAccountantSchedule);
+    const manualSchedules = allSchedules.filter((schedule) => !(0, exports.isAiAccountantSchedule)(schedule));
+    const pendingUnfiltered = allSchedules.filter((schedule) => schedule.status.code === 'draft');
+    const kpiSummary = {
+        aiAccountant: {
+            count: aiAccountantSchedules.length,
+            amount: sumAmount(aiAccountantSchedules),
+        },
+        manual: {
+            count: manualSchedules.length,
+            amount: sumAmount(manualSchedules),
+        },
+        needsReview: {
+            count: pendingUnfiltered.length,
+            amount: sumAmount(pendingUnfiltered),
+        },
+        total: {
+            count: allSchedules.length,
+            amount: sumAmount(allSchedules),
+        },
+    };
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -151,6 +230,22 @@ function getExpenseAutomationJESchedulesView(state) {
         { fetchState, error },
         monthEndFetchState,
     ]);
+    const countByType = (schedules) => {
+        const counts = jeSchedulesTypes_1.ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
+        schedules.forEach((schedule) => {
+            if (schedule.jeScheduleType != null) {
+                counts[schedule.jeScheduleType] += 1;
+            }
+        });
+        return counts;
+    };
+    const jeScheduleTypeCounts = {
+        active: countByType(allSchedules.filter((schedule) => schedule.status.code === 'draft' ||
+            schedule.status.code === 'ongoing' ||
+            schedule.status.code === 'completed' ||
+            schedule.status.code === 'marked_as_completed')),
+        ongoing: countByType(allSchedules.filter((schedule) => schedule.status.code === 'ongoing')),
+    };
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -159,12 +254,15 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
-        draftSchedules,
-        ongoingSchedules,
+        createdSchedules,
+        createdTotal,
+        jeScheduleTypeCounts,
+        kpiSummary,
         pendingReviewSchedules,
+        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
+        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
         fetchState: reducedFetchStatus.fetchState,

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

@@ -1,22 +1,28 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
+import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
-import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { MonthYearPeriodId, ScheduleDaysOfMonth } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
-import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { JEScheduleKey, JEScheduleTransactionKey, ScheduleJournalEntryStatusCodeType, ScheduleTransactionID, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
-export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
+import { ZeniDate } from '../../../zeniDayJS';
+import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
+export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "jePostingDate" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEScheduleMainTab: (v: string) => "completed" | "pending_review" | "ongoing";
-export type JEScheduleMainTab = ReturnType<typeof toJEScheduleMainTab>;
+export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
+export type JEPageTab = ReturnType<typeof toJEPageTab>;
 export interface JESchedulesViewUIState {
+    createdGroupCollapsed: boolean;
+    pendingGroupCollapsed: boolean;
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
-    selectedMainTab: JEScheduleMainTab;
+    selectedJETypeFilter: ScheduleTypes | null;
+    selectedPageTab: JEPageTab;
     sortKey: JEScheduleSortKey;
     sortOrder: SortOrder;
     totalCount: number;
@@ -35,12 +41,53 @@ export interface JESchedulesViewState extends FetchedState {
     accountSettings: AccountSettingsState;
     failedJeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
+    jeScheduleAccruedKeysByPeriod: Record<MonthYearPeriodId, JEScheduleKey[]>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
     jeScheduleTransactionKeysByPeriod: Record<MonthYearPeriodId, JEScheduleTransactionKey[]>;
+    newSchedule: NewJeScheduleState;
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     uiState: JESchedulesViewUIState;
 }
+export interface NewJeDetailLocalData {
+    amount: Amount;
+    jeLink: JETransactionLink;
+    memo: string;
+    postingDate: ZeniDate;
+    postingStatus: ScheduleJournalEntryStatusCodeType;
+    runningBalance: Amount;
+}
+export interface NewScheduleLocalData {
+    jeScheduleDetails: NewJeDetailLocalData[];
+    scheduleType: ScheduleTypes;
+    lastDayOfMonth?: boolean;
+    selectedAccount?: ID;
+    selectedBaseTransactionId?: ScheduleTransactionID;
+    selectedClass?: ID;
+    selectedDate?: ZeniDate;
+    selectedDayOfMonth?: ScheduleDaysOfMonth;
+    selectedJEScheduleKey?: JEScheduleTransactionKey;
+    selectedMonths?: number;
+    selectedVendor?: VendorBase;
+}
+export interface NewScheduleLocalDataFixedAssets extends NewScheduleLocalData {
+    assetId?: string;
+    selectedAccumulatedDepreciationCategory?: ID;
+}
+export interface SearchTransactionsState extends FetchStateAndError {
+    searchResults: JEScheduleTransactionKey[];
+    searchString?: string;
+}
+export declare const MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;
+export interface NewJeScheduleState extends FetchStateAndError {
+    newScheduleState: {
+        fixed_assets: NewScheduleLocalDataFixedAssets;
+        prepaid_expenses: NewScheduleLocalData;
+    };
+    saveStatus: FetchStateAndError;
+    searchTransactions: SearchTransactionsState;
+    selectedDetailScheduleType?: ScheduleTypes;
+}
 export interface AccountSettingsLocalData {
     previousAccruedExpensesAccount: AccountBase[];
     previousFixedAssetsAccount: AccountBase[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJEScheduleMainTab = exports.toJEScheduleSortKey = void 0;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = exports.toJEPageTab = exports.toJEScheduleSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const JE_SCHEDULE_SORT_KEYS = [
     'vendor',
@@ -20,10 +20,7 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_SCHEDULE_MAIN_TABS = [
-    'pending_review',
-    'ongoing',
-    'completed',
-];
-const toJEScheduleMainTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_MAIN_TABS);
-exports.toJEScheduleMainTab = toJEScheduleMainTab;
+const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
+exports.toJEPageTab = toJEPageTab;
+exports.MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;

package/lib/view/notificationPreferencesView/epics/saveNotificationPreferencesEpic.d.ts

@@ -2,8 +2,8 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { RootState } from '../../../reducer';
 import { ZeniAPI } from '../../../zeniAPI';
-import { clearAllNotificationPreferencesView, clearNotificationPreferencesLocalOverrides, saveNotificationPreferences, saveNotificationPreferencesFailure, saveNotificationPreferencesSuccess, setGroupFrequency, toggleEventChannel } from '../notificationPreferencesViewReducer';
-export type ActionType = ReturnType<typeof clearAllNotificationPreferencesView> | ReturnType<typeof clearNotificationPreferencesLocalOverrides> | ReturnType<typeof saveNotificationPreferences> | ReturnType<typeof saveNotificationPreferencesFailure> | ReturnType<typeof saveNotificationPreferencesSuccess> | ReturnType<typeof setGroupFrequency> | ReturnType<typeof toggleEventChannel> | ReturnType<typeof openSnackbar>;
+import { clearAllNotificationPreferencesView, clearNotificationPreferencesLocalOverrides, saveNotificationPreferences, saveNotificationPreferencesFailure, saveNotificationPreferencesSuccess } from '../notificationPreferencesViewReducer';
+export type ActionType = ReturnType<typeof clearAllNotificationPreferencesView> | ReturnType<typeof clearNotificationPreferencesLocalOverrides> | ReturnType<typeof saveNotificationPreferences> | ReturnType<typeof saveNotificationPreferencesFailure> | ReturnType<typeof saveNotificationPreferencesSuccess> | ReturnType<typeof openSnackbar>;
 export declare const saveNotificationPreferencesEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: undefined;
     type: "notificationPreferencesView/clearAllNotificationPreferencesView";
@@ -31,10 +31,4 @@ export declare const saveNotificationPreferencesEpic: (actions$: ActionsObservab
 } | {
     payload: import("../notificationPreferencesViewReducer").SaveNotificationPreferencesSuccessPayload;
     type: "notificationPreferencesView/saveNotificationPreferencesSuccess";
-} | {
-    payload: import("../notificationPreferencesViewReducer").SetFrequencyPayload;
-    type: "notificationPreferencesView/setGroupFrequency";
-} | {
-    payload: import("../notificationPreferencesViewReducer").TogglePreferencePayload;
-    type: "notificationPreferencesView/toggleEventChannel";
 }>;

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

@@ -9,14 +9,9 @@ const notificationPreferencesEndpoint_1 = require("../notificationPreferencesEnd
 const notificationPreferencesViewPayload_1 = require("../notificationPreferencesViewPayload");
 const notificationPreferencesViewReducer_1 = require("../notificationPreferencesViewReducer");
 const notificationPreferencesViewSelector_1 = require("../notificationPreferencesViewSelector");
-const DEBOUNCE_MS = 300;
-const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.toggleEventChannel.match(action) || notificationPreferencesViewReducer_1.setGroupFrequency.match(action)), 
-// Coalesce bursts of toggles into a single PUT. Trade-off: rapid clickers
-// defer saves until they pause. Consider a max-wait wrapper if this
-// becomes a UX problem.
-(0, operators_1.debounceTime)(DEBOUNCE_MS), (0, operators_1.withLatestFrom)(state$), 
-// `switchMap` unsubscribes from any in-flight PUT observable when a new
-// debounced batch fires. The prior HTTP request has already left the
+const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.saveNotificationPreferences.match(action)), (0, operators_1.withLatestFrom)(state$), 
+// `switchMap` unsubscribes from any in-flight PUT observable when a newer
+// Save fires. The prior HTTP request has already left the
 // client — the network call is NOT cancelled — but its response is
 // ignored, so stale success/failure actions cannot clobber the newer
 // batch's state. Server-side ordering is arrival-order LWW.
@@ -51,7 +46,7 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
     const isCancelledSince = () => cancelEpochAtDispatch <
         state$.value.notificationPreferencesViewState.cancelEpoch;
     // Abort the in-flight HTTP request when `switchMap` disposes this
-    // observable (new debounced batch fires, tenant switch, unmount).
+    // observable (a newer Save fires, tenant switch, unmount).
     // Without an AbortSignal, `switchMap` would drop the response
     // client-side but the older PUT would still land on the server —
     // under patch-semantic LWW, a slower older PUT arriving after a
@@ -77,7 +72,7 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
         ];
         if (!isCancelledSince()) {
             // Surface a user-visible error — without it the UI reverts to
-            // server truth after debounce and the failed toggle looks like
+            // server truth after the save and the failed toggle looks like
             // a mystery UI bug.
             actions.push(errorSnackbar);
         }
@@ -113,8 +108,10 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
     // under patch-semantic LWW. Cursor Bugbot 3637969823 + 3641372002.
     (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.clearNotificationPreferencesLocalOverrides.match(action) ||
         notificationPreferencesViewReducer_1.clearAllNotificationPreferencesView.match(action)))));
-    // Flip savePreferencesState to In-Progress BEFORE the network call so
-    // any "saving…" UI can render.
-    return (0, rxjs_1.concat)((0, rxjs_1.of)((0, notificationPreferencesViewReducer_1.saveNotificationPreferences)()), request$);
+    // `saveNotificationPreferences` (the trigger) already flipped
+    // savePreferencesState to In-Progress via its reducer case, so the PUT
+    // observable is returned directly — re-emitting the trigger here would
+    // loop the epic on itself.
+    return request$;
 }));
 exports.saveNotificationPreferencesEpic = saveNotificationPreferencesEpic;

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

@@ -1,7 +1,8 @@
 import { NotificationPreferences } from './notificationPreferencesViewState';
 export interface NotificationPreferencesPayload {
     event_enabled_by_channel?: Record<string, Record<string, boolean>>;
+    group_channel_enabled_by_group_id?: Record<string, Record<string, boolean>>;
     group_frequency_by_group_id?: Record<string, string>;
 }
 export declare const mapPayloadToPreferences: (payload?: NotificationPreferencesPayload) => NotificationPreferences;
-export declare const mapPreferencesToPayload: (preferences: NotificationPreferences) => Record<string, unknown>;
+export declare const mapPreferencesToPayload: (preferences: NotificationPreferences) => NotificationPreferencesPayload;

package/lib/view/notificationPreferencesView/notificationPreferencesViewPayload.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapPreferencesToPayload = exports.mapPayloadToPreferences = void 0;
 const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
-const mapEventEnabledByChannel = (raw) => {
+const mapChannelEnabledMap = (raw) => {
     if (raw == null) {
         return {};
     }
@@ -23,7 +23,8 @@ const mapPayloadToPreferences = (payload) => {
         (0, notificationRegistryState_1.toNotificationFrequency)(frequency),
     ]));
     return {
-        eventEnabledByChannel: mapEventEnabledByChannel(payload?.event_enabled_by_channel),
+        eventEnabledByChannel: mapChannelEnabledMap(payload?.event_enabled_by_channel),
+        groupChannelEnabledByGroupId: mapChannelEnabledMap(payload?.group_channel_enabled_by_group_id),
         groupFrequencyByGroupId,
     };
 };
@@ -33,6 +34,10 @@ const mapPreferencesToPayload = (preferences) => {
     if (Object.keys(preferences.eventEnabledByChannel).length > 0) {
         payload.event_enabled_by_channel = preferences.eventEnabledByChannel;
     }
+    if (Object.keys(preferences.groupChannelEnabledByGroupId).length > 0) {
+        payload.group_channel_enabled_by_group_id =
+            preferences.groupChannelEnabledByGroupId;
+    }
     if (Object.keys(preferences.groupFrequencyByGroupId).length > 0) {
         payload.group_frequency_by_group_id = preferences.groupFrequencyByGroupId;
     }

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

@@ -12,6 +12,11 @@ export interface TogglePreferencePayload {
     enabled: boolean;
     eventId: string;
 }
+export interface SetGroupChannelMasterPayload {
+    channel: NotificationChannel;
+    enabled: boolean;
+    groupId: string;
+}
 export interface FetchNotificationPreferencesSuccessPayload {
     preferences: NotificationPreferencesPayload | undefined;
     saveEpochAtDispatch: number;
@@ -25,6 +30,6 @@ export interface SaveNotificationPreferencesFailurePayload {
     cancelEpochAtDispatch: number;
     error?: ZeniAPIStatus;
 }
-export declare const clearAllNotificationPreferencesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearAllNotificationPreferencesView">, clearNotificationPreferencesLocalOverrides: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearNotificationPreferencesLocalOverrides">, fetchNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchNotificationPreferencesSuccessPayload, "notificationPreferencesView/fetchNotificationPreferencesSuccess">, saveNotificationPreferences: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/saveNotificationPreferences">, saveNotificationPreferencesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesFailurePayload, "notificationPreferencesView/saveNotificationPreferencesFailure">, saveNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesSuccessPayload, "notificationPreferencesView/saveNotificationPreferencesSuccess">, setGroupFrequency: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetFrequencyPayload, "notificationPreferencesView/setGroupFrequency">, toggleEventChannel: import("@reduxjs/toolkit").ActionCreatorWithPayload<TogglePreferencePayload, "notificationPreferencesView/toggleEventChannel">;
+export declare const clearAllNotificationPreferencesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearAllNotificationPreferencesView">, clearNotificationPreferencesLocalOverrides: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearNotificationPreferencesLocalOverrides">, fetchNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchNotificationPreferencesSuccessPayload, "notificationPreferencesView/fetchNotificationPreferencesSuccess">, saveNotificationPreferences: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/saveNotificationPreferences">, saveNotificationPreferencesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesFailurePayload, "notificationPreferencesView/saveNotificationPreferencesFailure">, saveNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesSuccessPayload, "notificationPreferencesView/saveNotificationPreferencesSuccess">, setGroupChannelMaster: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetGroupChannelMasterPayload, "notificationPreferencesView/setGroupChannelMaster">, setGroupFrequency: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetFrequencyPayload, "notificationPreferencesView/setGroupFrequency">, toggleEventChannel: import("@reduxjs/toolkit").ActionCreatorWithPayload<TogglePreferencePayload, "notificationPreferencesView/toggleEventChannel">;
 declare const _default: import("redux").Reducer<NotificationPreferencesViewState>;
 export default _default;

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toggleEventChannel = exports.setGroupFrequency = exports.saveNotificationPreferencesSuccess = exports.saveNotificationPreferencesFailure = exports.saveNotificationPreferences = exports.fetchNotificationPreferencesSuccess = exports.clearNotificationPreferencesLocalOverrides = exports.clearAllNotificationPreferencesView = exports.initialState = void 0;
+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 notificationPreferencesViewPayload_1 = require("./notificationPreferencesViewPayload");
 const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
@@ -22,8 +22,18 @@ const mergePreferences = (base, patch) => {
             ...channels,
         };
     });
+    const groupChannelEnabledByGroupId = {
+        ...base.groupChannelEnabledByGroupId,
+    };
+    Object.entries(patch.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
+        groupChannelEnabledByGroupId[groupId] = {
+            ...(base.groupChannelEnabledByGroupId[groupId] ?? {}),
+            ...channels,
+        };
+    });
     return {
         eventEnabledByChannel,
+        groupChannelEnabledByGroupId,
         groupFrequencyByGroupId: {
             ...base.groupFrequencyByGroupId,
             ...patch.groupFrequencyByGroupId,
@@ -34,16 +44,16 @@ const mergePreferences = (base, patch) => {
 // to the server from `localOverrides` — AND whose current value still equals
 // what was saved. Any new edits the user added while the PUT was in flight
 // (either new keys not present in `saved`, OR same keys the user flipped back
-// to a different value) are preserved so the next debounce cycle picks them up.
+// to a different value) are preserved so the next Save picks them up.
 //
 // Presence-only subtraction (the prior implementation) silently dropped a
-// same-key re-edit that landed AFTER debounce fired but BEFORE the response
+// same-key re-edit that landed AFTER a Save fired but BEFORE the response
 // returned. Concrete case:
 //   1. toggle evt1.email = false → localOverrides = {evt1:{email:false}}
-//   2. debounce PUT #1 fires with savedOverrides = {evt1:{email:false}}
+//   2. Save → PUT #1 fires with savedOverrides = {evt1:{email:false}}
 //   3. user re-toggles evt1.email = true → localOverrides = {evt1:{email:true}}
 //   4. PUT #1 success → subtract dropped `email` on presence, so the true
-//      re-edit disappeared and next-debounce found nothing to send.
+//      re-edit disappeared and the next Save found nothing to send.
 const subtractSavedOverrides = (current, saved) => {
     const eventEnabledByChannel = {};
     Object.entries(current.eventEnabledByChannel).forEach(([eventId, channels]) => {
@@ -65,13 +75,38 @@ const subtractSavedOverrides = (current, saved) => {
             eventEnabledByChannel[eventId] = remainingChannels;
         }
     });
+    // Same value-equality subtraction as eventEnabledByChannel above — a
+    // group-channel master the user re-flipped while a PUT was in flight must
+    // survive so the next Save re-sends it.
+    const groupChannelEnabledByGroupId = {};
+    Object.entries(current.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
+        const savedChannels = saved.groupChannelEnabledByGroupId[groupId];
+        if (savedChannels == null) {
+            groupChannelEnabledByGroupId[groupId] = channels;
+            return;
+        }
+        const remainingChannels = {};
+        Object.keys(channels).forEach((channel) => {
+            if (!(channel in savedChannels) ||
+                channels[channel] !== savedChannels[channel]) {
+                remainingChannels[channel] = channels[channel];
+            }
+        });
+        if (Object.keys(remainingChannels).length > 0) {
+            groupChannelEnabledByGroupId[groupId] = remainingChannels;
+        }
+    });
     const groupFrequencyByGroupId = {};
     Object.entries(current.groupFrequencyByGroupId).forEach(([groupId, frequency]) => {
         if (saved.groupFrequencyByGroupId[groupId] !== frequency) {
             groupFrequencyByGroupId[groupId] = frequency;
         }
     });
-    return { eventEnabledByChannel, groupFrequencyByGroupId };
+    return {
+        eventEnabledByChannel,
+        groupChannelEnabledByGroupId,
+        groupFrequencyByGroupId,
+    };
 };
 const notificationPreferencesView = (0, toolkit_1.createSlice)({
     name: 'notificationPreferencesView',
@@ -127,8 +162,8 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // snapshot of the server-known preferences (empty maps included), so
             // REPLACE `preferences` rather than merging — merging would leak keys
             // the server has since removed. DO NOT touch `localOverrides`: a refetch
-            // that fires while the user has in-flight edits (pre-debounce) must not
-            // silently drop them; the save-success path is the only clearer.
+            // that fires while the user has unsaved edits must not silently drop
+            // 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) {
@@ -181,8 +216,8 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // In-flight-edit invariant: `savedOverrides` is the exact snapshot the
             // epic PUT to the server. Subtracting those keys from `localOverrides`
             // (instead of clearing it wholesale) preserves any edits the user
-            // added AFTER the debounce fired but BEFORE the response landed. The
-            // next debounce cycle will pick them up. Clearing wholesale drops
+            // added AFTER the Save fired but BEFORE the response landed. The
+            // next Save will pick them up. Clearing wholesale drops
             // in-flight edits from both UI (once server echo lands) and server.
             // Cancel/in-flight-save race: `cancelEpoch` monotonically increases
             // on every Cancel. If the save captured a lower epoch at dispatch,
@@ -208,6 +243,16 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             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 groupMap = {
+                ...(draft.localOverrides.groupChannelEnabledByGroupId[groupId] ?? {}),
+            };
+            groupMap[channel] = enabled;
+            draft.localOverrides.groupChannelEnabledByGroupId[groupId] = groupMap;
+        },
         setGroupFrequency(draft, action) {
             draft.localOverrides.groupFrequencyByGroupId[action.payload.groupId] =
                 action.payload.frequency;
@@ -222,5 +267,5 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = notificationPreferencesView.actions, exports.clearAllNotificationPreferencesView = _a.clearAllNotificationPreferencesView, exports.clearNotificationPreferencesLocalOverrides = _a.clearNotificationPreferencesLocalOverrides, exports.fetchNotificationPreferencesSuccess = _a.fetchNotificationPreferencesSuccess, exports.saveNotificationPreferences = _a.saveNotificationPreferences, exports.saveNotificationPreferencesFailure = _a.saveNotificationPreferencesFailure, exports.saveNotificationPreferencesSuccess = _a.saveNotificationPreferencesSuccess, exports.setGroupFrequency = _a.setGroupFrequency, exports.toggleEventChannel = _a.toggleEventChannel;
+_a = notificationPreferencesView.actions, exports.clearAllNotificationPreferencesView = _a.clearAllNotificationPreferencesView, exports.clearNotificationPreferencesLocalOverrides = _a.clearNotificationPreferencesLocalOverrides, exports.fetchNotificationPreferencesSuccess = _a.fetchNotificationPreferencesSuccess, exports.saveNotificationPreferences = _a.saveNotificationPreferences, exports.saveNotificationPreferencesFailure = _a.saveNotificationPreferencesFailure, exports.saveNotificationPreferencesSuccess = _a.saveNotificationPreferencesSuccess, exports.setGroupChannelMaster = _a.setGroupChannelMaster, exports.setGroupFrequency = _a.setGroupFrequency, exports.toggleEventChannel = _a.toggleEventChannel;
 exports.default = notificationPreferencesView.reducer;