Merge branch 'master' into 14099-process-service

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

diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index 2bdd17a5a2eec12f06bce983aa336d6904d9d89d..0bf7110126df7849f4571cfbe6e2c21dffa49fdd 100644 (file)
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -8,12 +8,14 @@ import { matchPath } from 'react-router';
 import { ResourceKind, RESOURCE_UUID_PATTERN, extractUuidKind } from '~/models/resource';
 import { getProjectUrl } from '../models/project';
 import { getCollectionUrl } from '~/models/collection';
-import { loadProject, loadFavorites, loadCollection } from '../store/navigation/navigation-action';
+import { loadProject, loadFavorites, loadCollection } from '../store/workbench/workbench-actions';
 
 export const Routes = {
     ROOT: '/',
+    TOKEN: '/token',
     PROJECTS: `/projects/:id(${RESOURCE_UUID_PATTERN})`,
     COLLECTIONS: `/collections/:id(${RESOURCE_UUID_PATTERN})`,
+    PROCESS: `/processes/:id(${RESOURCE_UUID_PATTERN})`,
     FAVORITES: '/favorites',
 };
 
@@ -53,7 +55,7 @@ export interface CollectionRouteParams {
 }
 
 export const matchCollectionRoute = (route: string) =>
-    matchPath<ProjectRouteParams>(route, { path: Routes.COLLECTIONS });
+    matchPath<CollectionRouteParams>(route, { path: Routes.COLLECTIONS });
 
 
 const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => {