From da70841b3a1133d6692ef5be5c39d0b0cba9cff3 Mon Sep 17 00:00:00 2001
From: Jan <j.dolkowski@soldevelo.com>
Date: Thu, 18 Jan 2024 19:53:40 +0100
Subject: [PATCH] CM-473: adjust to business_data logic

---
 src/actions.js                     |  2 +-
 src/components/TaskPreviewCell.js  | 10 +++++-----
 src/components/TaskPreviewTable.js |  5 ++---
 src/reducer.js                     |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index e9c7dfd..26dfac0 100644
--- 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
index ce968d2..1a4e18e 100644
--- 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
index 32dd132..7be22ab 100644
--- 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
index 4fd8666..52dad25 100644
--- 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`;
             }