@zeniai/client-epic-state 5.3.7-betaRD0 → 5.3.8-beta0DI

package/lib/init.d.ts

@@ -3,8 +3,6 @@ import { RootState } from './rootStateTypes';
 import { RESTAPIEndpoints } from './zeniAPI';
 export type ZeniStore = Store<RootState>;
 export { zeniAPI } from './zeniAPIClientState';
-export { setSessionEndpointsLoader } from './sessionEndpointsLoader';
-export type { SessionEndpointsLoader } from './sessionEndpointsLoader';
 export { disconnectPusher, initializePusher, pusher } from './pusherClient';
 export type { PusherAuthPayload } from './pusherClient';
 export declare let store: ZeniStore;
@@ -25,13 +23,6 @@ export { injectFeatureModules, injectFeatureEpics } from './configureStore';
  * @param tenantId
  */
 export declare function updateZeniAPIClientConfig(userId?: string, sessionId?: string, tenantId?: string): void;
-/**
- * Replace the REST endpoints the API client calls. Epics read the endpoints
- * at request time, so every request made after this uses the new ones.
- * Note: This version SHOULD BE used only in the client side.
- * @param restEndPoints
- */
-export declare function updateZeniAPIEndpoints(restEndPoints: RESTAPIEndpoints): void;
 /**
  * Returns current Zeni REST API client config.
  * @returns

package/lib/init.js

@@ -36,10 +36,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectFeatureEpics = exports.injectFeatureModules = exports.store = exports.pusher = exports.initializePusher = exports.disconnectPusher = exports.setSessionEndpointsLoader = exports.zeniAPI = void 0;
+exports.injectFeatureEpics = exports.injectFeatureModules = exports.store = exports.pusher = exports.initializePusher = exports.disconnectPusher = exports.zeniAPI = void 0;
 exports.default = initialize;
 exports.updateZeniAPIClientConfig = updateZeniAPIClientConfig;
-exports.updateZeniAPIEndpoints = updateZeniAPIEndpoints;
 exports.zeniAPIClientConfig = zeniAPIClientConfig;
 exports.initializeWithNewStore = initializeWithNewStore;
 exports.initialize3rdPartyExtensions = initialize3rdPartyExtensions;
@@ -48,8 +47,6 @@ const zeniAPI_1 = require("./zeniAPI");
 const zeniAPIClientState_1 = require("./zeniAPIClientState");
 var zeniAPIClientState_2 = require("./zeniAPIClientState");
 Object.defineProperty(exports, "zeniAPI", { enumerable: true, get: function () { return zeniAPIClientState_2.zeniAPI; } });
-var sessionEndpointsLoader_1 = require("./sessionEndpointsLoader");
-Object.defineProperty(exports, "setSessionEndpointsLoader", { enumerable: true, get: function () { return sessionEndpointsLoader_1.setSessionEndpointsLoader; } });
 var pusherClient_1 = require("./pusherClient");
 Object.defineProperty(exports, "disconnectPusher", { enumerable: true, get: function () { return pusherClient_1.disconnectPusher; } });
 Object.defineProperty(exports, "initializePusher", { enumerable: true, get: function () { return pusherClient_1.initializePusher; } });
@@ -63,10 +60,11 @@ let initialized = false;
  */
 function initialize(restEndPoints, userId, sessionId, tenantId, isSandboxEnv, onSessionInvalidated) {
     if (initialized) {
-        console.warn('client-epic-state is already initialized');
+        console.warn(`Already initialized with url ${JSON.stringify(zeniAPIClientState_1.zeniAPI.apiEndPoints)}`);
         return exports.store;
     }
     initialized = true;
+    console.info(`initializing with ${JSON.stringify(restEndPoints)}`);
     initialize3rdPartyExtensions();
     (0, zeniAPIClientState_1.setZeniAPIClient)(new zeniAPI_1.ZeniAPIClient(restEndPoints, userId, sessionId, tenantId, onSessionInvalidated));
     exports.store = (0, configureStore_1.default)(zeniAPIClientState_1.zeniAPI, isSandboxEnv);
@@ -86,18 +84,6 @@ Object.defineProperty(exports, "injectFeatureEpics", { enumerable: true, get: fu
 function updateZeniAPIClientConfig(userId, sessionId, tenantId) {
     zeniAPIClientState_1.zeniAPI.update(userId, sessionId, tenantId);
 }
-/**
- * Replace the REST endpoints the API client calls. Epics read the endpoints
- * at request time, so every request made after this uses the new ones.
- * Note: This version SHOULD BE used only in the client side.
- * @param restEndPoints
- */
-function updateZeniAPIEndpoints(restEndPoints) {
-    if (zeniAPIClientState_1.zeniAPI == null) {
-        throw new Error('Call initialize() before updateZeniAPIEndpoints()');
-    }
-    zeniAPIClientState_1.zeniAPI.apiEndPoints = restEndPoints;
-}
 /**
  * Returns current Zeni REST API client config.
  * @returns
@@ -124,6 +110,7 @@ function zeniAPIClientConfig() {
  * @param tenantId tenant id
  */
 async function initializeWithNewStore(restEndPoints, userId, sessionId, tenantId) {
+    console.info(`initializeWithNewStore with ${JSON.stringify(restEndPoints)}`);
     initialize3rdPartyExtensions();
     const zeniHttpClient = new zeniAPI_1.ZeniAPIClient(restEndPoints, userId, sessionId, tenantId);
     const store = (0, configureStore_1.default)(zeniHttpClient, false);

package/lib/reducer.d.ts

@@ -165,6 +165,7 @@ declare const reducers: import("redux").Reducer<import("redux").CombinedState<{
     taskGroupTemplateViewState: import("./view/taskManager/taskGroupTemplateView/taskGroupTemplateViewState").TaskGroupTemplateViewState;
     taskGroupViewState: import("./view/taskManager/taskGroupView/taskGroupViewState").TaskGroupViewState;
     taskListState: import("./view/taskManager/taskListView/taskList").TaskListState;
+    timeEntryViewState: import("./view/taskManager/timeEntryView/timeEntryViewState").TimeEntryViewState;
     tagViewState: import(".").TagViewState;
     tasksCardState: import("./view/tasksCard/tasksCardState").TasksCardState;
     topExState: import("./view/topEx/topExState").TopExState;
@@ -265,6 +266,7 @@ declare const reducers: import("redux").Reducer<import("redux").CombinedState<{
     subscriptionState: import("./entity/subscription/subscription/subscriptionState").SubscriptionState;
     subscriptionSummaryState: import("./entity/subscription/subscriptionSummary/subscriptionSummaryState").SubscriptionSummaryState;
     tagState: import(".").TagState;
+    timeEntryState: import("./entity/timeEntry/timeEntryState").TimeEntryState;
     taskGroupState: import(".").TaskGroupState;
     taskGroupTemplateState: import("./entity/taskGroupTemplate/taskGroupTemplateState").TaskGroupTemplateState;
     taskState: import("./entity/task/taskState").TaskState;

package/lib/reducer.js

@@ -109,6 +109,7 @@ const taskGroupReducer_1 = __importStar(require("./entity/taskGroup/taskGroupRed
 const taskGroupTemplateReducer_1 = __importStar(require("./entity/taskGroupTemplate/taskGroupTemplateReducer"));
 const taskSummaryReducer_1 = __importStar(require("./entity/taskSummary/taskSummaryReducer"));
 const tenantReducer_1 = __importStar(require("./entity/tenant/tenantReducer"));
+const timeEntryReducer_1 = __importStar(require("./entity/timeEntry/timeEntryReducer"));
 const toastNotificationReducer_1 = __importStar(require("./entity/toastNotification/toastNotificationReducer"));
 const transactionReducer_1 = __importStar(require("./entity/transaction/transactionReducer"));
 const transactionActivityLogReducer_1 = __importStar(require("./entity/transactionActivityLog/transactionActivityLogReducer"));
@@ -294,6 +295,7 @@ const taskDetailReducer_1 = __importStar(require("./view/taskManager/taskDetailV
 const taskGroupTemplateViewReducer_1 = __importStar(require("./view/taskManager/taskGroupTemplateView/taskGroupTemplateViewReducer"));
 const taskGroupViewReducer_1 = __importStar(require("./view/taskManager/taskGroupView/taskGroupViewReducer"));
 const taskListReducer_1 = __importStar(require("./view/taskManager/taskListView/taskListReducer"));
+const timeEntryViewReducer_1 = __importStar(require("./view/taskManager/timeEntryView/timeEntryViewReducer"));
 const tasksCardReducer_1 = __importStar(require("./view/tasksCard/tasksCardReducer"));
 const topExReducer_1 = __importStar(require("./view/topEx/topExReducer"));
 const transactionActivityLogViewReducer_1 = __importStar(require("./view/transactionActivityLogView/transactionActivityLogViewReducer"));
@@ -382,6 +384,7 @@ const initialEntitiesState = {
     subscriptionState: subscriptionReducer_1.initialState,
     subscriptionSummaryState: subscriptionSummaryReducer_1.initialState,
     tagState: tagReducer_1.initialState,
+    timeEntryState: timeEntryReducer_1.initialState,
     taskGroupState: taskGroupReducer_1.initialState,
     taskGroupTemplateState: taskGroupTemplateReducer_1.initialState,
     taskState: taskReducer_1.initialState,
@@ -563,6 +566,7 @@ const initialViewsState = {
     taskGroupTemplateViewState: taskGroupTemplateViewReducer_1.initialState,
     taskGroupViewState: taskGroupViewReducer_1.initialState,
     taskListState: taskListReducer_1.initialState,
+    timeEntryViewState: timeEntryViewReducer_1.initialState,
     tasksCardState: tasksCardReducer_1.initialState,
     topExState: topExReducer_1.initialState,
     transactionActivityLogViewState: transactionActivityLogViewReducer_1.initialState,
@@ -671,6 +675,7 @@ const entityReducers = {
     subscriptionState: subscriptionReducer_1.default,
     subscriptionSummaryState: subscriptionSummaryReducer_1.default,
     tagState: tagReducer_1.default,
+    timeEntryState: timeEntryReducer_1.default,
     taskGroupState: taskGroupReducer_1.default,
     taskGroupTemplateState: taskGroupTemplateReducer_1.default,
     taskState: taskReducer_1.default,
@@ -851,6 +856,7 @@ const viewReducers = {
     taskGroupTemplateViewState: taskGroupTemplateViewReducer_1.default,
     taskGroupViewState: taskGroupViewReducer_1.default,
     taskListState: taskListReducer_1.default,
+    timeEntryViewState: timeEntryViewReducer_1.default,
     tagViewState: tagViewReducer_1.default,
     tasksCardState: tasksCardReducer_1.default,
     topExState: topExReducer_1.default,

package/lib/rootStateTypes.d.ts

@@ -69,6 +69,7 @@ import { TaskGroupState } from './entity/taskGroup/taskGroupState';
 import { TaskGroupTemplateState } from './entity/taskGroupTemplate/taskGroupTemplateState';
 import { TaskSummaryState } from './entity/taskSummary/taskSummaryState';
 import { TenantState } from './entity/tenant/tenantState';
+import { TimeEntryState } from './entity/timeEntry/timeEntryState';
 import { ToastNotificationState } from './entity/toastNotification/toastNotificationState';
 import { TransactionState } from './entity/transaction/transactionState';
 import { TransactionActivityLogState } from './entity/transactionActivityLog/transactionActivityLogState';
@@ -252,6 +253,7 @@ import { TaskDetailViewState } from './view/taskManager/taskDetailView/taskDetai
 import { TaskGroupTemplateViewState } from './view/taskManager/taskGroupTemplateView/taskGroupTemplateViewState';
 import { TaskGroupViewState } from './view/taskManager/taskGroupView/taskGroupViewState';
 import { TaskListState } from './view/taskManager/taskListView/taskList';
+import { TimeEntryViewState } from './view/taskManager/timeEntryView/timeEntryViewState';
 import { TasksCardState } from './view/tasksCard/tasksCardState';
 import { TopExState } from './view/topEx/topExState';
 import { TransactionActivityLogViewState } from './view/transactionActivityLogView/transactionActivityLogViewState';
@@ -344,6 +346,7 @@ export type EntitiesState = {
     taskState: TaskState;
     taskSummaryState: TaskSummaryState;
     tenantState: TenantState;
+    timeEntryState: TimeEntryState;
     toastNotificationState: ToastNotificationState;
     transactionActivityLogState: TransactionActivityLogState;
     transactionState: TransactionState;
@@ -521,6 +524,7 @@ export type ViewsState = {
     taskGroupViewState: TaskGroupViewState;
     taskListState: TaskListState;
     tasksCardState: TasksCardState;
+    timeEntryViewState: TimeEntryViewState;
     topExState: TopExState;
     transactionActivityLogViewState: TransactionActivityLogViewState;
     transactionDetailState: TransactionDetailState;

package/lib/view/taskManager/taskDetailView/taskDetailSelector.d.ts

@@ -25,6 +25,10 @@ export interface TaskDetailSelectorView extends SelectorView {
     isDeleted?: boolean;
     recurringSourceTaskId?: ID;
     snoozedUntil?: ZeniDate | null;
+    /** Drives the Category control in the For Internal Use block. Read from
+     *  the task entity rather than mirrored into local form data: it is not
+     *  editable inline, and a mirror would need its own discard path. */
+    taskCategoryId?: ID;
     taskGroupId?: ID;
 }
 export declare const getTaskDetail: (state: RootState, taskId?: ID) => TaskDetailSelectorView;

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

@@ -32,6 +32,7 @@ const getTaskDetail = (state, taskId) => {
     let isDeleted = undefined;
     let depth = undefined;
     let recurringSourceTaskId = undefined;
+    let taskCategoryId = undefined;
     let snoozedUntil = undefined;
     let taskGroupId = undefined;
     let subtasks = [];
@@ -45,6 +46,7 @@ const getTaskDetail = (state, taskId) => {
         if (taskEntity != null) {
             createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
             depth = taskEntity.depth;
+            taskCategoryId = taskEntity.taskCategoryId;
             isArchived = taskEntity.isArchived;
             isDeleted = taskEntity.isDeleted;
             recurringSourceTaskId = taskEntity.recurringSourceTaskId;
@@ -109,6 +111,7 @@ const getTaskDetail = (state, taskId) => {
         version: 0,
         createdByUser,
         depth,
+        taskCategoryId,
         isArchived,
         isDeleted,
         recurringSourceTaskId,

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -48,7 +48,7 @@ export interface TaskFilterCategory {
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }
-export type TaskListFilterCategoryField = 'status' | 'dueDate' | 'assignee' | 'creationDate' | 'priority' | 'tag';
+export type TaskListFilterCategoryField = 'status' | 'dueDate' | 'assignee' | 'createdBy' | 'creationDate' | 'priority' | 'tag';
 export declare const TASK_LIST_GROUP_BY_KEYS: readonly ["groupName", "status", "dueDate", "assignee", "priority", "tag"];
 export declare const toTaskListGroupByKeyType: (v: string) => "status" | "dueDate" | "priority" | "assignee" | "tag" | "groupName";
 export declare const toTaskListGroupByKeyTypeStrict: (v: string) => "status" | "dueDate" | "priority" | "assignee" | "tag" | "groupName" | undefined;

package/lib/view/taskManager/taskListView/taskList.js

@@ -53,6 +53,11 @@ exports.TASK_LIST_FILTER_CATEGORIES = [
         type: 'user',
         multiple: true,
     },
+    {
+        value: 'createdBy',
+        type: 'user',
+        multiple: true,
+    },
     { value: 'creationDate', type: 'dateRange', multiple: true },
 ];
 exports.TASK_LIST_GROUP_BY_CATEGORIES = [

package/lib/view/taskManager/taskListView/taskListFilterHelpers.js

@@ -15,6 +15,8 @@ const getCategoryValueForTaskList = (key, task) => {
             return task.createTime;
         case 'assignee':
             return task.assignees;
+        case 'createdBy':
+            return task.createdBy;
         default:
             return undefined;
     }

package/lib/view/taskManager/taskListView/taskListViewHelpers.d.ts

@@ -3,7 +3,7 @@ import { Task } from '../../../entity/task/taskState';
 import { User } from '../../../entity/user/userState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { TaskGroupKey } from './taskList';
-export type SubtaskSortKey = 'name' | 'status' | 'assignee' | 'tag';
+export type SubtaskSortKey = 'name' | 'status' | 'assignee' | 'tag' | 'priority' | 'dueDate' | 'timeSpent';
 export type SubtaskSortOrder = 'asc' | 'desc';
 export declare const getDueDateValueFromDueDateGroupId: (groupId: string) => ZeniDate;
 export declare const getTaskUpdates: (groupByKey: TaskGroupKey, groupId: string) => Partial<Task>;

package/lib/view/taskManager/taskListView/taskListViewHelpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortSubtasks = exports.getTaskUpdates = exports.getDueDateValueFromDueDateGroupId = void 0;
+const formatMinutesToFromHHMM_1 = require("../../../commonStateTypes/fiscalYearHelpers/formatMinutesToFromHHMM");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
 const taskList_1 = require("./taskList");
@@ -68,6 +69,11 @@ const sortSubtasks = (subtasks, sortKey, sortOrder, userList, tagList) => {
         return acc;
     }, {});
     const unknownStatusRank = taskDetailSelector_1.allTaskStatus.length;
+    const priorityOrder = taskDetailSelector_1.allTaskPriority.reduce((acc, priority, index) => {
+        acc[priority.code] = index;
+        return acc;
+    }, {});
+    const unknownPriorityRank = taskDetailSelector_1.allTaskPriority.length;
     const cmpStr = (a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' });
     const keyFn = (task) => {
         if (sortKey === 'name') {
@@ -94,6 +100,37 @@ const sortSubtasks = (subtasks, sortKey, sortOrder, userList, tagList) => {
             const tag = tagList.find((candidate) => candidate.tagId === firstTagId);
             return tag?.name ?? '';
         }
+        if (sortKey === 'priority') {
+            // Rank by the canonical order, not the code string: alphabetical would
+            // sort "high" before "urgent" and read as wrong to anyone scanning it.
+            return priorityOrder[task.priority?.code] ?? unknownPriorityRank;
+        }
+        if (sortKey === 'dueDate') {
+            // A task with no date is not "earliest", so undated rows belong at the
+            // bottom in BOTH directions. The comparator negates for 'desc', so one
+            // fixed sentinel would flip them to the top — the sentinel has to flip
+            // with the order to survive that negation.
+            // `dueDate` is already a ZeniDate (dayjs), so valueOf() is the epoch.
+            // An unparseable date yields NaN, and a NaN comparator leaves the array
+            // untouched -- the same silent failure the timeSpent branch guards.
+            // Treat it as undated rather than as a date.
+            const due = task.dueDate;
+            const epoch = due?.valueOf();
+            if (epoch == null || Number.isNaN(epoch)) {
+                return sortOrder === 'asc'
+                    ? Number.MAX_SAFE_INTEGER
+                    : Number.MIN_SAFE_INTEGER;
+            }
+            return epoch;
+        }
+        if (sortKey === 'timeSpent') {
+            // `timeSpent` is an "HHMM" STRING (no colon). Comparing it as text puts
+            // "1000" before "0900" only by luck of padding, and any malformed value
+            // makes the converter return NaN -- which a comparator turns into "no
+            // sort at all", silently. Coerce that to 0.
+            const minutes = (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(task.timeSpent ?? '');
+            return Number.isFinite(minutes) ? minutes : 0;
+        }
         return '';
     };
     const copy = [...subtasks];

package/lib/view/taskManager/timeEntryView/epic/fetchTaskCategoriesEpic.d.ts

@@ -0,0 +1,18 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateTaskCategories } from '../../../../entity/timeEntry/timeEntryReducer';
+import { RootState } from '../../../../rootStateTypes';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { fetchTaskCategories, fetchTaskCategoriesFailure, fetchTaskCategoriesSuccess } from '../timeEntryViewReducer';
+export type ActionType = ReturnType<typeof fetchTaskCategories> | ReturnType<typeof fetchTaskCategoriesSuccess> | ReturnType<typeof fetchTaskCategoriesFailure> | ReturnType<typeof updateTaskCategories>;
+/**
+ * The 156-category catalog that fills the Category dropdown.
+ *
+ * `switchMap` here, unlike the entry epics: there is one catalog, so a second
+ * request supersedes the first rather than racing it.
+ *
+ * Zeni-only on the server (the billing marker is commercially sensitive), so
+ * a customer user gets a 401 — surfaced as Error rather than an empty list,
+ * because an empty catalog looks like "no categories exist".
+ */
+export declare const fetchTaskCategoriesEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/taskManager/timeEntryView/epic/fetchTaskCategoriesEpic.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTaskCategoriesEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const operators_2 = require("rxjs/operators");
+const timeEntryReducer_1 = require("../../../../entity/timeEntry/timeEntryReducer");
+const responsePayload_1 = require("../../../../responsePayload");
+const timeEntryViewReducer_1 = require("../timeEntryViewReducer");
+/**
+ * The 156-category catalog that fills the Category dropdown.
+ *
+ * `switchMap` here, unlike the entry epics: there is one catalog, so a second
+ * request supersedes the first rather than racing it.
+ *
+ * Zeni-only on the server (the billing marker is commercially sensitive), so
+ * a customer user gets a 401 — surfaced as Error rather than an empty list,
+ * because an empty catalog looks like "no categories exist".
+ */
+const fetchTaskCategoriesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.fetchTaskCategories.match), (0, operators_1.switchMap)(() => zeniAPI
+    .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/task-categories`)
+    .pipe((0, operators_2.mergeMap)((response) => {
+    if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+        return (0, rxjs_1.of)((0, timeEntryReducer_1.updateTaskCategories)(response.data.task_categories ?? []), (0, timeEntryViewReducer_1.fetchTaskCategoriesSuccess)());
+    }
+    return (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTaskCategoriesFailure)(response.status));
+}), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTaskCategoriesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch task categories errored out' + JSON.stringify(error))))))));
+exports.fetchTaskCategoriesEpic = fetchTaskCategoriesEpic;

package/lib/view/taskManager/timeEntryView/epic/fetchTimeEntriesEpic.d.ts

@@ -0,0 +1,23 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateTimeEntries } from '../../../../entity/timeEntry/timeEntryReducer';
+import { RootState } from '../../../../rootStateTypes';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { fetchTimeEntriesForRange, fetchTimeEntriesForRangeFailure, fetchTimeEntriesForRangeSuccess, fetchTimeEntriesForTask, fetchTimeEntriesForTaskFailure, fetchTimeEntriesForTaskSuccess } from '../timeEntryViewReducer';
+export type ActionType = ReturnType<typeof fetchTimeEntriesForTask> | ReturnType<typeof fetchTimeEntriesForTaskSuccess> | ReturnType<typeof fetchTimeEntriesForTaskFailure> | ReturnType<typeof fetchTimeEntriesForRange> | ReturnType<typeof fetchTimeEntriesForRangeSuccess> | ReturnType<typeof fetchTimeEntriesForRangeFailure> | ReturnType<typeof updateTimeEntries>;
+/**
+ * Every entry on one task, all users — the task detail breakdown.
+ *
+ * `mergeMap`, not `switchMap`: a detail page and an expanded board row can
+ * ask for two different tasks at once, and cancelling the first would leave
+ * its breakdown stuck In-Progress forever.
+ */
+export declare const fetchTimeEntriesForTaskEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+/**
+ * One user's entries in an inclusive date range — the weekly timesheet.
+ *
+ * Needs the `is_deleted + user_id + entry_date` composite index (api #593).
+ * Without it the server returns 500, not an empty list, so the failure is
+ * surfaced rather than rendered as a blank week.
+ */
+export declare const fetchTimeEntriesForRangeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/taskManager/timeEntryView/epic/fetchTimeEntriesEpic.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTimeEntriesForRangeEpic = exports.fetchTimeEntriesForTaskEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const timeEntryReducer_1 = require("../../../../entity/timeEntry/timeEntryReducer");
+const responsePayload_1 = require("../../../../responsePayload");
+const timeEntryViewReducer_1 = require("../timeEntryViewReducer");
+const timeEntryViewState_1 = require("../timeEntryViewState");
+/**
+ * Every entry on one task, all users — the task detail breakdown.
+ *
+ * `mergeMap`, not `switchMap`: a detail page and an expanded board row can
+ * ask for two different tasks at once, and cancelling the first would leave
+ * its breakdown stuck In-Progress forever.
+ */
+const fetchTimeEntriesForTaskEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.fetchTimeEntriesForTask.match), (0, operators_1.mergeMap)((action) => {
+    const { taskId, cacheOverride } = action.payload;
+    const cached = state$.value.timeEntryViewState.timeEntryIdsByTaskId[taskId];
+    const status = state$.value.timeEntryViewState.fetchStateByTaskId[taskId];
+    // The reducer has already flipped this request to In-Progress, so the
+    // guard reads the COMPLETED cache, never the fetch state -- a fetch
+    // state is not an in-flight signal.
+    if (cacheOverride !== true &&
+        cached != null &&
+        status?.fetchState === 'In-Progress') {
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTimeEntriesForTaskSuccess)({ taskId, timeEntryIds: cached }));
+    }
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/time-entries`)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const entries = response.data.time_entries ?? [];
+            return (0, rxjs_1.of)((0, timeEntryReducer_1.updateTimeEntries)(entries), (0, timeEntryViewReducer_1.fetchTimeEntriesForTaskSuccess)({
+                taskId,
+                timeEntryIds: entries.map((entry) => entry.time_entry_id),
+            }));
+        }
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTimeEntriesForTaskFailure)({ taskId, status: response.status }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTimeEntriesForTaskFailure)({
+        taskId,
+        status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch time entries for task errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+exports.fetchTimeEntriesForTaskEpic = fetchTimeEntriesForTaskEpic;
+/**
+ * One user's entries in an inclusive date range — the weekly timesheet.
+ *
+ * Needs the `is_deleted + user_id + entry_date` composite index (api #593).
+ * Without it the server returns 500, not an empty list, so the failure is
+ * surfaced rather than rendered as a blank week.
+ */
+const fetchTimeEntriesForRangeEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.fetchTimeEntriesForRange.match), (0, operators_1.mergeMap)((action) => {
+    const { userId, startDate, endDate } = action.payload;
+    const rangeKey = (0, timeEntryViewState_1.toTimeEntryRangeKey)(userId, startDate, endDate);
+    const query = `user_id=${encodeURIComponent(userId)}&start_date=${encodeURIComponent(startDate)}&end_date=${encodeURIComponent(endDate)}`;
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/time-entries?${query}`)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const entries = response.data.time_entries ?? [];
+            return (0, rxjs_1.of)((0, timeEntryReducer_1.updateTimeEntries)(entries), (0, timeEntryViewReducer_1.fetchTimeEntriesForRangeSuccess)({
+                rangeKey,
+                timeEntryIds: entries.map((entry) => entry.time_entry_id),
+            }));
+        }
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTimeEntriesForRangeFailure)({
+            rangeKey,
+            status: response.status,
+        }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.fetchTimeEntriesForRangeFailure)({
+        rangeKey,
+        status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch time entries for range errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+exports.fetchTimeEntriesForRangeEpic = fetchTimeEntriesForRangeEpic;

package/lib/view/taskManager/timeEntryView/epic/writeTimeEntryEpic.d.ts

@@ -0,0 +1,23 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateTaskTimeSpentMinutes } from '../../../../entity/task/taskReducer';
+import { removeTimeEntry, updateTimeEntries } from '../../../../entity/timeEntry/timeEntryReducer';
+import { RootState } from '../../../../rootStateTypes';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { deleteTimeEntry, logTime, logTimeFailure, logTimeSuccess, timeEntryWriteFailure, timeEntryWriteSuccess, updateTimeEntryMinutes } from '../timeEntryViewReducer';
+export type ActionType = ReturnType<typeof logTime> | ReturnType<typeof logTimeSuccess> | ReturnType<typeof logTimeFailure> | ReturnType<typeof updateTimeEntryMinutes> | ReturnType<typeof deleteTimeEntry> | ReturnType<typeof timeEntryWriteSuccess> | ReturnType<typeof timeEntryWriteFailure> | ReturnType<typeof updateTimeEntries> | ReturnType<typeof removeTimeEntry> | ReturnType<typeof updateTaskTimeSpentMinutes>;
+/**
+ * Log time against a task.
+ *
+ * `mergeMap`, not `switchMap`: two rows on the board can be edited in quick
+ * succession and cancelling the first would silently drop that entry.
+ */
+export declare const logTimeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+/** Correct an entry's minutes. Owner, or a Zeni user as the admin path. */
+export declare const updateTimeEntryEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+/**
+ * Soft delete. The row stays in Datastore for the audit trail but leaves the
+ * totals, so the client drops it from the store rather than keeping something
+ * every reader would then have to remember to filter.
+ */
+export declare const deleteTimeEntryEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/taskManager/timeEntryView/epic/writeTimeEntryEpic.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteTimeEntryEpic = exports.updateTimeEntryEpic = exports.logTimeEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const taskReducer_1 = require("../../../../entity/task/taskReducer");
+const timeEntryReducer_1 = require("../../../../entity/timeEntry/timeEntryReducer");
+const timeEntrySelector_1 = require("../../../../entity/timeEntry/timeEntrySelector");
+const responsePayload_1 = require("../../../../responsePayload");
+const timeEntryViewReducer_1 = require("../timeEntryViewReducer");
+const unexpected = (what, error) => (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', `${what} errored out${JSON.stringify(error)}`);
+/**
+ * Log time against a task.
+ *
+ * `mergeMap`, not `switchMap`: two rows on the board can be edited in quick
+ * succession and cancelling the first would silently drop that entry.
+ */
+const logTimeEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.logTime.match), (0, operators_1.mergeMap)((action) => {
+    const { taskId, minutes, entryDate, source, identifier } = action.payload;
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/time-entries`, {
+        minutes,
+        entry_date: entryDate,
+        source,
+        // Sent only when the caller has one. The server treats it as the
+        // entity key, which is what makes a retried timer stop idempotent.
+        ...(identifier != null ? { identifier } : {}),
+    })
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const { time_entry, task_time_spent_minutes } = response.data;
+            return (0, rxjs_1.of)((0, timeEntryReducer_1.updateTimeEntries)([time_entry]), 
+            // The board reads `Task.time_spent` per row, so it has to be
+            // told the new total; otherwise the row keeps the old number
+            // until something refetches the whole list.
+            (0, taskReducer_1.updateTaskTimeSpentMinutes)({
+                taskId,
+                minutes: task_time_spent_minutes ?? 0,
+            }), (0, timeEntryViewReducer_1.logTimeSuccess)({ taskId, timeEntryId: time_entry.time_entry_id }));
+        }
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.logTimeFailure)({ taskId, status: response.status }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.logTimeFailure)({ taskId, status: unexpected('Log time', error) }))));
+}));
+exports.logTimeEpic = logTimeEpic;
+/** Correct an entry's minutes. Owner, or a Zeni user as the admin path. */
+const updateTimeEntryEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.updateTimeEntryMinutes.match), (0, operators_1.mergeMap)((action) => {
+    const { timeEntryId, minutes } = action.payload;
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/time-entries/${timeEntryId}`, { minutes })
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            return (0, rxjs_1.of)((0, timeEntryReducer_1.updateTimeEntries)([response.data.time_entry]), (0, timeEntryViewReducer_1.timeEntryWriteSuccess)({ timeEntryId }));
+        }
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.timeEntryWriteFailure)({ timeEntryId, status: response.status }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.timeEntryWriteFailure)({
+        timeEntryId,
+        status: unexpected('Update time entry', error),
+    }))));
+}));
+exports.updateTimeEntryEpic = updateTimeEntryEpic;
+/**
+ * Soft delete. The row stays in Datastore for the audit trail but leaves the
+ * totals, so the client drops it from the store rather than keeping something
+ * every reader would then have to remember to filter.
+ */
+const deleteTimeEntryEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(timeEntryViewReducer_1.deleteTimeEntry.match), (0, operators_1.mergeMap)((action) => {
+    const timeEntryId = action.payload;
+    // Read the task id BEFORE the delete: the entry is about to leave the
+    // store, and the view slice needs to know which task's id list to prune.
+    const taskId = (0, timeEntrySelector_1.getTimeEntryById)(state$.value.timeEntryState, timeEntryId)?.taskId;
+    return zeniAPI
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/time-entries/${timeEntryId}`)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response)) {
+            return (0, rxjs_1.of)((0, timeEntryReducer_1.removeTimeEntry)(timeEntryId), (0, timeEntryViewReducer_1.timeEntryWriteSuccess)({ timeEntryId, removedFromTaskId: taskId }));
+        }
+        return (0, rxjs_1.of)((0, timeEntryViewReducer_1.timeEntryWriteFailure)({ timeEntryId, status: response.status }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, timeEntryViewReducer_1.timeEntryWriteFailure)({
+        timeEntryId,
+        status: unexpected('Delete time entry', error),
+    }))));
+}));
+exports.deleteTimeEntryEpic = deleteTimeEntryEpic;

package/lib/view/taskManager/timeEntryView/timeEntryViewPayload.d.ts

@@ -0,0 +1,27 @@
+import { ID } from '../../../commonStateTypes/common';
+import { TaskCategoryPayload, TimeEntryPayload } from '../../../entity/timeEntry/timeEntryPayload';
+import { ZeniAPIResponse } from '../../../responsePayload';
+export interface TimeEntriesPayload {
+    time_entries: TimeEntryPayload[];
+    total_minutes: number;
+}
+export interface TimeEntryRangePayload extends TimeEntriesPayload {
+    end_date: string;
+    start_date: string;
+    user_id: ID;
+}
+export interface TimeEntryWritePayload {
+    /** The ids whose `time_spent` the server recomputed. The client refreshes
+     *  exactly these board rows instead of the whole list. */
+    recomputed_task_ids: ID[];
+    time_entry: TimeEntryPayload;
+    task_time_spent_minutes?: number;
+}
+export interface TaskCategoriesPayload {
+    count: number;
+    task_categories: TaskCategoryPayload[];
+}
+export type TimeEntriesResponse = ZeniAPIResponse<TimeEntriesPayload>;
+export type TimeEntryRangeResponse = ZeniAPIResponse<TimeEntryRangePayload>;
+export type TimeEntryWriteResponse = ZeniAPIResponse<TimeEntryWritePayload>;
+export type TaskCategoriesResponse = ZeniAPIResponse<TaskCategoriesPayload>;

package/lib/view/taskManager/timeEntryView/timeEntryViewPayload.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });