From f6a2e393f1a30947286b28c06ba7145e4b9e148e Mon Sep 17 00:00:00 2001
From: Kurt Greiner <kurt.greiner@elastic.co>
Date: Fri, 24 Jun 2022 13:34:17 -0400
Subject: [PATCH] Explicitly using EuiPageHeader w/ bottomBorder appears to
 match width of the content

---
 .../user_profile/user_profile.tsx             | 87 ++++++++++---------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx b/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx
index 64b4e8e365a3c..b0495d5f799f2 100644
--- a/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx
+++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile.tsx
@@ -18,6 +18,7 @@ import {
   EuiFormRow,
   EuiIcon,
   EuiIconTip,
+  EuiPageHeader,
   EuiPageTemplate,
   EuiSpacer,
   EuiText,
@@ -513,52 +514,54 @@ export const UserProfile: FunctionComponent<UserProfileProps> = ({ user, data })
           <EuiPageTemplate
             style={{ backgroundColor: euiTheme.colors.emptyShade }}
             className="eui-fullHeight"
-            pageHeader={{
-              bottomBorder: true,
-              pageTitle: (
-                <FormattedMessage
-                  id="xpack.security.accountManagement.userProfile.title"
-                  defaultMessage="Profile"
-                />
-              ),
-              pageTitleProps: { 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.disabledText} size="s">
-                              <FormattedMessage
-                                id="xpack.security.accountManagement.userProfile.noneProvided"
-                                defaultMessage="None provided"
-                              />
-                            </EuiText>
-                          )}
-                        </span>
-                      ),
-                    },
-                  ]}
-                  compressed
-                />
-              )),
-            }}
             bottomBar={formChanges.count > 0 ? <SaveChangesBottomBar /> : null}
             bottomBarProps={{ paddingSize: 'm', position: 'fixed' }}
             restrictWidth={1000}
           >
+            <EuiPageHeader
+              pageTitle={
+                <FormattedMessage
+                  id="xpack.security.accountManagement.userProfile.title"
+                  defaultMessage="Profile"
+                />
+              }
+              bottomBorder={true}
+              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.disabledText} size="s">
+                                <FormattedMessage
+                                  id="xpack.security.accountManagement.userProfile.noneProvided"
+                                  defaultMessage="None provided"
+                                />
+                              </EuiText>
+                            )}
+                          </span>
+                        ),
+                      },
+                    ]}
+                    compressed
+                  />
+                </>
+              ))}
+            />
+            <EuiSpacer />
             <Form aria-labelledby={titleId}>
               <UserDetailsEditor user={user} />
               <UserAvatarEditor user={user} formik={formik} />