Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Design edits #19

Merged
merged 1 commit into from
Apr 5, 2019
Merged

Design edits #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions ...ugins/security/public/components/management/change_password_form/change_password_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class ChangePasswordForm extends Component<Props, State> {
{this.props.isUserChangingOwnPassword && (
<EuiFormRow
{...this.validateCurrentPassword()}
fullWidth
label={
<FormattedMessage
id="xpack.security.account.changePasswordForm.currentPasswordLabel"
Expand All @@ -77,12 +78,20 @@ export class ChangePasswordForm extends Component<Props, State> {
value={this.state.currentPassword}
onChange={this.onCurrentPasswordChange}
disabled={this.state.changeInProgress}
fullWidth
/>
</EuiFormRow>
)}

<EuiFormRow
helpText={
<FormattedMessage
id="xpack.security.account.changePasswordForm.passwordRequirements"
defaultMessage="6 characters minimum"
/>
}
{...this.validateNewPassword()}
fullWidth
label={
<FormattedMessage
id="xpack.security.account.changePasswordForm.newPasswordLabel"
Expand All @@ -96,10 +105,12 @@ export class ChangePasswordForm extends Component<Props, State> {
value={this.state.newPassword}
onChange={this.onNewPasswordChange}
disabled={this.state.changeInProgress}
fullWidth
/>
</EuiFormRow>
<EuiFormRow
{...this.validateConfirmPassword()}
fullWidth
label={
<FormattedMessage
id="xpack.security.account.changePasswordForm.confirmPasswordLabel"
Expand All @@ -113,10 +124,11 @@ export class ChangePasswordForm extends Component<Props, State> {
value={this.state.confirmPassword}
onChange={this.onConfirmPasswordChange}
disabled={this.state.changeInProgress}
fullWidth
/>
</EuiFormRow>
<EuiFormRow>
<EuiFlexGroup alignItems="center">
<EuiFlexGroup alignItems="center" responsive={false}>
<EuiFlexItem grow={false}>
<EuiButton
onClick={this.onChangePasswordClick}
Expand Down Expand Up @@ -197,7 +209,7 @@ export class ChangePasswordForm extends Component<Props, State> {
error: (
<FormattedMessage
id="xpack.security.account.currentPasswordRequired"
defaultMessage="Please enter your current password"
defaultMessage="Enter your current password"
/>
),
};
Expand Down Expand Up @@ -286,7 +298,7 @@ export class ChangePasswordForm extends Component<Props, State> {

private handleChangePasswordSuccess = () => {
toastNotifications.addSuccess({
text: i18n.translate('xpack.security.account.changePasswordSuccess', {
title: i18n.translate('xpack.security.account.changePasswordSuccess', {
defaultMessage: 'Your password has been changed',
}),
'data-test-subj': 'passwordUpdateSuccess',
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/security/public/views/account/components/account_management_page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ describe('<AccountManagementPage>', () => {
expect(wrapper.find('EuiText[data-test-subj="userDisplayName"]').text()).toEqual(
user.full_name
);
expect(wrapper.find('strong[data-test-subj="username"]').text()).toEqual(user.username);
expect(wrapper.find('strong[data-test-subj="email"]').text()).toEqual(user.email);
expect(wrapper.find('[data-test-subj="username"]').text()).toEqual(user.username);
expect(wrapper.find('[data-test-subj="email"]').text()).toEqual(user.email);
});

it(`displays username when full_name is not provided`, () => {
Expand All @@ -48,10 +48,10 @@ describe('<AccountManagementPage>', () => {
expect(wrapper.find('EuiText[data-test-subj="userDisplayName"]').text()).toEqual(user.username);
});

it(`displays a placeholder when no email address is provided`, () => {
it(`displays a placeholder when n do email address is provided`, () => {
const user: User = createUser({ withEmail: false });
const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
expect(wrapper.find('strong[data-test-subj="email"]').text()).toEqual('(no email address)');
expect(wrapper.find('[data-test-subj="email"]').text()).toEqual('(no email address)');
});

it(`displays change password form for users in the native realm`, () => {
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugins/security/public/views/account/components/change_password/change_password.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ export class ChangePassword extends Component<Props, {}> {
const canChangePassword = canUserChangePassword(this.props.user);

const changePasswordTitle = (
<FormattedMessage
id="xpack.security.account.changePasswordTitle"
defaultMessage="Change password"
/>
<FormattedMessage id="xpack.security.account.changePasswordTitle" defaultMessage="Password" />
);

if (canChangePassword) {
Expand All @@ -42,6 +39,7 @@ export class ChangePassword extends Component<Props, {}> {
private getChangePasswordForm = (changePasswordTitle: React.ReactElement<any>) => {
return (
<EuiDescribedFormGroup
fullWidth
title={<h3>{changePasswordTitle}</h3>}
description={
<p>
Expand All @@ -60,6 +58,7 @@ export class ChangePassword extends Component<Props, {}> {
private getChangePasswordUnavailable(changePasswordTitle: React.ReactElement<any>) {
return (
<EuiDescribedFormGroup
fullWidth
title={<h3>{changePasswordTitle}</h3>}
description={
<p>
Expand Down
19 changes: 9 additions & 10 deletions x-pack/plugins/security/public/views/account/components/personal_info/personal_info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
// @ts-ignore
EuiDescribedFormGroup,
EuiFormRow,
EuiSpacer,
EuiText,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
Expand All @@ -21,6 +20,7 @@ interface Props {
export const PersonalInfo = (props: Props) => {
return (
<EuiDescribedFormGroup
fullWidth
title={
<h3>
<FormattedMessage
Expand All @@ -36,22 +36,21 @@ export const PersonalInfo = (props: Props) => {
/>
}
>
<EuiFormRow>
<EuiText>
<div>
<strong title="username" data-test-subj="username">
<EuiFormRow fullWidth>
<EuiText size="s">
<dl>
<dt title="username" data-test-subj="username">
{props.user.username}
</strong>
<EuiSpacer size="s" />
<strong title="email" data-test-subj="email">
</dt>
<dd title="email" data-test-subj="email">
{props.user.email || (
<FormattedMessage
id="xpack.security.account.noEmailMessage"
defaultMessage="(no email address)"
/>
)}
</strong>
</div>
</dd>
</dl>
</EuiText>
</EuiFormRow>
</EuiDescribedFormGroup>
Expand Down