refactor: refactor redirection to workspace if view doesn't exist

Cosmo-Tech · Jul 16, 2024 · 4b29784 · 4b29784
1 parent 0a8664f
commit 4b29784
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 55 deletions.
diff --git a/src/hooks/RouterHooks.js b/src/hooks/RouterHooks.js
@@ -8,63 +8,43 @@ import { useWorkspaceData } from '../state/hooks/WorkspaceHooks';
 import { ConfigUtils } from '../utils';
 import { useSortedScenarioList } from './ScenarioListHooks';
 
-export const useRedirectFromInstanceToScenarioView = () => {
-  const isUnmounted = useRef(false);
-  const currentWorkspaceData = useWorkspaceData();
-  const navigate = useNavigate();
-
-  useEffect(() => {
-    if (isUnmounted.current) {
-      return;
-    }
-    const isInstanceViewEnabled = ConfigUtils.isInstanceViewConfigValid(
-      currentWorkspaceData?.webApp?.options?.instanceView
-    );
-    if (isInstanceViewEnabled) return;
-    navigate('/workspaces');
-    return () => {
-      isUnmounted.current = true;
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentWorkspaceData?.webApp?.options?.instanceView]);
-};
-
-export const useRedirectFromDatasetManagerToScenarioView = () => {
+export const useRedirectToWorkspaceView = (view) => {
   const isUnmounted = useRef(false);
   const currentWorkspaceData = useWorkspaceData();
   const navigate = useNavigate();
+  const routerParameters = useParams();
 
   useEffect(() => {
     if (isUnmounted.current) {
       return;
     }
-    const isDatasetManagerViewEnabled = ConfigUtils.isDatasetManagerEnabledInWorkspace(currentWorkspaceData);
-    if (isDatasetManagerViewEnabled) return;
-    navigate('/workspaces');
-    return () => {
-      isUnmounted.current = true;
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentWorkspaceData?.webApp?.options?.datasetmanager, navigate]);
-};
-
-export const useRedirectFromDashboardsToScenarioView = () => {
-  const isUnmounted = useRef(false);
-  const currentWorkspaceData = useWorkspaceData();
-  const navigate = useNavigate();
-
-  useEffect(() => {
-    if (isUnmounted.current) {
-      return;
+    let isViewEnabled;
+    switch (view) {
+      case 'instance':
+        isViewEnabled = ConfigUtils.isInstanceViewConfigValid(currentWorkspaceData?.webApp?.options?.instanceView);
+        break;
+      case 'datasetManager':
+        isViewEnabled = ConfigUtils.isDatasetManagerEnabledInWorkspace(currentWorkspaceData);
+        break;
+      case 'dashboards':
+        isViewEnabled = ConfigUtils.isResultsDisplayEnabledInWorkspace(currentWorkspaceData);
+        break;
+      default:
+        isViewEnabled = true;
     }
-    const isDatasetManagerViewEnabled = ConfigUtils.isResultsDisplayEnabledInWorkspace(currentWorkspaceData);
-    if (isDatasetManagerViewEnabled) return;
-    navigate('/workspaces');
+    if (isViewEnabled) return;
+    const workspaceId = routerParameters.workspaceId;
+    navigate(workspaceId ? `/${workspaceId}` : '/workspaces');
     return () => {
       isUnmounted.current = true;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [currentWorkspaceData?.webApp?.options?.charts, navigate]);
+  }, [
+    currentWorkspaceData?.webApp?.options?.charts,
+    currentWorkspaceData?.webApp?.options?.instanceView,
+    currentWorkspaceData?.webApp?.options?.datasetmanager,
+    navigate,
+  ]);
 };
 
 export const useRouterScenarioId = () => {

diff --git a/src/views/Dashboards/Dashboards.js b/src/views/Dashboards/Dashboards.js
@@ -5,9 +5,9 @@ import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import { Card, CardContent, Grid, Tab, Tabs } from '@mui/material';
 import makeStyles from '@mui/styles/makeStyles';
+import { useRedirectToWorkspaceView } from '../../hooks/RouterHooks';
 import { useDashboardsViewReportsConfig } from '../../state/hooks/PowerBIHooks';
 import { DashboardsPowerBiReport } from './components';
-import {useRedirectFromDashboardsToScenarioView, useRedirectToWorkspaceView} from "../../hooks/RouterHooks";
 
 const useStyles = makeStyles((theme) => ({
   dashboardsRoot: {
@@ -71,7 +71,7 @@ const Dashboards = () => {
   };
 
   const dashboardsViewReportsConfig = useDashboardsViewReportsConfig();
-  useRedirectFromDashboardsToScenarioView();
+  useRedirectToWorkspaceView('dashboards');
   const dashboardTitle = dashboardsViewReportsConfig?.[value]?.title?.[i18n.language] ?? DEFAULT_MISSING_TITLE;
 
   return (

diff --git a/src/views/DatasetManager/DatasetManager.js b/src/views/DatasetManager/DatasetManager.js
@@ -6,11 +6,10 @@ import { useDatasetManager } from './DatasetManagerHook';
 import { DatasetList, DatasetMetadata, DatasetOverview, NoDatasetsPlaceholder } from './components';
 
 const DatasetManager = () => {
-  const { datasets, useRedirectFromDatasetManagerToScenarioView, useResetSelectedDatasetIfNecessary } =
-    useDatasetManager();
+  const { datasets, useRedirectToWorkspaceView, useResetSelectedDatasetIfNecessary } = useDatasetManager();
 
   useResetSelectedDatasetIfNecessary();
-  useRedirectFromDatasetManagerToScenarioView();
+  useRedirectToWorkspaceView('datasetManager');
 
   return datasets?.length > 0 ? (
     <div data-cy="dataset-manager-view" style={{ height: '100%', overflow: 'auto' }}>

diff --git a/src/views/DatasetManager/DatasetManagerHook.js b/src/views/DatasetManager/DatasetManagerHook.js
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 import { useEffect } from 'react';
 import { useDispatch } from 'react-redux';
-import { useRedirectFromDatasetManagerToScenarioView } from '../../hooks/RouterHooks';
+import { useRedirectToWorkspaceView } from '../../hooks/RouterHooks';
 import { useWorkspaceMainDatasets } from '../../hooks/WorkspaceDatasetsHooks';
 import { dispatchSelectDefaultDataset } from '../../state/dispatchers/dataset/DatasetDispatcher';
 import { useCurrentDataset } from '../../state/hooks/DatasetHooks';
@@ -25,5 +25,5 @@ export const useDatasetManager = () => {
     }, [currentDataset?.id, workspaceMainDatasets, dispatch]);
   };
 
-  return { datasets, useResetSelectedDatasetIfNecessary, useRedirectFromDatasetManagerToScenarioView };
+  return { datasets, useResetSelectedDatasetIfNecessary, useRedirectToWorkspaceView };
 };
diff --git a/src/views/Instance/Instance.js b/src/views/Instance/Instance.js
@@ -27,7 +27,7 @@ const Instance = () => {
     workspaceId,
     currentScenario,
     useRedirectionToScenario,
-    useRedirectFromInstanceToScenarioView,
+    useRedirectToWorkspaceView,
     instanceViewConfig,
   } = useInstance();
 
@@ -46,7 +46,7 @@ const Instance = () => {
   const isSwitchingScenario = currentScenario.status === STATUSES.LOADING;
 
   useRedirectionToScenario();
-  useRedirectFromInstanceToScenarioView();
+  useRedirectToWorkspaceView('instance');
 
   useEffect(() => {
     // Note that the "active" variable is necessary to prevent race conditions when the effect is called several times

diff --git a/src/views/Instance/InstanceHook.js b/src/views/Instance/InstanceHook.js
@@ -1,6 +1,6 @@
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
-import { useRedirectFromInstanceToScenarioView, useRedirectionToScenario } from '../../hooks/RouterHooks';
+import { useRedirectionToScenario, useRedirectToWorkspaceView } from '../../hooks/RouterHooks';
 import { useDatasets } from '../../state/hooks/DatasetHooks';
 import { useOrganizationId } from '../../state/hooks/OrganizationHooks';
 import { useCurrentScenario } from '../../state/hooks/ScenarioHooks';
@@ -18,7 +18,7 @@ export const useInstance = () => {
     organizationId,
     workspaceId,
     currentScenario,
-    useRedirectFromInstanceToScenarioView,
+    useRedirectToWorkspaceView,
     useRedirectionToScenario,
     instanceViewConfig,
   };