Tweaks

beyondessential · Jun 21, 2024 · fa82eb7 · fa82eb7
1 parent 75179ae
commit fa82eb7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/packages/datatrak-web-server/src/routes/TasksRoute.ts b/packages/datatrak-web-server/src/routes/TasksRoute.ts
@@ -27,7 +27,7 @@ const FIELDS = [
   'assignee_id',
   'status',
   'due_date',
-  'repeat_frequency',
+  'repeat_schedule',
   'survey_id',
   'entity_id',
 ];
@@ -77,7 +77,7 @@ const formatFilters = (filters: Record<string, string>[]) => {
       return;
     }
 
-    if (id === 'repeat_frequency') {
+    if (id === 'repeat_schedule') {
       formattedFilters[id] = {
         comparator: 'ilike',
         comparisonValue: `${value}%`,

diff --git a/packages/datatrak-web/src/features/Tasks/TasksTable/TasksTable.tsx b/packages/datatrak-web/src/features/Tasks/TasksTable/TasksTable.tsx
@@ -51,12 +51,7 @@ const ActionButton = (task: Task) => {
   const location = useLocation();
   if (!task) return null;
   const { assignee, survey, entity, status } = task;
-  if (
-    status === TaskStatus.overdue ||
-    status === TaskStatus.cancelled ||
-    status === TaskStatus.completed
-  )
-    return null;
+  if (status === TaskStatus.cancelled || status === TaskStatus.completed) return null;
   if (!assignee) {
     return <ActionButtonComponent variant="outlined">Assign</ActionButtonComponent>;
   }
@@ -106,7 +101,7 @@ const COLUMNS = [
     // TODO: Update this display once RN-1341 is done. Also handle sorting on this column in this issue.
     accessor: row =>
       row.status === TaskStatus.repeating ? JSON.stringify(row.repeatFrequency) : 'Doesn’t repeat',
-    id: 'repeat_frequency',
+    id: 'repeat_schedule',
     filterable: true,
     disableResizing: true,
   },

diff --git a/packages/types/src/schemas/schemas.ts b/packages/types/src/schemas/schemas.ts