X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/38d27e9783f7f760cee84cc225e86144069848c4..25d64433dff3ffcf083c2cedd8d849de49a691d1:/src/routes/routes.ts diff --git a/src/routes/routes.ts b/src/routes/routes.ts index d9da0234..50689ec3 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -25,7 +25,6 @@ export const Routes = { PROCESSES: `/processes/:id(${RESOURCE_UUID_PATTERN})`, FAVORITES: '/favorites', TRASH: '/trash', - PROCESS_LOGS: `/process-logs/:id(${RESOURCE_UUID_PATTERN})`, REPOSITORIES: '/repositories', SHARED_WITH_ME: '/shared-with-me', RUN_PROCESS: '/run-process', @@ -39,8 +38,8 @@ export const Routes = { MY_ACCOUNT: '/my-account', LINK_ACCOUNT: '/link_account', KEEP_SERVICES: `/keep-services`, - COMPUTE_NODES: `/nodes`, USERS: '/users', + USER_PROFILE: `/user/:id(${RESOURCE_UUID_PATTERN})`, API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`, GROUPS: '/groups', GROUP_DETAILS: `/group/:id(${RESOURCE_UUID_PATTERN})`, @@ -69,7 +68,7 @@ export const getResourceUrl = (uuid: string) => { export const getNavUrl = (uuid: string, config: FederationConfig) => { const path = getResourceUrl(uuid) || ""; - const cls = uuid.substr(0, 5); + const cls = uuid.substring(0, 5); if (cls === config.localCluster || extractUuidKind(uuid) === ResourceKind.USER || COLLECTION_PDH_REGEX.exec(uuid)) { return path; } else if (config.remoteHostsConfig[cls]) { @@ -96,10 +95,10 @@ export const getNavUrl = (uuid: string, config: FederationConfig) => { export const getProcessUrl = (uuid: string) => `/processes/${uuid}`; -export const getProcessLogUrl = (uuid: string) => `/process-logs/${uuid}`; - export const getGroupUrl = (uuid: string) => `/group/${uuid}`; +export const getUserProfileUrl = (uuid: string) => `/user/${uuid}`; + export interface ResourceRouteParams { id: string; } @@ -125,9 +124,6 @@ export const matchCollectionRoute = (route: string) => export const matchProcessRoute = (route: string) => matchPath(route, { path: Routes.PROCESSES }); -export const matchProcessLogRoute = (route: string) => - matchPath(route, { path: Routes.PROCESS_LOGS }); - export const matchSharedWithMeRoute = (route: string) => matchPath(route, { path: Routes.SHARED_WITH_ME }); @@ -176,8 +172,8 @@ 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 matchUserProfileRoute = (route: string) => + matchPath(route, { path: Routes.USER_PROFILE }); export const matchApiClientAuthorizationsRoute = (route: string) => matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });