Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
92 changes: 91 additions & 1 deletion packages/fiori/cypress/specs/UserMenu.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,97 @@ describe("Initial rendering", () => {
cy.get("@responsivePopover").find("[ui5-button]").should("have.length", 1);
});

it("tests config show-manage-account", () => {
it("tests title", () => {
cy.mount(
<>
<Button id="openUserMenuBtn">Open User Menu</Button>
<UserMenu open={true} opener="openUserMenuBtn">
<UserMenuAccount
slot="accounts"
titleText="Alain Chevalier">
</UserMenuAccount>
</UserMenu>
</>
);
cy.get("[ui5-user-menu]").as("userMenu");
cy.get("@userMenu").should("exist");
cy.get("@userMenu").shadow().find("[ui5-responsive-popover]").as("responsivePopover");
cy.get("@responsivePopover").should("exist");
cy.get("@responsivePopover").find("[ui5-text]").as("name");
cy.get("@name").should("have.length", 1);
cy.get("@name").contains("Alain Chevalier");
cy.get("@name").should("have.class", "ui5-user-menu-selected-account-title");

});

it("tests subtitle", () => {
cy.mount(
<>
<Button id="openUserMenuBtn">Open User Menu</Button>
<UserMenu open={true} opener="openUserMenuBtn">
<UserMenuAccount
slot="accounts"
subtitleText="Alain.Chevalier@sap.com">
</UserMenuAccount>
</UserMenu>
</>
);
cy.get("[ui5-user-menu]").as("userMenu");
cy.get("@userMenu").should("exist");
cy.get("@userMenu").shadow().find("[ui5-responsive-popover]").as("responsivePopover");
cy.get("@responsivePopover").should("exist");
cy.get("@responsivePopover").find("[ui5-text]").as("email");
cy.get("@email").should("have.length", 1);
cy.get("@email").contains("Alain.Chevalier@sap.com");
cy.get("@email").should("have.class", "ui5-user-menu-selected-account-subtitleText");
});

it("tests description", () => {
cy.mount(
<>
<Button id="openUserMenuBtn">Open User Menu</Button>
<UserMenu open={true} opener="openUserMenuBtn">
<UserMenuAccount
slot="accounts"
description="Delivery Manager, SAP SE">
</UserMenuAccount>
</UserMenu>
</>
);
cy.get("[ui5-user-menu]").as("userMenu");
cy.get("@userMenu").should("exist");
cy.get("@userMenu").shadow().find("[ui5-responsive-popover]").as("responsivePopover");
cy.get("@responsivePopover").should("exist");
cy.get("@responsivePopover").find("[ui5-text]").as("role");
cy.get("@role").should("have.length", 1);
cy.get("@role").contains("Delivery Manager, SAP SE");
cy.get("@role").should("have.class", "ui5-user-menu-selected-account-description");
});

it("tests additional info", () => {
cy.mount(
<>
<Button id="openUserMenuBtn">Open User Menu</Button>
<UserMenu open={true} opener="openUserMenuBtn">
<UserMenuAccount
slot="accounts"
additionalInfo="Primary Employment">
</UserMenuAccount>
</UserMenu>
</>
);
cy.get("[ui5-user-menu]").as("userMenu");
cy.get("@userMenu").should("exist");
cy.get("@userMenu").shadow().find("[ui5-responsive-popover]").as("responsivePopover");
cy.get("@responsivePopover").should("exist");
cy.get("@responsivePopover").find("[ui5-text]").as("info");
cy.get("@info").should("have.length", 1);
cy.get("@info").contains("Primary Employment");
cy.get("@info").should("have.class", "ui5-user-menu-selected-account-additional-info");
});


it("tests config show-manage-account", () => {
cy.mount(
<>
<Button id="openUserMenuBtn">Open User Menu</Button>
Expand Down
9 changes: 9 additions & 0 deletions packages/fiori/src/UserMenuAccount.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ class UserMenuAccount extends UI5Element {
@property({ type: String })
description = "";

/**
* Defines additional information for the user.
*
* @default ""
* @public
*/
@property({ type: String })
additionalInfo = "";

/**
* Defines if the user is selected.
*
Expand Down
3 changes: 3 additions & 0 deletions packages/fiori/src/UserMenuTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ function headerContent(this: UserMenu) {
{this._selectedAccount.description &&
<Text class="ui5-user-menu-selected-account-description">{this._selectedAccount.description}</Text>
}
{this._selectedAccount.additionalInfo &&
<Text class="ui5-user-menu-selected-account-additional-info">{this._selectedAccount.additionalInfo}</Text>
}

{this.showManageAccount &&
<Button id="selected-account-manage-btn" icon={userSettings} class="ui5-user-menu-manage-account-btn" onClick={this._handleManageAccountClick}>{this._manageAccountButtonText}</Button>
Expand Down
8 changes: 8 additions & 0 deletions packages/fiori/src/themes/UserMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@
color: var(--sapContent_LabelColor);
}

.ui5-user-menu-selected-account-additional-info {
margin-top: 0.25rem;
text-align: center;
font-family: var(--sapFontFamily);
font-size: var(--sapFontSize);
color: var(--sapContent_LabelColor);
}

.ui5-user-menu-manage-account-btn {
font-family: var(--sapFontSemiboldDuplexFamily);
margin-block-start: 1rem;
Expand Down
1 change: 1 addition & 0 deletions packages/fiori/test/pages/UserMenu.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
title-text="Alain Chevalier 1"
subtitle-text="alian.chevalier@sap.com"
description="Delivery Manager, SAP SE"
additional-info="Primary Employment"
selected>
</ui5-user-menu-account>
<ui5-user-menu-account slot="accounts"
Expand Down
Loading