From b5826af10e1e2f684939e41065cdb8c0a28c0506 Mon Sep 17 00:00:00 2001 From: goodm2ice Date: Fri, 14 Jan 2022 20:03:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D1=8F=20Views=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B2=20vie?= =?UTF-8?q?ws?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ChangePassword.tsx | 2 +- src/components/{Views => views}/CompanyView.tsx | 0 src/components/{Views => views}/MarkView.tsx | 3 ++- src/components/{Views => views}/PermissionView.tsx | 1 + src/components/{Views => views}/RoleView.tsx | 0 src/components/{Views => views}/TelemetryView.tsx | 3 +++ src/components/{Views => views}/UserView.tsx | 3 +++ src/components/{Views => views}/index.ts | 0 src/pages/AdminPanel/UserController/index.jsx | 2 +- src/pages/AdminPanel/WellController/TelemetrySelect.jsx | 2 +- src/pages/AdminPanel/WellController/index.jsx | 2 +- src/pages/Cluster/ClusterWells.jsx | 2 +- src/pages/Documents/DocumentsTemplate.jsx | 2 +- src/pages/Documents/DrillingProgram.jsx | 4 +++- src/pages/TelemetryView/SetpointViewer.jsx | 2 +- src/pages/TelemetryView/Setpoints.jsx | 4 +++- .../WellCompositeEditor/WellCompositeSections.jsx | 2 +- 17 files changed, 23 insertions(+), 11 deletions(-) rename src/components/{Views => views}/CompanyView.tsx (100%) rename src/components/{Views => views}/MarkView.tsx (98%) rename src/components/{Views => views}/PermissionView.tsx (99%) rename src/components/{Views => views}/RoleView.tsx (100%) rename src/components/{Views => views}/TelemetryView.tsx (98%) rename src/components/{Views => views}/UserView.tsx (97%) rename src/components/{Views => views}/index.ts (100%) diff --git a/src/components/ChangePassword.tsx b/src/components/ChangePassword.tsx index d5b9334..2f7b556 100644 --- a/src/components/ChangePassword.tsx +++ b/src/components/ChangePassword.tsx @@ -7,7 +7,7 @@ import { passwordRules, createPasswordRules } from '../utils/validationRules' import LoaderPortal from './LoaderPortal' import { invokeWebApiWrapperAsync } from './factory' -import { UserView } from './Views' +import { UserView } from './views' import { getUserId, getUserLogin } from '../utils/storage' const formLayout: FormProps = { labelCol: { span: 11 }, wrapperCol: { span: 16 } } diff --git a/src/components/Views/CompanyView.tsx b/src/components/views/CompanyView.tsx similarity index 100% rename from src/components/Views/CompanyView.tsx rename to src/components/views/CompanyView.tsx diff --git a/src/components/Views/MarkView.tsx b/src/components/views/MarkView.tsx similarity index 98% rename from src/components/Views/MarkView.tsx rename to src/components/views/MarkView.tsx index b9d4a9f..ee0c7d1 100644 --- a/src/components/Views/MarkView.tsx +++ b/src/components/views/MarkView.tsx @@ -1,5 +1,6 @@ import { Tooltip, Tag, Typography, Popconfirm, Button } from 'antd' import { memo } from 'react' + import { FileMarkDto } from '../../services/api' import { UserView } from './UserView' @@ -27,6 +28,6 @@ export const MarkView = memo(({ mark, onDelete }) => { )} - + }) diff --git a/src/components/Views/PermissionView.tsx b/src/components/views/PermissionView.tsx similarity index 99% rename from src/components/Views/PermissionView.tsx rename to src/components/views/PermissionView.tsx index eb5797f..3f2f5b9 100644 --- a/src/components/Views/PermissionView.tsx +++ b/src/components/views/PermissionView.tsx @@ -1,5 +1,6 @@ import { Tooltip } from 'antd' import { memo } from 'react' + import { PermissionDto } from '../../services/api' import { Grid, GridItem } from '../Grid' diff --git a/src/components/Views/RoleView.tsx b/src/components/views/RoleView.tsx similarity index 100% rename from src/components/Views/RoleView.tsx rename to src/components/views/RoleView.tsx diff --git a/src/components/Views/TelemetryView.tsx b/src/components/views/TelemetryView.tsx similarity index 98% rename from src/components/Views/TelemetryView.tsx rename to src/components/views/TelemetryView.tsx index a353cb5..99f991d 100644 --- a/src/components/Views/TelemetryView.tsx +++ b/src/components/views/TelemetryView.tsx @@ -1,5 +1,6 @@ import { Fragment, memo } from 'react' import { Tooltip } from 'antd' + import { TelemetryDto, TelemetryInfoDto } from '../../services/api' import { Grid, GridItem } from '../Grid' @@ -43,3 +44,5 @@ export const TelemetryView = memo(({ telemetry }) => telemet ) : ( - )) + +export default TelemetryView diff --git a/src/components/Views/UserView.tsx b/src/components/views/UserView.tsx similarity index 97% rename from src/components/Views/UserView.tsx rename to src/components/views/UserView.tsx index 62548c5..d16ed06 100644 --- a/src/components/Views/UserView.tsx +++ b/src/components/views/UserView.tsx @@ -1,6 +1,7 @@ import { memo } from 'react' import { Tooltip } from 'antd' import { UserOutlined } from '@ant-design/icons' + import { UserDto } from '../../services/api' import { Grid, GridItem } from '../Grid' import { CompanyView } from './CompanyView' @@ -33,3 +34,5 @@ export const UserView = memo(({ user }) => user ? ( ) : ( - )) + +export default UserView diff --git a/src/components/Views/index.ts b/src/components/views/index.ts similarity index 100% rename from src/components/Views/index.ts rename to src/components/views/index.ts diff --git a/src/pages/AdminPanel/UserController/index.jsx b/src/pages/AdminPanel/UserController/index.jsx index a9e2051..cd649e0 100644 --- a/src/pages/AdminPanel/UserController/index.jsx +++ b/src/pages/AdminPanel/UserController/index.jsx @@ -2,7 +2,7 @@ import { Button, Tag } from 'antd' import { UserSwitchOutlined } from '@ant-design/icons' import { useEffect, useState } from 'react' -import { RoleView } from '../../../components/Views' +import { RoleView } from '../../../components/views' import LoaderPortal from '../../../components/LoaderPortal' import { ChangePassword } from '../../../components/ChangePassword' import { invokeWebApiWrapperAsync } from '../../../components/factory' diff --git a/src/pages/AdminPanel/WellController/TelemetrySelect.jsx b/src/pages/AdminPanel/WellController/TelemetrySelect.jsx index 6b16cb5..9c2ba63 100644 --- a/src/pages/AdminPanel/WellController/TelemetrySelect.jsx +++ b/src/pages/AdminPanel/WellController/TelemetrySelect.jsx @@ -1,7 +1,7 @@ import { memo } from 'react' import { Select } from 'antd' -import { getTelemetryLabel } from '../../../components/Views' +import { getTelemetryLabel } from '../../../components/views' export const TelemetrySelect = memo(({ telemetry, value, onChange }) => { const onSelectChange = (id) => { diff --git a/src/pages/AdminPanel/WellController/index.jsx b/src/pages/AdminPanel/WellController/index.jsx index 194ec1c..bbf8199 100644 --- a/src/pages/AdminPanel/WellController/index.jsx +++ b/src/pages/AdminPanel/WellController/index.jsx @@ -4,7 +4,7 @@ import { CopyOutlined } from '@ant-design/icons' import LoaderPortal from '../../../components/LoaderPortal' import { invokeWebApiWrapperAsync } from '../../../components/factory' -import { TelemetryView, CompanyView } from '../../../components/Views' +import { TelemetryView, CompanyView } from '../../../components/views' import { EditableTable, makeColumn, diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx index 56db96d..e3ba3d2 100644 --- a/src/pages/Cluster/ClusterWells.jsx +++ b/src/pages/Cluster/ClusterWells.jsx @@ -14,7 +14,7 @@ import { import { invokeWebApiWrapperAsync } from '../../components/factory' import LoaderPortal from '../../components/LoaderPortal' import PointerIcon from '../../components/icons/PointerIcon' -import { CompanyView } from '../../components/Views' +import { CompanyView } from '../../components/views' import { Tvd } from '../WellOperations/Tvd' import { diff --git a/src/pages/Documents/DocumentsTemplate.jsx b/src/pages/Documents/DocumentsTemplate.jsx index 0bbaa33..182a5cc 100644 --- a/src/pages/Documents/DocumentsTemplate.jsx +++ b/src/pages/Documents/DocumentsTemplate.jsx @@ -6,7 +6,7 @@ import { invokeWebApiWrapperAsync, downloadFile, formatBytes } from '../../compo import { EditableTable, makePaginationObject } from '../../components/Table' import { UploadForm } from '../../components/UploadForm' import LoaderPortal from '../../components/LoaderPortal' -import { CompanyView, UserView } from '../../components/Views' +import { CompanyView, UserView } from '../../components/views' const pageSize = 12 const { RangePicker } = DatePicker diff --git a/src/pages/Documents/DrillingProgram.jsx b/src/pages/Documents/DrillingProgram.jsx index 87fadcf..4c8d456 100644 --- a/src/pages/Documents/DrillingProgram.jsx +++ b/src/pages/Documents/DrillingProgram.jsx @@ -1,11 +1,13 @@ import { useEffect, useState } from 'react' import { FileExcelOutlined } from '@ant-design/icons' import { Popconfirm, Button, Tooltip, Typography } from 'antd' + import { Flex } from '../../components/Grid' -import { MarkView, UserView } from '../../components/Views' +import { MarkView, UserView } from '../../components/views' import LoaderPortal from '../../components/LoaderPortal' import { invokeWebApiWrapperAsync, download, formatBytes } from '../../components/factory' import { DrillingProgramService, WellService } from '../../services/api' + import DocumentsTemplate from './DocumentsTemplate' const idFileCategoryDrillingProgramItems = 13 diff --git a/src/pages/TelemetryView/SetpointViewer.jsx b/src/pages/TelemetryView/SetpointViewer.jsx index 34bdb19..a756ac4 100644 --- a/src/pages/TelemetryView/SetpointViewer.jsx +++ b/src/pages/TelemetryView/SetpointViewer.jsx @@ -2,7 +2,7 @@ import { memo } from 'react' import { Modal, Input } from 'antd' import { Table } from '../../components/Table' -import { UserView } from '../../components/Views' +import { UserView } from '../../components/views' import { Grid, GridItem } from '../../components/Grid' import { formatDate, periodToString } from '../../utils' diff --git a/src/pages/TelemetryView/Setpoints.jsx b/src/pages/TelemetryView/Setpoints.jsx index 651cf51..093acc9 100644 --- a/src/pages/TelemetryView/Setpoints.jsx +++ b/src/pages/TelemetryView/Setpoints.jsx @@ -1,12 +1,14 @@ 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 { 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 { SetpointSender } from './SetpointSender' import { SetpointViewer, getSetpointStatus } from './SetpointViewer' diff --git a/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx index ed70399..1f3f559 100644 --- a/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx +++ b/src/pages/WellOperations/WellCompositeEditor/WellCompositeSections.jsx @@ -7,7 +7,7 @@ import { makeTextColumn, makeNumericColumnPlanFact } from '../../../components/T import { DrillParamsService, WellCompositeService } from '../../../services/api' import LoaderPortal from '../../../components/LoaderPortal' import { invokeWebApiWrapperAsync } from '../../../components/factory' -import { CompanyView } from '../../../components/Views' +import { CompanyView } from '../../../components/views' import { calcAndUpdateStatsBySections,