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

package/lib/esm/entity/timeEntry/timeEntrySelector.js

@@ -0,0 +1,23 @@
+import recordGet from 'lodash/get';
+export function getTimeEntryById(timeEntryState, timeEntryId) {
+    return recordGet(timeEntryState.timeEntriesById, timeEntryId, undefined);
+}
+export function getTimeEntriesByIds(timeEntryState, timeEntryIds) {
+    return timeEntryIds
+        .map((timeEntryId) => getTimeEntryById(timeEntryState, timeEntryId))
+        .filter((entry) => entry != null);
+}
+export function getTaskCategoryById(timeEntryState, taskCategoryId) {
+    return recordGet(timeEntryState.taskCategoriesById, taskCategoryId, undefined);
+}
+/**
+ * The catalog, ordered service → vertical → name, matching the order the
+ * server sends so the dropdown reads the same on both sides.
+ */
+export function getTaskCategories(timeEntryState, includeInactive = false) {
+    return Object.values(timeEntryState.taskCategoriesById)
+        .filter((category) => includeInactive || category.isActive)
+        .sort((left, right) => (left.service ?? '').localeCompare(right.service ?? '') ||
+        (left.vertical ?? '').localeCompare(right.vertical ?? '') ||
+        left.name.localeCompare(right.name));
+}

package/lib/esm/entity/timeEntry/timeEntryState.js

@@ -0,0 +1,8 @@
+import { stringToUnionStrict } from '../../commonStateTypes/stringToUnion';
+export const ALL_TIME_ENTRY_SOURCES = ['timer', 'manual', 'migration'];
+export const ALL_BILLING_TYPES = ['billable', 'non_billable'];
+/** Unknown values become `undefined` rather than being cast through.
+ *  A server that gains a source we do not know about must not land an
+ *  unmatched string in a union the UI switches on. */
+export const toTimeEntrySource = (raw) => raw == null ? undefined : stringToUnionStrict(raw, ALL_TIME_ENTRY_SOURCES);
+export const toBillingType = (raw) => raw == null ? undefined : stringToUnionStrict(raw, ALL_BILLING_TYPES);

package/lib/esm/epic.js

@@ -731,6 +731,9 @@ import { dragNDropTasksEpic, } from './view/taskManager/taskListView/epics/dragN
 import { fetchTaskListEpic, } from './view/taskManager/taskListView/epics/fetchTaskListEpic';
 import { fetchTaskListPageEpic, } from './view/taskManager/taskListView/epics/fetchTaskListPageEpic';
 import { updateTaskFromListViewEpic, } from './view/taskManager/taskListView/epics/updateTaskFromListViewEpic';
+import { fetchTaskCategoriesEpic, } from './view/taskManager/timeEntryView/epic/fetchTaskCategoriesEpic';
+import { fetchTimeEntriesForRangeEpic, fetchTimeEntriesForTaskEpic, } from './view/taskManager/timeEntryView/epic/fetchTimeEntriesEpic';
+import { deleteTimeEntryEpic, logTimeEpic, updateTimeEntryEpic, } from './view/taskManager/timeEntryView/epic/writeTimeEntryEpic';
 import { fetchTasksCardEpic, } from './view/tasksCard/fetchTasksCardEpic';
 import { fetchTopExEpic, } from './view/topEx/topExEpic';
 import { fetchTransactionActivityLogEpic, } from './view/transactionActivityLogView/fetchTransactionActivityLogEpic';
@@ -882,6 +885,7 @@ const ALL_EPICS = [
     deleteTagEpic,
     deleteTaskEpic,
     deleteTaskGroupEpic,
+    deleteTimeEntryEpic,
     deleteTransactionAttachmentEpic,
     deleteUserBankAccountEpic,
     disableAccountingProjectsEpic,
@@ -1233,6 +1237,7 @@ const ALL_EPICS = [
     fetchSubscriptionViewEpic,
     fetchSubTasksEpic,
     fetchSuggestedQuestionsEpic,
+    fetchTaskCategoriesEpic,
     fetchTaskDetailEpic,
     fetchTaskDetailPageEpic,
     fetchTaskGroupTemplatesEpic,
@@ -1241,6 +1246,8 @@ const ALL_EPICS = [
     fetchTaskListPageEpic,
     fetchTaskManagerMetricsEpic,
     fetchTasksCardEpic,
+    fetchTimeEntriesForRangeEpic,
+    fetchTimeEntriesForTaskEpic,
     fetchTopExEpic,
     fetchTransactionActivityLogEpic,
     fetchTransactionDetailEpic,
@@ -1333,6 +1340,7 @@ const ALL_EPICS = [
     issueCreditNoteEpic,
     lockChargeCardEpic,
     lockChargeCardsEpic,
+    logTimeEpic,
     markAsCompleteScheduleDetailEpic,
     markCoachmarkDismissedEpic,
     markTransactionAsNotMiscategorizedEpic,
@@ -1558,6 +1566,7 @@ const ALL_EPICS = [
     updateStatementInfoEpic,
     updateTaskFromListViewEpic,
     updateTaskGroupNameEpic,
+    updateTimeEntryEpic,
     updateTransactionDetailEpic,
     updateVendorContactEpic,
     uploadAccountStatementEpic,

package/lib/esm/index.js

@@ -75,6 +75,7 @@ import { getTaskGroupById } from './entity/taskGroup/taskGroupSelector';
 import { deleteConnection, doMagicLinkSignIn, doSignIn, doSignOut, fetchActiveTenant, fetchAllTenants, fetchExcludedResources as fetchExcludedResourcesForTenant, fetchExternalConnections as fetchExternalConnectionsForTenant, fetchSubscriptionSummaryForTenant, initEmailConnectOAuth, resendVerifyDeviceOTP, resetSignInState, saveAPIKeyConnection, saveConnectorCredentials, saveExternalConnection as saveExternalConnectionForTenant, saveOAuthConnection, sendEmailMagicLinkToUser, sendSessionHeartbeat, toExternalIntegrationType, updateCurrentTenant, updateSignInState, verifyDeviceWithTwoFA, } from './entity/tenant/tenantReducer';
 import { DEFAULT_RECEIPTS_EMAIL, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView, } from './entity/tenant/tenantSelector';
 import { toExternalSupportedTool } from './entity/tenant/tenantTypes';
+import { getTaskCategories, getTaskCategoryById, } from './entity/timeEntry/timeEntrySelector';
 import { pushToastNotification } from './entity/toastNotification/toastNotificationReducer';
 import { getLastNotificationTime, getNotifications, } from './entity/toastNotification/toastNotificationSelector';
 import { mapFileEntityToAttachment, toContentType, toContentTypeStrict, } from './entity/transaction/stateTypes/attachment';
@@ -423,6 +424,8 @@ import { ALL_TASK_LIST_TABS, TASK_LIST_FILTER_CATEGORIES, TASK_LIST_GROUP_BY_CAT
 import { bulkUpdateTaskList, dragNDropTasks, fetchTaskList, fetchTaskListPage, initiateTaskListLocalData, removeTaskFromList, updateTaskFilters, updateTaskFromListView, updateTaskListLocalData, updateTaskListSearchText, updateTaskListTab, updateTaskListUIState, } from './view/taskManager/taskListView/taskListReducer';
 import { getAllTasks, } from './view/taskManager/taskListView/taskListSelector';
 import { getDueDateValueFromDueDateGroupId, getTaskUpdates, sortSubtasks, } from './view/taskManager/taskListView/taskListViewHelpers';
+import { deleteTimeEntry, fetchTaskCategories, fetchTimeEntriesForRange, fetchTimeEntriesForTask, logTime, updateTimeEntryMinutes, } from './view/taskManager/timeEntryView/timeEntryViewReducer';
+import { getTimeEntriesForRange, getTimeEntriesForTask, getTimeEntrySaveState, } from './view/taskManager/timeEntryView/timeEntryViewSelector';
 import { fetchTasksCard } from './view/tasksCard/tasksCardReducer';
 import { fetchTopEx, updateTopExDownloadState, updateTopExTimeFrame, } from './view/topEx/topExReducer';
 import { getAllTopExpenses, getTop6Expenses, getTopExpenses, } from './view/topEx/topExSelector';
@@ -681,7 +684,7 @@ export { fetchGlobalMerchantRecommendation, createGlobalMerchant, updateCreateGl
 export { approveVendorGlobalReview, rejectVendorGlobalReview, fetchVendorGlobalReviewView, updateSelectedGlobalMerchant, updateVendorGlobalReviewViewUIState, getVendorGlobalReviewView, getTenantMerchantByMerchantId, toVendorGlobalReviewColumnSortKeyType, updateVendorGlobalReviewViewLocalData, };
 export { fetchArAging, updateArAgingUIState, fetchArAgingDetail, updateArAgingDetailUIState, getArAgingReport, getArAgingDetailForCustomer, updateArAgingNodeCollapseState, };
 export { toRecurringBillFrequency, toRecurringBillFrequencyStrict, };
-export { getTaskGroupById, getAllTasks, fetchTaskList, fetchTaskListPage, getTaskDetail, fetchTaskDetailPage, saveTaskUpdatesToLocalStore, saveTaskDetail, createSubTask, resetSubTaskCreateStatus, fetchSubTasks, archiveTask, fetchCannedResponses, saveCannedResponse, deleteCannedResponse, getCannedResponsesView, updateTaskListSearchText, updateTaskListUIState, allTaskStatus, allTaskPriority, updateTaskFilters, TASK_LIST_FILTER_CATEGORIES, TASK_LIST_GROUP_BY_CATEGORIES, deleteTask, discardTaskUpdatesInLocalStore, bulkUpdateTaskList, createNewTaskGroup, initiateTaskListLocalData, deleteTaskGroup, updateTaskListLocalData, dragNDropTasks, updateTaskGroupName, toTaskListGroupByKeyType, toTaskListGroupByKeyTypeStrict, getTaskUpdates, sortSubtasks, fetchAllTaskGroups, initialTaskDetail, getDueDateValueFromDueDateGroupId, toPriorityCodeType, toTaskStatusCodeType, toDueDateGroupKeyType, updateTaskFromListView, updateTaskListTab, removeTaskFromList, snoozeTask, unsnoozeTask, convertHHMMStrToMinutes, initialTaskDetailLocalData, ALL_TASK_LIST_TABS, };
+export { getTaskGroupById, getAllTasks, getTaskCategories, getTaskCategoryById, getTimeEntriesForRange, getTimeEntriesForTask, getTimeEntrySaveState, fetchTimeEntriesForTask, fetchTimeEntriesForRange, fetchTaskCategories, logTime, updateTimeEntryMinutes, deleteTimeEntry, fetchTaskList, fetchTaskListPage, getTaskDetail, fetchTaskDetailPage, saveTaskUpdatesToLocalStore, saveTaskDetail, createSubTask, resetSubTaskCreateStatus, fetchSubTasks, archiveTask, fetchCannedResponses, saveCannedResponse, deleteCannedResponse, getCannedResponsesView, updateTaskListSearchText, updateTaskListUIState, allTaskStatus, allTaskPriority, updateTaskFilters, TASK_LIST_FILTER_CATEGORIES, TASK_LIST_GROUP_BY_CATEGORIES, deleteTask, discardTaskUpdatesInLocalStore, bulkUpdateTaskList, createNewTaskGroup, initiateTaskListLocalData, deleteTaskGroup, updateTaskListLocalData, dragNDropTasks, updateTaskGroupName, toTaskListGroupByKeyType, toTaskListGroupByKeyTypeStrict, getTaskUpdates, sortSubtasks, fetchAllTaskGroups, initialTaskDetail, getDueDateValueFromDueDateGroupId, toPriorityCodeType, toTaskStatusCodeType, toDueDateGroupKeyType, updateTaskFromListView, updateTaskListTab, removeTaskFromList, snoozeTask, unsnoozeTask, convertHHMMStrToMinutes, initialTaskDetailLocalData, ALL_TASK_LIST_TABS, };
 export { getAllTags, fetchTagList, createTag, deleteTag, };
 export { getAllCardsAndBankPaymentMethods, createCardSetupIntent, confirmCardSetupIntent, addCardPaymentSource, fetchPaymentSources, resetCardPaymentErrorStatuses, clearCardPaymentView, };
 export { getAuditReportGroupViewSelectorView, getAuditRuleGroupViewSelectorView, getUserFromAllUsers, fetchAuditRuleGroupView, fetchAuditReportGroupView, saveReasonForAuditRule, clearAuditReportGroupViewByCompanyId, };

package/lib/esm/reducer.js

@@ -70,6 +70,7 @@ import taskGroup, { initialState as initialTaskGroupState, } from './entity/task
 import taskGroupTemplate, { initialState as initialTaskGroupTemplateState, } from './entity/taskGroupTemplate/taskGroupTemplateReducer';
 import taskSummary, { initialState as initailTaskSummaryState, } from './entity/taskSummary/taskSummaryReducer';
 import tenant, { initialState as initialTenantState, } from './entity/tenant/tenantReducer';
+import timeEntry, { initialState as initialTimeEntryState, } from './entity/timeEntry/timeEntryReducer';
 import toastNotification, { initialState as initialToastNotificationState, } from './entity/toastNotification/toastNotificationReducer';
 import transaction, { initialState as initialTransactionState, } from './entity/transaction/transactionReducer';
 import transactionActivityLog, { initialState as initialTransactionActivityLogState, } from './entity/transactionActivityLog/transactionActivityLogReducer';
@@ -256,6 +257,7 @@ import taskDetailView, { initialState as initialTaskDetailState, } from './view/
 import taskGroupTemplateView, { initialState as initialTaskGroupTemplateViewState, } from './view/taskManager/taskGroupTemplateView/taskGroupTemplateViewReducer';
 import taskGroupView, { initialState as initialTaskGroupViewState, } from './view/taskManager/taskGroupView/taskGroupViewReducer';
 import taskList, { initialState as initialTaskListState, } from './view/taskManager/taskListView/taskListReducer';
+import timeEntryView, { initialState as initialTimeEntryViewState, } from './view/taskManager/timeEntryView/timeEntryViewReducer';
 import tasksCard, { initialState as initialTasksCardState, } from './view/tasksCard/tasksCardReducer';
 import topEx, { initialState as initialTopExState, } from './view/topEx/topExReducer';
 import transactionActivityLogView, { initialState as initialTransactionActivityLogViewState, } from './view/transactionActivityLogView/transactionActivityLogViewReducer';
@@ -344,6 +346,7 @@ const initialEntitiesState = {
     subscriptionState: initialSubscriptionState,
     subscriptionSummaryState: initialSubscriptionSummaryState,
     tagState: initialTagState,
+    timeEntryState: initialTimeEntryState,
     taskGroupState: initialTaskGroupState,
     taskGroupTemplateState: initialTaskGroupTemplateState,
     taskState: initialTaskState,
@@ -526,6 +529,7 @@ const initialViewsState = {
     taskGroupTemplateViewState: initialTaskGroupTemplateViewState,
     taskGroupViewState: initialTaskGroupViewState,
     taskListState: initialTaskListState,
+    timeEntryViewState: initialTimeEntryViewState,
     tasksCardState: initialTasksCardState,
     topExState: initialTopExState,
     transactionActivityLogViewState: initialTransactionActivityLogViewState,
@@ -634,6 +638,7 @@ const entityReducers = {
     subscriptionState: subscription,
     subscriptionSummaryState: subscriptionSummary,
     tagState: tag,
+    timeEntryState: timeEntry,
     taskGroupState: taskGroup,
     taskGroupTemplateState: taskGroupTemplate,
     taskState: task,
@@ -815,6 +820,7 @@ const viewReducers = {
     taskGroupTemplateViewState: taskGroupTemplateView,
     taskGroupViewState: taskGroupView,
     taskListState: taskList,
+    timeEntryViewState: timeEntryView,
     tagViewState: tagView,
     tasksCardState: tasksCard,
     topExState: topEx,

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

@@ -26,6 +26,7 @@ export const getTaskDetail = (state, taskId) => {
     let isDeleted = undefined;
     let depth = undefined;
     let recurringSourceTaskId = undefined;
+    let taskCategoryId = undefined;
     let snoozedUntil = undefined;
     let taskGroupId = undefined;
     let subtasks = [];
@@ -39,6 +40,7 @@ export const getTaskDetail = (state, taskId) => {
         if (taskEntity != null) {
             createdByUser = getUserAndUserRole(userState, userRoleState, addressState, taskEntity.createdBy);
             depth = taskEntity.depth;
+            taskCategoryId = taskEntity.taskCategoryId;
             isArchived = taskEntity.isArchived;
             isDeleted = taskEntity.isDeleted;
             recurringSourceTaskId = taskEntity.recurringSourceTaskId;
@@ -103,6 +105,7 @@ export const getTaskDetail = (state, taskId) => {
         version: 0,
         createdByUser,
         depth,
+        taskCategoryId,
         isArchived,
         isDeleted,
         recurringSourceTaskId,

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

@@ -47,7 +47,13 @@ export const 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 },
 ];
 export const TASK_LIST_GROUP_BY_CATEGORIES = [
     { value: 'status' },

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

@@ -1,3 +1,8 @@
+/** Billing lives on the task's category, not the task, so it needs the catalog. */
+export const buildCategoryValueGetter = (taskCategoriesById) => (key, task) => key === 'billing'
+    ? (taskCategoriesById[task.taskCategoryId ?? '']?.billingType ??
+        'non_billable')
+    : getCategoryValueForTaskList(key, task);
 export const getCategoryValueForTaskList = (key, task) => {
     switch (key) {
         case 'dueDate':
@@ -12,6 +17,8 @@ export const getCategoryValueForTaskList = (key, task) => {
             return task.createTime;
         case 'assignee':
             return task.assignees;
+        case 'createdBy':
+            return task.createdBy;
         default:
             return undefined;
     }

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

@@ -15,7 +15,7 @@ import { getUserGroupList } from '../../userGroupListView/userGroupListViewSelec
 import { getUserList, } from '../../userListView/userListViewSelector';
 import { allTaskPriority, allTaskStatus, } from '../taskDetailView/taskDetailSelector';
 import { DUE_DATE_GROUP_KEYS, } from './taskList';
-import { getCategoryValueForTaskList } from './taskListFilterHelpers';
+import { buildCategoryValueGetter } from './taskListFilterHelpers';
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = orderBy(tasksList, (task) => {
         switch (sortKey) {
@@ -47,7 +47,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 = getSortOrder(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -70,11 +70,11 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
         return undefined;
     })
         .filter((value) => value?.name.toLowerCase().includes(searchText.toLowerCase()) === true);
-    const filteredTaskList = applyAdvancedFiltersOnList(getCategoryValueForTaskList, tasks, taskListState.filters);
+    const filteredTaskList = applyAdvancedFiltersOnList(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 = getTaskGroupById(taskGroupState, taskGroupId);
@@ -88,6 +88,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         if (taskGroup != null) {
             return {
@@ -119,7 +120,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);
 };
-export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+export 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];
@@ -132,6 +133,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = getUsersByUserIds(userState, assigneeIds)
@@ -149,7 +151,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
     });
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -161,6 +163,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -172,7 +175,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
     });
     return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, taskCategoriesById, }) => {
     const taskGroupsWithTasksList = ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -184,6 +187,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -195,7 +199,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];
@@ -208,6 +212,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         const tagIds = groupKey.split(',');
         const groupName = getTagsByIds(tagState, tagIds)
@@ -224,7 +229,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 = DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -236,6 +241,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             taskIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
         return {
             groupName: groupKey,
@@ -246,7 +252,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({
@@ -259,6 +265,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupsIds,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'assignee') {
@@ -270,6 +277,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'priority') {
@@ -281,6 +289,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'status') {
@@ -292,6 +301,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     if (groupByKey === 'tag') {
@@ -303,6 +313,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             addressState,
             tagState,
             userGroupsState,
+            taskCategoriesById,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -313,6 +324,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         addressState,
         tagState,
         userGroupsState,
+        taskCategoriesById,
     });
 };
 /**
@@ -337,7 +349,10 @@ const getTaskGroupsWithTaskListMemoized = createSelector((state) => state.taskLi
 // 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,
@@ -356,6 +371,7 @@ const getTaskGroupsWithTaskListMemoized = createSelector((state) => state.taskLi
     taskGroupsIds,
     tagState,
     userGroupsState,
+    taskCategoriesById,
 }));
 export const getAllTasks = createSelector(
 // `taskState`, `taskGroupState`, `addressState` and `tagState` are gone from

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

@@ -1,3 +1,4 @@
+import { convertHHMMStrToMinutes } from '../../../commonStateTypes/fiscalYearHelpers/formatMinutesToFromHHMM';
 import { dateNow } from '../../../zeniDayJS';
 import { allTaskPriority, allTaskStatus, } from '../taskDetailView/taskDetailSelector';
 import { toDueDateGroupKeyType } from './taskList';
@@ -63,6 +64,11 @@ export const sortSubtasks = (subtasks, sortKey, sortOrder, userList, tagList) =>
         return acc;
     }, {});
     const unknownStatusRank = allTaskStatus.length;
+    const priorityOrder = allTaskPriority.reduce((acc, priority, index) => {
+        acc[priority.code] = index;
+        return acc;
+    }, {});
+    const unknownPriorityRank = allTaskPriority.length;
     const cmpStr = (a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' });
     const keyFn = (task) => {
         if (sortKey === 'name') {
@@ -89,6 +95,37 @@ export 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 = convertHHMMStrToMinutes(task.timeSpent ?? '');
+            return Number.isFinite(minutes) ? minutes : 0;
+        }
         return '';
     };
     const copy = [...subtasks];

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

@@ -0,0 +1,24 @@
+import { of } from 'rxjs';
+import { catchError, filter, switchMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs/operators';
+import { updateTaskCategories } from '../../../../entity/timeEntry/timeEntryReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchTaskCategories, fetchTaskCategoriesFailure, fetchTaskCategoriesSuccess, } from '../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".
+ */
+export const fetchTaskCategoriesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchTaskCategories.match), switchMap(() => zeniAPI
+    .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/task-categories`)
+    .pipe(mergeMap((response) => {
+    if (isSuccessResponse(response) && response.data != null) {
+        return of(updateTaskCategories(response.data.task_categories ?? []), fetchTaskCategoriesSuccess());
+    }
+    return of(fetchTaskCategoriesFailure(response.status));
+}), catchError((error) => of(fetchTaskCategoriesFailure(createZeniAPIStatus('Unexpected Error', 'Fetch task categories errored out' + JSON.stringify(error))))))));

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

@@ -0,0 +1,73 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateTimeEntries } from '../../../../entity/timeEntry/timeEntryReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchTimeEntriesForRange, fetchTimeEntriesForRangeFailure, fetchTimeEntriesForRangeSuccess, fetchTimeEntriesForTask, fetchTimeEntriesForTaskFailure, fetchTimeEntriesForTaskSuccess, } from '../timeEntryViewReducer';
+import { toTimeEntryRangeKey } from '../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.
+ */
+export const fetchTimeEntriesForTaskEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTimeEntriesForTask.match), 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 of(fetchTimeEntriesForTaskSuccess({ taskId, timeEntryIds: cached }));
+    }
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/time-entries`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const entries = response.data.time_entries ?? [];
+            return of(updateTimeEntries(entries), fetchTimeEntriesForTaskSuccess({
+                taskId,
+                timeEntryIds: entries.map((entry) => entry.time_entry_id),
+            }));
+        }
+        return of(fetchTimeEntriesForTaskFailure({ taskId, status: response.status }));
+    }), catchError((error) => of(fetchTimeEntriesForTaskFailure({
+        taskId,
+        status: createZeniAPIStatus('Unexpected Error', 'Fetch time entries for task errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+/**
+ * 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 const fetchTimeEntriesForRangeEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchTimeEntriesForRange.match), mergeMap((action) => {
+    const { userId, startDate, endDate } = action.payload;
+    const rangeKey = 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(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const entries = response.data.time_entries ?? [];
+            return of(updateTimeEntries(entries), fetchTimeEntriesForRangeSuccess({
+                rangeKey,
+                timeEntryIds: entries.map((entry) => entry.time_entry_id),
+            }));
+        }
+        return of(fetchTimeEntriesForRangeFailure({
+            rangeKey,
+            status: response.status,
+        }));
+    }), catchError((error) => of(fetchTimeEntriesForRangeFailure({
+        rangeKey,
+        status: createZeniAPIStatus('Unexpected Error', 'Fetch time entries for range errored out' +
+            JSON.stringify(error)),
+    }))));
+}));