From 6d46c8cb82a37574a3ae1e00ad596d81f309f20b Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Wed, 28 Jul 2021 14:27:14 +0500
Subject: [PATCH] =?UTF-8?q?CF2-39:=20=D0=92=20=D0=BD=D0=BE=D0=B2=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B0=D0=B1=D1=81=D0=BE=D0=BB=D1=8E=D1=82=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=BF=D1=83=D1=82=D1=8F=D1=85=20=D0=BC=D0=B0=D1=80?=
 =?UTF-8?q?=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D1=85=20=D0=BE=D0=B1=D1=89=D0=B0=D1=8F=20=D1=87=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=83=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuDocuments.jsx | 18 +++++++++--------
 src/pages/Well.jsx               | 33 ++++++++++++++++----------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/components/MenuDocuments.jsx b/src/components/MenuDocuments.jsx
index 3c585f1..9c0d825 100644
--- a/src/components/MenuDocuments.jsx
+++ b/src/components/MenuDocuments.jsx
@@ -11,6 +11,8 @@ export default function MenuDocuments() {
   let { id } = useParams()
   let currentPath = useLocation().pathname
 
+  const rootPath = `/well/${id}`
+
   const [selectedElement, setSelectedElement] = useState('fluidService')
 
   useEffect(() => {
@@ -27,28 +29,28 @@ export default function MenuDocuments() {
       selectedKeys={[selectedElement]}
     >
       <Menu.Item key="fluidService" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/fluidService`}}>Растворный сервис</Link>
+        <Link to={{pathname: `${rootPath}/documents/fluidService`}}>Растворный сервис</Link>
       </Menu.Item>
       <Menu.Item key="cementing" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/cementing`}}>Цементирование</Link>
+        <Link to={{pathname: `${rootPath}/documents/cementing`}}>Цементирование</Link>
       </Menu.Item>
       <Menu.Item key="nnb" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/nnb`}}>ННБ</Link>
+        <Link to={{pathname: `${rootPath}/documents/nnb`}}>ННБ</Link>
       </Menu.Item>
       <Menu.Item key="gti" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/gti`}}>ГТИ</Link>
+        <Link to={{pathname: `${rootPath}/documents/gti`}}>ГТИ</Link>
       </Menu.Item>
       <Menu.Item key="documentsForWell" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/documentsForWell`}}>Документы по скважине</Link>
+        <Link to={{pathname: `${rootPath}/documents/documentsForWell`}}>Документы по скважине</Link>
       </Menu.Item>
       <Menu.Item key="supervisor" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/supervisor`}}>Супервайзер</Link>
+        <Link to={{pathname: `${rootPath}/documents/supervisor`}}>Супервайзер</Link>
       </Menu.Item>
       <Menu.Item key="master" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/master`}}>Мастер</Link>
+        <Link to={{pathname: `${rootPath}/documents/master`}}>Мастер</Link>
       </Menu.Item>
       <Menu.Item key="lastData" icon={<FolderOutlined/>}>
-        <Link to={{pathname: `/well/${id}/documents/lastData`}}>Последние данные</Link>
+        <Link to={{pathname: `${rootPath}/documents/lastData`}}>Последние данные</Link>
       </Menu.Item>
     </Menu>
 
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 79cb2f4..8e8ff19 100644
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -14,6 +14,7 @@ const { Content } = Layout
 
 export default function Well() {
   let { id } = useParams()
+  const rootPath = `/well/${id}`
 
   const {SubMenu} = Menu
 
@@ -25,25 +26,25 @@ export default function Well() {
         className="well_menu"
       >
         <Menu.Item key="1" icon={<FundViewOutlined/>}>
-          <Link to={{pathname: `/well/${id}/telemetry`}}>Мониторинг</Link>
+          <Link to={{pathname: `${rootPath}/telemetry`}}>Мониторинг</Link>
         </Menu.Item>
         <Menu.Item key="2" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/message`}}>Сообщения</Link>
+          <Link to={{pathname: `${rootPath}/message`}}>Сообщения</Link>
         </Menu.Item>
         <Menu.Item key="3" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/report`}}>Рапорт</Link>
+          <Link to={{pathname: `${rootPath}/report`}}>Рапорт</Link>
         </Menu.Item>
         <Menu.Item key="4" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/analysis`}}>Анализ</Link>
+          <Link to={{pathname: `${rootPath}/analysis`}}>Анализ</Link>
         </Menu.Item>
         <Menu.Item key="5" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/wellAnalysis`}}>Операции по скважине</Link>
+          <Link to={{pathname: `${rootPath}/wellAnalysis`}}>Операции по скважине</Link>
         </Menu.Item>
         <Menu.Item key="6" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/file`}}>Файлы</Link>
+          <Link to={{pathname: `${rootPath}/file`}}>Файлы</Link>
         </Menu.Item>
         <Menu.Item key="7" icon={<FolderOutlined/>}>
-          <Link to={{pathname: `/well/${id}/archive`}}>Архив</Link>
+          <Link to={{pathname: `${rootPath}/archive`}}>Архив</Link>
         </Menu.Item>
         <SubMenu
             key="documentsSub"
@@ -52,28 +53,28 @@ export default function Well() {
             selectable={true}
           >
             <Menu.Item key="documentsSub1" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/fluidService`}}>Растворный сервис</Link>
+              <Link to={{pathname: `${rootPath}/documents/fluidService`}}>Растворный сервис</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.1" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/cementing`}}>Цементирование</Link>
+              <Link to={{pathname: `${rootPath}/documents/cementing`}}>Цементирование</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.2" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/nnb`}}>ННБ</Link>
+              <Link to={{pathname: `${rootPath}/documents/nnb`}}>ННБ</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.3" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/gti`}}>ГТИ</Link>
+              <Link to={{pathname: `${rootPath}/documents/gti`}}>ГТИ</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.4" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/documentsForWell`}}>Документы по скважине</Link>
+              <Link to={{pathname: `${rootPath}/documents/documentsForWell`}}>Документы по скважине</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.5" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/supervisor`}}>Супервайзер</Link>
+              <Link to={{pathname: `${rootPath}/documents/supervisor`}}>Супервайзер</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.6" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/master`}}>Мастер</Link>
+              <Link to={{pathname: `${rootPath}/documents/master`}}>Мастер</Link>
             </Menu.Item>
             <Menu.Item key="documentsSub1.7" icon={<FolderOutlined/>}>
-              <Link to={{pathname: `/well/${id}/documents/lastData`}}>Последние данные</Link>
+              <Link to={{pathname: `${rootPath}/documents/lastData`}}>Последние данные</Link>
             </Menu.Item>
           </SubMenu>
       </Menu>
@@ -106,7 +107,7 @@ export default function Well() {
               <MenuDocuments/>
             </Route>
             <Route path="/">
-              <Redirect to={{pathname: `/well/${id}/telemetry`}}/>
+              <Redirect to={{pathname: `${rootPath}/telemetry`}}/>
             </Route>
           </Switch>
         </Content>