X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/342f4ed11da7860e834928aa79974f096a8f6291..b61a12ca0d14433ddb10a6d6361a18b1f127c98e:/src/routes/routes.ts diff --git a/src/routes/routes.ts b/src/routes/routes.ts index d7257b51..22c8f4c8 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -39,6 +39,7 @@ export const Routes = { LINK_ACCOUNT: '/link_account', KEEP_SERVICES: `/keep-services`, USERS: '/users', + USER_PROFILE: `/user/:id(${RESOURCE_UUID_PATTERN})`, API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`, GROUPS: '/groups', GROUP_DETAILS: `/group/:id(${RESOURCE_UUID_PATTERN})`, @@ -65,7 +66,10 @@ export const getResourceUrl = (uuid: string) => { } }; -export const getNavUrl = (uuid: string, config: FederationConfig) => { +/** + * @returns A relative or federated url for the given uuid, with a token for federated WB1 urls + */ +export const getNavUrl = (uuid: string, config: FederationConfig, includeToken: boolean = true): string => { const path = getResourceUrl(uuid) || ""; const cls = uuid.substring(0, 5); if (cls === config.localCluster || extractUuidKind(uuid) === ResourceKind.USER || COLLECTION_PDH_REGEX.exec(uuid)) { @@ -82,7 +86,9 @@ export const getNavUrl = (uuid: string, config: FederationConfig) => { u = new URL(config.remoteHostsConfig[cls].workbench2Url); } else { u = new URL(config.remoteHostsConfig[cls].workbenchUrl); - u.search = "api_token=" + config.sessions.filter((s) => s.clusterId === cls)[0].token; + if (includeToken) { + u.search = "api_token=" + config.sessions.filter((s) => s.clusterId === cls)[0].token; + } } u.pathname = path; return u.toString(); @@ -96,6 +102,8 @@ export const getProcessUrl = (uuid: string) => `/processes/${uuid}`; export const getGroupUrl = (uuid: string) => `/group/${uuid}`; +export const getUserProfileUrl = (uuid: string) => `/user/${uuid}`; + export interface ResourceRouteParams { id: string; } @@ -169,6 +177,9 @@ export const matchFedTokenRoute = (route: string) => export const matchUsersRoute = (route: string) => matchPath(route, { path: Routes.USERS }); +export const matchUserProfileRoute = (route: string) => + matchPath(route, { path: Routes.USER_PROFILE }); + export const matchApiClientAuthorizationsRoute = (route: string) => matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });