projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set better return type of route handlers ActionCreator
[arvados.git]
/
src
/
routes
/
routes.ts
diff --git
a/src/routes/routes.ts
b/src/routes/routes.ts
index 05f6663fe3c2bbb8021423249e5e045263ab3be7..b1da949652e60d0046e5487de5aa8f6279243bb2 100644
(file)
--- a/
src/routes/routes.ts
+++ b/
src/routes/routes.ts
@@
-25,11
+25,14
@@
export const Routes = {
SEARCH_RESULTS: '/search-results',
SSH_KEYS_ADMIN: `/ssh-keys-admin`,
SSH_KEYS_USER: `/ssh-keys-user`,
SEARCH_RESULTS: '/search-results',
SSH_KEYS_ADMIN: `/ssh-keys-admin`,
SSH_KEYS_USER: `/ssh-keys-user`,
+ SITE_MANAGER: `/site-manager`,
MY_ACCOUNT: '/my-account',
KEEP_SERVICES: `/keep-services`,
COMPUTE_NODES: `/nodes`,
USERS: '/users',
API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`,
MY_ACCOUNT: '/my-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'
};
LINKS: '/links'
};
@@
-51,6
+54,8
@@
export const getProcessUrl = (uuid: string) => `/processes/${uuid}`;
export const getProcessLogUrl = (uuid: string) => `/process-logs/${uuid}`;
export const getProcessLogUrl = (uuid: string) => `/process-logs/${uuid}`;
+export const getGroupUrl = (uuid: string) => `/group/${uuid}`;
+
export interface ResourceRouteParams {
id: string;
}
export interface ResourceRouteParams {
id: string;
}
@@
-103,6
+108,9
@@
export const matchSshKeysUserRoute = (route: string) =>
export const matchSshKeysAdminRoute = (route: string) =>
matchPath(route, { path: Routes.SSH_KEYS_ADMIN });
export const matchSshKeysAdminRoute = (route: string) =>
matchPath(route, { path: Routes.SSH_KEYS_ADMIN });
+export const matchSiteManagerRoute = (route: string) =>
+ matchPath(route, { path: Routes.SITE_MANAGER });
+
export const matchMyAccountRoute = (route: string) =>
matchPath(route, { path: Routes.MY_ACCOUNT });
export const matchMyAccountRoute = (route: string) =>
matchPath(route, { path: Routes.MY_ACCOUNT });
@@
-118,5
+126,11
@@
export const matchComputeNodesRoute = (route: string) =>
export const matchApiClientAuthorizationsRoute = (route: string) =>
matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });
export const matchApiClientAuthorizationsRoute = (route: string) =>
matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });
+export const matchGroupsRoute = (route: string) =>
+ matchPath(route, { path: Routes.GROUPS });
+
+export const matchGroupDetailsRoute = (route: string) =>
+ matchPath<ResourceRouteParams>(route, { path: Routes.GROUP_DETAILS });
+
export const matchLinksRoute = (route: string) =>
export const matchLinksRoute = (route: string) =>
- matchPath(route, { path: Routes.LINKS });
\ No newline at end of file
+ matchPath(route, { path: Routes.LINKS });