Скорректированно название HOC и удалены лишние экспорты

src/components/LayoutPortal.tsx

@@ -12,7 +12,7 @@ import {
 import { LayoutPropsContext } from '@asb/context'
 import { UserMenu, UserMenuProps } from '@components/UserMenu'
 import { WellTreeSelector, WellTreeSelectorProps } from '@components/selectors/WellTreeSelector'
-import { isURLAvailable, wrapPrivateComponent } from '@utils'
+import { isURLAvailable, withPermissions } from '@utils'
 
 import SuspenseFallback from './SuspenseFallback'
 
@@ -131,6 +131,6 @@ const _LayoutPortal = memo(() => {
     )
 })
 
-export const LayoutPortal = wrapPrivateComponent(_LayoutPortal, { requirements: ['Deposit.get'] })
+export const LayoutPortal = withPermissions(_LayoutPortal, ['Deposit.get'])
 
 export default LayoutPortal

src/components/Table/Columns/index.ts

@@ -2,29 +2,14 @@ import { ReactNode } from 'react'
 import { Rule } from 'antd/lib/form'
 import { ColumnProps } from 'antd/lib/table'
 
-export { makeDateColumn } from './date'
-export { makeTimeColumn } from './time'
-export {
-    RegExpIsFloat,
-    makeNumericRender,
-    makeNumericColumn,
-    makeNumericColumnOptions,
-    makeNumericColumnPlanFact,
-    makeNumericStartEnd,
-    makeNumericMinMax,
-} from './numeric'
-export { makeColumnsPlanFact } from './plan_fact'
-export { makeSelectColumn } from './select'
-export { makeTagColumn, makeTagInput } from './tag'
-export { makeFilterTextMatch, makeTextColumn } from './text'
-export {
-    timezoneOptions,
-    TimezoneSelect,
-    makeTimezoneColumn,
-    makeTimezoneRenderer
-} from './timezone'
-
-export type { TagInputProps } from './tag'
+export * from './date'
+export * from './time'
+export * from './numeric'
+export * from './plan_fact'
+export * from './select'
+export * from './tag'
+export * from './text'
+export * from './timezone'
 
 export type DataType<T = any> = Record<string, T>
 export type RenderMethod<T = any> = (value: T, dataset?: DataType<T>, index?: number) => ReactNode

src/components/Table/index.tsx

@@ -1,58 +1,24 @@
-export { makeDateSorter, makeNumericSorter, makeStringSorter, makeTimeSorter } from './sorters'
-export { EditableTable, makeTableAction } from './EditableTable'
-export { DatePickerWrapper } from './DatePickerWrapper'
-export { TimePickerWrapper } from './TimePickerWrapper'
-export { DateRangeWrapper } from './DateRangeWrapper'
-export { Table } from './Table'
-export {
-    RegExpIsFloat,
-    timezoneOptions,
-    TimezoneSelect,
-    makeDateColumn,
-    makeTimeColumn,
-    makeGroupColumn,
-    makeColumn,
-    makeColumnsPlanFact,
-    makeFilterTextMatch,
-    makeNumericRender,
-    makeNumericColumn,
-    makeNumericColumnOptions,
-    makeNumericColumnPlanFact,
-    makeNumericStartEnd,
-    makeNumericMinMax,
-    makeSelectColumn,
-    makeTagColumn,
-    makeTagInput,
-    makeTextColumn,
-    makeTimezoneColumn,
-    makeTimezoneRenderer,
-} from './Columns'
-
-export type {
-    DataType,
-    RenderMethod,
-    SorterMethod,
-    TagInputProps,
-    columnPropsOther,
-} from './Columns'
-export type { DateRangeWrapperProps } from './DateRangeWrapper'
-export type { DatePickerWrapperProps } from './DatePickerWrapper'
-export type { TimePickerWrapperProps } from './TimePickerWrapper'
-export type { BaseTableColumn, TableColumns, TableContainer } from './Table'
+export * from './sorters'
+export * from './EditableTable'
+export * from './DatePickerWrapper'
+export * from './TimePickerWrapper'
+export * from './DateRangeWrapper'
+export * from './Table'
+export * from './Columns'
 
 export const defaultPagination = {
     defaultPageSize: 14,
     showSizeChanger: true,
 }
 
-type PaginationContainer = {
+export type PaginationContainer<T> = {
     skip?: number
     take?: number
     count?: number
-    items?: any[] | null
+    items?: T[] | null
 }
 
-export const makePaginationObject = (сontainer: PaginationContainer, ...other: any) => ({
+export const makePaginationObject = <T, M extends object>(сontainer: PaginationContainer<T>, other: M) => ({
     ...other,
     pageSize: сontainer.take,
     total: сontainer.count ?? сontainer.items?.length ?? 0,

src/components/d3/index.ts

@@ -1,4 +1,2 @@
 export * from './D3Chart'
-export type { D3ChartProps } from './D3Chart'
-
 export * from './types'

src/components/icons/index.ts

@@ -1,6 +1,3 @@
-export type { PointerIconColors, PointerIconProps } from './PointerIcon'
-export type { WellIconColors, WellIconProps, WellIconState } from './WellIcon'
-
-export { PointerIcon } from './PointerIcon'
-export { WellIcon } from './WellIcon'
-export { Loader } from './Loader'
+export * from './PointerIcon'
+export * from './WellIcon'
+export * from './Loader'

src/components/views/index.ts

@@ -1,14 +1,7 @@
-export type { PermissionViewProps } from './PermissionView'
-export type { TelemetryViewProps } from './TelemetryView'
-export type { CompanyViewProps } from './CompanyView'
-export type { RoleViewProps } from './RoleView'
-export type { UserViewProps } from './UserView'
-export type { WirelineViewProps } from './WirelineView'
-
-export { PermissionView } from './PermissionView'
-export { TelemetryView, getTelemetryLabel } from './TelemetryView'
-export { CompanyView } from './CompanyView'
-export { RoleView } from './RoleView'
-export { UserView } from './UserView'
-export { WirelineView } from './WirelineView'
+export * from './PermissionView'
+export * from './TelemetryView'
+export * from './CompanyView'
+export * from './RoleView'
+export * from './UserView'
+export * from './WirelineView'
 export * from './WellView'

src/components/widgets/index.ts

@@ -1,5 +1,2 @@
-export { WidgetSettingsWindow } from './WidgetSettingsWindow'
-export { BaseWidget } from './BaseWidget'
-
-export type { WidgetSettingsWindowProps } from './WidgetSettingsWindow'
-export type { WidgetSettings, BaseWidgetProps } from './BaseWidget'
+export * from './WidgetSettingsWindow'
+export * from './BaseWidget'

src/pages/AdminPanel/ClusterController.jsx

@@ -11,7 +11,7 @@ import {
 } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { AdminClusterService, AdminDepositService } from '@api'
-import { arrayOrDefault, coordsFormat, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, coordsFormat, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 
 const ClusterController = memo(() => {
@@ -112,8 +112,4 @@ const ClusterController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(ClusterController, {
-    requirements: ['AdminDeposit.get', 'AdminCluster.get'],
-    title: 'Кусты',
-    route: 'cluster',
-})
+export default withPermissions(ClusterController, ['AdminDeposit.get', 'AdminCluster.get'])

src/pages/AdminPanel/CompanyController.jsx

@@ -10,7 +10,7 @@ import {
 } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { AdminCompanyService, AdminCompanyTypeService } from '@api'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 
 const CompanyController = memo(() => {
@@ -103,8 +103,4 @@ const CompanyController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(CompanyController, {
-    requirements: ['AdminCompany.get', 'AdminCompanyType.get'],
-    title: 'Компании',
-    route: 'company',
-})
+export default withPermissions(CompanyController, ['AdminCompany.get', 'AdminCompanyType.get'])

src/pages/AdminPanel/CompanyTypeController.jsx

@@ -3,7 +3,7 @@ import { Input } from 'antd'
 
 import { EditableTable, makeColumn, makeStringSorter, defaultPagination } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminCompanyTypeService } from '@api'
 
@@ -81,8 +81,4 @@ const CompanyTypeController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(CompanyTypeController, {
-    requirements: ['AdminCompanyType.get'],
-    title: 'Типы компаний',
-    route: 'company_type',
-})
+export default withPermissions(CompanyTypeController, ['AdminCompanyType.get'])

src/pages/AdminPanel/DepositController.jsx

@@ -3,7 +3,7 @@ import { Input } from 'antd'
 
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { EditableTable, makeColumn, defaultPagination, makeTimezoneColumn } from '@components/Table'
-import { arrayOrDefault, coordsFormat, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, coordsFormat, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminDepositService } from '@api'
 
@@ -81,8 +81,4 @@ const DepositController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(DepositController, {
-    requirements: ['AdminDeposit.get'],
-    title: 'Месторождения',
-    route: 'deposit',
-})
+export default withPermissions(DepositController, ['AdminDeposit.get'])

src/pages/AdminPanel/PermissionController.jsx

@@ -3,7 +3,7 @@ import { Input } from 'antd'
 
 import { EditableTable, makeColumn, makeStringSorter } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 import { AdminPermissionService } from '@api'
 
@@ -88,8 +88,4 @@ const PermissionController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(PermissionController, {
-    requirements: ['AdminPermission.get'],
-    title: 'Разрешения',
-    route: 'permission',
-})
+export default withPermissions(PermissionController, ['AdminPermission.get'])

src/pages/AdminPanel/RoleController.jsx

@@ -5,7 +5,7 @@ import { PermissionView, RoleView } from '@components/views'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { EditableTable, makeTagColumn, makeTextColumn } from '@components/Table'
 import { AdminPermissionService, AdminUserRoleService } from '@api'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { min1 } from '@utils/validationRules'
 
 const RoleController = memo(() => {
@@ -95,8 +95,4 @@ const RoleController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(RoleController, {
-    requirements: ['AdminPermission.get', 'AdminUserRole.get'],
-    title: 'Роли',
-    route: 'role',
-})
+export default withPermissions(RoleController, ['AdminPermission.get', 'AdminUserRole.get'])

src/pages/AdminPanel/Telemetry/TelemetryMerger.jsx

@@ -8,7 +8,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { lables } from '@components/views/TelemetryView'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import TelemetrySelect from '@components/selectors/TelemetrySelect'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { AdminTelemetryService } from '@api'
 
 const { Item } = Descriptions
@@ -134,9 +134,4 @@ const TelemetryMerger = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(TelemetryMerger, {
-    requirements: [],
-    title: 'Объединение',
-    route: 'merger',
-    key: 'merger',
-})
+export default withPermissions(TelemetryMerger)

src/pages/AdminPanel/Telemetry/TelemetryViewer.jsx

@@ -14,7 +14,7 @@ import {
 } from '@components/Table'
 import Poprompt from '@components/selectors/Poprompt'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { AdminTelemetryService } from '@api'
 
 const TelemetryController = memo(() => {
@@ -121,9 +121,4 @@ const TelemetryController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(TelemetryController, {
-    requirements: [],
-    title: 'Просмотр',
-    route: 'viewer',
-    key: 'viewer',
-})
+export default withPermissions(TelemetryController)

src/pages/AdminPanel/Telemetry/index.jsx

@@ -2,7 +2,7 @@ import { memo, useMemo } from 'react'
 import { Outlet } from 'react-router-dom'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 const Telemetry = memo(() => {
     const root = useRootPath()
@@ -15,9 +15,4 @@ const Telemetry = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Telemetry, {
-    requirements: ['AdminTelemetry.get'],
-    title: 'Телеметрия',
-    key: 'telemetry',
-    route: 'telemetry/*',
-})
+export default withPermissions(Telemetry, ['AdminTelemetry.get'])

src/pages/AdminPanel/UserController/index.jsx

@@ -17,7 +17,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { AdminCompanyService, AdminUserRoleService, AdminUserService } from '@api'
 import { createLoginRules, nameRules, phoneRules, emailRules } from '@utils/validationRules'
 import { makeTextOnFilter, makeTextFilters, makeArrayOnFilter } from '@utils/filters'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 
 import RoleTag from './RoleTag'
 
@@ -227,8 +227,4 @@ const UserController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(UserController, {
-    requirements: ['AdminUser.get', 'AdminCompany.get', 'AdminUserRole.get'],
-    title: 'Пользователи',
-    route: 'user',
-})
+export default withPermissions(UserController, ['AdminUser.get', 'AdminCompany.get', 'AdminUserRole.get'])

src/pages/AdminPanel/VisitLog.jsx

@@ -3,7 +3,7 @@ import { Input } from 'antd'
 
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { defaultPagination, makeColumn, makeDateSorter, makeStringSorter, Table } from '@components/Table'
-import { arrayOrDefault, formatDate, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, formatDate, withPermissions } from '@utils'
 import { RequestTrackerService } from '@api'
 
 const logRecordCount = 1000
@@ -65,8 +65,4 @@ const VisitLog = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(VisitLog, {
-    requirements: ['RequestTracker.get'],
-    title: 'Журнал посещений',
-    route: 'visit_log',
-})
+export default withPermissions(VisitLog, ['RequestTracker.get'])

src/pages/AdminPanel/WellController/index.jsx

@@ -21,7 +21,7 @@ import {
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { TelemetryView, CompanyView } from '@components/views'
 import TelemetrySelect from '@components/selectors/TelemetrySelect'
-import { arrayOrDefault, coordsFormat, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, coordsFormat, withPermissions } from '@utils'
 
 const wellTypes = [
     { value: 1, label: 'Наклонно-направленная' },
@@ -160,8 +160,4 @@ const WellController = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(WellController, {
-    requirements: ['AdminCluster.get', 'AdminCompany.get', 'AdminTelemetry.get', 'AdminWell.get'],
-    title: 'Скважины',
-    route: 'well',
-})
+export default withPermissions(WellController, ['AdminCluster.get', 'AdminCompany.get', 'AdminTelemetry.get', 'AdminWell.get'])

src/pages/AdminPanel/index.jsx

@@ -3,7 +3,7 @@ import { lazy, memo, useMemo } from 'react'
 
 import { RootPathContext, useLayoutProps, useRootPath } from '@asb/context'
 import { MenuBreadcrumbItems } from '@components/MenuBreadcrumb'
-import { NoAccessComponent, wrapPrivateComponent } from '@utils'
+import { NoAccessComponent, withPermissions } from '@utils'
 
 import { AdminNavigationMenu, menuItems } from './AdminNavigationMenu'
 
@@ -58,4 +58,4 @@ const AdminPanel = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(AdminPanel, { requirements: ['RequestTracker.get'] })
+export default withPermissions(AdminPanel, ['RequestTracker.get'])

src/pages/Cluster/ClusterWells.jsx

@@ -22,7 +22,7 @@ import {
   calcAndUpdateStatsBySections,
   isRawDate,
   makeFilterMinMaxFunction,
-  wrapPrivateComponent
+  withPermissions
 } from '@utils'
 
 const Tvd = lazy(() => import('@pages/Well/WellOperations/Tvd'))
@@ -219,8 +219,4 @@ const ClusterWells = memo(({ statsWells }) => {
   )
 })
 
-export default wrapPrivateComponent(ClusterWells, {
-  requirements: [],
-  title: 'Статистика по скважинам',
-  route: 'wells',
-})
+export default withPermissions(ClusterWells)

src/pages/Cluster/index.jsx

@@ -4,7 +4,7 @@ import { useParams } from 'react-router-dom'
 import { useLayoutProps } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { OperationStatService } from '@api'
 
 import ClusterWells from './ClusterWells'
@@ -40,9 +40,4 @@ const Cluster = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Cluster, {
-    requirements: ['OperationStat.get'],
-    title: 'Анализ скважин куста',
-    route: 'cluster/:idCluster/*',
-    key: 'cluster',
-})
+export default withPermissions(Cluster, ['OperationStat.get'])

src/pages/Deposit.jsx

@@ -7,7 +7,7 @@ import { useLayoutProps } from '@asb/context'
 import { PointerIcon } from '@components/icons'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, limitValue, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, limitValue, withPermissions } from '@utils'
 import { DepositService } from '@api'
 
 import '@styles/index.css'
@@ -113,9 +113,4 @@ const Deposit = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(Deposit, {
-  requirements: ['Cluster.get'],
-  title: 'Месторождение',
-  route: 'deposit/*',
-  key: 'deposit',
-})
+export default withPermissions(Deposit, ['Cluster.get'])

src/pages/FileDownload.jsx

@@ -4,7 +4,7 @@ import { InfoCircleFilled, CloseCircleOutlined } from '@ant-design/icons'
 import { Button, Result, Typography } from 'antd'
 
 import { downloadFile, invokeWebApiWrapperAsync } from '@components/factory'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 import { FileService, WellService } from '@api'
 
 const { Paragraph, Text } = Typography
@@ -99,7 +99,4 @@ const FileDownload = memo(function FileDownload() {
 
 FileDownload.displayName = 'FileDownloadMemo'
 
-export default wrapPrivateComponent(FileDownload, {
-    requirements: ['File.get'],
-    route: 'file_download/:idWell/:idFile/*',
-})
+export default withPermissions(FileDownload, ['File.get'])

src/pages/Well/Analytics/Statistics.jsx

@@ -7,7 +7,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
 import { WellSelector } from '@components/selectors/WellSelector'
 import { makeGroupColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table'
 import { OperationStatService, WellOperationService } from '@api'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 
 import '@styles/index.css'
 import '@styles/statistics.less'
@@ -242,8 +242,4 @@ const Statistics = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Statistics, {
-    requirements: [],
-    title: 'Оценка по ЦБ',
-    route: 'statistics',
-})
+export default withPermissions(Statistics)

src/pages/Well/Analytics/WellCompositeEditor/WellCompositeSections.jsx

@@ -10,7 +10,7 @@ import { makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@c
 import { WellCompositeService } from '@api'
 import {
   hasPermission,
-  wrapPrivateComponent,
+  withPermissions,
   calcAndUpdateStatsBySections,
   makeFilterMinMaxFunction,
   getOperations
@@ -267,8 +267,4 @@ const WellCompositeSections = memo(({ statsWells, selectedSections }) => {
   )
 })
 
-export default wrapPrivateComponent(WellCompositeSections, {
-  requirements: ['WellComposite.get'],
-  title: 'Статистика по секциям',
-  route: 'sections',
-})
+export default withPermissions(WellCompositeSections, ['WellComposite.get'])

src/pages/Well/Analytics/WellCompositeEditor/index.jsx

@@ -7,7 +7,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import SuspenseFallback from '@components/SuspenseFallback'
 import WellSelector from '@components/selectors/WellSelector'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, NoAccessComponent, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, NoAccessComponent, withPermissions } from '@utils'
 import { OperationStatService, WellCompositeService } from '@api'
 
 import WellCompositeSections from './WellCompositeSections'
@@ -76,4 +76,4 @@ const WellCompositeEditor = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(WellCompositeEditor, { requirements: ['OperationStat.get', 'WellComposite.get'] })
+export default withPermissions(WellCompositeEditor, ['OperationStat.get', 'WellComposite.get'])

src/pages/Well/Analytics/index.jsx

@@ -2,7 +2,7 @@ import { memo, useMemo } from 'react'
 import { Outlet } from 'react-router-dom'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 const Analytics = memo(() => {
     const root = useRootPath()
@@ -15,9 +15,4 @@ const Analytics = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Analytics, {
-    requirements: [],
-    title: 'Аналитика',
-    route: 'analytics/*',
-    key: 'analytics',
-})
+export default withPermissions(Analytics)

src/pages/Well/Documents/index.jsx

@@ -2,7 +2,7 @@ import { Navigate, Route, Routes } from 'react-router-dom'
 import { memo, useMemo } from 'react'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent, NoAccessComponent, hasPermission } from '@utils'
+import { withPermissions, NoAccessComponent, hasPermission } from '@utils'
 
 import DocumentsTemplate from './DocumentsTemplate'
 
@@ -48,9 +48,4 @@ const MenuDocuments = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(MenuDocuments, {
-  requirements: [ 'Deposit.get', 'File.get' ],
-  title: 'Документы',
-  route: 'document/*',
-  key: 'document',
-})
+export default withPermissions(MenuDocuments, [ 'Deposit.get', 'File.get' ])

src/pages/Well/DrillingProgram/index.jsx

@@ -13,7 +13,7 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
-import { arrayOrDefault, formatDate, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, formatDate, withPermissions } from '@utils'
 import { DrillingProgramService } from '@api'
 
 import CategoryAdder from './CategoryAdder'
@@ -185,8 +185,4 @@ const DrillingProgram = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(DrillingProgram, {
-  requirements: [ 'DrillingProgram.get' ],
-  title: 'Программа бурения',
-  route: 'drillingProgram',
-})
+export default withPermissions(DrillingProgram, [ 'DrillingProgram.get' ])

src/pages/Well/Measure/index.jsx

@@ -5,7 +5,7 @@ import { Button } from 'antd'
 import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 import { MeasureService } from '@api'
 
 import { MeasureTable } from './MeasureTable'
@@ -93,8 +93,4 @@ const Measure = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(Measure, {
-  requirements: [ 'Measure.get' ],
-  title: 'Измерения',
-  route: 'measure',
-})
+export default withPermissions(Measure, [ 'Measure.get' ])

src/pages/Well/Reports/DailyReport/index.jsx

@@ -7,7 +7,7 @@ import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { DateRangeWrapper, Table, makeDateColumn, makeColumn } from '@components/Table'
 import { download, invokeWebApiWrapperAsync, notify } from '@components/factory'
-import { arrayOrDefault, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, withPermissions } from '@utils'
 import { DailyReportService } from '@api'
 
 import ReportEditor from './ReportEditor'
@@ -123,10 +123,4 @@ const DailyReport = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(DailyReport, {
-    requirements: [
-        // 'DailyReport.get',
-    ],
-    title: 'Суточный рапорт',
-    route: 'daily_report',
-})
+export default withPermissions(DailyReport) //, ['DailyReport.get'])

src/pages/Well/Reports/DiagramReport/index.jsx

@@ -7,7 +7,7 @@ import { useWell } from '@asb/context'
 import { DateRangeWrapper } from 'components/Table'
 import { LoaderPortal } from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { formatDate, wrapPrivateComponent } from '@utils'
+import { formatDate, withPermissions } from '@utils'
 import { Subscribe } from '@services/signalr'
 import { ReportService } from '@api'
 
@@ -175,8 +175,4 @@ const DiagramReport = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(DiagramReport, {
-  requirements: [ 'Report.get' ],
-  title: 'Диаграмма',
-  route: 'diagram_report',
-})
+export default withPermissions(DiagramReport, [ 'Report.get' ])

src/pages/Well/Reports/index.jsx

@@ -2,7 +2,7 @@ import { Outlet } from 'react-router-dom'
 import { memo, useMemo } from 'react'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 const Reports = memo(() => {
     const root = useRootPath()
@@ -15,9 +15,4 @@ const Reports = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Reports, {
-    requirements: [],
-    title: 'Рапорта',
-    route: 'reports/*',
-    key: 'reports',
-})
+export default withPermissions(Reports)

src/pages/Well/Telemetry/Archive/index.jsx

@@ -11,7 +11,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { DatePickerWrapper, makeDateSorter } from '@components/Table'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
-import { formatDate, range, wrapPrivateComponent } from '@utils'
+import { formatDate, range, withPermissions } from '@utils'
 import { TelemetryDataSaubService } from '@api'
 
 import { makeChartGroups, normalizeData, yAxis } from '../TelemetryView'
@@ -265,8 +265,4 @@ const Archive = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Archive, {
-    requirements: ['TelemetryDataSaub.get'],
-    title: 'Архив',
-    route: 'archive',
-})
+export default withPermissions(Archive, ['TelemetryDataSaub.get'])

src/pages/Well/Telemetry/DashboardNNB/index.jsx

@@ -7,7 +7,7 @@ import { useWell, useRootPath } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { BaseWidget, WidgetSettingsWindow } from '@components/widgets'
-import { arrayOrDefault, wrapPrivateComponent, getJSON, setJSON, getTabname } from '@utils'
+import { arrayOrDefault, withPermissions, getJSON, setJSON, getTabname } from '@utils'
 import Subscribe from '@services/signalr'
 import {
     WitsInfoService,
@@ -260,8 +260,7 @@ const DashboardNNB = memo(({ enableEditing = false }) => {
     )
 })
 
-export default wrapPrivateComponent(DashboardNNB, {
-    requirements: [
+export default withPermissions(DashboardNNB, [
     // 'WitsInfo',
     // 'WitsRecord1',
     // 'WitsRecord7',
@@ -269,8 +268,4 @@ export default wrapPrivateComponent(DashboardNNB, {
     // 'WitsRecord50',
     // 'WitsRecord60',
     // 'WitsRecord61',
-    ],
-    title: 'ННБ',
-    route: 'dashboard_nnb/*',
-    key: 'dashboard_nnb',
-})
+])

src/pages/Well/Telemetry/Messages.jsx

@@ -8,7 +8,7 @@ import { useWell } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeColumn, makeDateColumn, makeNumericColumn, makeNumericSorter, makeTextColumn, Table } from '@components/Table'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 import { MessageService } from '@api'
 
 import '@styles/filter.less'
@@ -147,8 +147,4 @@ const Messages = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(Messages, {
-  requirements: ['Message.get'],
-  title: 'Сообщения',
-  route: 'messages',
-})
+export default withPermissions(Messages, ['Message.get'])

src/pages/Well/Telemetry/OperationTime/index.jsx

@@ -7,7 +7,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import D3HorizontalPercentChart from '@components/d3/D3HorizontalPercentChart'
 import { DateRangeWrapper, makeColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table'
-import { arrayOrDefault, range, wrapPrivateComponent } from '@utils'
+import { arrayOrDefault, range, withPermissions } from '@utils'
 import { SubsystemOperationTimeService } from '@api'
 
 import '@styles/filter.less'
@@ -121,9 +121,4 @@ export const OperationTime = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(OperationTime, {
-    requirements: [], // SubsystemOperationTime.get
-    title: 'Наработка',
-    route: 'operation_time',
-    key: 'operation_time',
-})
+export default withPermissions(OperationTime) //, ['SubsystemOperationTime.get'])

src/pages/Well/Telemetry/Operations/index.jsx

@@ -7,7 +7,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { DateRangeWrapper } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { unique } from '@utils/filters'
-import { getPermissions, arrayOrDefault, range, wrapPrivateComponent, pretify } from '@utils'
+import { getPermissions, arrayOrDefault, range, withPermissions, pretify } from '@utils'
 import { DetectedOperationService, DrillerService, TelemetryDataSaubService } from '@api'
 
 import DrillerList from './DrillerList'
@@ -161,4 +161,4 @@ const Operations = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Operations, { requirements: ['DetectedOperation.get', 'TelemetryDataSaub.get'] })
+export default withPermissions(Operations, ['DetectedOperation.get', 'TelemetryDataSaub.get'])

src/pages/Well/Telemetry/TelemetryView/index.jsx

@@ -9,7 +9,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { Grid, GridItem } from '@components/Grid'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { PeriodPicker, defaultPeriod } from '@components/selectors/PeriodPicker'
-import { formatDate, hasPermission, wrapPrivateComponent } from '@utils'
+import { formatDate, hasPermission, withPermissions } from '@utils'
 import { Subscribe } from '@services/signalr'
 import {
   DrillFlowChartService,
@@ -312,14 +312,10 @@ const TelemetryView = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(TelemetryView, {
-  requirements: [
+export default withPermissions(TelemetryView, [
   'DrillFlowChart.get',
   'OperationStat.get',
   'TelemetryDataSaub.get',
   'TelemetryDataSpin.get',
   'Well.get',
-  ],
-  title: 'Мониторинг',
-  route: 'telemetry',
-})
+])

src/pages/Well/Telemetry/index.jsx

@@ -1,9 +1,8 @@
-import { FundViewOutlined } from '@ant-design/icons'
 import { Outlet } from 'react-router-dom'
 import { memo, useMemo } from 'react'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 import '@styles/index.css'
 
@@ -18,10 +17,4 @@ const Telemetry = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(Telemetry, {
-  requirements: [],
-  icon: <FundViewOutlined />,
-  title: 'Телеметрия',
-  route: 'telemetry/*',
-  key: 'telemetry',
-})
+export default withPermissions(Telemetry)

src/pages/Well/WellCase/index.jsx

@@ -9,7 +9,7 @@ import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { makeColumn, makeDateColumn, makeTextColumn, Table } from '@components/Table'
 import { WellFinalDocumentsService } from '@api'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 import WellCaseEditor from './WellCaseEditor'
 import { HistoryTable } from './HistoryTable'
@@ -102,9 +102,4 @@ const WellCase = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(WellCase, {
-    title: 'Дело скважины',
-    route: 'well_case',
-    requirements: [],
-    // requirements: ['WellFinalDocuments.get'],
-})
+export default withPermissions(WellCase) //, ['WellFinalDocuments.get'])

src/pages/Well/WellOperations/OperationEditor/Fact.jsx

@@ -1,14 +1,10 @@
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 import WellOperationsEditor from './WellOperationsEditor'
 
-export const WellOperationsEditorFact = wrapPrivateComponent(
+export const WellOperationsEditorFact = withPermissions(
     () => <WellOperationsEditor idType={1} tableName={'well_operations_fact'}/>,
-    {
-        requirements: [ 'WellOperation.get' ],
-        title: 'Факт',
-        route: 'fact',
-    }
+    [ 'WellOperation.get' ],
 )
 
 export default WellOperationsEditorFact

src/pages/Well/WellOperations/OperationEditor/Plan.jsx

@@ -1,14 +1,10 @@
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 import WellOperationsEditor from './WellOperationsEditor'
 
-export const WellOperationsEditorPlan = wrapPrivateComponent(
+export const WellOperationsEditorPlan = withPermissions(
     () => <WellOperationsEditor idType={0} tableName={'well_operations_plan'}/>,
-    {
-        requirements: [ 'WellOperation.get' ],
-        title: 'План',
-        route: 'plan',
-    }
+    [ 'WellOperation.get' ],
 )
 
 export default WellOperationsEditorPlan

src/pages/Well/WellOperations/Tvd/index.jsx

@@ -8,7 +8,7 @@ import { useTopRightBlock, useWell } from '@asb/context'
 import { D3Chart } from '@components/d3'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { formatDate, fractionalSum, wrapPrivateComponent, getOperations, pretify } from '@utils'
+import { formatDate, fractionalSum, withPermissions, getOperations, pretify } from '@utils'
 
 import TLPie from './TLPie'
 import TLChart from './TLChart'
@@ -294,8 +294,4 @@ const Tvd = memo(({ well: givenWell, title, ...other }) => {
     )
 })
 
-export default wrapPrivateComponent(Tvd, {
-    requirements: ['OperationStat.get', 'DetectedOperation.get'],
-    title: 'TVD',
-    route: 'tvd',
-})
+export default withPermissions(Tvd, ['OperationStat.get', 'DetectedOperation.get'])

src/pages/Well/WellOperations/index.jsx

@@ -2,14 +2,7 @@ import { Outlet } from 'react-router-dom'
 import { memo, useMemo } from 'react'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { wrapPrivateComponent } from '@utils'
-
-const properties = {
-  requirements: [],
-  title: 'Операции по скважине',
-  route: 'operations/*',
-  key: 'operations',
-}
+import { withPermissions } from '@utils'
 
 const WellOperations = memo(() => {
   const root = useRootPath()
@@ -22,4 +15,4 @@ const WellOperations = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(WellOperations, properties)
+export default withPermissions(WellOperations)

src/pages/Well/index.jsx

@@ -4,7 +4,7 @@ import { Navigate, Route, Routes, useLocation, useParams } from 'react-router-do
 import { WellContext, RootPathContext, useRootPath, useLayoutProps, TopRightBlockContext } from '@asb/context'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { MenuBreadcrumbItems } from '@components/MenuBreadcrumb'
-import { NoAccessComponent, wrapPrivateComponent } from '@utils'
+import { NoAccessComponent, withPermissions } from '@utils'
 import { WellService } from '@api'
 
 import { NavigationMenu, menuItems } from './NavigationMenu'
@@ -138,9 +138,4 @@ const Well = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Well, {
-    requirements: [],
-    title: 'Скважина',
-    route: 'well/:idWell/*',
-    key: 'well',
-})
+export default withPermissions(Well)

src/pages/public/Login.jsx

@@ -6,7 +6,7 @@ import { Card, Form, Input, Button } from 'antd'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { loginRules, passwordRules } from '@utils/validationRules'
-import { setUser, wrapPrivateComponent } from '@utils'
+import { setUser, withPermissions } from '@utils'
 import { AuthService } from '@api'
 
 import '@styles/index.css'
@@ -59,8 +59,4 @@ const Login = memo(() => {
   )
 })
 
-export default wrapPrivateComponent(Login, {
-  requirements: [],
-  title: 'Вход в систему',
-  route: 'login',
-})
+export default withPermissions(Login)

src/pages/public/Register.jsx

@@ -20,7 +20,7 @@ import {
     passwordRules,
     phoneRules
 } from '@utils/validationRules'
-import { wrapPrivateComponent } from '@utils'
+import { withPermissions } from '@utils'
 
 import Logo from '@images/Logo'
 
@@ -92,8 +92,4 @@ export const Register = memo(() => {
     )
 })
 
-export default wrapPrivateComponent(Register, {
-    requirements: [],
-    title: 'Регистрация',
-    route: 'register',
-})
+export default withPermissions(Register)

src/utils/functions/index.ts

@@ -1,29 +1,12 @@
 export * from './arrayOrDefault'
-
 export * from './datetime'
-export type { RawDate, TimezoneId, timeInS } from './datetime'
-
 export * from './chart'
-
 export * from './min_max_filter'
-export type { KeyType } from './min_max_filter'
-
 export * from './objects'
-
 export * from './numbers'
-
 export * from './permissions'
-export type { Role, Permission, ServiceName, ServiceRequestType, PermissionRequest, PermissionRecord, PrivateProps } from './permissions'
-
 export * from './saubOperations'
-export type { SaubData } from './saubOperations'
-
 export * from './storage'
-export type { StorageNames, DataDashboardNNB } from './storage'
-
 export * from './string'
-
 export * from './svg'
-
 export * from './table_settings'
-export type { TableColumnSettings, TableSettings, TableSettingsStore } from './table_settings'

src/utils/functions/permissions.tsx

@@ -87,17 +87,7 @@ export const publicPages: Readonly<string[]> = [
     '/register',
 ]
 
-export type PrivateProps = {
-    key?: string
-    icon?: ReactNode
-    route?: string
-    title?: ReactNode
-    requirements?: string[]
-}
-
-export type PrivateComponent<P extends object> = NamedExoticComponent<P> & PrivateProps & {
-    getKey: () => string
-}
+export type PrivateComponent<P extends object> = NamedExoticComponent<P>
 
 export const NoAccessComponent = memo(() => getUser().login ? (
     <AccessDenied /> // <Navigate to={'/access_denied'} replace />
@@ -105,18 +95,13 @@ export const NoAccessComponent = memo(() => getUser().login ? (
     <Navigate to={'/login'} replace />
 ))
 
-export const wrapPrivateComponent = <P extends object>(
+export const withPermissions = <P extends object>(
     Component: NamedExoticComponent<P> | ((props: P) => ReactElement),
-    properties: PrivateProps = {},
+    requirements: Permission[] = [],
     elseNode: JSX.Element = <NoAccessComponent />
-): PrivateComponent<P> => Object.assign(
-    memo<P>((props) => hasPermission(properties.requirements) ? <Component {...props} /> : elseNode),
-    {
-        getKey() { return this.key ?? this.route ?? '' },
-        requirements: [],
-        ...properties,
-    }
-)
+): PrivateComponent<P> => Object.assign(memo<P>(function PrivateWrapper(props) {
+    return hasPermission(requirements) ? <Component {...props} /> : elseNode
+}))
 
 export const getTabname = () => {
     const params = useParams()

src/utils/hooks/index.ts

@@ -1,8 +1,4 @@
 export * from './cachedFetch'
-
 export * from './functionalValue'
-export type { FunctionalValue } from './functionalValue'
-
 export * from './usePartialProps'
-
 export * from './useUserSettings'