From 372617f31426d9c9184007d47f20612b360952a4 Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Fri, 8 Oct 2021 10:50:27 +0500
Subject: [PATCH] CF2-49: Removed unnecessary useEffect()

---
 src/pages/Measure/MeasureTable.jsx | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 2a9ca4c..4831ec6 100644
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -18,8 +18,7 @@ const format='YYYY.MM.DD HH:mm'
 export const MeasureTable = ({idWell, idCategory, title, columns, values, updateMeasuresFunc}) => {
 
   const [showLoader, setShowLoader] = useState(false);
-  const [selectedTimeLineId, setSelectedTimeLineId] = useState(undefined)
-  const [displayedValues, setDisplayedValues] = useState([]);
+  const [displayedValues, setDisplayedValues] = useState({});
   const [editingColumns, setEditingColumns] = useState(columns);
   const [isTableEditing, setIsTableEditing] = useState(false);
   const [editingActionName, setEditingActionName] = useState('');
@@ -34,28 +33,20 @@ export const MeasureTable = ({idWell, idCategory, title, columns, values, update
   )
 
   useEffect(() => {
-    let valuesToDisplay = []
+    const defaultValuesToDisplay = values[values.length-1]
 
-    if(!selectedTimeLineId)
-      valuesToDisplay = values && values.length
-                        ? values[values.length-1] 
-                        : []
-    else
-      valuesToDisplay = values.find(el => el.id === selectedTimeLineId)
-
-    setDisplayedValues(valuesToDisplay)
-    setSelectedTimeLineId(valuesToDisplay?.id)
-  }, [selectedTimeLineId, values])
+    setDisplayedValues(defaultValuesToDisplay)
+  }, [values])
 
   useEffect(() => {
     let switchableColumns = []
 
-    isTableEditing && editingActionName !== 'delete'
+    isTableEditing
       ? switchableColumns = createEditingColumns(columns, () => <Input className='w-100 measure-input' />)
       : switchableColumns = createEditingColumns(columns, null)
 
     if(editingActionName === 'edit')
-      measuresForm.setFieldsValue(displayedValues.data);
+      measuresForm.setFieldsValue(displayedValues?.data);
     else if(editingActionName === 'add')
       measuresForm.resetFields()
 
@@ -67,7 +58,6 @@ export const MeasureTable = ({idWell, idCategory, title, columns, values, update
     await MeasureService.markAsDelete(idWell, displayedValues.id)
     updateMeasuresFunc()
     setShowLoader(false)
-    setIsTableEditing(false)
   }
 
   const checkIsDataDefault = () =>
@@ -177,7 +167,7 @@ export const MeasureTable = ({idWell, idCategory, title, columns, values, update
               <Timeline.Item 
                 key={index}
                 className='measure-button'
-                onClick={() => setSelectedTimeLineId(item.id)} 
+                onClick={() => setDisplayedValues(item)} 
                 dot={item?.id === displayedValues?.id 
                             ? <CheckSquareOutlined className="timeline-clock-icon" /> 
                             : null}
@@ -197,7 +187,7 @@ export const MeasureTable = ({idWell, idCategory, title, columns, values, update
             onFinish={handleSubmitMeasuresForm}
           >
             <View
-              item={displayedValues?.data ?? []}
+              item={displayedValues?.data ?? {}}
               columns={editingColumns}
             />
           </Form>