From ba827c8901ad45c3a8af49bf11af20c90bd46376 Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Mon, 17 Dec 2018 14:35:46 +0100 Subject: [PATCH] init-modal Feature #14565 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- src/store/users/users-actions.ts | 8 +++ .../action-sets/user-action-set.ts | 7 +-- .../user-dialog/manage-dialog.tsx | 62 +++++++++++++++++++ src/views/workbench/workbench.tsx | 2 + 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 src/views-components/user-dialog/manage-dialog.tsx diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts index 585a3663..61b5aad4 100644 --- a/src/store/users/users-actions.ts +++ b/src/store/users/users-actions.ts @@ -16,6 +16,7 @@ import { navigateToProject, navigateToUsers, navigateToRootProject } from "~/sto 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 interface UserCreateFormDialogData { email: string; @@ -31,6 +32,13 @@ export const openUserAttributes = (uuid: string) => dispatch(dialogActions.OPEN_DIALOG({ id: USER_ATTRIBUTES_DIALOG, data })); }; +export const openUserManage = (uuid: string) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const { resources } = getState(); + const data = getResource(uuid)(resources); + dispatch(dialogActions.OPEN_DIALOG({ id: USER_MANAGE_DIALOG, data })); + }; + export const openUserCreateDialog = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const userUuid = await services.authService.getUuid(); 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 7b0884e6..c1b559fe 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 } from "~/store/users/users-actions"; +import { openUserAttributes, openUserProjects, openUserManage } from "~/store/users/users-actions"; export const userActionSet: ContextMenuActionSet = [[{ name: "Attributes", @@ -25,11 +25,10 @@ export const userActionSet: ContextMenuActionSet = [[{ execute: (dispatch, { uuid }) => { dispatch(openAdvancedTabDialog(uuid)); } -}, -{ +}, { name: "Manage", icon: UserPanelIcon, execute: (dispatch, { uuid }) => { - dispatch(openAdvancedTabDialog(uuid)); + dispatch(openUserManage(uuid)); } }]]; diff --git a/src/views-components/user-dialog/manage-dialog.tsx b/src/views-components/user-dialog/manage-dialog.tsx new file mode 100644 index 00000000..953e312e --- /dev/null +++ b/src/views-components/user-dialog/manage-dialog.tsx @@ -0,0 +1,62 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import * as React from "react"; +import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography } from "@material-ui/core"; +import { WithDialogProps } from "~/store/dialog/with-dialog"; +import { withDialog } from '~/store/dialog/with-dialog'; +import { WithStyles, withStyles } from '@material-ui/core/styles'; +import { ArvadosTheme } from '~/common/custom-theme'; +import { compose } from "redux"; +import { USER_MANAGE_DIALOG } from "~/store/users/users-actions"; +import { UserResource } from "~/models/user"; + +type CssRules = 'spacing'; + +const styles = withStyles((theme: ArvadosTheme) => ({ + spacing: { + paddingBottom: theme.spacing.unit * 2, + paddingTop: theme.spacing.unit * 2, + } +})); + +interface UserManageDataProps { + data: UserResource; +} + +type UserManageProps = UserManageDataProps & WithStyles; + +export const UserManageDialog = compose( + withDialog(USER_MANAGE_DIALOG), + styles)( + (props: WithDialogProps & UserManageProps) => + + {`Manage - ${props.data.firstName} ${props.data.lastName}`} + + + As an admin, you can log in as this user. When you’ve finished, you will need to log out and log in again with your own account. + + + + 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. + + + + + + + + ); diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 025540e2..b9c41bef 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -79,6 +79,7 @@ import { UserPanel } from '~/views/user-panel/user-panel'; import { UserAttributesDialog } from '~/views-components/user-dialog/attributes-dialog'; import { CreateUserDialog } from '~/views-components/dialog-forms/create-user-dialog'; import { HelpApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/help-dialog'; +import { UserManageDialog } from '~/views-components/user-dialog/manage-dialog'; type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content'; @@ -213,6 +214,7 @@ export const WorkbenchPanel = + ); \ No newline at end of file -- 2.30.2