[ARVADOS-WORKBENCH2] updated: 1.3.0-62-g3865bd1
Git user
git at public.curoverse.com
Fri Dec 7 04:48:47 EST 2018
Summary of changes:
src/components/autocomplete/autocomplete.tsx | 60 ++++++--
src/components/text-field/text-field.tsx | 4 +-
src/models/user.ts | 12 ++
src/routes/route-change-handlers.ts | 3 +
src/routes/routes.ts | 4 +
src/services/auth-service/auth-service.ts | 23 ++-
src/store/auth/auth-action.ts | 1 -
src/store/auth/auth-reducer.test.ts | 4 +
src/store/my-account/my-account-panel-actions.ts | 31 ++++
src/store/navigation/navigation-action.ts | 2 +
src/store/workbench/workbench-actions.ts | 6 +
src/validators/validators.tsx | 2 +
src/views-components/main-app-bar/account-menu.tsx | 4 +-
.../my-account-panel/my-account-panel-root.tsx | 161 +++++++++++++++++++++
src/views/my-account-panel/my-account-panel.tsx | 26 ++++
src/views/workbench/workbench.tsx | 2 +
16 files changed, 326 insertions(+), 19 deletions(-)
create mode 100644 src/store/my-account/my-account-panel-actions.ts
create mode 100644 src/views/my-account-panel/my-account-panel-root.tsx
create mode 100644 src/views/my-account-panel/my-account-panel.tsx
via 3865bd152892a1ad5f85f23d085268837db8c9ee (commit)
via 663ddeefc6a120d6dba213b1392805146d659721 (commit)
via fa1f1c301a58d163e452ca9d14d326934a403f17 (commit)
via a29cf3418b6c301c0f531cecb7db4c721e7eb014 (commit)
via 5ecee04a6186627bd1875b2dabcc31489569ff71 (commit)
via f9dafeec8d45f0cb19d71326b7fa877891a7eb9e (commit)
via 88bc5b67b64644ac164698f35bcd867dbb463cd6 (commit)
via 6d7c7e9ed34aec3d30324ff544b17b7e39872f54 (commit)
via 425cafe27cbfd822af1e7640c2a18efb3796d4c6 (commit)
via 88d3dba97a29f7188c3bda8be965fb18f97f4b4d (commit)
via 025c6ba35cb5b7e7b386e3cbc7bee59c4a652b36 (commit)
via a1e2b8ba77e4a7273940a3fc542bc42e282618a7 (commit)
via e8e0182d65a74b1a222127eb8b36f31a906b14c8 (commit)
via b7a4d46fe2b011cdb6e38ed42e9f886fee8290b8 (commit)
via 4ea2ff188ec745966387ce8bbe14880bfeede863 (commit)
via 92dd5d32b573b5c90f3ce72dc207f6d0e7f21178 (commit)
from eb8fb03156072ae7d9c289d8d7156fc2d94e40be (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3865bd152892a1ad5f85f23d085268837db8c9ee
Merge: eb8fb03 663ddee
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Fri Dec 7 10:48:35 2018 +0100
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14500_admin_api_tokens
refs #2
14500
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --cc src/routes/route-change-handlers.ts
index 1a88ff2,68de310..a733e42
--- a/src/routes/route-change-handlers.ts
+++ b/src/routes/route-change-handlers.ts
@@@ -31,7 -31,7 +31,8 @@@ const handleLocationChange = (store: Ro
const sshKeysMatch = Routes.matchSshKeysRoute(pathname);
const keepServicesMatch = Routes.matchKeepServicesRoute(pathname);
const computeNodesMatch = Routes.matchComputeNodesRoute(pathname);
+ const apiClientAuthorizationsMatch = Routes.matchApiClientAuthorizationsRoute(pathname);
+ const myAccountMatch = Routes.matchMyAccountRoute(pathname);
if (projectMatch) {
store.dispatch(WorkbenchActions.loadProject(projectMatch.params.id));
@@@ -65,7 -65,7 +66,9 @@@
store.dispatch(WorkbenchActions.loadKeepServices);
} else if (computeNodesMatch) {
store.dispatch(WorkbenchActions.loadComputeNodes);
+ } else if (apiClientAuthorizationsMatch) {
+ store.dispatch(WorkbenchActions.loadApiClientAuthorizations);
+ } else if (myAccountMatch) {
+ store.dispatch(WorkbenchActions.loadMyAccount);
}
};
diff --cc src/routes/routes.ts
index 1fda25d,71d920a..7f15a8d
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@@ -23,9 -23,9 +23,10 @@@ export const Routes =
WORKFLOWS: '/workflows',
SEARCH_RESULTS: '/search-results',
SSH_KEYS: `/ssh-keys`,
+ MY_ACCOUNT: '/my-account',
KEEP_SERVICES: `/keep-services`,
- COMPUTE_NODES: `/nodes`
+ COMPUTE_NODES: `/nodes`,
+ API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`
};
export const getResourceUrl = (uuid: string) => {
diff --cc src/store/navigation/navigation-action.ts
index e1e8cef,a365272..067a9ac
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -68,8 -68,8 +68,10 @@@ export const navigateToRepositories = p
export const navigateToSshKeys= push(Routes.SSH_KEYS);
+ export const navigateToMyAccount = push(Routes.MY_ACCOUNT);
+
export const navigateToKeepServices = push(Routes.KEEP_SERVICES);
-export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
+export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
+
+export const navigateToApiClientAuthorizations = push(Routes.API_CLIENT_AUTHORIZATIONS);
diff --cc src/views-components/main-app-bar/account-menu.tsx
index f385b9f,ee726f3..415cba3
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@@ -12,10 -12,7 +12,10 @@@ import { logout } from '~/store/auth/au
import { RootState } from "~/store/store";
import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions';
import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
-import { navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes, navigateToMyAccount } from '~/store/navigation/navigation-action';
+import {
+ navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes,
- navigateToApiClientAuthorizations
++ navigateToApiClientAuthorizations, navigateToMyAccount
+} from '~/store/navigation/navigation-action';
import { openVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions";
interface AccountMenuProps {
@@@ -40,10 -37,9 +40,10 @@@ export const AccountMenu = connect(mapS
<MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
<MenuItem onClick={() => dispatch(openCurrentTokenDialog)}>Current token</MenuItem>
<MenuItem onClick={() => dispatch(navigateToSshKeys)}>Ssh Keys</MenuItem>
+ { user.isAdmin && <MenuItem onClick={() => dispatch(navigateToApiClientAuthorizations)}>Api Tokens</MenuItem> }
{ user.isAdmin && <MenuItem onClick={() => dispatch(navigateToKeepServices)}>Keep Services</MenuItem> }
{ user.isAdmin && <MenuItem onClick={() => dispatch(navigateToComputeNodes)}>Compute Nodes</MenuItem> }
- <MenuItem>My account</MenuItem>
+ <MenuItem onClick={() => dispatch(navigateToMyAccount)}>My account</MenuItem>
<MenuItem onClick={() => dispatch(logout())}>Logout</MenuItem>
</DropdownMenu>
: null);
diff --cc src/views/workbench/workbench.tsx
index 1f5a503,5efffa1..3cd040f
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -145,7 -142,7 +146,8 @@@ export const WorkbenchPanel
<Route path={Routes.SSH_KEYS} component={SshKeyPanel} />
<Route path={Routes.KEEP_SERVICES} component={KeepServicePanel} />
<Route path={Routes.COMPUTE_NODES} component={ComputeNodePanel} />
+ <Route path={Routes.API_CLIENT_AUTHORIZATIONS} component={ApiClientAuthorizationPanel} />
+ <Route path={Routes.MY_ACCOUNT} component={MyAccountPanel} />
</Switch>
</Grid>
</Grid>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list