Merge branch '16159-logout-request-with-token'

[arvados-workbench2.git] / src / routes / routes.ts

diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index ced460e77ceeb0689a7467a5f332304097345aa8..452589f6fcb6429a07f173189e555b4222f51cff 100644 (file)
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { matchPath } from 'react-router';
-import { ResourceKind, RESOURCE_UUID_PATTERN, extractUuidKind, COLLECTION_PDH_REGEX } from '~/models/resource';
+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';
@@ -46,8 +46,9 @@ export const Routes = {
     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) => {
@@ -112,6 +113,9 @@ export const matchFavoritesRoute = (route: string) =>
 export const matchTrashRoute = (route: string) =>
     matchPath(route, { path: Routes.TRASH });
 
+export const matchAllProcessesRoute = (route: string) =>
+    matchPath(route, { path: Routes.ALL_PROCESSES });
+
 export const matchProjectRoute = (route: string) =>
     matchPath<ResourceRouteParams>(route, { path: Routes.PROJECTS });