@zeniai/client-epic-state 5.2.81 → 5.2.83-beta0UT

package/lib/view/settingsView/settingsViewHelpers.js

@@ -153,6 +153,7 @@ const isRemindersSectionVisibleOnSettingsPage = (reminderNotificationSettings) =
         reminderNotificationSettings.pendingBillApprovalNotification != null ||
         reminderNotificationSettings.pendingReimbursementApprovalNotification !=
             null ||
+        reminderNotificationSettings.pendingTaskNotification != null ||
         reminderNotificationSettings.uncategorizedTransactionNotification != null);
 };
 exports.isRemindersSectionVisibleOnSettingsPage = isRemindersSectionVisibleOnSettingsPage;

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

@@ -32,10 +32,12 @@ export interface NotificationSettingsPayload {
     is_month_end_insights_active: boolean | null;
     is_pending_bill_approval_notification_active: boolean | null;
     is_pending_reimbursement_approval_notification_active: boolean | null;
+    is_pending_task_notification_active: boolean | null;
     is_uncategorized_transaction_notification_active: boolean | null;
     missing_receipt_notification: RemindersPayload | null;
     pending_bill_approval_notification: RemindersPayload | null;
     pending_reimbursement_approval_notification: RemindersPayload | null;
+    pending_task_notification: RemindersPayload | null;
     uncategorized_transaction_notification: RemindersPayload | null;
     month_end_email_recipient_email_ids?: string[];
     task_checklist_preferences?: NotificationPreferencesPayload;

package/lib/view/settingsView/settingsViewReducer.js

@@ -8,6 +8,7 @@ const settingsViewState_1 = require("./settingsViewState");
 const initialNotificationSettingsData = {
     reminderNotificationSettings: {
         missingReceiptNotification: null,
+        pendingTaskNotification: null,
         uncategorizedTransactionNotification: null,
         pendingBillApprovalNotification: null,
         pendingReimbursementApprovalNotification: null,
@@ -48,6 +49,7 @@ const initialNotificationSettingsLocalData = {
         missingReceiptNotification: initialRemindersLocalData,
         pendingBillApprovalNotification: initialRemindersLocalData,
         pendingReimbursementApprovalNotification: initialRemindersLocalData,
+        pendingTaskNotification: initialRemindersLocalData,
         uncategorizedTransactionNotification: initialRemindersLocalData,
     },
 };
@@ -377,7 +379,7 @@ function toRemindersLocalData(reminderNotificationSettingDetails) {
 }
 const toNotificationSettingsLocalData = (data, loggedInUserEmail) => {
     const { monthEndInsightsNotificationSettings, reminderNotificationSettings } = data;
-    const { missingReceiptNotification, pendingBillApprovalNotification, pendingReimbursementApprovalNotification, uncategorizedTransactionNotification, } = reminderNotificationSettings;
+    const { missingReceiptNotification, pendingBillApprovalNotification, pendingReimbursementApprovalNotification, pendingTaskNotification, uncategorizedTransactionNotification, } = reminderNotificationSettings;
     return {
         monthEndInsights: {
             notify: monthEndInsightsNotificationSettings.enabled ??
@@ -388,6 +390,7 @@ const toNotificationSettingsLocalData = (data, loggedInUserEmail) => {
             missingReceiptNotification: toRemindersLocalData(missingReceiptNotification),
             pendingBillApprovalNotification: toRemindersLocalData(pendingBillApprovalNotification),
             pendingReimbursementApprovalNotification: toRemindersLocalData(pendingReimbursementApprovalNotification),
+            pendingTaskNotification: toRemindersLocalData(pendingTaskNotification),
             uncategorizedTransactionNotification: toRemindersLocalData(uncategorizedTransactionNotification),
         },
     };
@@ -412,6 +415,7 @@ const toNotificationSettings = (data) => {
             missingReceiptNotification: toReminderNotificationSettingsDetails(data.is_missing_receipt_notification_active, data.missing_receipt_notification),
             pendingBillApprovalNotification: toReminderNotificationSettingsDetails(data.is_pending_bill_approval_notification_active, data.pending_bill_approval_notification),
             pendingReimbursementApprovalNotification: toReminderNotificationSettingsDetails(data.is_pending_reimbursement_approval_notification_active, data.pending_reimbursement_approval_notification),
+            pendingTaskNotification: toReminderNotificationSettingsDetails(data.is_pending_task_notification_active, data.pending_task_notification),
             uncategorizedTransactionNotification: toReminderNotificationSettingsDetails(data.is_uncategorized_transaction_notification_active, data.uncategorized_transaction_notification),
         },
         monthEndInsightsNotificationSettings: {

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

@@ -9,8 +9,8 @@ interface BillingAddress extends FetchStateAndError {
 export interface IntegrationsSettings {
     refreshQBO: FetchStateAndError;
 }
-export declare const REMINDER_NOTIFICATION_TYPES: readonly ["missingReceiptNotification", "uncategorizedTransactionNotification", "pendingBillApprovalNotification", "pendingReimbursementApprovalNotification"];
-declare const toReminderTypeKey: (v: string) => "missingReceiptNotification" | "uncategorizedTransactionNotification" | "pendingBillApprovalNotification" | "pendingReimbursementApprovalNotification";
+export declare const REMINDER_NOTIFICATION_TYPES: readonly ["missingReceiptNotification", "pendingTaskNotification", "uncategorizedTransactionNotification", "pendingBillApprovalNotification", "pendingReimbursementApprovalNotification"];
+declare const toReminderTypeKey: (v: string) => "missingReceiptNotification" | "pendingTaskNotification" | "uncategorizedTransactionNotification" | "pendingBillApprovalNotification" | "pendingReimbursementApprovalNotification";
 export type ReminderTypeKey = ReturnType<typeof toReminderTypeKey>;
 export declare const toRemindersFrequencyType: (v: string) => "weekly" | "monthly" | "daily" | "bi-weekly";
 export type FrequencyTypeKey = ReturnType<typeof toRemindersFrequencyType>;

package/lib/view/settingsView/settingsViewState.js

@@ -4,6 +4,7 @@ exports.toNotificationMode = exports.NOTIFICATION_MODES = exports.toRemindersFre
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
 exports.REMINDER_NOTIFICATION_TYPES = [
     'missingReceiptNotification',
+    'pendingTaskNotification',
     'uncategorizedTransactionNotification',
     'pendingBillApprovalNotification',
     'pendingReimbursementApprovalNotification',

package/lib/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js

@@ -9,6 +9,7 @@ const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer")
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
 const taskSelector_1 = require("../../../../entity/task/taskSelector");
 const responsePayload_1 = require("../../../../responsePayload");
+const zeniDayJS_1 = require("../../../../zeniDayJS");
 const taskListReducer_1 = require("../../taskListView/taskListReducer");
 const taskDetailReducer_1 = require("../taskDetailReducer");
 const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.saveTaskDetail.match), (0, operators_1.mergeMap)((action) => {
@@ -154,7 +155,7 @@ const prepareTaskPayload = (state, taskId, taskGroupIds) => {
             : null,
         recurring_frequency: localData.type.code === 'recurring' ? localData.recurringFrequency : null,
         recurring_start_date: localData.type.code === 'recurring'
-            ? (localData.recurringStartDate?.format(timePeriod_1.DEFAULT_DATE_FORMAT) ?? null)
+            ? (localData.recurringStartDate ?? (0, zeniDayJS_1.dateNow)()).format(timePeriod_1.DEFAULT_DATE_FORMAT)
             : null,
         recurring_days_of_week: localData.type.code === 'recurring' &&
             localData.recurringFrequency === 'semi_weekly'

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -177,10 +177,12 @@ const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
         !(0, isEqual_1.default)(taskDetailLocalData.fileIds, taskDetailInStore.fileIds ?? []) ||
         !(0, isEqual_1.default)(taskDetailLocalData.dueDate, taskDetailInStore.dueDate) ||
         !(0, isEqual_1.default)(taskDetailLocalData.type, taskDetailInStore.type) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.savedRecurringEndDate, taskDetailInStore.recurringEndDate) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.recurringFrequency, taskDetailInStore.recurringFrequency) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.recurringDaysOfWeek, taskDetailInStore.recurringDaysOfWeek) ||
-        !(0, isEqual_1.default)(taskDetailLocalData.recurringStartDate, taskDetailInStore.recurringStartDate) ||
+        // Only a recurring task saves these, so on any other type they are not an edit.
+        (taskDetailLocalData.type.code === 'recurring' &&
+            (!(0, isEqual_1.default)(taskDetailLocalData.savedRecurringEndDate, taskDetailInStore.recurringEndDate) ||
+                !(0, isEqual_1.default)(taskDetailLocalData.recurringFrequency, taskDetailInStore.recurringFrequency) ||
+                !(0, isEqual_1.default)(taskDetailLocalData.recurringDaysOfWeek, taskDetailInStore.recurringDaysOfWeek) ||
+                !(0, isEqual_1.default)(taskDetailLocalData.recurringStartDate, taskDetailInStore.recurringStartDate))) ||
         !(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent) ||
         !(0, isEqual_1.default)(taskDetailLocalData.taskGroupId, taskDetailInStore.taskGroupIds.length > 0
             ? taskDetailInStore.taskGroupIds[0]

package/lib/view/userGroupListView/userGroupListViewSelector.d.ts

@@ -1,7 +1,9 @@
 import { SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { UserGroup, UserGroupsState } from '../../entity/userGroups/userGroupsState';
+import { RootState } from '../../rootStateTypes';
 import { UserGroupListType, UserGroupListViewState } from './userGroupListViewState';
 export interface UserGroupListSelectorView extends SelectorView {
     userGroups: UserGroup[];
 }
 export declare const getUserGroupList: (userGroupsState: UserGroupsState, userGroupListViewState: UserGroupListViewState, userGroupType: UserGroupListType) => UserGroupListSelectorView;
+export declare const getTaskManagerCandidateUserGroups: (state: RootState) => UserGroup[];

package/lib/view/userGroupListView/userGroupListViewSelector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserGroupList = void 0;
+exports.getTaskManagerCandidateUserGroups = exports.getUserGroupList = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
 const userGroupsSelector_1 = require("../../entity/userGroups/userGroupsSelector");
 const getUserGroupList = (userGroupsState, userGroupListViewState, userGroupType) => {
     const listState = userGroupListViewState.userGroupListByType[userGroupType];
@@ -18,3 +19,7 @@ function getUserGroupListByIds(userGroupsState, userGroupListViewState, type) {
         .map((id) => (0, userGroupsSelector_1.getUserGroupByUserGroupId)(userGroupsState, id))
         .filter((value) => value != null);
 }
+exports.getTaskManagerCandidateUserGroups = (0, toolkit_1.createSelector)([
+    (state) => state.userGroupsState,
+    (state) => state.userGroupListViewState,
+], (userGroupsState, userGroupListViewState) => getUserGroupListByIds(userGroupsState, userGroupListViewState, 'taskManagerCandidate'));

package/lib/view/userListView/fetchUserListByTypeEpic.d.ts

@@ -7,6 +7,6 @@ import { RootState } from '../../rootStateTypes';
 import { ZeniAPI } from '../../zeniAPI';
 import { updateChargeCardCount, updateDebitCardCount } from '../spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer';
 import { updateUserGroupIds } from '../userGroupListView/userGroupListViewReducer';
-import { fetchUserListByType, updateUserIds, updateUserListFetchFailure } from './userListViewReducer';
-export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure> | ReturnType<typeof updateAllUserGroups> | ReturnType<typeof updateUserGroupIds>;
+import { fetchUserListByType, resetUserListFetchState, updateUserIds, updateUserListFetchFailure } from './userListViewReducer';
+export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure> | ReturnType<typeof resetUserListFetchState> | ReturnType<typeof updateAllUserGroups> | ReturnType<typeof updateUserGroupIds>;
 export declare const fetchUserListByTypeEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/userListView/fetchUserListByTypeEpic.js

@@ -24,7 +24,14 @@ const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         const queryParam = getQueryParam(userType, isZeniTenant);
         apiUrl =
             apiUrl + `?query=${encodeURIComponent(JSON.stringify(queryParam))}`;
+        // The tenant the request is sent for. A reply after a tenant switch must
+        // not land in the new tenant's state, so the fetch is reset instead.
+        const requestTenantId = zeniAPI.tenantId;
+        const isForPreviousTenant = () => requestTenantId != null && zeniAPI.tenantId !== requestTenantId;
         return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.mergeMap)((response) => {
+            if (isForPreviousTenant()) {
+                return (0, rxjs_1.of)((0, userListViewReducer_1.resetUserListFetchState)({ userType }));
+            }
             if ((0, responsePayload_1.isSuccessResponse)(response)) {
                 const userListAction = [
                     (0, userReducer_1.updateAllUsers)({ users: response.data?.users ?? [] }),
@@ -53,10 +60,12 @@ const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
             else {
                 return (0, rxjs_1.of)((0, userListViewReducer_1.updateUserListFetchFailure)({ userType, status: response.status }));
             }
-        }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, userListViewReducer_1.updateUserListFetchFailure)({
-            userType,
-            status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'User REST API call errored out' + JSON.stringify(error)),
-        }))));
+        }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)(isForPreviousTenant()
+            ? (0, userListViewReducer_1.resetUserListFetchState)({ userType })
+            : (0, userListViewReducer_1.updateUserListFetchFailure)({
+                userType,
+                status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'User REST API call errored out' + JSON.stringify(error)),
+            }))));
     }
     else {
         return (0, rxjs_1.from)([]);

package/lib/view/userListView/userListViewReducer.d.ts

@@ -18,6 +18,8 @@ export declare const fetchUserListByType: import("@reduxjs/toolkit").ActionCreat
 }, "userListView/removeUserId">, updateUserListFetchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
     userType: UserListType;
-}, "userListView/updateUserListFetchFailure">;
+}, "userListView/updateUserListFetchFailure">, resetUserListFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    userType: UserListType;
+}, "userListView/resetUserListFetchState">;
 declare const _default: import("redux").Reducer<UserListViewState>;
 export default _default;

package/lib/view/userListView/userListViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateUserListFetchFailure = exports.removeUserId = exports.addUserId = exports.updateUserIds = exports.fetchUserListByType = exports.initialState = void 0;
+exports.resetUserListFetchState = exports.updateUserListFetchFailure = exports.removeUserId = exports.addUserId = exports.updateUserIds = exports.fetchUserListByType = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../rootActions");
 const initialUserList = {
@@ -63,6 +63,12 @@ const userListView = (0, toolkit_1.createSlice)({
                 draft.userListByType[userType].ids.splice(userIndex, 1);
             }
         },
+        resetUserListFetchState(draft, action) {
+            const list = draft.userListByType[action.payload.userType];
+            if (list.fetchState === 'In-Progress') {
+                list.fetchState = 'Not-Started';
+            }
+        },
         updateUserListFetchFailure(draft, action) {
             const { userType, status } = action.payload;
             draft.userListByType[userType].fetchState = 'Error';
@@ -75,5 +81,5 @@ const userListView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = userListView.actions, exports.fetchUserListByType = _a.fetchUserListByType, exports.updateUserIds = _a.updateUserIds, exports.addUserId = _a.addUserId, exports.removeUserId = _a.removeUserId, exports.updateUserListFetchFailure = _a.updateUserListFetchFailure;
+_a = userListView.actions, exports.fetchUserListByType = _a.fetchUserListByType, exports.updateUserIds = _a.updateUserIds, exports.addUserId = _a.addUserId, exports.removeUserId = _a.removeUserId, exports.updateUserListFetchFailure = _a.updateUserListFetchFailure, exports.resetUserListFetchState = _a.resetUserListFetchState;
 exports.default = userListView.reducer;

package/package.json

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