@zeniai/client-epic-state 5.1.68-beta0ND → 5.1.68-betaDI0

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,
@@ -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 debounce cycle 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',
@@ -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;

package/lib/view/notificationPreferencesView/notificationPreferencesViewSelector.js

@@ -13,8 +13,16 @@ const getEffectiveNotificationPreferences = (state) => {
             ...channels,
         };
     });
+    const mergedGroupChannelEnabledByGroupId = { ...view.preferences.groupChannelEnabledByGroupId };
+    Object.entries(view.localOverrides.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
+        mergedGroupChannelEnabledByGroupId[groupId] = {
+            ...(view.preferences.groupChannelEnabledByGroupId[groupId] ?? {}),
+            ...channels,
+        };
+    });
     return {
         eventEnabledByChannel: mergedEventEnabledByChannel,
+        groupChannelEnabledByGroupId: mergedGroupChannelEnabledByGroupId,
         groupFrequencyByGroupId: {
             ...view.preferences.groupFrequencyByGroupId,
             ...view.localOverrides.groupFrequencyByGroupId,
@@ -27,6 +35,7 @@ exports.getNotificationLocalOverrides = getNotificationLocalOverrides;
 const hasUnsavedNotificationPreferences = (state) => {
     const overrides = getView(state).localOverrides;
     return (Object.keys(overrides.eventEnabledByChannel).length > 0 ||
+        Object.keys(overrides.groupChannelEnabledByGroupId).length > 0 ||
         Object.keys(overrides.groupFrequencyByGroupId).length > 0);
 };
 exports.hasUnsavedNotificationPreferences = hasUnsavedNotificationPreferences;

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

@@ -2,6 +2,7 @@ import { FetchStateAndError } from '../../commonStateTypes/common';
 import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 export interface NotificationPreferences {
     eventEnabledByChannel: Record<string, Partial<Record<NotificationChannel, boolean>>>;
+    groupChannelEnabledByGroupId: Record<string, Partial<Record<NotificationChannel, boolean>>>;
     groupFrequencyByGroupId: Record<string, NotificationFrequency>;
 }
 export interface NotificationPreferencesViewState {

package/lib/view/notificationPreferencesView/notificationPreferencesViewState.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyNotificationPreferences = void 0;
 const emptyNotificationPreferences = () => ({
     eventEnabledByChannel: {},
+    groupChannelEnabledByGroupId: {},
     groupFrequencyByGroupId: {},
 });
 exports.emptyNotificationPreferences = emptyNotificationPreferences;

package/package.json

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

package/lib/esm/view/companyView/epic/companyPassport/updateCompanyProductServicesEpic.js

@@ -1,81 +0,0 @@
-import { from } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
-import { updateCompanies } from '../../../../entity/company/companyReducer';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTenantProductSettings } from '../../../../entity/tenant/tenantReducer';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { updateCompanyProductServices, updateCompanyProductServicesFailure, updateCompanyProductServicesSuccess, } from '../../companyViewReducer';
-export const updateCompanyProductServicesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateCompanyProductServices.match), switchMap((action) => {
-    const { companyId, services } = action.payload;
-    const { isBookkeepingEnabled, isBillPayEnabled, isReimbursementEnabled } = services;
-    const tenantId = Object.values(state$.value.tenantState.tenantsById).find((tenant) => tenant?.companyId === companyId)?.tenantId;
-    // Send only the service-enable fields so the backend routes this through
-    // its isolated "enable services" path. Bookkeeping is a Tenant product
-    // flag and implies spend management; bill pay / reimbursement are Company
-    // feature flags.
-    const requestBody = {};
-    if (isBookkeepingEnabled != null) {
-        requestBody.is_book_keeping_enabled = isBookkeepingEnabled;
-        requestBody.is_spend_management_enabled = isBookkeepingEnabled;
-    }
-    if (isBillPayEnabled != null) {
-        requestBody.is_bill_pay_feature_enabled = isBillPayEnabled;
-    }
-    if (isReimbursementEnabled != null) {
-        requestBody.is_reimbursement_feature_enabled = isReimbursementEnabled;
-    }
-    return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, requestBody)
-        .pipe(mergeMap((response) => {
-        if (isSuccessResponse(response)) {
-            const companies = response.data?.companies ?? [];
-            if (companies.length > 0) {
-                const actions = [
-                    updateCompanies({
-                        payload: companies,
-                        schema: {},
-                    }),
-                ];
-                // The company response carries the company feature flags; the
-                // tenant product flags are not part of it, so merge them from
-                // the (now-succeeded) request values.
-                if (isBookkeepingEnabled != null && tenantId != null) {
-                    actions.push(updateTenantProductSettings({
-                        tenantId,
-                        isBookkeepingEnabled,
-                        isSpendManagementEnabled: isBookkeepingEnabled,
-                    }));
-                }
-                actions.push(updateCompanyProductServicesSuccess());
-                actions.push(openSnackbar({
-                    messageSection: 'product_services_update',
-                    messageText: 'success',
-                    type: 'success',
-                }));
-                return from(actions);
-            }
-        }
-        return from([
-            updateCompanyProductServicesFailure({
-                status: response.status,
-            }),
-            openSnackbar({
-                messageSection: 'product_services_update',
-                messageText: 'failed',
-                type: 'error',
-            }),
-        ]);
-    }), catchError((error) => from([
-        updateCompanyProductServicesFailure({
-            status: createZeniAPIStatus('Unexpected error', 'Update Company Product Services errored out' +
-                (error instanceof Error
-                    ? error.message
-                    : JSON.stringify(error))),
-        }),
-        openSnackbar({
-            messageSection: 'product_services_update',
-            messageText: 'failed',
-            type: 'error',
-        }),
-    ])));
-}));

package/lib/view/companyView/epic/companyPassport/updateCompanyProductServicesEpic.d.ts

@@ -1,10 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { updateCompanies } from '../../../../entity/company/companyReducer';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTenantProductSettings } from '../../../../entity/tenant/tenantReducer';
-import { RootState } from '../../../../reducer';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { updateCompanyProductServices, updateCompanyProductServicesFailure, updateCompanyProductServicesSuccess } from '../../companyViewReducer';
-export type ActionType = ReturnType<typeof updateCompanies> | ReturnType<typeof updateTenantProductSettings> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateCompanyProductServices> | ReturnType<typeof updateCompanyProductServicesSuccess> | ReturnType<typeof updateCompanyProductServicesFailure>;
-export declare const updateCompanyProductServicesEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/companyView/epic/companyPassport/updateCompanyProductServicesEpic.js

@@ -1,85 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCompanyProductServicesEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const companyReducer_1 = require("../../../../entity/company/companyReducer");
-const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
-const tenantReducer_1 = require("../../../../entity/tenant/tenantReducer");
-const responsePayload_1 = require("../../../../responsePayload");
-const companyViewReducer_1 = require("../../companyViewReducer");
-const updateCompanyProductServicesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(companyViewReducer_1.updateCompanyProductServices.match), (0, operators_1.switchMap)((action) => {
-    const { companyId, services } = action.payload;
-    const { isBookkeepingEnabled, isBillPayEnabled, isReimbursementEnabled } = services;
-    const tenantId = Object.values(state$.value.tenantState.tenantsById).find((tenant) => tenant?.companyId === companyId)?.tenantId;
-    // Send only the service-enable fields so the backend routes this through
-    // its isolated "enable services" path. Bookkeeping is a Tenant product
-    // flag and implies spend management; bill pay / reimbursement are Company
-    // feature flags.
-    const requestBody = {};
-    if (isBookkeepingEnabled != null) {
-        requestBody.is_book_keeping_enabled = isBookkeepingEnabled;
-        requestBody.is_spend_management_enabled = isBookkeepingEnabled;
-    }
-    if (isBillPayEnabled != null) {
-        requestBody.is_bill_pay_feature_enabled = isBillPayEnabled;
-    }
-    if (isReimbursementEnabled != null) {
-        requestBody.is_reimbursement_feature_enabled = isReimbursementEnabled;
-    }
-    return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, requestBody)
-        .pipe((0, operators_1.mergeMap)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            const companies = response.data?.companies ?? [];
-            if (companies.length > 0) {
-                const actions = [
-                    (0, companyReducer_1.updateCompanies)({
-                        payload: companies,
-                        schema: {},
-                    }),
-                ];
-                // The company response carries the company feature flags; the
-                // tenant product flags are not part of it, so merge them from
-                // the (now-succeeded) request values.
-                if (isBookkeepingEnabled != null && tenantId != null) {
-                    actions.push((0, tenantReducer_1.updateTenantProductSettings)({
-                        tenantId,
-                        isBookkeepingEnabled,
-                        isSpendManagementEnabled: isBookkeepingEnabled,
-                    }));
-                }
-                actions.push((0, companyViewReducer_1.updateCompanyProductServicesSuccess)());
-                actions.push((0, snackbarReducer_1.openSnackbar)({
-                    messageSection: 'product_services_update',
-                    messageText: 'success',
-                    type: 'success',
-                }));
-                return (0, rxjs_1.from)(actions);
-            }
-        }
-        return (0, rxjs_1.from)([
-            (0, companyViewReducer_1.updateCompanyProductServicesFailure)({
-                status: response.status,
-            }),
-            (0, snackbarReducer_1.openSnackbar)({
-                messageSection: 'product_services_update',
-                messageText: 'failed',
-                type: 'error',
-            }),
-        ]);
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.from)([
-        (0, companyViewReducer_1.updateCompanyProductServicesFailure)({
-            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Update Company Product Services errored out' +
-                (error instanceof Error
-                    ? error.message
-                    : JSON.stringify(error))),
-        }),
-        (0, snackbarReducer_1.openSnackbar)({
-            messageSection: 'product_services_update',
-            messageText: 'failed',
-            type: 'error',
-        }),
-    ])));
-}));
-exports.updateCompanyProductServicesEpic = updateCompanyProductServicesEpic;