CM-762: fix group task tab (#42)

* CM-750: fix task filtering * CM-750: fix eslint * CM-762: fix group task tab --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com>
openimis · Mar 22, 2024 · a03fc6d · a03fc6d
1 parent 5159e73
commit a03fc6d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -51,10 +51,6 @@ const TASK_PROJECTION = () => [
   'jsonExt',
 ];
 
-const TASKS_FULL_PROJECTION = () => [
-  ...TASK_PROJECTION, 'businessEvent',
-];
-
 export const formatTaskGroupGQL = (taskGroup) => {
   const executors = taskGroup?.taskexecutorSet?.map((executor) => decodeId(executor.id));
   const taskSources = taskGroup?.taskSources?.map((taskSource) => taskSource.name);

diff --git a/src/components/TaskFilter.js b/src/components/TaskFilter.js
@@ -64,7 +64,7 @@ function TaskFilter({
           module="tasksManagement"
           label="task.entity"
           value={filterTextFieldValue('entity')}
-          onChange={onChangeStringFilter('entity', CONTAINS_LOOKUP)}
+          onChange={onChangeStringFilter('entityString', CONTAINS_LOOKUP)}
         />
       </Grid>
       <Grid item xs={3} className={classes.item}>
@@ -81,14 +81,6 @@ function TaskFilter({
           ])}
         />
       </Grid>
-      <Grid item xs={3} className={classes.item}>
-        <TextInput
-          module="tasksManagement"
-          label="task.businessStatus"
-          value={filterTextFieldValue('businessStatus')}
-          onChange={onChangeStringFilter('businessStatus', CONTAINS_LOOKUP)}
-        />
-      </Grid>
       <Grid item xs={3} className={classes.item}>
         <PublishedComponent
           pubRef="tasksManagement.taskStatusPicker"
@@ -101,7 +93,7 @@ function TaskFilter({
             {
               id: 'status',
               value,
-              filter: `status: ${value}`,
+              filter: value ? `status: ${value}` : EMPTY_STRING,
             },
           ])}
         />

diff --git a/src/components/TaskSearcher.js b/src/components/TaskSearcher.js
@@ -107,7 +107,7 @@ function TaskSearcher({
     if (entityIds) {
       filters.entityIds = {
         value: entityIds,
-        filter: `entityIds: "${entityIds}"`,
+        filter: `entityIds: [${entityIds.map((id) => `"${id}"`)}]`,
       };
     }
     return filters;