15768: fixed navigateTo bug Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii...

[arvados-workbench2.git] / src / store / navigation / navigation-action.ts

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index 55479188c12d91edc99792e8d03d8781d96d7deb..b3bd32909da8f248b34fe1756cc67020c06cabbe 100644 (file)
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -2,86 +2,85 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Dispatch, compose, AnyAction } from 'redux';
+import { Dispatch, compose, AnyAction } from "redux";
 import { push } from "react-router-redux";
-import { ResourceKind, extractUuidKind } from 'models/resource';
-import { SidePanelTreeCategory } from '../side-panel-tree/side-panel-tree-actions';
-import { Routes, getGroupUrl, getNavUrl, getUserProfileUrl } from 'routes/routes';
-import { RootState } from 'store/store';
-import { ServiceRepository } from 'services/services';
-import { pluginConfig } from 'plugins';
-import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import { USERS_PANEL_LABEL, MY_ACCOUNT_PANEL_LABEL } from 'store/breadcrumbs/breadcrumbs-actions';
+import { ResourceKind, extractUuidKind } from "models/resource";
+import { SidePanelTreeCategory } from "../side-panel-tree/side-panel-tree-actions";
+import { Routes, getGroupUrl, getNavUrl, getUserProfileUrl } from "routes/routes";
+import { RootState } from "store/store";
+import { ServiceRepository } from "services/services";
+import { pluginConfig } from "plugins";
+import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
+import { USERS_PANEL_LABEL, MY_ACCOUNT_PANEL_LABEL } from "store/breadcrumbs/breadcrumbs-actions";
 
 export const navigationNotAvailable = (id: string) =>
     snackbarActions.OPEN_SNACKBAR({
         message: `${id} not available`,
         hideDuration: 3000,
-        kind: SnackbarKind.ERROR
+        kind: SnackbarKind.ERROR,
     });
 
-export const navigateTo = (uuid: string) =>
-    async (dispatch: Dispatch, getState: () => RootState) => {
+export const navigateTo = (inputUuid: any) => async (dispatch: Dispatch, getState: () => RootState) => {
+    const uuid = typeof inputUuid === "string" ? inputUuid : inputUuid[0];
 
-        for (const navToFn of pluginConfig.navigateToHandlers) {
-            if (navToFn(dispatch, getState, uuid)) {
-                return;
-            }
-        }
-
-        const kind = extractUuidKind(uuid);
-        switch (kind) {
-            case ResourceKind.PROJECT:
-            case ResourceKind.USER:
-            case ResourceKind.COLLECTION:
-            case ResourceKind.CONTAINER_REQUEST:
-                dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
-                return;
-            case ResourceKind.VIRTUAL_MACHINE:
-                dispatch<any>(navigateToAdminVirtualMachines);
-                return;
-            case ResourceKind.WORKFLOW:
-                dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
-                // dispatch<any>(openDetailsPanel(uuid));
-                return;
+    for (const navToFn of pluginConfig.navigateToHandlers) {
+        if (navToFn(dispatch, getState, uuid)) {
+            return;
         }
+    }
 
-        switch (uuid) {
-            case SidePanelTreeCategory.PROJECTS:
-                const usr = getState().auth.user;
-                if (usr) {
-                    dispatch<any>(pushOrGoto(getNavUrl(usr.uuid, getState().auth)));
-                }
-                return;
-            case SidePanelTreeCategory.FAVORITES:
-                dispatch<any>(navigateToFavorites);
-                return;
-            case SidePanelTreeCategory.PUBLIC_FAVORITES:
-                dispatch(navigateToPublicFavorites);
-                return;
-            case SidePanelTreeCategory.SHARED_WITH_ME:
-                dispatch(navigateToSharedWithMe);
-                return;
-            case SidePanelTreeCategory.TRASH:
-                dispatch(navigateToTrash);
-                return;
-            case SidePanelTreeCategory.GROUPS:
-                dispatch(navigateToGroups);
-                return;
-            case SidePanelTreeCategory.ALL_PROCESSES:
-                dispatch(navigateToAllProcesses);
-                return;
-            case USERS_PANEL_LABEL:
-                dispatch(navigateToUsers);
-                return;
-            case MY_ACCOUNT_PANEL_LABEL:
-                dispatch(navigateToMyAccount);
-                return;
-        }
+    const kind = extractUuidKind(uuid);
+    switch (kind) {
+        case ResourceKind.PROJECT:
+        case ResourceKind.USER:
+        case ResourceKind.COLLECTION:
+        case ResourceKind.CONTAINER_REQUEST:
+            dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
+            return;
+        case ResourceKind.VIRTUAL_MACHINE:
+            dispatch<any>(navigateToAdminVirtualMachines);
+            return;
+        case ResourceKind.WORKFLOW:
+            dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
+            // dispatch<any>(openDetailsPanel(uuid));
+            return;
+    }
 
-        dispatch(navigationNotAvailable(uuid));
-    };
+    switch (uuid) {
+        case SidePanelTreeCategory.PROJECTS:
+            const usr = getState().auth.user;
+            if (usr) {
+                dispatch<any>(pushOrGoto(getNavUrl(usr.uuid, getState().auth)));
+            }
+            return;
+        case SidePanelTreeCategory.FAVORITES:
+            dispatch<any>(navigateToFavorites);
+            return;
+        case SidePanelTreeCategory.PUBLIC_FAVORITES:
+            dispatch(navigateToPublicFavorites);
+            return;
+        case SidePanelTreeCategory.SHARED_WITH_ME:
+            dispatch(navigateToSharedWithMe);
+            return;
+        case SidePanelTreeCategory.TRASH:
+            dispatch(navigateToTrash);
+            return;
+        case SidePanelTreeCategory.GROUPS:
+            dispatch(navigateToGroups);
+            return;
+        case SidePanelTreeCategory.ALL_PROCESSES:
+            dispatch(navigateToAllProcesses);
+            return;
+        case USERS_PANEL_LABEL:
+            dispatch(navigateToUsers);
+            return;
+        case MY_ACCOUNT_PANEL_LABEL:
+            dispatch(navigateToMyAccount);
+            return;
+    }
 
+    dispatch(navigationNotAvailable(uuid));
+};
 
 export const navigateToNotFound = push(Routes.NO_MATCH);
 
@@ -98,7 +97,7 @@ export const navigateToWorkflows = push(Routes.WORKFLOWS);
 export const pushOrGoto = (url: string): AnyAction => {
     if (url === "") {
         return { type: "noop" };
-    } else if (url[0] === '/') {
+    } else if (url[0] === "/") {
         return push(url);
     } else {
         window.location.href = url;
@@ -106,7 +105,6 @@ export const pushOrGoto = (url: string): AnyAction => {
     }
 };
 
-
 export const navigateToRootProject = (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     navigateTo(SidePanelTreeCategory.PROJECTS)(dispatch, getState);
 };
@@ -117,7 +115,7 @@ export const navigateToRunProcess = push(Routes.RUN_PROCESS);
 
 export const navigateToSearchResults = (searchValue: string) => {
     if (searchValue !== "") {
-        return push({ pathname: Routes.SEARCH_RESULTS, search: '?q=' + encodeURIComponent(searchValue) });
+        return push({ pathname: Routes.SEARCH_RESULTS, search: "?q=" + encodeURIComponent(searchValue) });
     } else {
         return push({ pathname: Routes.SEARCH_RESULTS });
     }