директория Views переименована в views

This commit is contained in:
Александр Сироткин 2022-01-14 20:03:00 +05:00
parent 6e8de88ec7
commit b5826af10e
17 changed files with 23 additions and 11 deletions

View File

@ -7,7 +7,7 @@ import { passwordRules, createPasswordRules } from '../utils/validationRules'
import LoaderPortal from './LoaderPortal' import LoaderPortal from './LoaderPortal'
import { invokeWebApiWrapperAsync } from './factory' import { invokeWebApiWrapperAsync } from './factory'
import { UserView } from './Views' import { UserView } from './views'
import { getUserId, getUserLogin } from '../utils/storage' import { getUserId, getUserLogin } from '../utils/storage'
const formLayout: FormProps = { labelCol: { span: 11 }, wrapperCol: { span: 16 } } const formLayout: FormProps = { labelCol: { span: 11 }, wrapperCol: { span: 16 } }

View File

@ -1,5 +1,6 @@
import { Tooltip, Tag, Typography, Popconfirm, Button } from 'antd' import { Tooltip, Tag, Typography, Popconfirm, Button } from 'antd'
import { memo } from 'react' import { memo } from 'react'
import { FileMarkDto } from '../../services/api' import { FileMarkDto } from '../../services/api'
import { UserView } from './UserView' import { UserView } from './UserView'
@ -27,6 +28,6 @@ export const MarkView = memo<MarkViewProps>(({ mark, onDelete }) => {
<Button type='link'>x</Button> <Button type='link'>x</Button>
</Popconfirm> </Popconfirm>
)} )}
</Tag > </Tag>
</Tooltip> </Tooltip>
}) })

View File

@ -1,5 +1,6 @@
import { Tooltip } from 'antd' import { Tooltip } from 'antd'
import { memo } from 'react' import { memo } from 'react'
import { PermissionDto } from '../../services/api' import { PermissionDto } from '../../services/api'
import { Grid, GridItem } from '../Grid' import { Grid, GridItem } from '../Grid'

View File

@ -1,5 +1,6 @@
import { Fragment, memo } from 'react' import { Fragment, memo } from 'react'
import { Tooltip } from 'antd' import { Tooltip } from 'antd'
import { TelemetryDto, TelemetryInfoDto } from '../../services/api' import { TelemetryDto, TelemetryInfoDto } from '../../services/api'
import { Grid, GridItem } from '../Grid' import { Grid, GridItem } from '../Grid'
@ -43,3 +44,5 @@ export const TelemetryView = memo<TelemetryViewProps>(({ telemetry }) => telemet
) : ( ) : (
<Tooltip title={'нет данных'}>-</Tooltip> <Tooltip title={'нет данных'}>-</Tooltip>
)) ))
export default TelemetryView

View File

@ -1,6 +1,7 @@
import { memo } from 'react' import { memo } from 'react'
import { Tooltip } from 'antd' import { Tooltip } from 'antd'
import { UserOutlined } from '@ant-design/icons' import { UserOutlined } from '@ant-design/icons'
import { UserDto } from '../../services/api' import { UserDto } from '../../services/api'
import { Grid, GridItem } from '../Grid' import { Grid, GridItem } from '../Grid'
import { CompanyView } from './CompanyView' import { CompanyView } from './CompanyView'
@ -33,3 +34,5 @@ export const UserView = memo<UserViewProps>(({ user }) => user ? (
) : ( ) : (
<Tooltip title='нет пользователя'>-</Tooltip> <Tooltip title='нет пользователя'>-</Tooltip>
)) ))
export default UserView

View File

@ -2,7 +2,7 @@ import { Button, Tag } from 'antd'
import { UserSwitchOutlined } from '@ant-design/icons' import { UserSwitchOutlined } from '@ant-design/icons'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { RoleView } from '../../../components/Views' import { RoleView } from '../../../components/views'
import LoaderPortal from '../../../components/LoaderPortal' import LoaderPortal from '../../../components/LoaderPortal'
import { ChangePassword } from '../../../components/ChangePassword' import { ChangePassword } from '../../../components/ChangePassword'
import { invokeWebApiWrapperAsync } from '../../../components/factory' import { invokeWebApiWrapperAsync } from '../../../components/factory'

View File

@ -1,7 +1,7 @@
import { memo } from 'react' import { memo } from 'react'
import { Select } from 'antd' import { Select } from 'antd'
import { getTelemetryLabel } from '../../../components/Views' import { getTelemetryLabel } from '../../../components/views'
export const TelemetrySelect = memo(({ telemetry, value, onChange }) => { export const TelemetrySelect = memo(({ telemetry, value, onChange }) => {
const onSelectChange = (id) => { const onSelectChange = (id) => {

View File

@ -4,7 +4,7 @@ import { CopyOutlined } from '@ant-design/icons'
import LoaderPortal from '../../../components/LoaderPortal' import LoaderPortal from '../../../components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '../../../components/factory' import { invokeWebApiWrapperAsync } from '../../../components/factory'
import { TelemetryView, CompanyView } from '../../../components/Views' import { TelemetryView, CompanyView } from '../../../components/views'
import { import {
EditableTable, EditableTable,
makeColumn, makeColumn,

View File

@ -14,7 +14,7 @@ import {
import { invokeWebApiWrapperAsync } from '../../components/factory' import { invokeWebApiWrapperAsync } from '../../components/factory'
import LoaderPortal from '../../components/LoaderPortal' import LoaderPortal from '../../components/LoaderPortal'
import PointerIcon from '../../components/icons/PointerIcon' import PointerIcon from '../../components/icons/PointerIcon'
import { CompanyView } from '../../components/Views' import { CompanyView } from '../../components/views'
import { Tvd } from '../WellOperations/Tvd' import { Tvd } from '../WellOperations/Tvd'
import { import {

View File

@ -6,7 +6,7 @@ import { invokeWebApiWrapperAsync, downloadFile, formatBytes } from '../../compo
import { EditableTable, makePaginationObject } from '../../components/Table' import { EditableTable, makePaginationObject } from '../../components/Table'
import { UploadForm } from '../../components/UploadForm' import { UploadForm } from '../../components/UploadForm'
import LoaderPortal from '../../components/LoaderPortal' import LoaderPortal from '../../components/LoaderPortal'
import { CompanyView, UserView } from '../../components/Views' import { CompanyView, UserView } from '../../components/views'
const pageSize = 12 const pageSize = 12
const { RangePicker } = DatePicker const { RangePicker } = DatePicker

View File

@ -1,11 +1,13 @@
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { FileExcelOutlined } from '@ant-design/icons' import { FileExcelOutlined } from '@ant-design/icons'
import { Popconfirm, Button, Tooltip, Typography } from 'antd' import { Popconfirm, Button, Tooltip, Typography } from 'antd'
import { Flex } from '../../components/Grid' import { Flex } from '../../components/Grid'
import { MarkView, UserView } from '../../components/Views' import { MarkView, UserView } from '../../components/views'
import LoaderPortal from '../../components/LoaderPortal' import LoaderPortal from '../../components/LoaderPortal'
import { invokeWebApiWrapperAsync, download, formatBytes } from '../../components/factory' import { invokeWebApiWrapperAsync, download, formatBytes } from '../../components/factory'
import { DrillingProgramService, WellService } from '../../services/api' import { DrillingProgramService, WellService } from '../../services/api'
import DocumentsTemplate from './DocumentsTemplate' import DocumentsTemplate from './DocumentsTemplate'
const idFileCategoryDrillingProgramItems = 13 const idFileCategoryDrillingProgramItems = 13

View File

@ -2,7 +2,7 @@ import { memo } from 'react'
import { Modal, Input } from 'antd' import { Modal, Input } from 'antd'
import { Table } from '../../components/Table' import { Table } from '../../components/Table'
import { UserView } from '../../components/Views' import { UserView } from '../../components/views'
import { Grid, GridItem } from '../../components/Grid' import { Grid, GridItem } from '../../components/Grid'
import { formatDate, periodToString } from '../../utils' import { formatDate, periodToString } from '../../utils'

View File

@ -1,12 +1,14 @@
import moment from 'moment' import moment from 'moment'
import { Button, Modal } from 'antd' import { Button, Modal } from 'antd'
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import { Table } from '../../components/Table' import { Table } from '../../components/Table'
import { UserView } from '../../components/Views' import { UserView } from '../../components/views'
import LoaderPortal from '../../components/LoaderPortal' import LoaderPortal from '../../components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '../../components/factory' import { invokeWebApiWrapperAsync } from '../../components/factory'
import { makeStringCutter } from '../../utils/string' import { makeStringCutter } from '../../utils/string'
import { SetpointsService } from '../../services/api' import { SetpointsService } from '../../services/api'
import { SetpointSender } from './SetpointSender' import { SetpointSender } from './SetpointSender'
import { SetpointViewer, getSetpointStatus } from './SetpointViewer' import { SetpointViewer, getSetpointStatus } from './SetpointViewer'

View File

@ -7,7 +7,7 @@ import { makeTextColumn, makeNumericColumnPlanFact } from '../../../components/T
import { DrillParamsService, WellCompositeService } from '../../../services/api' import { DrillParamsService, WellCompositeService } from '../../../services/api'
import LoaderPortal from '../../../components/LoaderPortal' import LoaderPortal from '../../../components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '../../../components/factory' import { invokeWebApiWrapperAsync } from '../../../components/factory'
import { CompanyView } from '../../../components/Views' import { CompanyView } from '../../../components/views'
import { import {
calcAndUpdateStatsBySections, calcAndUpdateStatsBySections,