Исправлено наложение активных телеметрий

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)
@@ -155,15 +156,15 @@ 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) {
+    setDataSaub((prev) => {
+      if (!data)
+        return replace ? [] : prev
       const dataSaub = normalizeData(data)
-      setDataSaub((prev) => {
+      const out = replace ? [...dataSaub] : [...prev, ...dataSaub]
-        const out = [...prev, ...dataSaub]
+      out.sort(dateSorter)
-        out.sort(dateSorter)
+      return out
-        return out
+    })
-      })
-    }
   }, [])
 
   const handleDataSpin = useCallback((data) => data && setDataSpin((prev) => [...prev, ...data]), [])
@@ -185,24 +186,22 @@ const TelemetryView = memo(() => {
   }, [spinSubject$])
 
   useEffect(() => {
-    const cancel = invokeWebApiWrapperAsync(
+    if (currentWellId == well.id) return
-      async (signal) => {
+    setCurrentWellId(well.id)
-        if (signal.aborted) return false
+    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)
-        if (signal.aborted) return false
         setFlowChartData(flowChart ?? [])
-        handleDataSaub(dataSaub)
+        handleDataSaub(dataSaub, true)
-        handleDataSpin(dataSpin)
+        setDataSpin(Array.isArray(dataSpin) ? dataSpin : [])
       },
       setIsDataLoading,
       `Не удалось получить данные`,
       { actionName: 'Получение данных по скважине', well }
     )
-
+  }, [well, chartInterval, currentWellId, handleDataSaub])
-    return () => cancel()
-  }, [well, chartInterval, handleDataSpin, handleDataSaub])
 
   useEffect(() => {
     const unsubscribe = Subscribe(