[ARVADOS-WORKBENCH2] updated: 1.3.0-239-g24574669
Git user
git at public.curoverse.com
Thu Dec 27 05:32:43 EST 2018
Summary of changes:
src/store/users/users-actions.ts | 10 +++---
.../context-menu/action-sets/user-action-set.ts | 4 +--
.../dialog-forms/setup-shell-account-dialog.tsx | 42 +++++++++++++++-------
src/views-components/user-dialog/manage-dialog.tsx | 6 ++--
4 files changed, 39 insertions(+), 23 deletions(-)
via 24574669fd453c6846bc9f64ce9ae407db79568b (commit)
from 5017989693137cabe7f00a00c51db35625f9b55f (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 24574669fd453c6846bc9f64ce9ae407db79568b
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Dec 27 11:32:28 2018 +0100
cr changes
Feature #14565
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts
index e4465ddc..4780aa72 100644
--- a/src/store/users/users-actions.ts
+++ b/src/store/users/users-actions.ts
@@ -17,7 +17,7 @@ import { saveApiToken } from '~/store/auth/auth-action';
export const USERS_PANEL_ID = 'usersPanel';
export const USER_ATTRIBUTES_DIALOG = 'userAttributesDialog';
export const USER_CREATE_FORM_NAME = 'userCreateFormName';
-export const USER_MANAGE_DIALOG = 'userManageDialog';
+export const USER_MANAGEMENT_DIALOG = 'userManageDialog';
export const SETUP_SHELL_ACCOUNT_DIALOG = 'setupShellAccountDialog';
export interface UserCreateFormDialogData {
@@ -33,11 +33,11 @@ export const openUserAttributes = (uuid: string) =>
dispatch(dialogActions.OPEN_DIALOG({ id: USER_ATTRIBUTES_DIALOG, data }));
};
-export const openUserManage = (uuid: string) =>
+export const openUserManagement = (uuid: string) =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const { resources } = getState();
const data = getResource<UserResource>(uuid)(resources);
- dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGE_DIALOG, data }));
+ dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGEMENT_DIALOG, data }));
};
export const openSetupShellAccount = (uuid: string) =>
@@ -45,11 +45,11 @@ export const openSetupShellAccount = (uuid: string) =>
const { resources } = getState();
const user = getResource<UserResource>(uuid)(resources);
const virtualMachines = await services.virtualMachineService.list();
- dispatch(dialogActions.CLOSE_DIALOG({ id: USER_MANAGE_DIALOG }));
+ dispatch(dialogActions.CLOSE_DIALOG({ id: USER_MANAGEMENT_DIALOG }));
dispatch(dialogActions.OPEN_DIALOG({ id: SETUP_SHELL_ACCOUNT_DIALOG, data: { user, ...virtualMachines } }));
};
-export const loginAs = (uuid: string) =>
+export const loginAs = (uuid: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const client = await services.apiClientAuthorizationService.get(uuid);
dispatch<any>(saveApiToken(client.apiToken));
diff --git a/src/views-components/context-menu/action-sets/user-action-set.ts b/src/views-components/context-menu/action-sets/user-action-set.ts
index c1b559fe..d2b97d15 100644
--- a/src/views-components/context-menu/action-sets/user-action-set.ts
+++ b/src/views-components/context-menu/action-sets/user-action-set.ts
@@ -5,7 +5,7 @@
import { ContextMenuActionSet } from "~/views-components/context-menu/context-menu-action-set";
import { AdvancedIcon, ProjectIcon, AttributesIcon, UserPanelIcon } from "~/components/icon/icon";
import { openAdvancedTabDialog } from '~/store/advanced-tab/advanced-tab';
-import { openUserAttributes, openUserProjects, openUserManage } from "~/store/users/users-actions";
+import { openUserAttributes, openUserProjects, openUserManagement } from "~/store/users/users-actions";
export const userActionSet: ContextMenuActionSet = [[{
name: "Attributes",
@@ -29,6 +29,6 @@ export const userActionSet: ContextMenuActionSet = [[{
name: "Manage",
icon: UserPanelIcon,
execute: (dispatch, { uuid }) => {
- dispatch<any>(openUserManage(uuid));
+ dispatch<any>(openUserManagement(uuid));
}
}]];
diff --git a/src/views-components/dialog-forms/setup-shell-account-dialog.tsx b/src/views-components/dialog-forms/setup-shell-account-dialog.tsx
index 8b9a6b61..c53f53c2 100644
--- a/src/views-components/dialog-forms/setup-shell-account-dialog.tsx
+++ b/src/views-components/dialog-forms/setup-shell-account-dialog.tsx
@@ -12,6 +12,7 @@ import { USER_LENGTH_VALIDATION } from '~/validators/validators';
import { InputLabel } from '@material-ui/core';
import { NativeSelectField } from '~/components/select-field/select-field';
import { SETUP_SHELL_ACCOUNT_DIALOG, createUser } from '~/store/users/users-actions';
+import { UserResource } from '~/models/user';
interface SetupShellAccountFormDialogData {
email: string;
@@ -37,14 +38,31 @@ export const SetupShellAccountDialog = compose(
/>
);
-const UserEmailField = ({ data }: any) =>
- <Field
- name='email'
- component={TextField}
- disabled
- label={data.user.email} />;
+interface UserProps {
+ data: {
+ user: UserResource;
+ };
+}
+
+interface VirtualMachinesProps {
+ data: {
+ items: VirtualMachinesResource[];
+ };
+}
+interface DataProps {
+ user: UserResource;
+ items: VirtualMachinesResource[];
+}
+
+const UserEmailField = ({ data }: UserProps) =>
+ <span>
+ <Field
+ name='email'
+ component={TextField}
+ disabled
+ label={data.user.email} /></span>;
-const UserVirtualMachineField = ({ data }: any) =>
+const UserVirtualMachineField = ({ data }: VirtualMachinesProps) =>
<div style={{ marginBottom: '21px' }}>
<InputLabel>Virtual Machine</InputLabel>
<Field
@@ -61,17 +79,15 @@ const UserGroupsVirtualMachineField = () =>
validate={USER_LENGTH_VALIDATION}
label="Groups for virtual machine (comma separated list)" />;
-const getVirtualMachinesList = (virtualMachines: VirtualMachinesResource[]) => {
- const mappedVirtualMachines = virtualMachines.map(it => ({ key: it.hostname, value: it.hostname }));
- return mappedVirtualMachines;
-};
+const getVirtualMachinesList = (virtualMachines: VirtualMachinesResource[]) =>
+ virtualMachines.map(it => ({ key: it.hostname, value: it.hostname }));
type SetupShellAccountDialogComponentProps = WithDialogProps<{}> & InjectedFormProps<SetupShellAccountFormDialogData>;
const SetupShellAccountFormFields = (props: SetupShellAccountDialogComponentProps) =>
<>
- <UserEmailField data={props.data}/>
- <UserVirtualMachineField data={props.data} />
+ <UserEmailField data={props.data as DataProps} />
+ <UserVirtualMachineField data={props.data as DataProps} />
<UserGroupsVirtualMachineField />
</>;
diff --git a/src/views-components/user-dialog/manage-dialog.tsx b/src/views-components/user-dialog/manage-dialog.tsx
index a64b5082..8db1e053 100644
--- a/src/views-components/user-dialog/manage-dialog.tsx
+++ b/src/views-components/user-dialog/manage-dialog.tsx
@@ -9,7 +9,7 @@ import { withDialog } from '~/store/dialog/with-dialog';
import { WithStyles, withStyles } from '@material-ui/core/styles';
import { ArvadosTheme } from '~/common/custom-theme';
import { compose, Dispatch } from "redux";
-import { USER_MANAGE_DIALOG, openSetupShellAccount, loginAs } from "~/store/users/users-actions";
+import { USER_MANAGEMENT_DIALOG, openSetupShellAccount, loginAs } from "~/store/users/users-actions";
import { UserResource } from "~/models/user";
import { connect } from "react-redux";
@@ -40,7 +40,7 @@ type UserManageProps = UserManageDataProps & UserManageActionProps & WithStyles<
export const UserManageDialog = compose(
connect(null, mapDispatchToProps),
- withDialog(USER_MANAGE_DIALOG),
+ withDialog(USER_MANAGEMENT_DIALOG),
styles)(
(props: WithDialogProps<UserManageProps> & UserManageProps) =>
<Dialog open={props.open}
@@ -58,7 +58,7 @@ export const UserManageDialog = compose(
<Typography variant="body2" className={props.classes.spacing}>
As an admin, you can setup a shell account for this user. The login name is automatically generated from the user's e-mail address.
</Typography>
- <Button variant="contained" color="primary" onClick={() => props.openSetupShellAccount(props.data.uuid)} disabled>
+ <Button variant="contained" color="primary" onClick={() => props.openSetupShellAccount(props.data.uuid)}>
{`SETUP SHELL ACCOUNT FOR ${props.data.firstName} ${props.data.lastName}`}
</Button>
</DialogContent>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list