Skip to content
Snippets Groups Projects
Commit 63e1d83d authored by Bernhard Fürst's avatar Bernhard Fürst
Browse files

OZG-7405 Rename DropdownMenuButtonComponent to DropdownMenuItemButtonComponent

parent b593579d
Branches
Tags
1 merge request!3OZG-7405 Replace ozgcloud-menu with ods-dropdown-menu
......@@ -33,11 +33,11 @@
{{ currentUserInitials }}
</p>
</div>
<ods-dropdown-menu-button
<ods-dropdown-menu-item-button
caption="Abmelden"
(itemClicked)="authenticationService.logout()"
data-test-id="popup-logout-button"
>
<ods-logout-icon icon />
</ods-dropdown-menu-button>
</ods-dropdown-menu-item-button>
</ods-dropdown-menu>
......@@ -30,7 +30,7 @@ import {
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import {
DropdownMenuButtonComponent,
DropdownMenuItemButtonComponent,
DropdownMenuComponent,
LogoutIconComponent,
} from '@ods/system';
......@@ -54,7 +54,7 @@ describe('UserProfileButtonContainerComponent', () => {
imports: [
RouterTestingModule,
MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuButtonComponent),
MockComponent(DropdownMenuItemButtonComponent),
MockComponent(LogoutIconComponent),
],
providers: [
......
......@@ -22,14 +22,14 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { Component, OnInit } from '@angular/core';
import { DropdownMenuButtonComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
import { DropdownMenuItemButtonComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
import { AuthenticationService } from 'authentication';
@Component({
selector: 'user-profile-button-container',
templateUrl: './user-profile-button-container.component.html',
standalone: true,
imports: [DropdownMenuComponent, DropdownMenuButtonComponent, LogoutIconComponent],
imports: [DropdownMenuComponent, DropdownMenuItemButtonComponent, LogoutIconComponent],
})
export class UserProfileButtonContainerComponent implements OnInit {
public currentUserInitials: string;
......
......@@ -23,18 +23,18 @@
*/
import { dispatchEventFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DropdownMenuButtonComponent } from './dropdown-menu-button.component';
import { DropdownMenuItemButtonComponent } from './dropdown-menu-item-button.component';
describe('DropdownMenuButtonComponent', () => {
let component: DropdownMenuButtonComponent;
let fixture: ComponentFixture<DropdownMenuButtonComponent>;
describe('DropdownMenuItemButtonComponent', () => {
let component: DropdownMenuItemButtonComponent;
let fixture: ComponentFixture<DropdownMenuItemButtonComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [DropdownMenuButtonComponent],
imports: [DropdownMenuItemButtonComponent],
}).compileComponents();
fixture = TestBed.createComponent(DropdownMenuButtonComponent);
fixture = TestBed.createComponent(DropdownMenuItemButtonComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
......
......@@ -25,12 +25,11 @@ import { CommonModule } from '@angular/common';
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
selector: 'ods-dropdown-menu-button',
selector: 'ods-dropdown-menu-item-button',
standalone: true,
imports: [CommonModule],
template: `<button
class="flex min-h-12 w-full items-center gap-4 border-2 border-transparent px-4 py-3
text-start outline-none hover:border-primary focus-visible:border-focus"
class="flex min-h-12 w-full items-center gap-4 border-2 border-transparent px-4 py-3 text-start outline-none hover:border-primary focus-visible:border-focus"
role="menuitem"
(click)="itemClicked.emit()"
>
......@@ -38,7 +37,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
<p class="text-text">{{ caption }}</p>
</button>`,
})
export class DropdownMenuButtonComponent {
export class DropdownMenuItemButtonComponent {
@Input({ required: true }) caption!: string;
@Output() itemClicked: EventEmitter<MouseEvent> = new EventEmitter();
......
......@@ -31,7 +31,7 @@ import {
import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
import { DropdownMenuButtonComponent } from '../dropdown-menu-button/dropdown-menu-button.component';
import { DropdownMenuItemButtonComponent } from '../dropdown-menu-item-button/dropdown-menu-item-button.component';
import { DropdownMenuComponent } from './dropdown-menu.component';
const meta: Meta<DropdownMenuComponent> = {
......@@ -41,7 +41,7 @@ const meta: Meta<DropdownMenuComponent> = {
moduleMetadata({
imports: [
DropdownMenuComponent,
DropdownMenuButtonComponent,
DropdownMenuItemButtonComponent,
SaveIconComponent,
UserIconComponent,
],
......@@ -72,9 +72,9 @@ export const Default: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<ods-user-icon button-content />
<ods-dropdown-menu-button caption="Lorem" />
<ods-dropdown-menu-button caption="Ipsum" />
<ods-dropdown-menu-button caption="Dolor" />
<ods-dropdown-menu-item-button caption="Lorem" />
<ods-dropdown-menu-item-button caption="Ipsum" />
<ods-dropdown-menu-item-button caption="Dolor" />
</ods-dropdown-menu>`,
}),
};
......@@ -84,8 +84,8 @@ export const LongText: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger popup</p>
<ods-dropdown-menu-button caption="Lorem" />
<ods-dropdown-menu-button caption="Lorem ipsum dolor sit amet" />
<ods-dropdown-menu-item-button caption="Lorem" />
<ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet" />
</ods-dropdown-menu>`,
}),
};
......@@ -95,12 +95,12 @@ export const ItemsWithIcons: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger popup</p>
<ods-dropdown-menu-button caption="Lorem">
<ods-dropdown-menu-item-button caption="Lorem">
<ods-save-icon icon size="small" />
</ods-dropdown-menu-button>
<ods-dropdown-menu-button caption="Lorem ipsum dolor sit amet">
</ods-dropdown-menu-item-button>
<ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet">
<ods-save-icon icon size="small" />
</ods-dropdown-menu-button>
</ods-dropdown-menu-item-button>
</ods-dropdown-menu>`,
}),
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment