diff --git a/src/components/ErrorFetch.js b/src/components/ErrorFetch.ts
old mode 100755
new mode 100644
similarity index 66%
rename from src/components/ErrorFetch.js
rename to src/components/ErrorFetch.ts
index b4f2bed..68993f1
--- a/src/components/ErrorFetch.js
+++ b/src/components/ErrorFetch.ts
@@ -1,5 +1,7 @@
export class ErrorFetch extends Error {
- constructor(status, message) {
+ public status: number
+
+ constructor(status: number, message?: string) {
super(message)
this.name = 'ErrorFetch'
this.status = status
diff --git a/src/components/Private/PrivateMenu.tsx b/src/components/Private/PrivateMenu.tsx
index 6894518..8ecc6ab 100644
--- a/src/components/Private/PrivateMenu.tsx
+++ b/src/components/Private/PrivateMenu.tsx
@@ -3,8 +3,8 @@ import { Menu, MenuItemProps, MenuProps } from 'antd'
import { Children, cloneElement, memo, ReactElement, useContext, useMemo } from 'react'
import { Link, useLocation } from 'react-router-dom'
+import { RootPathContext } from '@asb/context'
import { isURLAvailable } from '@utils/permissions'
-import { RootPathContext } from '@pages/Main'
export type PrivateMenuProps = MenuProps & { root?: string }
diff --git a/src/components/Private/PrivateRoute.tsx b/src/components/Private/PrivateRoute.tsx
index 901a0b6..7be8f17 100755
--- a/src/components/Private/PrivateRoute.tsx
+++ b/src/components/Private/PrivateRoute.tsx
@@ -7,7 +7,7 @@ import { getUserId } from '@utils/storage'
import { isURLAvailable } from '@utils/permissions'
export type PrivateRouteProps = RouteProps & {
- root: string
+ root?: string
path: string
children?: ReactNode
redirect?: (location?: Location
) => ReactNode
diff --git a/src/components/Private/PrivateSwitch.tsx b/src/components/Private/PrivateSwitch.tsx
index 57911ed..1be3dff 100644
--- a/src/components/Private/PrivateSwitch.tsx
+++ b/src/components/Private/PrivateSwitch.tsx
@@ -1,12 +1,12 @@
import { join } from 'path'
import { Location } from 'history'
import { Children, cloneElement, memo, ReactElement, ReactNode, useCallback, useContext, useMemo } from 'react'
-
import { Redirect, Route, Switch, SwitchProps, useLocation } from 'react-router-dom'
+
+import { RootPathContext } from '@asb/context'
import { isURLAvailable } from '@utils/permissions'
import { getUserId } from '@utils/storage'
-import { RootPathContext } from '@pages/Main'
export type PrivateSwitchProps = SwitchProps & {
root?: string
diff --git a/src/components/UploadForm.jsx b/src/components/UploadForm.tsx
old mode 100755
new mode 100644
similarity index 69%
rename from src/components/UploadForm.jsx
rename to src/components/UploadForm.tsx
index 2d0f244..3ec99a5
--- a/src/components/UploadForm.jsx
+++ b/src/components/UploadForm.tsx
@@ -1,22 +1,35 @@
import { memo, useCallback, useState } from 'react'
import { Upload, Button } from 'antd'
import { UploadOutlined } from '@ant-design/icons'
+import { UploadFile } from 'antd/lib/upload/interface'
import { upload } from './factory'
import { ErrorFetch } from './ErrorFetch'
-export const UploadForm = memo(({ url, disabled, accept, style, formData, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
- const [fileList, setfileList] = useState([])
+export type UploadFormProps = {
+ url: string
+ disabled?: boolean
+ accept?: string
+ style?: CSSStyleSheet
+ formData: FormData
+ onUploadStart?: () => void
+ onUploadSuccess?: () => void
+ onUploadComplete?: () => void
+ onUploadError?: (error: unknown) => void
+}
+
+export const UploadForm = memo(({ url, disabled, accept, style, formData, onUploadStart, onUploadSuccess, onUploadComplete, onUploadError }) => {
+ const [fileList, setfileList] = useState[]>([])
const handleFileSend = useCallback(async () => {
onUploadStart?.()
try {
const formDataLocal = new FormData()
- fileList.forEach((val) => formDataLocal.append('files', val.originFileObj))
+ fileList.forEach((val) => formDataLocal.append('files', String(val.originFileObj)))
if(formData)
for(const propName in formData)
- formDataLocal.append(propName, formData[propName])
+ formDataLocal.append(propName, String(formData.get(propName)))
const response = await upload(url, formDataLocal)
if (!response.ok) {
diff --git a/src/components/charts/ChartOperationTime.jsx b/src/components/charts/ChartOperationTime.jsx
deleted file mode 100755
index 6de7784..0000000
--- a/src/components/charts/ChartOperationTime.jsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import moment from 'moment'
-import { useEffect, useState } from 'react'
-
-import { ChartOpertationTimeBase } from './ChartOperationTimeBase'
-
-export const CreateLabels = () => {
- let labels = []
- return labels
-}
-
-export const CreateData = (lineConfig) => {
- let datasets = {
- label: lineConfig.label,
- data: [],
- backgroundColor: [
- '#f00', '#ff0', '#f0f', '#0ff', '#00f', '#0f0'
- ],
- }
- return datasets
-}
-
-export const ChartOperationTime = ({ lines, data, rangeDate }) => {
- const [opertationTimeDataParams, setOpertationTimeDataParams] = useState({ data: { labels: [], datasets: [] } })
-
- useEffect(() => {
- if ((!lines)
- || (!data))
- return
-
- let newLabels = lines.map(lineCfg => {
- let labels = CreateLabels(lineCfg)
- if (data.length !== 0)
- labels = data.map(dataItem => {
- return dataItem[lineCfg.labelAccessorName]
- })
- return labels
- })
-
- let newDatasets = lines.map(lineCfg => {
- let datasets = CreateData(lineCfg)
- if (data.length !== 0)
- datasets.data = data.map(dataItem => {
- return dataItem[lineCfg.pieceAccessorName]
- })
- return datasets
- })
-
- let interval = rangeDate ? (rangeDate[1] - rangeDate[0]) / 1000 : null
- let startDate = rangeDate ? rangeDate[0] : moment()
- let newParams = {
- xInterval: interval,
- xStart: startDate,
- data: {
- labels: newLabels,
- datasets: newDatasets
- }
- }
- setOpertationTimeDataParams(newParams)
-
- console.log(newParams)
-
- }, [data, lines, rangeDate])
-
- return (<>
-
-
- )
-}
\ No newline at end of file
diff --git a/src/components/charts/ChartOperationTimeBase.tsx b/src/components/charts/ChartOperationTimeBase.tsx
deleted file mode 100755
index df48daf..0000000
--- a/src/components/charts/ChartOperationTimeBase.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import {
- Chart,
- ArcElement,
- TimeScale,
- Legend,
- PointElement,
- ChartData,
- ChartTypeRegistry,
- ChartOptions,
- DoughnutController,
-} from 'chart.js'
-import 'chartjs-adapter-moment'
-import ChartDataLabels from 'chartjs-plugin-datalabels'
-
-Chart.register(TimeScale, DoughnutController, PointElement, ArcElement, Legend, ChartDataLabels)
-
-const defaultOptions = {
- responsive: true,
- title: {
- display: true,
- position: 'top',
- text: 'Doughnut Chart',
- fontSize: 18,
- fontColor: '#111'
- },
- legend: {
- display: true,
- position: 'bottom',
- labels: {
- fontColor: '#333',
- fontSize: 16
- }
- }
-}
-
-export type ChartTimeData = ChartData
-
-export type ChartTimeDataParams = {
- data: ChartTimeData,
- xStart?: Date,
- xInterval?: number,
- displayLabels?: Boolean,
-}
-
-export type ChartTimeBaseProps = {
- dataParams: ChartTimeDataParams,
- // TODO: Create good type for options
- options?: ChartOptions | any,
-}
-
-export type TimeParams = {
- unit: String
- stepSize: number
-}
-
-const linesPerInterval = 32
-
-export const timeUnitByInterval = (intervalSec: number): String => {
- if (intervalSec <= 60)
- return 'millisecond'
-
- if (intervalSec <= 32 * 60)
- return 'second'
-
- if (intervalSec <= 32 * 60 * 60)
- return 'minute'
-
- if (intervalSec <= 32 * 12 * 60 * 60)
- return 'hour'
-
- if (intervalSec <= 32 * 24 * 60 * 60)
- return 'day'
-
- if (intervalSec <= 32 * 7 * 24 * 60 * 60)
- return 'week'
-
- if (intervalSec <= 32 * 30.4375 * 24 * 60 * 60)
- return 'month'
-
- if (intervalSec <= 32 * 121.75 * 24 * 60 * 60)
- return 'quarter'
- else
- return 'year'
-}
-
-export const timeParamsByInterval = (intervalSec: number): TimeParams => {
- let stepSize = intervalSec
- let unit = timeUnitByInterval(intervalSec)
-
- switch (unit) {
- case 'millisecond':
- stepSize *= 1000
- break
- case 'second':
- //stepSize *= 1
- break
- case 'minute':
- stepSize /= 60
- break
- case 'hour':
- stepSize /= 60 * 60
- break
- case 'day':
- stepSize /= 24 * 60 * 60
- break
- case 'week':
- stepSize /= 7 * 24 * 60 * 60
- break
- case 'month':
- stepSize /= 30 * 24 * 60 * 60
- break
- case 'quarter':
- stepSize /= 91 * 24 * 60 * 60
- break
- case 'year':
- stepSize /= 365.25 * 24 * 60 * 60
- break
- }
-
- stepSize = Math.round(stepSize / linesPerInterval)
- stepSize = stepSize > 0 ? stepSize : 1
- return { unit, stepSize }
-}
-
-export const ChartOpertationTimeBase: React.FC = ({ options, dataParams }) => {
- const chartRef = useRef(null)
- const [chart, setChart] = useState()
-
- useEffect(() => {
- if ((chartRef.current) && (!chart)) {
- let thisOptions = {}
- Object.assign(thisOptions, defaultOptions, options)
-
- let newChart = new Chart(chartRef.current, {
- type: 'doughnut',
- plugins: [ChartDataLabels],
- options: thisOptions,
- data: dataParams.data
- })
- setChart(newChart)
-
- return () => chart?.destroy()
- }
- }, [chart, options, dataParams])
-
- useEffect(() => {
- if (!chart)
- return
-
- chart.data = dataParams.data
- chart.options.aspectRatio = options?.aspectRatio
- if (dataParams.xStart) {
- let interval = Number(dataParams.xInterval ?? 600)
- let start = new Date(dataParams.xStart)
- let end = new Date(dataParams.xStart)
- end.setSeconds(end.getSeconds() + interval)
- let { unit, stepSize } = timeParamsByInterval(interval)
-
- if (chart.options.scales?.x) {
- chart.options.scales.x.max = end.getTime()
- chart.options.scales.x.min = start.getTime()
- chart.options.scales.x.ticks.display = dataParams.displayLabels ?? true
- chart.options.scales.x.time.unit = unit
- chart.options.scales.x.time.stepSize = stepSize
- }
- }
-
- chart.update()
- }, [chart, dataParams, options])
-
- return ()
-}
diff --git a/src/components/charts/ChartTelemetryDepthToDay.jsx b/src/components/charts/ChartTelemetryDepthToDay.jsx
deleted file mode 100755
index e6c526e..0000000
--- a/src/components/charts/ChartTelemetryDepthToDay.jsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import {
- Chart,
- TimeScale,
- LinearScale,
- Legend,
- LineController,
- PointElement,
- LineElement
-} from 'chart.js'
-import 'chartjs-adapter-moment'
-import ChartDataLabels from 'chartjs-plugin-datalabels'
-import zoomPlugin from 'chartjs-plugin-zoom'
-
-Chart.register(TimeScale, LinearScale, LineController, LineElement, PointElement, Legend, ChartDataLabels, zoomPlugin)
-
-const defaultOptions = {
- responsive: true,
- aspectRatio: 2.45,
- scales: {
- x: {
- type: 'time',
- time: {
- unit: 'hour',
- displayFormats: {
- hour: 'MM.DD'
- },
- tooltipFormat: 'DD T'
- },
- },
- y: {
- type: 'linear',
- position: 'top',
- reverse: true,
- // ticks: {
- // // forces step size to be 50 units
- // stepSize: 50
- // }
- }
- },
- parsing: {
- xAxisKey: 'date',
- yAxisKey: 'depth'
- },
- elements: {
- point: {
- radius: 1.7,
- hoverRadius: 5,
- },
- },
- plugins: {
- datalabels: {
- display: false,
- },
- }
-}
-
-const makeDataset = (data, label, color, width = 1.5, dash) => ({
- label: label,
- data: data,
- backgroundColor: color,
- borderColor: color,
- borderWidth: width,
- borderDash: dash,
-})
-
-export const ChartTelemetryDepthToDay = ({ depthData, bitPositionData }) => {
- const chartRef = useRef(null)
- const [chart, setChart] = useState()
-
- useEffect(() => {
- const data = {
- datasets: [
- makeDataset(depthData, 'Глубина', '#0A0'),
- makeDataset(bitPositionData, 'Положение долота', 'blue'),
- ]
- }
-
- if(chartRef.current && !chart) {
- const thisOptions = {}
- Object.assign(thisOptions, defaultOptions)
-
- const newChart = new Chart(chartRef.current, {
- type: 'line',
- plugins: [ChartDataLabels],
- options: thisOptions,
- data: data
- })
- setChart(newChart)
-
- return () => chart?.destroy()
- } else {
- chart.data = data
- chart.update()
- }
- }, [chart, depthData, bitPositionData])
-
- return()
-}
diff --git a/src/components/charts/ChartTelemetryDepthToInterval.jsx b/src/components/charts/ChartTelemetryDepthToInterval.jsx
deleted file mode 100755
index d5995fc..0000000
--- a/src/components/charts/ChartTelemetryDepthToInterval.jsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import { Chart, registerables } from 'chart.js'
-
-Chart.register(...registerables)
-
-const defaultOptions = {
- responsive: true,
- aspectRatio: 2.6,
- scales: {
- x: {
- title: {
- display: true,
- text: 'Дата начала интервала'
- },
- },
- y: {
- title: {
- display: true,
- text: 'Коэффициент скорости'
- }
- }
- },
- plugins: {
- datalabels: {
- display: false
- }
- }
-}
-
-export const ChartTelemetryDepthToInterval = ({ depthToIntervalData }) => {
- const chartRef = useRef(null)
- const [chart, setChart] = useState()
-
- const calculateBarWidth = (dataLength) => {
- if (dataLength < 3) return 150
- if (dataLength < 16) return 70
- return 10
- }
-
- useEffect(() => {
- const xData = depthToIntervalData.map(el => new Date(el.intervalStartDate).toLocaleString())
- const yData = depthToIntervalData.map(el => el.intervalDepthProgress.toFixed(3))
-
- const data = {
- labels: xData,
- datasets: [{
- label: 'Скорость проходки за интервал',
- data: yData,
- borderColor: '#00b300',
- borderWidth: 2,
- backgroundColor: '#0A0',
- barThickness: calculateBarWidth(xData.length)
- }]
- }
-
- const thisOptions = {}
- Object.assign(thisOptions, defaultOptions)
-
- if (chartRef.current && !chart) {
- const newChart = new Chart(chartRef.current, {
- type: 'bar',
- options: thisOptions,
- data: data
- })
- setChart(newChart)
- } else {
- chart.data = data
- chart.options = thisOptions
- chart.update()
- }
- }, [chart, depthToIntervalData])
-
- return ()
-}
diff --git a/src/components/charts/ChartTelemetryOperationsSummary.jsx b/src/components/charts/ChartTelemetryOperationsSummary.jsx
deleted file mode 100755
index 7228cea..0000000
--- a/src/components/charts/ChartTelemetryOperationsSummary.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useEffect, useRef, useState } from 'react'
-import { Chart, registerables } from 'chart.js'
-
-Chart.register(...registerables)
-
-const transformSecondsToHoursString = (seconds) => {
- const hours = Math.floor(seconds / 3600)
- const minutes = Math.floor((seconds % 3600) / 60)
- const s = seconds - (hours * 3600) - (minutes * 60)
-
- return `${hours} ч.${minutes} мин.${s} сек.`
-}
-
-const transformSecondsToTimeString = (seconds) => {
- if (seconds === 1) // 1 is default state if null returned (1 is to show chart anyway with 0 sec)
- return '0 сек.'
- else if(seconds < 60)
- return seconds + ' сек.'
- else if (seconds < 3600)
- return Math.floor(seconds / 60) + ' мин. ' + (0.6 * (seconds % 60)).toFixed() + ' сек.'
- else
- return transformSecondsToHoursString(seconds)
-}
-
-const defaultOptions = {
- responsive: true,
- aspectRatio: 2.8,
- plugins: {
- datalabels: {
- color: '#ffffff',
- formatter: transformSecondsToTimeString,
- font: {
- weight: 'bold'
- }
- },
- tooltip: {
- callbacks: {
- label: (tooltipItem) => transformSecondsToTimeString(tooltipItem.parsed),
- }
- }
- }
-}
-
-const chartPartsColors = [
- '#54a60c', '#0ca68a', '#0c8aa6', '#0c57a6', '#0c33a6',
- '#6f10d5', '#d510a1', '#f1bc41', '#c5f141', '#41f196',
- '#41cbf1', '#4196f1', '#bf41f1', '#41f1c5', '#cbf141',
- '#f1ce41', '#f17f41', '#f14141', '#34b40e', '#420eb4'
-]
-
-export const ChartTelemetryOperationsSummary = ({ operationsData }) => {
- const chartRef = useRef(null)
- const [chart, setChart] = useState()
-
- useEffect(() => {
- const namesData = operationsData?.map(el => el.operationName) ?? ['Нет операций']
- const durationsData = operationsData?.map(el => el.duration) ?? [1]
-
- const data = {
- labels: namesData,
- datasets: [
- {
- label: 'Скорость проходки за интервал',
- data: durationsData,
- borderColor: chartPartsColors,
- backgroundColor: chartPartsColors,
- }
- ]
- }
-
- const thisOptions = {}
- Object.assign(thisOptions, defaultOptions)
-
- if (chartRef.current && !chart) {
- const newChart = new Chart(chartRef.current, {
- type: 'doughnut',
- options: thisOptions,
- data: data
- })
- setChart(newChart)
- } else {
- chart.data = data
- chart.options = thisOptions
- chart.update()
- }
- }, [chart, operationsData])
-
- return ()
-}
diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx
index f354d07..7545055 100755
--- a/src/components/selectors/WellTreeSelector.tsx
+++ b/src/components/selectors/WellTreeSelector.tsx
@@ -1,11 +1,10 @@
import { TreeSelect } from 'antd'
+import { LabelInValueType } from 'rc-select/lib/Select'
+import { RawValueType } from 'rc-tree-select/lib/TreeSelect'
import { DefaultValueType } from 'rc-tree-select/lib/interface'
import { useState, useEffect, ReactNode, useCallback, memo } from 'react'
import { useHistory, useLocation, useRouteMatch } from 'react-router-dom'
-import { RawValueType } from 'rc-tree-select/lib/TreeSelect'
-import { LabelInValueType } from 'rc-select/lib/Select'
-
import { isRawDate } from '@utils'
import LoaderPortal from '@components/LoaderPortal'
import { WellIcon, WellIconState } from '@components/icons'
@@ -54,7 +53,7 @@ const getLabel = (wellsTree: TreeNodeData[], value?: string): string | undefined
break
default: break
}
- return value
+ return 'Ошибка! Скважина не найдена!'
}
export const WellTreeSelector = memo(({ ...other }) => {
@@ -100,14 +99,9 @@ export const WellTreeSelector = memo(({ ...other }) => {
)
}, [])
- useEffect(() => {
- setValue(getLabel(wellsTree, routeMatch?.url))
- }, [wellsTree, routeMatch])
+ useEffect(() => setValue(getLabel(wellsTree, routeMatch?.url)), [wellsTree, routeMatch])
- const onChange = useCallback((value: string): void => {
- if (wellsTree)
- setValue(getLabel(wellsTree, value))
- }, [wellsTree])
+ const onChange = useCallback((value?: string): void => setValue(getLabel(wellsTree, value)), [wellsTree])
const onSelect = useCallback((value: RawValueType | LabelInValueType): void => {
if (['number', 'string'].includes(typeof value))
diff --git a/src/context.ts b/src/context.ts
new file mode 100644
index 0000000..06311dc
--- /dev/null
+++ b/src/context.ts
@@ -0,0 +1,4 @@
+import { createContext } from 'react'
+
+export const IdWellContext = createContext(null)
+export const RootPathContext = createContext('')
diff --git a/src/context/Context.js b/src/context/Context.js
deleted file mode 100755
index ea1c502..0000000
--- a/src/context/Context.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import {createContext} from 'react'
-
-const Context = createContext()
-
-export default Context
\ No newline at end of file
diff --git a/src/index.js b/src/index.tsx
old mode 100755
new mode 100644
similarity index 100%
rename from src/index.js
rename to src/index.tsx
diff --git a/src/pages/AdminPanel/Telemetry/index.jsx b/src/pages/AdminPanel/Telemetry/index.jsx
index 9a145e0..7d97fda 100755
--- a/src/pages/AdminPanel/Telemetry/index.jsx
+++ b/src/pages/AdminPanel/Telemetry/index.jsx
@@ -2,10 +2,10 @@ import { Layout } from 'antd'
import { lazy, memo, Suspense, useContext, useMemo } from 'react'
import { useParams } from 'react-router-dom'
+import { RootPathContext } from '@asb/context'
import { PrivateMenu, PrivateSwitch } from '@components/Private'
import { SuspenseFallback } from '@pages/SuspenseFallback'
-import { RootPathContext } from '@pages/Main'
const TelemetryViewer = lazy(() => import('./TelemetryViewer'))
const TelemetryMerger = lazy(() => import('./TelemetryMerger'))
diff --git a/src/pages/AdminPanel/index.jsx b/src/pages/AdminPanel/index.jsx
index 8963f67..c704c99 100755
--- a/src/pages/AdminPanel/index.jsx
+++ b/src/pages/AdminPanel/index.jsx
@@ -2,9 +2,9 @@ import { Layout } from 'antd'
import { lazy, memo, Suspense, useContext, useMemo } from 'react'
import { useParams } from 'react-router-dom'
+import { RootPathContext } from '@asb/context'
import { PrivateMenu, PrivateSwitch } from '@components/Private'
-import { RootPathContext } from '@pages/Main'
import { SuspenseFallback } from '@pages/SuspenseFallback'
const ClusterController = lazy(() => import( './ClusterController'))
diff --git a/src/pages/Analytics/Statistics.jsx b/src/pages/Analytics/Statistics.jsx
index fabd3c1..e10c29f 100755
--- a/src/pages/Analytics/Statistics.jsx
+++ b/src/pages/Analytics/Statistics.jsx
@@ -1,6 +1,7 @@
import { Table as RawTable, Typography } from 'antd'
import { Fragment, memo, useCallback, useContext, useEffect, useState } from 'react'
+import { IdWellContext } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
import { WellSelector } from '@components/selectors/WellSelector'
@@ -8,7 +9,6 @@ import { makeGroupColumn, makeNumericColumn, makeNumericRender, makeTextColumn,
import { OperationStatService, WellOperationService } from '@api'
import { arrayOrDefault } from '@utils'
-import { IdWellContext } from '../Well'
import '@styles/index.css'
import '@styles/statistics.less'
diff --git a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
index c353e4d..d01c9f5 100755
--- a/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/NewParamsTable.jsx
@@ -1,12 +1,12 @@
import { memo, useCallback, useContext, useEffect, useState } from 'react'
import { Button, Modal, Popconfirm } from 'antd'
+import { IdWellContext } from '@asb/context'
import { Table } from '@components/Table'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
import { DrillParamsService } from '@api'
-import { IdWellContext } from '@pages/Well'
import { getColumns } from '@pages/WellOperations/WellDrillParams'
export const NewParamsTable = memo(({ selectedWellsKeys }) => {
diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
index 38aa452..228e8f3 100755
--- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx
@@ -3,6 +3,7 @@ import { useState, useEffect, memo, useMemo, useContext } from 'react'
import { LineChartOutlined, ProfileOutlined } from '@ant-design/icons'
import { Table, Tag, Button, Badge, Divider, Modal, Row, Col } from 'antd'
+import { IdWellContext } from '@asb/context'
import { CompanyView } from '@components/views'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -15,7 +16,6 @@ import {
getOperations
} from '@utils/functions'
-import { IdWellContext } from '@pages/Well'
import { Tvd } from '@pages/WellOperations/Tvd'
import WellOperationsTable from '@pages/Cluster/WellOperationsTable'
import NewParamsTable from './NewParamsTable'
diff --git a/src/pages/Analytics/WellCompositeEditor/index.jsx b/src/pages/Analytics/WellCompositeEditor/index.jsx
index 8cecd33..9725994 100755
--- a/src/pages/Analytics/WellCompositeEditor/index.jsx
+++ b/src/pages/Analytics/WellCompositeEditor/index.jsx
@@ -2,14 +2,14 @@ import { useState, useEffect, memo, useContext } from 'react'
import { useParams } from 'react-router-dom'
import { Col, Layout, Row } from 'antd'
-import { arrayOrDefault } from '@utils'
+import { IdWellContext } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal'
import WellSelector from '@components/selectors/WellSelector'
import { invokeWebApiWrapperAsync } from '@components/factory'
import { PrivateMenu, PrivateSwitch } from '@components/Private'
+import { arrayOrDefault } from '@utils'
import { OperationStatService, WellCompositeService } from '@api'
-import { IdWellContext } from '@pages/Well'
import ClusterWells from '@pages/Cluster/ClusterWells'
import { WellCompositeSections } from './WellCompositeSections'
diff --git a/src/pages/Analytics/index.jsx b/src/pages/Analytics/index.jsx
index 1a38c6a..33834a4 100755
--- a/src/pages/Analytics/index.jsx
+++ b/src/pages/Analytics/index.jsx
@@ -2,11 +2,11 @@ import { memo, useContext, useMemo } from 'react'
import { useParams } from 'react-router-dom'
import { Layout } from 'antd'
+import { RootPathContext } from '@asb/context'
import { PrivateMenu, PrivateSwitch } from '@components/Private'
import Statistics from './Statistics'
import WellCompositeEditor from './WellCompositeEditor'
-import { RootPathContext } from '@pages/Main'
export const Analytics = memo(() => {
const { tab } = useParams()
diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx
index f919f2f..1c48058 100755
--- a/src/pages/Cluster/ClusterWells.jsx
+++ b/src/pages/Cluster/ClusterWells.jsx
@@ -11,6 +11,7 @@ import {
makeNumericColumnPlanFact,
Table,
makeNumericRender,
+ makeNumericColumn,
} from '@components/Table'
import { CompanyView } from '@components/views'
import LoaderPortal from '@components/LoaderPortal'
@@ -36,6 +37,7 @@ const DAY_IN_MS = 86_400_000
const ONLINE_DEADTIME = 600_000
const getDate = (str) => isRawDate(str) ? new Date(str).toLocaleString() : '-'
+const numericRender = makeNumericRender(1)
export const ClusterWells = memo(({ statsWells }) => {
const [selectedWellId, setSelectedWellId] = useState(0)
@@ -127,38 +129,23 @@ export const ClusterWells = memo(({ statsWells }) => {
makeColumn('начало', 'factStart', { sorter: makeDateSorter('factStart'), render: getDate }),
makeColumn('окончание', 'factEnd', { sorter: makeDateSorter('factEnd'), render: getDate }),
]),
- makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
- makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
- makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
- makeNumericColumnPlanFact('НПВ, сут', 'notProductiveTime', filtersMinMax, makeFilterMinMaxFunction, makeNumericRender(1)),
- {
- title: 'TVD',
- key: 'tvd',
- render: (value) => ,
- align: 'center'
- },
- {
- title: 'Операции',
- key: 'operations',
- render: (value) => ,
- align: 'center'
- },
- {
- title: 'Участники',
- key: 'companies',
- dataIndex: 'companies',
+ makeNumericColumnPlanFact('Продолжительность, сут', 'period', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+ makeNumericColumnPlanFact('МСП, м/ч', 'rateOfPenetration', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+ makeNumericColumnPlanFact('Рейсовая скорость, м/ч', 'routeSpeed', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+ makeNumericColumn('НПВ, ч', 'notProductiveTimeFact', filtersMinMax, makeFilterMinMaxFunction, numericRender),
+ makeColumn('TVD', 'tvd', { align: 'center', render: (_, value) => (
+