X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ba9a587ab628caea44d923b34d285a29e83e3456..a48138fa7227595bba0db267a4c37832cba9afa2:/src/store/navigation/navigation-action.ts diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts index 4ee22108..f2f1cea6 100644 --- a/src/store/navigation/navigation-action.ts +++ b/src/store/navigation/navigation-action.ts @@ -2,34 +2,35 @@ // // 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 } 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(navigateToProject(uuid)); - } else if (kind === ResourceKind.COLLECTION) { - dispatch(navigateToCollection(uuid)); - } else if (kind === ResourceKind.CONTAINER_REQUEST) { - dispatch(navigateToProcess(uuid)); + if (kind === ResourceKind.PROJECT || kind === ResourceKind.USER || kind === ResourceKind.COLLECTION || kind === ResourceKind.CONTAINER_REQUEST) { + dispatch(pushOrGoto(getNavUrl(uuid, getState().auth))); + } else if (kind === ResourceKind.VIRTUAL_MACHINE) { + dispatch(navigateToAdminVirtualMachines); } if (uuid === SidePanelTreeCategory.FAVORITES) { dispatch(navigateToFavorites); + } else if (uuid === SidePanelTreeCategory.PUBLIC_FAVORITES) { + dispatch(navigateToPublicFavorites); } else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) { dispatch(navigateToSharedWithMe); } else if (uuid === SidePanelTreeCategory.WORKFLOWS) { dispatch(navigateToWorkflows); } else if (uuid === SidePanelTreeCategory.TRASH) { dispatch(navigateToTrash); + } else if (uuid === GROUPS_PANEL_LABEL) { + dispatch(navigateToGroups); } }; @@ -39,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(navigateTo(rootProjectUuid)); } }; @@ -62,12 +71,34 @@ export const navigateToRunProcess = push(Routes.RUN_PROCESS); export const navigateToSearchResults = push(Routes.SEARCH_RESULTS); -export const navigateToVirtualMachines = push(Routes.VIRTUAL_MACHINES); +export const navigateToUserVirtualMachines = push(Routes.VIRTUAL_MACHINES_USER); + +export const navigateToAdminVirtualMachines = push(Routes.VIRTUAL_MACHINES_ADMIN); export const navigateToRepositories = push(Routes.REPOSITORIES); -export const navigateToSshKeys= push(Routes.SSH_KEYS); +export const navigateToSshKeysAdmin = push(Routes.SSH_KEYS_ADMIN); + +export const navigateToSshKeysUser = push(Routes.SSH_KEYS_USER); + +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 navigateToUsers = push(Routes.USERS); \ No newline at end of file +export const navigateToComputeNodes = push(Routes.COMPUTE_NODES); + +export const navigateToUsers = push(Routes.USERS); + +export const navigateToApiClientAuthorizations = push(Routes.API_CLIENT_AUTHORIZATIONS); + +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);