From 1b9db1c35a1796b7f1b3ace1155ef6c8765b2a7c Mon Sep 17 00:00:00 2001
From: goodmice <hamel2517@gmail.com>
Date: Mon, 24 Oct 2022 06:41:30 +0500
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BB=D0=BE=D0=BA=20=D0=B8=D0=BC=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B0/=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D1=91=D0=BD=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?=
 =?UTF-8?q?=20=D0=BF=D0=BB=D0=B0=D0=BD/=D1=84=D0=B0=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => OperationEditor}/ImportExportBar.jsx |  0
 .../ImportOperations.jsx                      |  0
 .../OperationEditor/WellOperationsEditor.jsx  |  6 ++++++
 src/pages/Well/WellOperations/index.jsx       | 21 +++----------------
 4 files changed, 9 insertions(+), 18 deletions(-)
 rename src/pages/Well/WellOperations/{ => OperationEditor}/ImportExportBar.jsx (100%)
 rename src/pages/Well/WellOperations/{ => OperationEditor}/ImportOperations.jsx (100%)

diff --git a/src/pages/Well/WellOperations/ImportExportBar.jsx b/src/pages/Well/WellOperations/OperationEditor/ImportExportBar.jsx
similarity index 100%
rename from src/pages/Well/WellOperations/ImportExportBar.jsx
rename to src/pages/Well/WellOperations/OperationEditor/ImportExportBar.jsx
diff --git a/src/pages/Well/WellOperations/ImportOperations.jsx b/src/pages/Well/WellOperations/OperationEditor/ImportOperations.jsx
similarity index 100%
rename from src/pages/Well/WellOperations/ImportOperations.jsx
rename to src/pages/Well/WellOperations/OperationEditor/ImportOperations.jsx
diff --git a/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx b/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
index 87cb0b5..ac23224 100644
--- a/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
+++ b/src/pages/Well/WellOperations/OperationEditor/WellOperationsEditor.jsx
@@ -15,11 +15,14 @@ import {
   makeNumericSorter,
   makeTextColumn,
 } from '@components/Table'
+import { Flex } from '@components/Grid'
 import LoaderPortal from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault } from '@utils'
 import { WellOperationService } from '@api'
 
+import ImportExportBar from './ImportExportBar'
+
 const { TextArea } = Input
 
 const basePageSize = 160
@@ -137,6 +140,9 @@ export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
 
   return (
     <LoaderPortal show={showLoader}>
+      <Flex style={{ width: '100%' }}>
+        <ImportExportBar onImported={updateOperations}/>
+      </Flex>
       <EditableTable
         {...other}
         bordered
diff --git a/src/pages/Well/WellOperations/index.jsx b/src/pages/Well/WellOperations/index.jsx
index 38fc5e4..53d7dfb 100644
--- a/src/pages/Well/WellOperations/index.jsx
+++ b/src/pages/Well/WellOperations/index.jsx
@@ -1,11 +1,8 @@
-import { useNavigate, useLocation, Outlet } from 'react-router-dom'
-import { memo, useCallback, useMemo } from 'react'
+import { Outlet } from 'react-router-dom'
+import { memo, useMemo } from 'react'
 
 import { RootPathContext, useRootPath } from '@asb/context'
-import { Flex } from '@components/Grid'
-import { getTabname, wrapPrivateComponent } from '@utils'
-
-import { ImportExportBar } from './ImportExportBar'
+import { wrapPrivateComponent } from '@utils'
 
 const properties = {
   requirements: [],
@@ -15,23 +12,11 @@ const properties = {
 }
 
 const WellOperations = memo(() => {
-  const tab = getTabname()
-  const navigate = useNavigate()
-  const location = useLocation()
   const root = useRootPath()
   const rootPath = useMemo(() => `${root}/${properties.key}`, [root])
 
-  const onImported = useCallback(() =>
-    navigate(`${rootPath}`, { state: { from: location.pathname }})
-  , [navigate, location, rootPath])
-
-  const isIEBarDisabled = useMemo(() => !['plan', 'fact'].includes(tab), [tab])
-
   return(
     <RootPathContext.Provider value={rootPath}>
-      <Flex style={{ width: '100%' }}>
-        <ImportExportBar disabled={isIEBarDisabled} onImported={onImported}/>
-      </Flex>
       <Outlet />
     </RootPathContext.Provider>
   )