From 0948c2a6024c6347d4d3a1467d6ec9d0003453d7 Mon Sep 17 00:00:00 2001 From: goodmice Date: Tue, 25 Oct 2022 18:51:39 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D1=82=D0=B8=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PrivateWellMenu.tsx | 4 ++-- src/pages/AdminPanel/AdminNavigationMenu.jsx | 4 ++-- src/pages/Well/NavigationMenu.jsx | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/PrivateWellMenu.tsx b/src/components/PrivateWellMenu.tsx index bcd2c0f..78e6d6c 100644 --- a/src/components/PrivateWellMenu.tsx +++ b/src/components/PrivateWellMenu.tsx @@ -6,7 +6,7 @@ import { Menu, MenuProps } from 'antd' import { hasPermission, Permission } from '@utils' -type PrivateWellMenuItem = { +export type PrivateWellMenuItem = { title: string route: string permissions: Permission | Permission[] @@ -69,7 +69,7 @@ export const makeItem = ( visible, }) -export type PrivateWellMenuProps = MenuProps & { +export type PrivateWellMenuProps = Omit & { idWell?: number items: PrivateWellMenuItem[] rootPath?: string diff --git a/src/pages/AdminPanel/AdminNavigationMenu.jsx b/src/pages/AdminPanel/AdminNavigationMenu.jsx index 1925703..0474af2 100644 --- a/src/pages/AdminPanel/AdminNavigationMenu.jsx +++ b/src/pages/AdminPanel/AdminNavigationMenu.jsx @@ -13,9 +13,9 @@ import { } from '@ant-design/icons' import { makeItem, PrivateWellMenu } from '@components/PrivateWellMenu' -import { isDev } from '@asb/utils' +import { isDev } from '@utils' -const menuItems = [ +export const menuItems = [ makeItem('Месторождения', 'deposit', [], ), makeItem('Кусты', 'cluster', [], ), makeItem('Скважины', 'well', [], ), diff --git a/src/pages/Well/NavigationMenu.jsx b/src/pages/Well/NavigationMenu.jsx index 1bc2ea4..e6b9181 100644 --- a/src/pages/Well/NavigationMenu.jsx +++ b/src/pages/Well/NavigationMenu.jsx @@ -16,9 +16,7 @@ import { import { makeItem, PrivateWellMenu } from '@components/PrivateWellMenu' - - -const menuItems = [ +export const menuItems = [ makeItem('Телеметрия', 'telemetry', [], , [ makeItem('Мониторинг', 'telemetry', [], ), makeItem('Сообщения', 'messages', [], ),