Move TopBar/Footer part back to src/pages/workspaces.

DataBiosphere · Feb 2, 2024 · d0f8c6a · d0f8c6a
1 parent e316da5
commit d0f8c6a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/pages/workspaces/WorkspaceMigration.ts b/src/pages/workspaces/WorkspaceMigration.ts
@@ -1,4 +1,19 @@
-import { WorkspaceMigrationPage } from 'src/workspaces/migration/WorkspaceMigrationPage';
+import { div, h } from 'react-hyperscript-helpers';
+import FooterWrapper from 'src/components/FooterWrapper';
+import TopBar from 'src/components/TopBar';
+import * as Nav from 'src/libs/nav';
+import { BillingProjectList } from 'src/workspaces/migration/BillingProjectList';
+import { MigrationInformation } from 'src/workspaces/migration/WorkspaceInformation';
+
+const WorkspaceMigrationPage = () => {
+  return h(FooterWrapper, [
+    h(TopBar, { title: 'Workspace Multi-Region Bucket Migrations', href: Nav.getLink('workspace-migration') }, []),
+    div({ role: 'main', style: { display: 'flex', flex: '1 1 auto', flexFlow: 'column' } }, [
+      h(MigrationInformation, {}),
+      h(BillingProjectList, {}),
+    ]),
+  ]);
+};
 
 export const navPaths = [
   {

diff --git a/...paces/migration/WorkspaceMigrationPage.ts → ...kspaces/migration/WorkspaceInformation.ts b/...paces/migration/WorkspaceMigrationPage.ts → ...kspaces/migration/WorkspaceInformation.ts
@@ -2,16 +2,12 @@ import { icon, Link } from '@terra-ui-packages/components';
 import { useEffect, useState } from 'react';
 import { div, h, h2, p } from 'react-hyperscript-helpers';
 import Collapse from 'src/components/Collapse';
-import FooterWrapper from 'src/components/FooterWrapper';
-import TopBar from 'src/components/TopBar';
 import colors from 'src/libs/colors';
-import * as Nav from 'src/libs/nav';
 import { getLocalPref, setLocalPref } from 'src/libs/prefs';
 import * as Style from 'src/libs/style';
 import * as Utils from 'src/libs/utils';
-import { BillingProjectList } from 'src/workspaces/migration/BillingProjectList';
 
-const MigrationInformation = () => {
+export const MigrationInformation = () => {
   const persistenceId = 'multiregionBucketMigration';
   const [infoPanelOpen, setInfoPanelOpen] = useState(() => getLocalPref(persistenceId)?.infoPanelOpen);
 
@@ -69,13 +65,3 @@ const MigrationInformation = () => {
     ]),
   ]);
 };
-
-export const WorkspaceMigrationPage = () => {
-  return h(FooterWrapper, [
-    h(TopBar, { title: 'Workspace Multi-Region Bucket Migrations', href: Nav.getLink('workspace-migration') }, []),
-    div({ role: 'main', style: { display: 'flex', flex: '1 1 auto', flexFlow: 'column' } }, [
-      h(MigrationInformation, {}),
-      h(BillingProjectList, {}),
-    ]),
-  ]);
-};