From 2667a39361f9b34ea12bb3d12667b268f453a603 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 7 Feb 2022 15:18:19 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Documents/index.jsx | 11 ++++++-----
 src/pages/Well.jsx            |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Documents/index.jsx b/src/pages/Documents/index.jsx
index 3b2e2ba..b7eacc1 100644
--- a/src/pages/Documents/index.jsx
+++ b/src/pages/Documents/index.jsx
@@ -1,9 +1,10 @@
+import { join } from 'path'
 import { memo } from 'react'
 import { Layout, Menu } from 'antd'
 import { FolderOutlined } from '@ant-design/icons'
 import { Switch, useParams } from 'react-router-dom'
 
-import { PrivateDefaultRoute, PrivateMenuItem, PrivateRoute } from '@components/Private'
+import { PrivateDefaultRoute, PrivateMenuItemLink, PrivateRoute } from '@components/Private'
 
 import DocumentsTemplate from './DocumentsTemplate'
 
@@ -30,7 +31,7 @@ export const MenuDocuments = memo(({ idWell }) => {
     <>
       <Menu mode={'horizontal'} selectable={true} className={'well_menu'} selectedKeys={[category]}>
         {documentCategories.map(category => (
-          <PrivateMenuItem.Link
+          <PrivateMenuItemLink
             root={root}
             key={`${category.key}`}
             path={`${category.key}`}
@@ -44,11 +45,11 @@ export const MenuDocuments = memo(({ idWell }) => {
         <Content className={'site-layout-background'}>
           <Switch>
             {documentCategories.map(category => (
-              <PrivateRoute path={`${root}/${category.key}`} key={`${category.key}`}>
-                <DocumentsTemplate idCategory={category.id} idWell={idWell}/>
+              <PrivateRoute path={join(root, category.key)} key={`${category.key}`}>
+                <DocumentsTemplate idCategory={category.id} idWell={idWell} />
               </PrivateRoute>
             ))}
-            <PrivateDefaultRoute urls={documentCategories.map((cat) => `${root}/${cat.key}`)}/>
+            <PrivateDefaultRoute urls={documentCategories.map((cat) => join(root, cat.key))}/>
           </Switch>
         </Content>
       </Layout>
diff --git a/src/pages/Well.jsx b/src/pages/Well.jsx
index 170ab62..618eb69 100644
--- a/src/pages/Well.jsx
+++ b/src/pages/Well.jsx
@@ -61,10 +61,10 @@ export const Well = memo(() => {
             <PrivateRoute path={`${rootPath}/archive`}>
               <Archive idWell={idWell} />
             </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/telemetryAnalysis/:tab`}>
+            <PrivateRoute path={`${rootPath}/telemetryAnalysis/:tab?`}>
               <TelemetryAnalysis idWell={idWell} />
             </PrivateRoute>
-            <PrivateRoute path={`${rootPath}/document/:category`}>
+            <PrivateRoute path={`${rootPath}/document/:category?`}>
               <Documents idWell={idWell} />
             </PrivateRoute>
             <PrivateRoute path={`${rootPath}/measure`}>