From 374eaaef21cf25f62970f01ce7850bca396b9a17 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 7 Feb 2022 15:01:07 +0500
Subject: [PATCH] =?UTF-8?q?*=20=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BC=D0=B5=D0=BC=D0=BE=D1=80=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2=20*=20=D0=A1=D1=82=D0=B8=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Cluster/functions.jsx               |  2 +-
 src/pages/Deposit.jsx                         |  7 +++---
 src/pages/Login.jsx                           | 10 ++++----
 src/pages/Measure/MeasureTable.jsx            | 20 ++++++++-------
 src/pages/Measure/index.jsx                   |  6 ++---
 src/pages/Messages.jsx                        |  6 ++---
 src/pages/Report/ReportCreationNotify.jsx     | 25 ++++++++++---------
 src/pages/Report/Reports.jsx                  |  6 ++---
 src/pages/Report/index.jsx                    | 16 ++++++------
 src/pages/TelemetryView/SetpointSender.jsx    |  2 +-
 src/pages/TelemetryView/Setpoints.jsx         | 12 ++++-----
 src/pages/WellOperations/ImportOperations.jsx |  9 ++++---
 src/pages/WellOperations/WellSectionsStat.jsx |  8 +++---
 13 files changed, 70 insertions(+), 59 deletions(-)

diff --git a/src/pages/Cluster/functions.jsx b/src/pages/Cluster/functions.jsx
index e92d316..8aba6b7 100644
--- a/src/pages/Cluster/functions.jsx
+++ b/src/pages/Cluster/functions.jsx
@@ -3,7 +3,7 @@ import { OperationStatService } from '@api'
 const maxPrefix = 'isMax'
 const minPrefix = 'isMin'
 
-export const getPrecision = (number) => Number.isNaN(number ?? NaN) ? '-' : number.toFixed(2)
+export const getPrecision = (number) => Number.isFinite(number) ? number.toFixed(2) : '-'
 
 export const getOperations = async (idWell) => {
   const ops = await OperationStatService.getTvd(idWell)
diff --git a/src/pages/Deposit.jsx b/src/pages/Deposit.jsx
index 463438c..f337ed3 100644
--- a/src/pages/Deposit.jsx
+++ b/src/pages/Deposit.jsx
@@ -3,6 +3,7 @@ import { Link } from 'react-router-dom'
 import { useState, useEffect, memo } from 'react'
 
 import { ClusterService } from '@api'
+import { arrayOrDefault } from '@utils'
 import { PointerIcon } from '@components/icons'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -43,7 +44,7 @@ export const Deposit = memo(() => {
   useEffect(() => invokeWebApiWrapperAsync(
     async () => {
       const data = await ClusterService.getClusters()
-      setClustersData(data)
+      setClustersData(arrayOrDefault(data))
       setViewParams(calcViewParams(data))
     },
     setShowLoader,
@@ -54,7 +55,7 @@ export const Deposit = memo(() => {
     <LoaderPortal show={showLoader}>
       <div className={'h-100vh'}>
         <Map {...viewParams}>
-          {clustersData.map(cluster =>
+          {clustersData.map(cluster => (
             <Overlay
               width={32}
               anchor={[cluster.latitude, cluster.longitude]}
@@ -65,7 +66,7 @@ export const Deposit = memo(() => {
                 <span>{cluster.caption}</span>
               </Link>
             </Overlay>
-          )}
+          ))}
         </Map>
       </div>
     </LoaderPortal>
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 09432fe..31e30a8 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -1,20 +1,20 @@
+import { memo, useState } from 'react'
+import { Link, useHistory } from 'react-router-dom'
 import { Card, Form, Input, Button } from 'antd'
 import { UserOutlined, LockOutlined } from '@ant-design/icons'
-import { useState } from 'react'
-import { Link, useHistory } from 'react-router-dom'
 
 import { AuthService } from '@api'
+import { setUser } from '@utils/storage'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { loginRules, passwordRules } from '@utils/validationRules'
-import { setUser } from '@utils/storage'
 
 import '@styles/index.css'
 import logo from '@images/logo_32.png'
 
 const logoIcon = <img src={logo} alt={'АСБ'} className={'logo'} width={130} />
 
-export const Login = () => {
+export const Login = memo(() => {
   const history = useHistory()
   const [showLoader, setShowLoader] = useState(false)
 
@@ -51,6 +51,6 @@ export const Login = () => {
       </Card>
     </LoaderPortal>
   )
-}
+})
 
 export default Login
diff --git a/src/pages/Measure/MeasureTable.jsx b/src/pages/Measure/MeasureTable.jsx
index 191afc8..5d31991 100644
--- a/src/pages/Measure/MeasureTable.jsx
+++ b/src/pages/Measure/MeasureTable.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo } from 'react'
 import { Button, Form, Input, Popconfirm, Timeline } from 'antd'
 import {
   CheckSquareOutlined,
@@ -9,20 +9,20 @@ import {
   DeleteOutlined
 } from '@ant-design/icons'
 
-import LoaderPortal from '../../components/LoaderPortal'
-import { MeasureService } from '../../services/api'
-import { invokeWebApiWrapperAsync } from '../../components/factory'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { MeasureService } from '@api'
+import { formatDate } from '@utils'
 
 import { View } from './View'
 
-import '../../styles/index.css'
-import '../../styles/measure.css'
-import { formatDate } from '../../utils'
+import '@styles/index.css'
+import '@styles/measure.css'
 
 const createEditingColumns = (cols, renderDelegate) =>
   cols.map(col => ({ render: renderDelegate, ...col }))
 
-export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButtons}) => {
+export const MeasureTable = memo(({idWell, group, updateMeasuresFunc, additionalButtons}) => {
   const [showLoader, setShowLoader] = useState(false)
   const [displayedValues, setDisplayedValues] = useState({})
   const [editingColumns, setEditingColumns] = useState(group.columns)
@@ -160,4 +160,6 @@ export const MeasureTable = ({idWell, group, updateMeasuresFunc, additionalButto
       </div>
     </>
   )
-}
+})
+
+export default MeasureTable
diff --git a/src/pages/Measure/index.jsx b/src/pages/Measure/index.jsx
index 06beb48..104b3ad 100644
--- a/src/pages/Measure/index.jsx
+++ b/src/pages/Measure/index.jsx
@@ -1,5 +1,5 @@
 import { Button } from 'antd'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo } from 'react'
 import { TableOutlined } from '@ant-design/icons'
 
 import { MeasureService } from '@api'
@@ -41,7 +41,7 @@ const defaultData = [
   }
 ]
 
-export const Measure = ({ idWell }) => {
+export const Measure = memo(({ idWell }) => {
   const [showLoader, setShowLoader] = useState(false)
   const [isMeasuresUpdating, setIsMeasuresUpdating] = useState(true)
   const [data, setData] = useState(defaultData)
@@ -85,6 +85,6 @@ export const Measure = ({ idWell }) => {
       />
     </LoaderPortal>
   )
-}
+})
 
 export default Measure
diff --git a/src/pages/Messages.jsx b/src/pages/Messages.jsx
index a3664c5..5e80d6a 100644
--- a/src/pages/Messages.jsx
+++ b/src/pages/Messages.jsx
@@ -3,8 +3,8 @@ import { useState, useEffect, memo } from 'react'
 import { Table, Select, DatePicker, Input } from 'antd'
 
 import { MessageService } from '@api'
-import { invokeWebApiWrapperAsync } from '@components/factory'
 import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
 
 import '@styles/message.css'
 
@@ -103,8 +103,8 @@ export const Messages = memo(({ idWell }) => {
 
   return (
     <>
-      <div className='filter-group'>
-        <h3 className='filter-group-heading'>Фильтр сообщений</h3>
+      <div className={'filter-group'}>
+        <h3 className={'filter-group-heading'}>Фильтр сообщений</h3>
         <Select
           mode={'multiple'}
           allowClear
diff --git a/src/pages/Report/ReportCreationNotify.jsx b/src/pages/Report/ReportCreationNotify.jsx
index e6385d1..6620651 100644
--- a/src/pages/Report/ReportCreationNotify.jsx
+++ b/src/pages/Report/ReportCreationNotify.jsx
@@ -1,8 +1,19 @@
+import { memo } from 'react'
 import { Progress, Button } from 'antd'
 
 import { downloadFile } from '@components/factory'
 
-export const ReportCreationNotify = ({ progressData }) => (
+export const defaultProgressData = {
+  progressData: {
+    progress: 0.0,
+    operation: 'Создание отчета',
+    currentPage: 0,
+    totalPages: 0,
+    file: null
+  }
+}
+
+export const ReportCreationNotify = memo(({ progressData = defaultProgressData }) => (
   <>
     <Progress percent={ Number(progressData.progress?.toFixed(2)) } />
     <br/>
@@ -17,14 +28,4 @@ export const ReportCreationNotify = ({ progressData }) => (
       </Button>
     )}
   </>
-)
-
-ReportCreationNotify.defaultProps = {
-  progressData: {
-    progress: 0.0,
-    operation: 'Создание отчета',
-    currentPage: 0,
-    totalPages: 0,
-    file: null
-  }
-}
+))
diff --git a/src/pages/Report/Reports.jsx b/src/pages/Report/Reports.jsx
index 9b28a00..71aaf83 100644
--- a/src/pages/Report/Reports.jsx
+++ b/src/pages/Report/Reports.jsx
@@ -1,5 +1,5 @@
 import { Button, Tooltip } from 'antd'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo } from 'react'
 import { FilePdfOutlined, FileTextOutlined } from '@ant-design/icons'
 
 import { ReportService } from '@api'
@@ -55,7 +55,7 @@ const columns = [
   },
 ]
 
-export const Reports = ({ idWell }) => {
+export const Reports = memo(({ idWell }) => {
   const [reports, setReports] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
@@ -80,6 +80,6 @@ export const Reports = ({ idWell }) => {
       />
     </LoaderPortal>
   )
-}
+})
 
 export default Reports
diff --git a/src/pages/Report/index.jsx b/src/pages/Report/index.jsx
index bd2fc6c..4c96c2a 100644
--- a/src/pages/Report/index.jsx
+++ b/src/pages/Report/index.jsx
@@ -1,12 +1,12 @@
 import 'moment/locale/ru'
 import moment from 'moment'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo } from 'react'
 import { DatePicker, Radio, Button, Select, notification } from 'antd'
 
-import { ReportService } from '../../services/api'
-import { Subscribe } from '../../services/signalr'
-import LoaderPortal from '../../components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '../../components/factory'
+import { ReportService } from '@api'
+import { Subscribe } from '@services/signalr'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
 
 import { Reports } from './Reports'
 import { ReportCreationNotify } from './ReportCreationNotify'
@@ -31,7 +31,7 @@ const reportFormats = [
   { value: 1, label: 'LAS' },
 ]
 
-export default function Report({ idWell }) {
+export const Report = memo(({ idWell }) => {
   const [aviableDateRange, setAviableDateRange] = useState([moment(), moment()])
   const [filterDateRange, setFilterDateRange] = useState([
     moment().subtract(1, 'days').startOf('day'),
@@ -167,4 +167,6 @@ export default function Report({ idWell }) {
       <Reports idWell={idWell} />
     </div>
   )
-}
+})
+
+export default Report
diff --git a/src/pages/TelemetryView/SetpointSender.jsx b/src/pages/TelemetryView/SetpointSender.jsx
index 0bc26d1..95ca499 100644
--- a/src/pages/TelemetryView/SetpointSender.jsx
+++ b/src/pages/TelemetryView/SetpointSender.jsx
@@ -2,11 +2,11 @@ import { useState } from 'react'
 import { Select, Modal, Input, InputNumber } from 'antd'
 
 import { SetpointsService } from '@api'
+import { Grid, GridItem } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeNumericRender, EditableTable } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/PeriodPicker'
-import { Grid, GridItem } from '@components/Grid'
 
 export const SetpointSender = ({ idWell, onClose, visible, setpointNames }) => {
     const [expirePeriod, setExpirePeriod] = useState(defaultPeriod)
diff --git a/src/pages/TelemetryView/Setpoints.jsx b/src/pages/TelemetryView/Setpoints.jsx
index 093acc9..77563f3 100644
--- a/src/pages/TelemetryView/Setpoints.jsx
+++ b/src/pages/TelemetryView/Setpoints.jsx
@@ -2,12 +2,12 @@ import moment from 'moment'
 import { Button, Modal } from 'antd'
 import { useState, useEffect } from 'react'
 
-import { Table } from '../../components/Table'
-import { UserView } from '../../components/views'
-import LoaderPortal from '../../components/LoaderPortal'
-import { invokeWebApiWrapperAsync } from '../../components/factory'
-import { makeStringCutter } from '../../utils/string'
-import { SetpointsService } from '../../services/api'
+import { Table } from '@components/Table'
+import { UserView } from '@components/views'
+import LoaderPortal from '@components/LoaderPortal'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { makeStringCutter } from '@utils/string'
+import { SetpointsService } from '@api'
 
 import { SetpointSender } from './SetpointSender'
 import { SetpointViewer, getSetpointStatus } from './SetpointViewer'
diff --git a/src/pages/WellOperations/ImportOperations.jsx b/src/pages/WellOperations/ImportOperations.jsx
index d396661..76e74e8 100644
--- a/src/pages/WellOperations/ImportOperations.jsx
+++ b/src/pages/WellOperations/ImportOperations.jsx
@@ -1,12 +1,13 @@
 import { Switch } from 'antd'
-import { useState } from 'react'
+import { memo, useState } from 'react'
+
 import { ErrorFetch } from '@components/ErrorFetch'
 import { UploadForm } from '@components/UploadForm'
 
 const errorTextStyle = { color: 'red', fontWeight: 'bold' }
 const uploadFormStyle = { marginTop: '24px' }
 
-export const ImportOperations = ({ idWell, onDone }) =>{
+export const ImportOperations = memo(({ idWell, onDone }) =>{
   const [deleteBeforeImport, setDeleteBeforeImport] = useState(false)
   const [errorText, setErrorText] = useState('')
 
@@ -38,4 +39,6 @@ export const ImportOperations = ({ idWell, onDone }) =>{
       <span style={errorTextStyle}>{errorText}</span>
     </div>
   )
-}
+})
+
+export default ImportOperations
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
index fe1da03..f300d51 100644
--- a/src/pages/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/WellOperations/WellSectionsStat.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, memo } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -19,7 +19,7 @@ const columns = [
   makeColumnsPlanFact('Спуск ОК, м/ч'         ,'casingDownSpeed', { render: numericRender }),
 ]
 
-export const WellSectionsStat = ({idWell}) => {
+export const WellSectionsStat = memo(({ idWell }) => {
   const [sections, setSections] = useState([])
   const [showLoader, setShowLoader] = useState(false)
 
@@ -64,4 +64,6 @@ export const WellSectionsStat = ({idWell}) => {
       />
     </LoaderPortal>
   )
-}
+})
+
+export default WellSectionsStat