X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe5d65e4e704358fab18d91dae5a97ff7659f5df..dd3d65aa7dea7269352eabe19096cb3dc44eb6c5:/src/store/navigation/navigation-action.ts

diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index f610eb5e99..f60f37f934 100644
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -2,31 +2,27 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Dispatch, compose } from 'redux';
+import { Dispatch, compose, AnyAction } from 'redux';
 import { push } from "react-router-redux";
 import { ResourceKind, extractUuidKind } from '~/models/resource';
-import { getCollectionUrl } from "~/models/collection";
-import { getProjectUrl } from "~/models/project";
 import { SidePanelTreeCategory } from '../side-panel-tree/side-panel-tree-actions';
-import { Routes, getProcessUrl, getProcessLogUrl, getGroupUrl } from '~/routes/routes';
+import { Routes, getProcessLogUrl, getGroupUrl, getNavUrl } from '~/routes/routes';
 import { RootState } from '~/store/store';
 import { ServiceRepository } from '~/services/services';
 import { GROUPS_PANEL_LABEL } from '~/store/breadcrumbs/breadcrumbs-actions';
 
 export const navigateTo = (uuid: string) =>
-    async (dispatch: Dispatch) => {
+    async (dispatch: Dispatch, getState: () => RootState) => {
         const kind = extractUuidKind(uuid);
-        if (kind === ResourceKind.PROJECT || kind === ResourceKind.USER) {
-            dispatch<any>(navigateToProject(uuid));
-        } else if (kind === ResourceKind.COLLECTION) {
-            dispatch<any>(navigateToCollection(uuid));
-        } else if (kind === ResourceKind.CONTAINER_REQUEST) {
-            dispatch<any>(navigateToProcess(uuid));
+        if (kind === ResourceKind.PROJECT || kind === ResourceKind.USER || kind === ResourceKind.COLLECTION || kind === ResourceKind.CONTAINER_REQUEST) {
+            dispatch<any>(pushOrGoto(getNavUrl(uuid, getState().auth)));
         } else if (kind === ResourceKind.VIRTUAL_MACHINE) {
             dispatch<any>(navigateToAdminVirtualMachines);
         }
         if (uuid === SidePanelTreeCategory.FAVORITES) {
             dispatch<any>(navigateToFavorites);
+        } else if (uuid === SidePanelTreeCategory.PUBLIC_FAVORITES) {
+            dispatch(navigateToPublicFavorites);
         } else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) {
             dispatch(navigateToSharedWithMe);
         } else if (uuid === SidePanelTreeCategory.WORKFLOWS) {
@@ -44,20 +40,28 @@ export const navigateToFavorites = push(Routes.FAVORITES);
 
 export const navigateToTrash = push(Routes.TRASH);
 
-export const navigateToWorkflows = push(Routes.WORKFLOWS);
+export const navigateToPublicFavorites = push(Routes.PUBLIC_FAVORITES);
 
-export const navigateToProject = compose(push, getProjectUrl);
+export const navigateToWorkflows = push(Routes.WORKFLOWS);
 
-export const navigateToCollection = compose(push, getCollectionUrl);
+export const pushOrGoto = (url: string): AnyAction => {
+    if (url === "") {
+        return { type: "noop" };
+    } else if (url[0] === '/') {
+        return push(url);
+    } else {
+        window.location.href = url;
+        return { type: "noop" };
+    }
+};
 
-export const navigateToProcess = compose(push, getProcessUrl);
 
 export const navigateToProcessLogs = compose(push, getProcessLogUrl);
 
 export const navigateToRootProject = (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     const rootProjectUuid = services.authService.getUuid();
     if (rootProjectUuid) {
-        dispatch(navigateToProject(rootProjectUuid));
+        dispatch<any>(navigateTo(rootProjectUuid));
     }
 };
 
@@ -65,7 +69,13 @@ export const navigateToSharedWithMe = push(Routes.SHARED_WITH_ME);
 
 export const navigateToRunProcess = push(Routes.RUN_PROCESS);
 
-export const navigateToSearchResults = push(Routes.SEARCH_RESULTS);
+export const navigateToSearchResults = (searchValue: string) => {
+    if (searchValue !== "") {
+        return push({ pathname: Routes.SEARCH_RESULTS, search: '?q=' + encodeURIComponent(searchValue) });
+    } else {
+        return push({ pathname: Routes.SEARCH_RESULTS });
+    }
+};
 
 export const navigateToUserVirtualMachines = push(Routes.VIRTUAL_MACHINES_USER);
 
@@ -73,14 +83,16 @@ export const navigateToAdminVirtualMachines = push(Routes.VIRTUAL_MACHINES_ADMIN
 
 export const navigateToRepositories = push(Routes.REPOSITORIES);
 
-export const navigateToSshKeysAdmin= push(Routes.SSH_KEYS_ADMIN);
+export const navigateToSshKeysAdmin = push(Routes.SSH_KEYS_ADMIN);
 
-export const navigateToSshKeysUser= push(Routes.SSH_KEYS_USER);
+export const navigateToSshKeysUser = push(Routes.SSH_KEYS_USER);
 
-export const navigateToSiteManager= push(Routes.SITE_MANAGER);
+export const navigateToSiteManager = push(Routes.SITE_MANAGER);
 
 export const navigateToMyAccount = push(Routes.MY_ACCOUNT);
 
+export const navigateToLinkAccount = push(Routes.LINK_ACCOUNT);
+
 export const navigateToKeepServices = push(Routes.KEEP_SERVICES);
 
 export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
@@ -94,3 +106,5 @@ export const navigateToGroups = push(Routes.GROUPS);
 export const navigateToGroupDetails = compose(push, getGroupUrl);
 
 export const navigateToLinks = push(Routes.LINKS);
+
+export const navigateToCollectionsContentAddress = push(Routes.COLLECTIONS_CONTENT_ADDRESS);