X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/20844fff7469abc3caaf0e14c05741e0acc62611..73122efb6429184611d17b3278ecbe9c2e26a6c2:/src/routes/routes.ts diff --git a/src/routes/routes.ts b/src/routes/routes.ts index 191fe11b..528a0376 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -3,11 +3,11 @@ // SPDX-License-Identifier: AGPL-3.0 import { matchPath } from 'react-router'; -import { ResourceKind, RESOURCE_UUID_PATTERN, extractUuidKind, COLLECTION_PDH_REGEX } from '~/models/resource'; -import { getProjectUrl } from '~/models/project'; -import { getCollectionUrl } from '~/models/collection'; -import { Config } from '~/common/config'; -import { Session } from "~/models/session"; +import { ResourceKind, RESOURCE_UUID_PATTERN, extractUuidKind, COLLECTION_PDH_REGEX, PORTABLE_DATA_HASH_PATTERN } from 'models/resource'; +import { getProjectUrl } from 'models/project'; +import { getCollectionUrl } from 'models/collection'; +import { Config } from 'common/config'; +import { Session } from "models/session"; export interface FederationConfig { localCluster: string; @@ -39,15 +39,15 @@ export const Routes = { MY_ACCOUNT: '/my-account', LINK_ACCOUNT: '/link_account', KEEP_SERVICES: `/keep-services`, - COMPUTE_NODES: `/nodes`, USERS: '/users', API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`, GROUPS: '/groups', GROUP_DETAILS: `/group/:id(${RESOURCE_UUID_PATTERN})`, LINKS: '/links', PUBLIC_FAVORITES: '/public-favorites', - COLLECTIONS_CONTENT_ADDRESS: '/collections/:id', + COLLECTIONS_CONTENT_ADDRESS: `/collections/:id(${PORTABLE_DATA_HASH_PATTERN})`, ALL_PROCESSES: '/all_processes', + NO_MATCH: '*', }; export const getResourceUrl = (uuid: string) => { @@ -175,9 +175,6 @@ export const matchFedTokenRoute = (route: string) => export const matchUsersRoute = (route: string) => matchPath(route, { path: Routes.USERS }); -export const matchComputeNodesRoute = (route: string) => - matchPath(route, { path: Routes.COMPUTE_NODES }); - export const matchApiClientAuthorizationsRoute = (route: string) => matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });