@zeniai/client-epic-state 5.3.10 → 5.3.12-beta0DI

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"));
@@ -295,6 +296,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"));
@@ -383,6 +385,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,
@@ -565,6 +568,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,
@@ -673,6 +677,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,
@@ -854,6 +859,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';
@@ -253,6 +254,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';
@@ -345,6 +347,7 @@ export type EntitiesState = {
     taskState: TaskState;
     taskSummaryState: TaskSummaryState;
     tenantState: TenantState;
+    timeEntryState: TimeEntryState;
     toastNotificationState: ToastNotificationState;
     transactionActivityLogState: TransactionActivityLogState;
     transactionState: TransactionState;
@@ -523,6 +526,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' | 'billing';
 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,7 +53,13 @@ exports.TASK_LIST_FILTER_CATEGORIES = [
         type: 'user',
         multiple: true,
     },
+    {
+        value: 'createdBy',
+        type: 'user',
+        multiple: true,
+    },
     { value: 'creationDate', type: 'dateRange', multiple: true },
+    { value: 'billing', type: 'dropdown', multiple: true },
 ];
 exports.TASK_LIST_GROUP_BY_CATEGORIES = [
     { value: 'status' },

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

@@ -1,3 +1,7 @@
+import { ID } from '../../../commonStateTypes/common';
 import { Task } from '../../../entity/task/taskState';
+import { TaskCategory } from '../../../entity/timeEntry/timeEntryState';
 import { FilterCategoryValueType } from '../../spendManagement/spendManagementFilterHelpers';
+/** Billing lives on the task's category, not the task, so it needs the catalog. */
+export declare const buildCategoryValueGetter: (taskCategoriesById: Record<ID, TaskCategory>) => (key: string, task: Task) => FilterCategoryValueType | (string | undefined)[] | undefined;
 export declare const getCategoryValueForTaskList: (key: string, task: Task) => FilterCategoryValueType | (string | undefined)[] | undefined;

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

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCategoryValueForTaskList = void 0;
+exports.getCategoryValueForTaskList = exports.buildCategoryValueGetter = void 0;
+/** Billing lives on the task's category, not the task, so it needs the catalog. */
+const buildCategoryValueGetter = (taskCategoriesById) => (key, task) => key === 'billing'
+    ? (taskCategoriesById[task.taskCategoryId ?? '']?.billingType ??
+        'non_billable')
+    : (0, exports.getCategoryValueForTaskList)(key, task);
+exports.buildCategoryValueGetter = buildCategoryValueGetter;
 const getCategoryValueForTaskList = (key, task) => {
     switch (key) {
         case 'dueDate':
@@ -15,6 +21,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/taskListSelector.d.ts

@@ -1,9 +1,10 @@
-import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AddressState } from '../../../entity/address/addressState';
 import { TagState } from '../../../entity/tag/tagState';
 import { Task, TaskState } from '../../../entity/task/taskState';
 import { TaskGroupTemplate } from '../../../entity/taskGroupTemplate/taskGroupTemplateState';
+import { TaskCategory } from '../../../entity/timeEntry/timeEntryState';
 import { UserState } from '../../../entity/user/userState';
 import { UserGroupsState } from '../../../entity/userGroups/userGroupsState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
@@ -48,9 +49,10 @@ export interface TaskListSelectorView extends SelectorView {
  * slice. `TaskListState` still satisfies this, so callers are unaffected.
  */
 type TaskListGroupingInputs = Pick<TaskListState, 'filters' | 'taskIdsByAssignees' | 'taskIdsByDueDate' | 'taskIdsByGroupsIds' | 'taskIdsByPriority' | 'taskIdsByStatus' | 'taskIdsByTags' | 'uiState'>;
-export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }: {
     addressState: AddressState;
     tagState: TagState;
+    taskCategoriesById: Record<ID, TaskCategory>;
     taskListState: TaskListGroupingInputs;
     taskState: TaskState;
     userGroupsState: UserGroupsState;
@@ -62,9 +64,10 @@ export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }: {
     addressState: AddressState;
     tagState: TagState;
+    taskCategoriesById: Record<ID, TaskCategory>;
     taskListState: TaskListGroupingInputs;
     taskState: TaskState;
     userGroupsState: UserGroupsState;

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

@@ -53,7 +53,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, }) => {
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, taskCategoriesById, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -76,11 +76,11 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
         return undefined;
     })
         .filter((value) => value?.name.toLowerCase().includes(searchText.toLowerCase()) === true);
-    const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)(taskListFilterHelpers_1.getCategoryValueForTaskList, tasks, taskListState.filters);
+    const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)((0, taskListFilterHelpers_1.buildCategoryValueGetter)(taskCategoriesById), tasks, taskListState.filters);
     const sortedTaskList = sortTasksList(tagState, filteredTaskList, sortKey, sortOrder);
     return sortedTaskList;
 };
-const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupsIds, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupsIds, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
         const taskGroup = (0, taskGroupSelector_1.getTaskGroupById)(taskGroupState, taskGroupId);
@@ -94,6 +94,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         if (taskGroup != null) {
             return {
@@ -125,7 +126,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     // Also hides deleted groups, which are empty as a side effect.
     return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
     const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByAssignees[groupKey];
@@ -138,6 +139,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
@@ -156,7 +158,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
-const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -168,6 +170,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -180,7 +183,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -192,6 +195,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -203,7 +207,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
     });
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
     const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByTags[groupKey];
@@ -216,6 +220,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         const tagIds = groupKey.split(',');
         const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
@@ -232,7 +237,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
     });
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = taskList_1.DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -244,6 +249,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: groupKey,
@@ -254,7 +260,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
     });
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupsIds, tagState, userGroupsState, }) => {
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupsIds, tagState, userGroupsState, taskCategoriesById, }) => {
     const { groupByKey } = taskListState.uiState;
     if (groupByKey === 'groupName') {
         return getTaskListGroupedByGroupName({
@@ -267,6 +273,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupsIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'assignee') {
@@ -278,6 +285,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'priority') {
@@ -289,6 +297,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'status') {
@@ -300,6 +309,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'tag') {
@@ -311,6 +321,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -321,6 +332,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         addressState,
         tagState,
         userGroupsState,
+        taskCategoriesById,
     });
 };
 /**
@@ -345,7 +357,10 @@ const getTaskGroupsWithTaskListMemoized = (0, toolkit_1.createSelector)((state)
 // invalidate this memo and rebuild a board the user is already using.
 (state) => tagsAreStructural(state.taskListState.uiState)
     ? state.tagState
-    : EMPTY_TAG_STATE, (state) => state.userGroupsState, (uiState, filters, taskIdsByGroupsIds, taskIdsByAssignees, taskIdsByPriority, taskIdsByStatus, taskIdsByTags, taskIdsByDueDate, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupsIds, tagState, userGroupsState) => getTaskGroupsWithTaskList({
+    : EMPTY_TAG_STATE, (state) => state.userGroupsState, 
+// Only the catalog, not the whole timeEntry slice: billing is read off
+// the task's category, and a timer tick must not rebuild the board.
+(state) => state.timeEntryState.taskCategoriesById, (uiState, filters, taskIdsByGroupsIds, taskIdsByAssignees, taskIdsByPriority, taskIdsByStatus, taskIdsByTags, taskIdsByDueDate, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupsIds, tagState, userGroupsState, taskCategoriesById) => getTaskGroupsWithTaskList({
     taskListState: {
         uiState,
         filters,
@@ -364,6 +379,7 @@ const getTaskGroupsWithTaskListMemoized = (0, toolkit_1.createSelector)((state)
     taskGroupsIds,
     tagState,
     userGroupsState,
+    taskCategoriesById,
 }));
 exports.getAllTasks = (0, toolkit_1.createSelector)(
 // `taskState`, `taskGroupState`, `addressState` and `tagState` are gone from

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;