CM-473: adjust to business_data logic

openimis · Jan 18, 2024 · da70841 · da70841
1 parent 563f745
commit da70841
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -32,7 +32,7 @@ const TASK_FULL_PROJECTION = () => [
   'isDeleted',
   'taskGroup{id, code, completionPolicy, taskexecutorSet {edges{node{id, user{id}}}}}',
   'data',
-  'currentEntityData',
+  'businessData',
   'jsonExt',
 ];
 

diff --git a/src/components/TaskPreviewCell.js b/src/components/TaskPreviewCell.js
@@ -2,20 +2,20 @@ import React from 'react';
 import { HYPHEN } from '../constants';
 
 function TaskPreviewCell({
-  formatterIndex, itemData, incomingData, formatter, jsonExt,
+  formatterIndex, itemData, incomingData, formatter,
 }) {
   const showHistorical = (itemIncomingData) => {
-    if (formatter(itemData, jsonExt, formatterIndex) === formatter(itemIncomingData, jsonExt, formatterIndex)
-        || !formatter(itemIncomingData, jsonExt, formatterIndex)) {
+    if (formatter(itemData, formatterIndex) === formatter(itemIncomingData, formatterIndex)
+        || !formatter(itemIncomingData, formatterIndex)) {
       return HYPHEN;
     }
-    return formatter(itemIncomingData, jsonExt, formatterIndex);
+    return formatter(itemIncomingData, formatterIndex);
   };
 
   return (
     <>
       <p>
-        {formatter(itemData, jsonExt, formatterIndex) ?? HYPHEN}
+        {formatter(itemData, formatterIndex) ?? HYPHEN}
       </p>
       <p style={{ fontWeight: 'bold' }}>
         {showHistorical(incomingData)}

diff --git a/src/components/TaskPreviewTable.js b/src/components/TaskPreviewTable.js
@@ -81,9 +81,8 @@ function TaskPreviewTable({
                 <TaskPreviewCell
                   formatter={formatter}
                   formatterIndex={formatterIndex}
-                  jsonExt={!previewItem?.jsonExt || JSON.parse(previewItem.jsonExt)}
-                  itemData={previewItem.data?.current_data}
-                  incomingData={previewItem.data?.incoming_data}
+                  itemData={previewItem.businessData?.current_data}
+                  incomingData={previewItem.businessData?.incoming_data}
                 />
               </TableCell>
             ))}

diff --git a/src/reducer.js b/src/reducer.js
@@ -115,8 +115,8 @@ function reducer(
         task: parseData(action.payload.data.task)?.map((task) => ({
           ...task,
           id: decodeId(task.id),
-          currentEntityData: parseTaskData(JSON.parse((JSON.parse(task.currentEntityData)))),
-          data: parseTaskData(JSON.parse(task.data, (key, value) => {
+          businessData: parseTaskData(JSON.parse(task.businessData, (key, value) => {
+            console.log(task.businessData)
             if (['date_valid_to', 'date_valid_from'].includes(key)) {
               return `${value} 00:00:00`;
             }