From bf2d6d6d361ee8c73f8c7570b848b9e56b85a115 Mon Sep 17 00:00:00 2001
From: goodmice <hamel2517@gmail.com>
Date: Mon, 7 Nov 2022 05:38:31 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=B9=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D1=81=D0=BA=D0=B2=D0=B0=D0=B6=D0=B8=D0=BD=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Well/Telemetry/TelemetryView/index.jsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Well/Telemetry/TelemetryView/index.jsx b/src/pages/Well/Telemetry/TelemetryView/index.jsx
index 7a2ca50..b2c654f 100644
--- a/src/pages/Well/Telemetry/TelemetryView/index.jsx
+++ b/src/pages/Well/Telemetry/TelemetryView/index.jsx
@@ -140,6 +140,7 @@ export const normalizeData = (data) => data?.map(item => ({
 const dateSorter = makeDateSorter('date')
 
 const TelemetryView = memo(() => {
+  const [currentWellId, setCurrentWellId] = useState(null)
   const [dataSaub, setDataSaub] = useState([])
   const [dataSpin, setDataSpin] = useState([])
   const [chartInterval, setChartInterval] = useState(defaultPeriod)
@@ -154,11 +155,11 @@ const TelemetryView = memo(() => {
   const saubSubject$ = useMemo(() => new BehaviorSubject(), [])
   const spinSubject$ = useMemo(() => new BehaviorSubject(), [])
 
-  const handleDataSaub = useCallback((data) => {
+  const handleDataSaub = useCallback((data, replace = false) => {
     if (data) {
       const dataSaub = normalizeData(data)
       setDataSaub((prev) => {
-        const out = [...prev, ...dataSaub]
+        const out = replace ? [...dataSaub] : [...prev, ...dataSaub]
         out.sort(dateSorter)
         return out
       })
@@ -184,20 +185,22 @@ const TelemetryView = memo(() => {
   }, [spinSubject$])
 
   useEffect(() => {
+    if (currentWellId == well.id) return
+    setCurrentWellId(well.id)
     invokeWebApiWrapperAsync(
       async () => {
         const flowChart = await DrillFlowChartService.getByIdWell(well.id)
         const dataSaub = await TelemetryDataSaubService.getData(well.id, null, chartInterval)
         const dataSpin = await TelemetryDataSpinService.getData(well.id, null, chartInterval)
         setFlowChartData(flowChart ?? [])
-        handleDataSaub(dataSaub)
-        handleDataSpin(dataSpin)
+        handleDataSaub(dataSaub, true)
+        setDataSpin(Array.isArray(dataSpin) ? dataSpin : [])
       },
       null,
       `Не удалось получить данные`,
       { actionName: 'Получение данных по скважине', well }
     )
-  }, [well, chartInterval, handleDataSpin, handleDataSaub])
+  }, [well, chartInterval, currentWellId, handleDataSaub])
 
   useEffect(() => {
     const unsubscribe = Subscribe(