Merge pull request #43 from openimis/develop

MERGING develop into release/24.04
openimis · Mar 28, 2024 · 26cbdc1 · 26cbdc1
2 parents acd59c6 + 35f989e
commit 26cbdc1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -36,15 +36,14 @@ const TASK_FULL_PROJECTION = () => [
   'jsonExt',
 ];
 
-const TASKS_FULL_PROJECTION = () => [
+const TASK_PROJECTION = () => [
   'id',
   'entityId',
   'entityString',
   'source',
   'status',
   'executorActionEvent',
   'businessEvent',
-  'businessStatus',
   'dateCreated',
   'isDeleted',
   'taskGroup{id, code, completionPolicy}',
@@ -101,7 +100,7 @@ export function fetchTaskGroups(modulesManager, params) {
 }
 
 export function fetchTasks(modulesManager, params) {
-  const payload = formatPageQueryWithCount('task', params, TASKS_FULL_PROJECTION());
+  const payload = formatPageQueryWithCount('task', params, TASK_PROJECTION());
   return graphql(payload, ACTION_TYPE.SEARCH_TASKS);
 }
 

diff --git a/src/components/TaskApprovementPanel.js b/src/components/TaskApprovementPanel.js
@@ -13,6 +13,7 @@ import CheckIcon from '@material-ui/icons/Check';
 import {
   APPROVED, EMPTY_STRING,
   FAILED, TASK_STATUS,
+  TASK_CONTRIBUTION_KEY,
 } from '../constants';
 import { resolveTask } from '../actions';
 
@@ -99,6 +100,21 @@ function TaskApprovementPanel({
     }
   };
 
+  if (task.source) {
+    const contrib = modulesManager.getContribs(TASK_CONTRIBUTION_KEY)
+      .find((c) => c.taskSource.includes(task.source));
+
+    if (contrib?.confirmationPanel) {
+      return (
+        <contrib.confirmationPanel
+          task
+          defaultAction={handleButtonClick}
+          defaultDisabled={disable}
+        />
+      );
+    }
+  }
+
   return (
     <Paper className={classes.paper}>
       <div className={classes.fabContainer}>

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
@@ -52,7 +52,6 @@ function TaskSearcher({
       'task.type',
       'task.entity',
       'task.assignee',
-      'task.businessStatus',
       'task.status',
     ];
     if (rights.includes(RIGHT_TASKS_MANAGEMENT_SEARCH)) {
@@ -66,7 +65,6 @@ function TaskSearcher({
     ['type', true],
     ['entity', true],
     ['assignee', true],
-    ['businessStatus', true],
     ['status', true],
   ];
 
@@ -75,7 +73,6 @@ function TaskSearcher({
     (task) => trimBusinessEvent(task.businessEvent),
     (task) => task.entityString,
     (task) => task?.taskGroup?.code,
-    (task) => task.businessStatus,
     (task) => task.status,
     (task) => (
       <Tooltip title={formatMessage('viewDetailsButton.tooltip')}>
@@ -110,7 +107,7 @@ function TaskSearcher({
     if (entityIds) {
       filters.entityIds = {
         value: entityIds,
-        filter: `entityIds: "${entityIds}"`,
+        filter: `entityIds: [${entityIds.map((id) => `"${id}"`)}]`,
       };
     }
     return filters;
@@ -143,7 +140,7 @@ function TaskSearcher({
       sorts={sorts}
       rowsPerPageOptions={ROWS_PER_PAGE_OPTIONS}
       defaultPageSize={DEFAULT_PAGE_SIZE}
-      defaultOrderBy="source"
+      defaultOrderBy="-dateCreated"
       rowIdentifier={rowIdentifier}
       onDoubleClick={onDoubleClick}
       defaultFilters={defaultFilters()}

diff --git a/src/index.js b/src/index.js
@@ -15,7 +15,7 @@ import TaskGroupPicker from './pickers/TaskGroupPicker';
 import TaskSearcher from './components/TaskSearcher';
 import getAdminMainMenuContributions from './contributions/AdminMainMenuContributions';
 import { TASK_ROUTE } from './constants';
-import { fetchTask } from './actions';
+import { fetchTask, resolveTask } from './actions';
 
 const ROUTE_TASKS_MANAGEMENT = 'tasks';
 const ROUTE_TASK_MANAGEMENT = 'tasks/task';
@@ -47,3 +47,5 @@ const DEFAULT_CONFIG = {
 };
 
 export const TasksManagementModule = (cfg) => ({ ...DEFAULT_CONFIG, ...cfg });
+
+export { resolveTask };
diff --git a/src/reducer.js b/src/reducer.js
@@ -115,12 +115,7 @@ function reducer(
         task: parseData(action.payload.data.task)?.map((task) => ({
           ...task,
           id: decodeId(task.id),
-          businessData: parseTaskData(JSON.parse(task.businessData, (key, value) => {
-            if (['date_valid_to', 'date_valid_from'].includes(key)) {
-              return `${value} 00:00:00`;
-            }
-            return value;
-          })),
+          businessData: parseTaskData(JSON.parse(task.businessData)),
         }))?.[0],
         errorTask: null,
       };