From 8560ce5f4798416bcbef4b0b6cf2edfe36cea378 Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Thu, 2 Sep 2021 11:37:28 +0500
Subject: [PATCH] Changed ClusterInfo data's keys from data.id to data.caption

---
 src/pages/Cluster/ClusterSections.jsx |  2 +-
 src/pages/Cluster/ClusterWells.jsx    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/Cluster/ClusterSections.jsx b/src/pages/Cluster/ClusterSections.jsx
index 05c58de..21789a8 100644
--- a/src/pages/Cluster/ClusterSections.jsx
+++ b/src/pages/Cluster/ClusterSections.jsx
@@ -71,7 +71,7 @@ export default function ClusterSections({ clusterData }) {
   let rows = [];
 
   clusterData.statsWells?.forEach((well) => {
-    well.sections.forEach((section) => {
+    well.sections?.forEach((section) => {
       let row = {
         key: well.caption + section.id,
         id: well.id,
diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index d061796..777f320 100644
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -45,19 +45,19 @@ export default function ClusterWells({clusterData}) {
         setWellOperations(operations)
 
         const tvdPlanData = operations.map(el => { 
-          return {key: el.plan?.id, depth: el.plan?.wellDepth, date: el.plan?.startDate}
+          return {key: el.caption, depth: el.plan?.wellDepth, date: el.plan?.startDate}
         }).filter(el => el.key)
         
         setTvdDataPlan(tvdPlanData)
 
         const tvdFactData = operations.map(el => { 
-          return {key: el.fact?.id, depth: el.fact?.wellDepth, date: el.fact?.startDate}
+          return {key: el.caption, depth: el.fact?.wellDepth, date: el.fact?.startDate}
         }).filter(el => el.key)
 
         setTvdDataFact(tvdFactData)
 
         const tvdPredictData = operations.map(el => { 
-          return {key: el.predict?.id, depth: el.predict?.wellDepth, date: el.predict?.startDate}
+          return {key: el.caption, depth: el.predict?.wellDepth, date: el.predict?.startDate}
         }).filter(el => el.key)
 
         setTvdDataForecast(tvdPredictData)
@@ -76,7 +76,7 @@ export default function ClusterWells({clusterData}) {
     });
 
     return {
-      key: well.id,
+      key: well.caption,
       id: well.id,
       caption: well.caption,
       wellType: well.wellType,
@@ -190,7 +190,7 @@ export default function ClusterWells({clusterData}) {
       key: "companies",
       dataIndex: "companies",
       render: (item) =>
-        item.map((company) => <Tag color="blue">{company.caption}</Tag>),
+        item?.map((company) => <Tag color="blue">{company.caption}</Tag>) ?? '-',
     },
   ];
 
@@ -202,7 +202,7 @@ export default function ClusterWells({clusterData}) {
         size={"small"}
         bordered
         pagination={false}
-        rowKey={(record) => record.id}
+        rowKey={(record) => record.caption}
       />
 
       <Modal