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

[User Profile] Update edit profile header layout #202902

Merged
merged 9 commits into from
Dec 12, 2024
Merged

[User Profile] Update edit profile header layout #202902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7375fd5
Update edit profile header layout
kowalczyk-krzysztof Dec 3, 2024
128c6a9
design tweaks
ryankeairns Dec 4, 2024
9d7face
Merge pull request #1 from ryankeairns/feat/user-profile-header-layou…
kowalczyk-krzysztof Dec 4, 2024
5f1f6ad
Update test
kowalczyk-krzysztof Dec 4, 2024
b0d14ca
Merge branch 'main' into feat/user-profile-header-layout-changes
kowalczyk-krzysztof Dec 9, 2024
3ec83b3
Truncate text
kowalczyk-krzysztof Dec 9, 2024
1b5f73d
Merge branch 'main' into feat/user-profile-header-layout-changes
kowalczyk-krzysztof Dec 10, 2024
e78f5f2
Add min width to list item
kowalczyk-krzysztof Dec 10, 2024
e40500c
Merge branch 'main' into feat/user-profile-header-layout-changes
kowalczyk-krzysztof Dec 12, 2024
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
6 changes: 3 additions & 3 deletions x-pack/plugins/security/public/account_management/user_profile/user_profile.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,14 +414,14 @@ describe('useUserProfileForm', () => {
expect(testWrapper.exists('EuiBadgeGroup[data-test-subj="remainingRoles"]')).toBeFalsy();
});

it('should display a popover for users with more than one role', () => {
it('should display a popover for users with more than three roles', () => {
const data: UserProfileData = {};

const nonCloudUser = mockAuthenticatedUser({ elastic_cloud_user: false });
coreStart.settings.client.get.mockReturnValue(false);
coreStart.settings.client.isOverridden.mockReturnValue(true);

nonCloudUser.roles = [...nonCloudUser.roles, 'user-role-1', 'user-role-2'];
nonCloudUser.roles = [...nonCloudUser.roles, 'user-role-1', 'user-role-2', 'user-role-3'];
const testWrapper = mount(
<Providers
services={coreStart}
Expand All @@ -436,7 +436,7 @@ describe('useUserProfileForm', () => {
</Providers>
);

const extraRoles = nonCloudUser.roles.splice(1);
const extraRoles = nonCloudUser.roles.splice(3);

const userRolesExpandButton = testWrapper.find(
'EuiButtonEmpty[data-test-subj="userRolesExpand"]'
Expand Down
150 changes: 93 additions & 57 deletions x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ import {
EuiIconTip,
EuiKeyPadMenu,
EuiKeyPadMenuItem,
EuiPageHeaderSection,
EuiPopover,
EuiSpacer,
EuiText,
EuiTextTruncate,
EuiTitle,
EuiToolTip,
useEuiTheme,
useGeneratedHtmlId,
Expand Down Expand Up @@ -72,6 +75,28 @@ const formRowCSS = css`
}
`;

const pageHeaderCSS = css`
max-width: 1248px;
margin: auto;
border-bottom: none;
`;

const pageTitleCSS = css`
min-width: 120px;
`;

const rightSideItemsCSS = css`
justify-content: flex-start;

@include euiBreakpoint('m') {
justify-content: flex-end;
}
`;

const rightSideItemCSS = css`
min-width: 160px;
`;

export interface UserProfileProps {
user: AuthenticatedUser;
data?: UserProfileData;
Expand Down Expand Up @@ -607,14 +632,13 @@ function UserPasswordEditor({
}

const UserRoles: FunctionComponent<UserRoleProps> = ({ user }) => {
const { euiTheme } = useEuiTheme();
const [isPopoverOpen, setIsPopoverOpen] = useState(false);

const onButtonClick = () => setIsPopoverOpen((isOpen) => !isOpen);
const closePopover = () => setIsPopoverOpen(false);

const [firstRole] = user.roles;
const remainingRoles = user.roles.slice(1);
const firstThreeRoles = user.roles.slice(0, 3);
const remainingRoles = user.roles.slice(3);

const renderMoreRoles = () => {
const button = (
Expand Down Expand Up @@ -653,16 +677,13 @@ const UserRoles: FunctionComponent<UserRoleProps> = ({ user }) => {

return (
<>
<div
style={{
maxWidth: euiTheme.breakpoint.m / 6,
display: 'inline-block',
}}
>
<EuiBadge key={firstRole} color="hollow" data-test-subj={`role${firstRole}`}>
{firstRole}
</EuiBadge>
</div>
<EuiBadgeGroup gutterSize="xs" data-test-subj="displayedRoles">
{firstThreeRoles.map((role) => (
<EuiBadge key={role} color="hollow" data-test-subj={`role${role}`}>
{role}
</EuiBadge>
))}
</EuiBadgeGroup>
{remainingRoles.length ? renderMoreRoles() : null}
</>
);
Expand Down Expand Up @@ -693,7 +714,9 @@ export const UserProfile: FunctionComponent<UserProfileProps> = ({ user, data })
defaultMessage="Username"
/>
),
description: user.username as string | undefined | JSX.Element,
description:
user.username &&
((<EuiTextTruncate text={user.username} />) as string | undefined | JSX.Element),
helpText: (
<FormattedMessage
id="xpack.security.accountManagement.userProfile.usernameHelpText"
Expand All @@ -712,7 +735,7 @@ export const UserProfile: FunctionComponent<UserProfileProps> = ({ user, data })
defaultMessage="Full name"
/>
),
description: user.full_name,
description: user.full_name && <EuiTextTruncate text={user.full_name} />,
helpText: (
<FormattedMessage
id="xpack.security.accountManagement.userProfile.fullNameHelpText"
Expand All @@ -729,7 +752,7 @@ export const UserProfile: FunctionComponent<UserProfileProps> = ({ user, data })
defaultMessage="Email address"
/>
),
description: user.email,
description: user.email && <EuiTextTruncate text={user.email} />,
helpText: (
<FormattedMessage
id="xpack.security.accountManagement.userProfile.emailHelpText"
Expand Down Expand Up @@ -778,48 +801,61 @@ export const UserProfile: FunctionComponent<UserProfileProps> = ({ user, data })
/>
) : null}

<KibanaPageTemplate className="eui-fullHeight" restrictWidth={1000}>
<KibanaPageTemplate.Header
pageTitle={
<FormattedMessage
id="xpack.security.accountManagement.userProfile.title"
defaultMessage="Profile"
/>
}
id={titleId}
rightSideItems={rightSideItems.reverse().map((item) => (
<EuiDescriptionList
textStyle="reverse"
listItems={[
{
title: (
<EuiText color={euiTheme.colors.darkestShade} size="s">
<EuiFlexGroup responsive={false} alignItems="center" gutterSize="none">
<EuiFlexItem grow={false}>{item.title}</EuiFlexItem>
<EuiFlexItem grow={false} style={{ marginLeft: '0.33em' }}>
<EuiIconTip type="questionInCircle" content={item.helpText} />
</EuiFlexItem>
</EuiFlexGroup>
</EuiText>
),
description: (
<span data-test-subj={item.testSubj}>
{item.description || (
<EuiText color={euiTheme.colors.textDisabled} size="s">
<FormattedMessage
id="xpack.security.accountManagement.userProfile.noneProvided"
defaultMessage="None provided"
/>
<KibanaPageTemplate className="eui-fullHeight" restrictWidth={true}>
<KibanaPageTemplate.Header id={titleId} css={pageHeaderCSS}>
<EuiPageHeaderSection>
<EuiTitle size="l" css={pageTitleCSS}>
<h1>
<FormattedMessage
id="xpack.security.accountManagement.userProfile.title"
defaultMessage="Profile"
/>
</h1>
</EuiTitle>
</EuiPageHeaderSection>
<EuiPageHeaderSection>
<EuiFlexGroup alignItems="flexStart" css={rightSideItemsCSS}>
{rightSideItems.map((item) => (
<EuiDescriptionList
key={item.testSubj}
textStyle="reverse"
css={rightSideItemCSS}
listItems={[
{
title: (
<EuiText color={euiTheme.colors.darkestShade} size="s">
<EuiFlexGroup
responsive={false}
alignItems="center"
gutterSize="none"
>
<EuiFlexItem grow={false}>{item.title}</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiIconTip type="questionInCircle" content={item.helpText} />
</EuiFlexItem>
</EuiFlexGroup>
</EuiText>
)}
</span>
),
},
]}
compressed
/>
))}
/>
),
description: (
<span data-test-subj={item.testSubj}>
{item.description || (
<EuiText color={euiTheme.colors.textDisabled} size="s">
<FormattedMessage
id="xpack.security.accountManagement.userProfile.noneProvided"
defaultMessage="None provided"
/>
</EuiText>
)}
</span>
),
},
]}
compressed
/>
))}
</EuiFlexGroup>
</EuiPageHeaderSection>
</KibanaPageTemplate.Header>
<KibanaPageTemplate.Section>
<Form aria-labelledby={titleId}>
<UserDetailsEditor user={user} />
Expand Down
4 changes: 2 additions & 2 deletions ...serverless/functional/test_suites/common/platform_security/user_profiles/user_profiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const actualFullname = await pageObjects.userProfiles.getProfileFullname();
const actualEmail = await pageObjects.userProfiles.getProfileEmail();

expect(actualFullname).to.be(userData.full_name);
expect(actualEmail).to.be(userData.email);
expect(actualFullname).to.contain(userData.full_name);
expect(actualEmail).to.contain(userData.email);
});

it('should not have edit actions', async () => {
Expand Down
Loading