From de182bccb0bab13f90545e9d0496866e9dddf811 Mon Sep 17 00:00:00 2001
From: Erik Escoffier <me@erik.nz>
Date: Thu, 28 Sep 2023 17:40:43 +0200
Subject: [PATCH 1/7] Revert "Proper redirect"

This reverts commit 5a22094e7e2bad2be55b673215db8acccdf921fa.
---
 app/scripts/redirects.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/scripts/redirects.tsx b/app/scripts/redirects.tsx
index e1d6d6e2a..f6649346a 100644
--- a/app/scripts/redirects.tsx
+++ b/app/scripts/redirects.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import { Navigate, Route, useParams } from 'react-router';
 
-import { DATASETS_PATH, STORIES_PATH } from '$utils/routes';
+import { STORIES_PATH } from '$utils/routes';
 import { useDataset } from '$utils/veda-data';
+import DatasetsOverview from '$components/datasets/s-overview';
 import DatasetsExplore from '$components/datasets/s-explore';
 
 function DiscoveryRedirect() {
@@ -57,10 +58,5 @@ export const discoveryRoutes = (
 
 export function DatasetExploreRedirect() {
   const dataset = useDataset();
-  const url = `${DATASETS_PATH}/${dataset?.data.id}`;
-  return dataset?.data.disableExplore ? (
-    <Navigate replace to={url} />
-  ) : (
-    <DatasetsExplore />
-  );
+  return dataset?.data.disableExplore ? <DatasetsOverview /> : <DatasetsExplore />;
 }

From 4af51139e70456a1ad582b1801bb5b073a787d62 Mon Sep 17 00:00:00 2001
From: Erik Escoffier <me@erik.nz>
Date: Thu, 28 Sep 2023 17:40:49 +0200
Subject: [PATCH 2/7] Revert "Redirect to overview when explore is not allowed"

This reverts commit 94202b2030ba9dc5709a8da252a0b585b11131fb.
---
 app/scripts/components/datasets/s-overview/index.tsx | 2 +-
 app/scripts/main.tsx                                 | 5 +++--
 app/scripts/redirects.tsx                            | 8 --------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/scripts/components/datasets/s-overview/index.tsx b/app/scripts/components/datasets/s-overview/index.tsx
index dc1bcd425..eaaa26239 100644
--- a/app/scripts/components/datasets/s-overview/index.tsx
+++ b/app/scripts/components/datasets/s-overview/index.tsx
@@ -59,7 +59,7 @@ function DatasetsOverview() {
             <PageActions>
               {dataset?.data.disableExplore !== true && (
                 <Button
-                  forwardedAs={Link as any}
+                  forwardedAs={Link}
                   to={getDatasetExplorePath(dataset.data)}
                   size='large'
                   variation='achromic-outline'
diff --git a/app/scripts/main.tsx b/app/scripts/main.tsx
index eba9b82d8..18b0997b7 100644
--- a/app/scripts/main.tsx
+++ b/app/scripts/main.tsx
@@ -5,7 +5,7 @@ import { BrowserRouter, Route, Routes, useLocation } from 'react-router-dom';
 import { DevseedUiThemeProvider as DsTp } from '@devseed-ui/theme-provider';
 import { userPages } from 'veda';
 
-import { DatasetExploreRedirect, discoveryRoutes, thematicRoutes } from './redirects';
+import { discoveryRoutes, thematicRoutes } from './redirects';
 
 import theme, { GlobalStyles } from '$styles/theme';
 import { getAppURL } from '$utils/history';
@@ -28,6 +28,7 @@ const StoriesHub = lazy(() => import('$components/stories/hub'));
 const StoriesSingle = lazy(() => import('$components/stories/single'));
 
 const DataCatalog = lazy(() => import('$components/data-catalog'));
+const DatasetsExplore = lazy(() => import('$components/datasets/s-explore'));
 const DatasetsOverview = lazy(() => import('$components/datasets/s-overview'));
 
 const Analysis = lazy(() => import('$components/analysis/define'));
@@ -94,7 +95,7 @@ function Root() {
                 />
                 <Route
                   path={`${DATASETS_PATH}/:datasetId/explore`}
-                  element={<DatasetExploreRedirect />}
+                  element={<DatasetsExplore />}
                 />
                 <Route path={STORIES_PATH} element={<StoriesHub />} />
                 <Route
diff --git a/app/scripts/redirects.tsx b/app/scripts/redirects.tsx
index f6649346a..6590d3a1d 100644
--- a/app/scripts/redirects.tsx
+++ b/app/scripts/redirects.tsx
@@ -2,9 +2,6 @@ import React from 'react';
 import { Navigate, Route, useParams } from 'react-router';
 
 import { STORIES_PATH } from '$utils/routes';
-import { useDataset } from '$utils/veda-data';
-import DatasetsOverview from '$components/datasets/s-overview';
-import DatasetsExplore from '$components/datasets/s-explore';
 
 function DiscoveryRedirect() {
   const { discoveryId } = useParams();
@@ -55,8 +52,3 @@ export const discoveryRoutes = (
     <Route path='discoveries/:discoveryId' element={<DiscoveryRedirect />} />
   </Route>
 );
-
-export function DatasetExploreRedirect() {
-  const dataset = useDataset();
-  return dataset?.data.disableExplore ? <DatasetsOverview /> : <DatasetsExplore />;
-}

From 143f695d429c98b26cf733190aeb94e0c438bfea Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Thu, 28 Sep 2023 11:59:28 -0400
Subject: [PATCH 3/7] Reberts navlink back to use react router for testing

---
 app/scripts/components/common/page-header.tsx | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/scripts/components/common/page-header.tsx b/app/scripts/components/common/page-header.tsx
index 70ca2d0ed..8467bdea9 100644
--- a/app/scripts/components/common/page-header.tsx
+++ b/app/scripts/components/common/page-header.tsx
@@ -399,8 +399,7 @@ function PageHeader() {
                 <GlobalMenu>
                   <li>
                     <GlobalMenuLink
-                      as='a'
-                      href={DATASETS_PATH}
+                      to={DATASETS_PATH}
                       onClick={closeNavOnClick}
                     >
                       Data Catalog
@@ -408,19 +407,14 @@ function PageHeader() {
                   </li>
                   <li>
                     <GlobalMenuLink
-                      as='a'
-                      href={ANALYSIS_PATH}
+                      to={ANALYSIS_PATH}
                       onClick={closeNavOnClick}
                     >
                       Data Analysis
                     </GlobalMenuLink>
                   </li>
                   <li>
-                    <GlobalMenuLink
-                      as='a'
-                      href={STORIES_PATH}
-                      onClick={closeNavOnClick}
-                    >
+                    <GlobalMenuLink to={STORIES_PATH} onClick={closeNavOnClick}>
                       {getString('stories').other}
                     </GlobalMenuLink>
                   </li>

From 8b6588e2af41e42918c58650da1a9e314cd9a505 Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Thu, 28 Sep 2023 12:10:51 -0400
Subject: [PATCH 4/7] Remove redirect logics

---
 app/scripts/main.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/scripts/main.tsx b/app/scripts/main.tsx
index 18b0997b7..6a5d02710 100644
--- a/app/scripts/main.tsx
+++ b/app/scripts/main.tsx
@@ -114,9 +114,10 @@ function Root() {
                 )}
 
                 {/* Legacy: Routes related to thematic areas redirect. */}
-                {thematicRoutes}
+                {/* Removing for ghgc */}
+                {/* {thematicRoutes} */}
                 {/* Legacy: Routes related to renaming /discoveries to /stories. */}
-                {discoveryRoutes}
+                {/* {discoveryRoutes} */}
 
                 {userPages.map((p) => (
                   <Route

From d6b1ee691227c4cc1b9690e829bdebb43be8d62e Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Thu, 28 Sep 2023 15:05:27 -0400
Subject: [PATCH 5/7] Change link back to a tag

---
 app/scripts/components/common/page-header.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/scripts/components/common/page-header.tsx b/app/scripts/components/common/page-header.tsx
index 8467bdea9..70ca2d0ed 100644
--- a/app/scripts/components/common/page-header.tsx
+++ b/app/scripts/components/common/page-header.tsx
@@ -399,7 +399,8 @@ function PageHeader() {
                 <GlobalMenu>
                   <li>
                     <GlobalMenuLink
-                      to={DATASETS_PATH}
+                      as='a'
+                      href={DATASETS_PATH}
                       onClick={closeNavOnClick}
                     >
                       Data Catalog
@@ -407,14 +408,19 @@ function PageHeader() {
                   </li>
                   <li>
                     <GlobalMenuLink
-                      to={ANALYSIS_PATH}
+                      as='a'
+                      href={ANALYSIS_PATH}
                       onClick={closeNavOnClick}
                     >
                       Data Analysis
                     </GlobalMenuLink>
                   </li>
                   <li>
-                    <GlobalMenuLink to={STORIES_PATH} onClick={closeNavOnClick}>
+                    <GlobalMenuLink
+                      as='a'
+                      href={STORIES_PATH}
+                      onClick={closeNavOnClick}
+                    >
                       {getString('stories').other}
                     </GlobalMenuLink>
                   </li>

From e3446076b05392135b010880d51682197286848b Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Thu, 28 Sep 2023 15:31:53 -0400
Subject: [PATCH 6/7] Remove legacy redirect

---
 app/scripts/main.tsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/scripts/main.tsx b/app/scripts/main.tsx
index 6a5d02710..4db0f935d 100644
--- a/app/scripts/main.tsx
+++ b/app/scripts/main.tsx
@@ -5,8 +5,6 @@ import { BrowserRouter, Route, Routes, useLocation } from 'react-router-dom';
 import { DevseedUiThemeProvider as DsTp } from '@devseed-ui/theme-provider';
 import { userPages } from 'veda';
 
-import { discoveryRoutes, thematicRoutes } from './redirects';
-
 import theme, { GlobalStyles } from '$styles/theme';
 import { getAppURL } from '$utils/history';
 import LayoutRoot, {
@@ -112,13 +110,6 @@ function Root() {
                 {process.env.NODE_ENV !== 'production' && (
                   <Route path='/sandbox/*' element={<Sandbox />} />
                 )}
-
-                {/* Legacy: Routes related to thematic areas redirect. */}
-                {/* Removing for ghgc */}
-                {/* {thematicRoutes} */}
-                {/* Legacy: Routes related to renaming /discoveries to /stories. */}
-                {/* {discoveryRoutes} */}
-
                 {userPages.map((p) => (
                   <Route
                     key={p}

From 8cac5bd1af1fa56133947f168d080fa35fd08694 Mon Sep 17 00:00:00 2001
From: Erik Escoffier <me@erik.nz>
Date: Thu, 28 Sep 2023 21:33:16 +0200
Subject: [PATCH 7/7] Fixed linter

---
 app/scripts/components/analysis/define/index.tsx | 1 -
 app/scripts/main.tsx                             | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/app/scripts/components/analysis/define/index.tsx b/app/scripts/components/analysis/define/index.tsx
index b33f84fcf..9f87e3a48 100644
--- a/app/scripts/components/analysis/define/index.tsx
+++ b/app/scripts/components/analysis/define/index.tsx
@@ -138,7 +138,6 @@ const FloatingFooter = styled.div<{ isSticky: boolean }>`
   position: sticky;
   left: 0;
   right: 0;
-  // trick to get the IntersectionObserver to fire
   bottom: -1px;
   padding: ${variableGlsp(0.5)};
   background: ${themeVal('color.surface')};
diff --git a/app/scripts/main.tsx b/app/scripts/main.tsx
index 6a5d02710..d0e7f372f 100644
--- a/app/scripts/main.tsx
+++ b/app/scripts/main.tsx
@@ -5,8 +5,6 @@ import { BrowserRouter, Route, Routes, useLocation } from 'react-router-dom';
 import { DevseedUiThemeProvider as DsTp } from '@devseed-ui/theme-provider';
 import { userPages } from 'veda';
 
-import { discoveryRoutes, thematicRoutes } from './redirects';
-
 import theme, { GlobalStyles } from '$styles/theme';
 import { getAppURL } from '$utils/history';
 import LayoutRoot, {
@@ -113,12 +111,6 @@ function Root() {
                   <Route path='/sandbox/*' element={<Sandbox />} />
                 )}
 
-                {/* Legacy: Routes related to thematic areas redirect. */}
-                {/* Removing for ghgc */}
-                {/* {thematicRoutes} */}
-                {/* Legacy: Routes related to renaming /discoveries to /stories. */}
-                {/* {discoveryRoutes} */}
-
                 {userPages.map((p) => (
                   <Route
                     key={p}