[ARVADOS-WORKBENCH2] updated: 1.3.0-116-g454ef1c
Git user
git at public.curoverse.com
Wed Dec 12 04:55:35 EST 2018
Summary of changes:
src/components/icon/icon.tsx | 2 +
src/models/link.ts | 1 +
src/routes/route-change-handlers.ts | 16 ++-
src/routes/routes.ts | 20 +++-
.../ancestors-service/ancestors-service.ts | 21 +++-
src/services/workflow-service/workflow-service.ts | 35 ++++++
src/store/auth/auth-action.ts | 9 +-
.../collection-panel/collection-panel-action.ts | 12 ++
src/store/navigation/navigation-action.ts | 8 +-
src/store/process-panel/process-panel-actions.ts | 15 +++
src/store/processes/process-update-actions.ts | 3 +-
.../run-process-panel/run-process-panel-actions.ts | 27 ++++-
.../run-process-panel/run-process-panel-reducer.ts | 12 ++
src/store/users/users-actions.ts | 20 +++-
.../virtual-machines/virtual-machines-actions.ts | 32 +++--
src/validators/validators.tsx | 1 +
.../dialog-update/dialog-process-update.tsx | 3 +-
.../form-fields/process-form-fields.tsx | 9 +-
src/views-components/main-app-bar/account-menu.tsx | 17 +--
src/views-components/main-app-bar/admin-menu.tsx | 43 +++++++
src/views-components/main-app-bar/main-app-bar.tsx | 4 +-
.../main-content-bar/main-content-bar.tsx | 9 +-
src/views/collection-panel/collection-panel.tsx | 17 ++-
.../process-panel/process-information-card.tsx | 9 +-
src/views/process-panel/process-panel-root.tsx | 4 +-
src/views/process-panel/process-panel.tsx | 5 +-
.../repositories-panel/repositories-panel.tsx | 2 +-
.../run-process-panel/run-process-second-step.tsx | 32 ++++-
.../run-process-panel/workflow-preset-select.tsx | 68 +++++++++++
.../virtual-machine-admin-panel.tsx | 112 ++++++++++++++++++
...ne-panel.tsx => virtual-machine-user-panel.tsx} | 131 +++++++--------------
src/views/workbench/workbench.tsx | 9 +-
32 files changed, 546 insertions(+), 162 deletions(-)
create mode 100644 src/views-components/main-app-bar/admin-menu.tsx
create mode 100644 src/views/run-process-panel/workflow-preset-select.tsx
create mode 100644 src/views/virtual-machine-panel/virtual-machine-admin-panel.tsx
rename src/views/virtual-machine-panel/{virtual-machine-panel.tsx => virtual-machine-user-panel.tsx} (53%)
via 454ef1c106b3d738526d65ecfae8db98ad7bebc2 (commit)
via edb6e7b588bc443de1c54782812064f00e6e5b53 (commit)
via 9fe5431b326d565cb423613f7752a4dad9d9aedd (commit)
via 1832d4a40997469ae0c2d3e6f2e5a552b834118b (commit)
via 3dbe57077135d1684407ba6cc2a0d20cfcb33618 (commit)
via 00e249f6a7b5e9da3a4b39bfc9d88ec96e928ec0 (commit)
via 4d2ff0c66175bf47c5643e9500c2cc6d7caf8c8b (commit)
via fbeaaaf7f54590fc6fd02b990ee8e4fe1be41817 (commit)
via 4f09ca588d03cc6e1be52190f902c21a0ae2a850 (commit)
via bbfd038f8d53725f154ff139229a74d961792915 (commit)
via a8350416b8f225a64aa207c5823e42ede43fd7d0 (commit)
via 54063448526c6eac346823d6cc66ba7a05f2cce7 (commit)
via 7a81b9d2c37ceb5add5df8fe9fe48b409d971e37 (commit)
via 9a29063c1833eb300da899559bc322e7bca50f97 (commit)
via 188fed64a7cfe68460f64a874dba3fd280d5d561 (commit)
via 91fc1bd2a1df91b37755f3453e6e9693baa4ce64 (commit)
via 2b1802c27fe8eb3664da3378fa7f59761d9ce184 (commit)
via 4f4f2feaf1ac31946a87290ba4eef3a6b5455f2d (commit)
via 1b15486e36f96b209a1854c1f33f8330e97f1b94 (commit)
via 6c0ca05293d2d1bb5b4b0df63f541eb4f75428c3 (commit)
via 88c4b93c3e4f05afff419374277299d61ac61176 (commit)
via 6eaf8881f39c83f9073921277f81274425921054 (commit)
via 4e3cefd4fa42762aac756f3163dfff9047f2e516 (commit)
via c0b8c031bf6327c8ed22fb05ec40f3045b5aa1f1 (commit)
via 860aa7438d52897f646c3482f8656be1193d8123 (commit)
via c7b35b9342e953cc3cae862b6958c18589f48037 (commit)
via 94ca0c19fac51ae89bed3a9bbb2b90545697dfbf (commit)
via 6c12dcde231f8a6d419a4e154d6906bce944963c (commit)
via 222a0099d2b8285b8770092f5da01314e0c7de7d (commit)
via 4c3faee100f2d676bb18dc68f7cf1c4ac25ae50d (commit)
via 3fdf49aeaf054284ec59e18885e66f798777ada9 (commit)
via b8e9a146d964192cc2f0bdc95100644fa53f7ca6 (commit)
via bf1d33cba4c15502866dda0ba4385d746033e773 (commit)
via 6aadd480a93c6b1332cba0d3924362af11412e02 (commit)
via 6f071fa34ec74d0ba035eb57e102307763d99496 (commit)
via f96eb4f60a314f2e5b0a21afd1ab836598d6c91f (commit)
via 64c8c2628cbeadba5dce7e18e41028108142b766 (commit)
via d366e025618106edb2419941a041cd0f4214b245 (commit)
from 090f4825bdd30925a10c6df1b9493df0c2e8f541 (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 454ef1c106b3d738526d65ecfae8db98ad7bebc2
Merge: 090f482 edb6e7b
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Wed Dec 12 10:55:10 2018 +0100
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14512_admin_links
refs #2
14512
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --cc src/views-components/main-app-bar/admin-menu.tsx
index 0000000,40ba916..88aafba
mode 000000,100644..100644
--- a/src/views-components/main-app-bar/admin-menu.tsx
+++ b/src/views-components/main-app-bar/admin-menu.tsx
@@@ -1,0 -1,45 +1,43 @@@
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+
+ import * as React from "react";
+ import { MenuItem } from "@material-ui/core";
+ import { User } from "~/models/user";
+ import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
+ import { AdminMenuIcon } from "~/components/icon/icon";
+ import { DispatchProp, connect } from 'react-redux';
+ import { logout } from '~/store/auth/auth-action';
+ import { RootState } from "~/store/store";
+ import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
-import {
- navigateToSshKeysAdmin, navigateToKeepServices, navigateToComputeNodes,
- navigateToApiClientAuthorizations
-} from '~/store/navigation/navigation-action';
++import * as NavigationAction from '~/store/navigation/navigation-action';
+ import { openAdminVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions";
+ import { openUserPanel } from "~/store/users/users-actions";
+
+ interface AdminMenuProps {
+ user?: User;
+ }
+
+ const mapStateToProps = (state: RootState): AdminMenuProps => ({
+ user: state.auth.user
+ });
+
+ export const AdminMenu = connect(mapStateToProps)(
+ ({ user, dispatch }: AdminMenuProps & DispatchProp<any>) =>
+ user
+ ? <DropdownMenu
+ icon={<AdminMenuIcon />}
+ id="admin-menu"
+ title="Admin Panel">
+ <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
+ <MenuItem onClick={() => dispatch(openAdminVirtualMachines())}>Virtual Machines</MenuItem>
- <MenuItem onClick={() => dispatch(navigateToSshKeysAdmin)}>Ssh Keys</MenuItem>
- <MenuItem onClick={() => dispatch(navigateToApiClientAuthorizations)}>Api Tokens</MenuItem>
++ <MenuItem onClick={() => dispatch(NavigationAction.navigateToSshKeysAdmin)}>Ssh Keys</MenuItem>
++ <MenuItem onClick={() => dispatch(NavigationAction.navigateToApiClientAuthorizations)}>Api Tokens</MenuItem>
+ <MenuItem onClick={() => dispatch(openUserPanel())}>Users</MenuItem>
- <MenuItem onClick={() => dispatch(navigateToComputeNodes)}>Compute Nodes</MenuItem>
- <MenuItem onClick={() => dispatch(navigateToKeepServices)}>Keep Services</MenuItem>
++ <MenuItem onClick={() => dispatch(NavigationAction.navigateToComputeNodes)}>Compute Nodes</MenuItem>
++ <MenuItem onClick={() => dispatch(NavigationAction.navigateToKeepServices)}>Keep Services</MenuItem>
++ <MenuItem onClick={() => dispatch(NavigationAction.navigateToLinks)}>Links</MenuItem>
+ <MenuItem onClick={() => dispatch(logout())}>Logout</MenuItem>
+ </DropdownMenu>
+ : null);
diff --cc src/views-components/main-content-bar/main-content-bar.tsx
index 0336217,9259219..3806b52
--- a/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/src/views-components/main-content-bar/main-content-bar.tsx
@@@ -18,11 -18,12 +18,12 @@@ interface MainContentBarProps
const isButtonVisible = ({ router }: RootState) => {
const pathname = router.location ? router.location.pathname : '';
- return !Routes.matchWorkflowRoute(pathname) && !Routes.matchVirtualMachineRoute(pathname) &&
- !Routes.matchRepositoriesRoute(pathname) && !Routes.matchSshKeysRoute(pathname) &&
+ return !Routes.matchWorkflowRoute(pathname) && !Routes.matchUserVirtualMachineRoute(pathname) &&
+ !Routes.matchAdminVirtualMachineRoute(pathname) && !Routes.matchRepositoriesRoute(pathname) &&
+ !Routes.matchSshKeysAdminRoute(pathname) && !Routes.matchSshKeysUserRoute(pathname) &&
!Routes.matchKeepServicesRoute(pathname) && !Routes.matchComputeNodesRoute(pathname) &&
- !Routes.matchApiClientAuthorizationsRoute(pathname) && !Routes.matchUsersRoute(pathname) &&
- !Routes.matchLinksRoute(pathname);
+ !Routes.matchApiClientAuthorizationsRoute(pathname) && !Routes.matchUsersRoute(pathname) &&
- !Routes.matchMyAccountRoute(pathname);
++ !Routes.matchMyAccountRoute(pathname) && !Routes.matchLinksRoute(pathname);
};
export const MainContentBar = connect((state: RootState) => ({
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list