C-719: Remove business status display (#39)

openimis · Mar 11, 2024 · f894602 · f894602
1 parent acd59c6
commit f894602
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -36,22 +36,25 @@ 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}',
   'data',
   '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);
@@ -101,7 +104,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';
 
@@ -49,6 +50,7 @@ function TaskApprovementPanel({
   const [disable, setDisable] = useState(false);
   const task = { ...edited };
 
+
   useEffect(() => {
     if (task?.businessStatus && user) {
       const businesStatus = JSON.parse(task.businessStatus);
@@ -99,6 +101,19 @@ 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/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')}>

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 };