diff --git a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.html b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.html
index ad49106a6b2fd1033e3f173d48f99a9d5f260c26..29fc9153463819b76fb30d8f2deef1dd77e7a9c4 100644
--- a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.html
+++ b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.html
@@ -33,11 +33,11 @@
{{ currentUserInitials }}
</p>
</div>
- <ods-dropdown-menu-item-button
+ <ods-dropdown-menu-button-item
caption="Abmelden"
(itemClicked)="authenticationService.logout()"
data-test-id="popup-logout-button"
>
<ods-logout-icon icon />
- </ods-dropdown-menu-item-button>
+ </ods-dropdown-menu-button-item>
</ods-dropdown-menu>
diff --git a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
index 3cd4a58993cf896093f94ddb1364bed78e639e50..4593934bfd05732c53156c7d324a877c4de3a6f5 100644
--- a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
+++ b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
@@ -21,19 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- dispatchEventFromFixture,
- getElementFromFixture,
- mock,
- Mock,
-} from '@alfa-client/test-utils';
+import { dispatchEventFromFixture, getElementFromFixture, mock, Mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
-import {
- DropdownMenuItemButtonComponent,
- DropdownMenuComponent,
- LogoutIconComponent,
-} from '@ods/system';
+import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
import { AuthenticationService } from 'authentication';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -54,7 +45,7 @@ describe('UserProfileButtonContainerComponent', () => {
imports: [
RouterTestingModule,
MockComponent(DropdownMenuComponent),
- MockComponent(DropdownMenuItemButtonComponent),
+ MockComponent(DropdownMenuButtonItemComponent),
MockComponent(LogoutIconComponent),
],
providers: [
@@ -89,10 +80,7 @@ describe('UserProfileButtonContainerComponent', () => {
component.currentUserInitials = 'AV';
fixture.detectChanges();
- const popupButtonContentElement: HTMLElement = getElementFromFixture(
- fixture,
- popupButtonContent,
- );
+ const popupButtonContentElement: HTMLElement = getElementFromFixture(fixture, popupButtonContent);
expect(popupButtonContentElement.textContent.trim()).toEqual('AV');
});
diff --git a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile.button-container.component.ts b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile.button-container.component.ts
index 862b49a8a560bfc56a1656ff09656429d72c423e..439d995011c6250518b0b57bd70629bfd1e08055 100644
--- a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile.button-container.component.ts
+++ b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile.button-container.component.ts
@@ -22,14 +22,14 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { Component, OnInit } from '@angular/core';
-import { DropdownMenuItemButtonComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
+import { DropdownMenuButtonItemComponent, 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, DropdownMenuItemButtonComponent, LogoutIconComponent],
+ imports: [DropdownMenuComponent, DropdownMenuButtonItemComponent, LogoutIconComponent],
})
export class UserProfileButtonContainerComponent implements OnInit {
public currentUserInitials: string;
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index b8dc9ee5f359412762d745b28f4c2640e5128edb..886dbc3377ed2be0887f68565cf76d1c6af61413 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -28,9 +28,9 @@ export * from './lib/bescheid-status-text/bescheid-status-text.component';
export * from './lib/bescheid-wrapper/bescheid-wrapper.component';
export * from './lib/button-card/button-card.component';
export * from './lib/button/button.component';
-export * from './lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component';
-export * from './lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component';
+export * from './lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component';
export * from './lib/dropdown-menu/dropdown-menu-item/dropdown-menu-item.component';
+export * from './lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component';
export * from './lib/dropdown-menu/dropdown-menu/dropdown-menu.component';
export * from './lib/form/button-toggle/button-toggle.component';
export * from './lib/form/checkbox/checkbox.component';
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.spec.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.spec.ts
similarity index 81%
rename from alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.spec.ts
rename to alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.spec.ts
index 2209a7cc1b1ef2656a95a0a335d94e981ea8295c..0b747f1e0507e5375a8dd0baba6a7ce2733ba89c 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.spec.ts
@@ -23,18 +23,18 @@
*/
import { dispatchEventFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DropdownMenuItemButtonComponent } from './dropdown-menu-item-button.component';
+import { DropdownMenuButtonItemComponent } from './dropdown-menu-button-item.component';
-describe('DropdownMenuItemButtonComponent', () => {
- let component: DropdownMenuItemButtonComponent;
- let fixture: ComponentFixture<DropdownMenuItemButtonComponent>;
+describe('DropdownMenuButtonItemComponent', () => {
+ let component: DropdownMenuButtonItemComponent;
+ let fixture: ComponentFixture<DropdownMenuButtonItemComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [DropdownMenuItemButtonComponent],
+ imports: [DropdownMenuButtonItemComponent],
}).compileComponents();
- fixture = TestBed.createComponent(DropdownMenuItemButtonComponent);
+ fixture = TestBed.createComponent(DropdownMenuButtonItemComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.ts
similarity index 94%
rename from alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.ts
rename to alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.ts
index 89724520593f25535f7d77e2d12d8ca46cdd2e06..90badf1ab01696f8203a8af8caee1af377c9cbae 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-button/dropdown-menu-item-button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-button-item/dropdown-menu-button-item.component.ts
@@ -25,7 +25,7 @@ import { CommonModule } from '@angular/common';
import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({
- selector: 'ods-dropdown-menu-item-button',
+ selector: 'ods-dropdown-menu-button-item',
standalone: true,
imports: [CommonModule],
template: `<button
@@ -37,7 +37,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
<p class="text-text">{{ caption }}</p>
</button>`,
})
-export class DropdownMenuItemButtonComponent {
+export class DropdownMenuButtonItemComponent {
@Input({ required: true }) caption!: string;
@Output() itemClicked: EventEmitter<MouseEvent> = new EventEmitter();
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.spec.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.spec.ts
deleted file mode 100644
index c69f395f5ab2b2ad83033dedf56089c5b288f462..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DropdownMenuItemTextComponent } from './dropdown-menu-item-text.component';
-
-describe('DropdownMenuItemTextComponent', () => {
- let component: DropdownMenuItemTextComponent;
- let fixture: ComponentFixture<DropdownMenuItemTextComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [DropdownMenuItemTextComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(DropdownMenuItemTextComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ea560a7db0ee5abf5c37f1f60e451b99a97c5bc2
--- /dev/null
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DropdownMenuTextItemComponent } from './dropdown-menu-text-item.component';
+
+describe('DropdownMenuTextItemComponent', () => {
+ let component: DropdownMenuTextItemComponent;
+ let fixture: ComponentFixture<DropdownMenuTextItemComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [DropdownMenuTextItemComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(DropdownMenuTextItemComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.ts
similarity index 87%
rename from alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.ts
rename to alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.ts
index 4a9ee9db5584be4a880f7cb5f04258ece51ab3fe..f4ecc939dbea7c502369dbf706406d80822c9e09 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu-text-item/dropdown-menu-text-item.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
@Component({
- selector: 'ods-dropdown-menu-item-text',
+ selector: 'ods-dropdown-menu-text-item',
standalone: true,
imports: [CommonModule],
styles: [':host {@apply flex min-h-12 items-start gap-4 px-4 py-3 text-start first:mt-2 last:mb-2}'],
@@ -15,7 +15,7 @@ import { Component, Input } from '@angular/core';
</div>
`,
})
-export class DropdownMenuItemTextComponent {
+export class DropdownMenuTextItemComponent {
@Input({ required: true }) title!: string;
@Input({ required: true }) description!: string;
}
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
index 3c3ae1a25e67dca0739dfca09e806f2a2eb7069b..122285175c192a415ffed0b4f26de97bb9075ae8 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.stories.ts
@@ -25,9 +25,9 @@ import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, t
import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
-import { DropdownMenuItemButtonComponent } from '../dropdown-menu-item-button/dropdown-menu-item-button.component';
-import { DropdownMenuItemTextComponent } from '../dropdown-menu-item-text/dropdown-menu-item-text.component';
+import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-item.component';
+import { DropdownMenuTextItemComponent } from '../dropdown-menu-text-item/dropdown-menu-text-item.component';
import { DropdownMenuComponent } from './dropdown-menu.component';
const meta: Meta<DropdownMenuComponent> = {
@@ -38,8 +38,8 @@ const meta: Meta<DropdownMenuComponent> = {
imports: [
DropdownMenuComponent,
DropdownMenuItemComponent,
- DropdownMenuItemButtonComponent,
- DropdownMenuItemTextComponent,
+ DropdownMenuButtonItemComponent,
+ DropdownMenuTextItemComponent,
SaveIconComponent,
UserIconComponent,
],
@@ -70,9 +70,9 @@ export const Button: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<ods-user-icon button-content />
- <ods-dropdown-menu-item-button caption="Lorem" />
- <ods-dropdown-menu-item-button caption="Ipsum" />
- <ods-dropdown-menu-item-button caption="Dolor" />
+ <ods-dropdown-menu-button-item caption="Lorem" />
+ <ods-dropdown-menu-button-item caption="Ipsum" />
+ <ods-dropdown-menu-button-item caption="Dolor" />
</ods-dropdown-menu>`,
}),
};
@@ -82,8 +82,8 @@ export const ButtonLongText: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
- <ods-dropdown-menu-item-button caption="Lorem" />
- <ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet" />
+ <ods-dropdown-menu-button-item caption="Lorem" />
+ <ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet" />
</ods-dropdown-menu>`,
}),
};
@@ -93,12 +93,12 @@ export const ButtonWithIcon: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
- <ods-dropdown-menu-item-button caption="Lorem">
+ <ods-dropdown-menu-button-item caption="Lorem">
<ods-save-icon icon size="small" />
- </ods-dropdown-menu-item-button>
- <ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet">
+ </ods-dropdown-menu-button-item>
+ <ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet">
<ods-save-icon icon size="small" />
- </ods-dropdown-menu-item-button>
+ </ods-dropdown-menu-button-item>
</ods-dropdown-menu>`,
}),
};
@@ -108,15 +108,15 @@ export const StructuredContent: Story = {
props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p>
- <ods-dropdown-menu-item-text title="Item 1" description="The quick brown fox jumps over the lazy dog">
- </ods-dropdown-menu-item-text>
- <ods-dropdown-menu-item-text title="Item 2" description="The quick brown fox jumps over the lazy dog">
+ <ods-dropdown-menu-text-item title="Item 1" description="The quick brown fox jumps over the lazy dog">
+ </ods-dropdown-menu-text-item>
+ <ods-dropdown-menu-text-item title="Item 2" description="The quick brown fox jumps over the lazy dog">
<ods-save-icon icon size="large" />
- </ods-dropdown-menu-item-text>
- <ods-dropdown-menu-item-text title="Item 3" description="The quick brown fox jumps over the lazy dog">
+ </ods-dropdown-menu-text-item>
+ <ods-dropdown-menu-text-item title="Item 3" description="The quick brown fox jumps over the lazy dog">
<ods-save-icon icon size="large" />
<button additionalContent class="border">Button</button>
- </ods-dropdown-menu-item-text>
+ </ods-dropdown-menu-text-item>
</ods-dropdown-menu>`,
}),
};
diff --git a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
index 11816a3ee19c35ccc61b8368ee1168db8072090b..ab6ac8c685619b3bf971e2da0d6328a81987fa43 100644
--- a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
+++ b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html
@@ -36,7 +36,7 @@
<div class="ml-1 text-sm font-medium">Hilfe</div>
</div>
- <ods-dropdown-menu-item-text
+ <ods-dropdown-menu-text-item
*ngIf="apiRootStateResource?.resource | hasLink: apiRootLinkRel.DOCUMENTATIONS"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
title="Benutzerleitfaden"
@@ -49,5 +49,5 @@
[url]="apiRootStateResource.resource | getUrl: apiRootLinkRel.DOCUMENTATIONS"
>
</alfa-documentation>
- </ods-dropdown-menu-item-text>
+ </ods-dropdown-menu-text-item>
</ods-dropdown-menu>
diff --git a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
index f4981c1a2a997d3b36b4de59fec7b962e59c53e6..96f154ac92d70d4dbba6bdd86dcabb4122468d04 100644
--- a/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
+++ b/alfa-client/libs/user-assistance/src/lib/help-menu/help-menu.component.spec.ts
@@ -27,7 +27,7 @@ import { getElementFromDomRoot } from '@alfa-client/test-utils';
import { UiModule } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuComponent, DropdownMenuItemTextComponent, FileIconComponent, HelpIconComponent } from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuTextItemComponent, FileIconComponent, HelpIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { createApiRootResource } from '../../../../../libs/api-root-shared/test/api-root';
@@ -49,7 +49,7 @@ describe('HelpMenuComponent', () => {
MockComponent(DocumentationComponent),
MockComponent(FileIconComponent),
MockComponent(HelpIconComponent),
- MockComponent(DropdownMenuItemTextComponent),
+ MockComponent(DropdownMenuTextItemComponent),
MockComponent(DropdownMenuComponent),
],
imports: [NoopAnimationsModule, UiModule],
diff --git a/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts b/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
index cbc71aeeed505f072d0a60d471a6167c3b5058f3..70fb69b6d2ae8b0a50142d79ca356b1a7b19fb6e 100644
--- a/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
+++ b/alfa-client/libs/user-assistance/src/lib/user-assistance.module.ts
@@ -25,7 +25,7 @@ import { TechSharedModule } from '@alfa-client/tech-shared';
import { UiModule } from '@alfa-client/ui';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
-import { DropdownMenuComponent, DropdownMenuItemTextComponent, FileIconComponent, HelpIconComponent } from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuTextItemComponent, FileIconComponent, HelpIconComponent } from '@ods/system';
import { DocumentationComponent } from './help-menu/documentation/documentation.component';
import { OpenDocumentationButtonComponent } from './help-menu/documentation/open-documentation-button/open-documentation-button.component';
import { HelpMenuComponent } from './help-menu/help-menu.component';
@@ -37,7 +37,7 @@ import { HelpMenuComponent } from './help-menu/help-menu.component';
FileIconComponent,
HelpIconComponent,
DropdownMenuComponent,
- DropdownMenuItemTextComponent,
+ DropdownMenuTextItemComponent,
UiModule,
],
declarations: [HelpMenuComponent, DocumentationComponent, OpenDocumentationButtonComponent],
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
index bc1d6f54df9f5a14a63b9effafcc38382cc565eb..8808114310f78fe0a7addeb9417dc889456a6e21 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.html
@@ -35,7 +35,7 @@
class="user-profile-icon"
>
</alfa-user-icon>
- <ods-dropdown-menu-item-button caption="Abmelden" (itemClicked)="logoutEmitter.emit()" data-test-id="logout-button">
+ <ods-dropdown-menu-button-item caption="Abmelden" (itemClicked)="logoutEmitter.emit()" data-test-id="logout-button">
<ods-logout-icon icon />
- </ods-dropdown-menu-item-button>
+ </ods-dropdown-menu-button-item>
</ods-dropdown-menu>
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
index 2c59e65c88e88a8f9d5af52dc7a5cf7f5193e58e..536a5722d27b6afced3eb3d91b8c1bfc0fc163db 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.spec.ts
@@ -29,7 +29,7 @@ import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuComponent, DropdownMenuItemButtonComponent, LogoutIconComponent } from '@ods/system';
+import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile';
import { MockComponent } from 'ng-mocks';
@@ -51,7 +51,7 @@ describe('UserProfileInHeaderComponent', () => {
MatIcon,
MockComponent(UserIconComponent),
MockComponent(DropdownMenuComponent),
- MockComponent(DropdownMenuItemButtonComponent),
+ MockComponent(DropdownMenuButtonItemComponent),
MockComponent(LogoutIconComponent),
],
imports: [NoopAnimationsModule],
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
index 7cef75cd1d2c2718ce893b3c44a4460a4a322a3c..6bd1588ea1c21f419e2e78828ab9a466f0add14f 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile.module.ts
@@ -28,8 +28,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {
+ DropdownMenuButtonItemComponent,
DropdownMenuComponent,
- DropdownMenuItemButtonComponent,
DropdownMenuItemComponent,
ErrorIconComponent,
LogoutIconComponent,
@@ -67,7 +67,7 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
ErrorIconComponent,
DropdownMenuComponent,
DropdownMenuItemComponent,
- DropdownMenuItemButtonComponent,
+ DropdownMenuButtonItemComponent,
],
declarations: [
UserIconComponent,
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
index 6745d1ac0628b9934894b0737919a44d683f7842..08a87d82729c537e73469b8b34249b293b344cce 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.html
@@ -25,7 +25,7 @@
-->
<ods-dropdown-menu>
<ods-more-icon button-content *ngIf="buttonEnabled" data-test-id="more-menu-button" />
- <ods-dropdown-menu-item-text
+ <ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE"
data-test-id="vorgang-archive-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
@@ -36,8 +36,8 @@
>
<ods-file-icon icon size="large" fileType="xdomea" />
<alfa-vorgang-archive-container additionalContent [vorgangWithEingang]="vorgangWithEingang"></alfa-vorgang-archive-container>
- </ods-dropdown-menu-item-text>
- <ods-dropdown-menu-item-text
+ </ods-dropdown-menu-text-item>
+ <ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT"
data-test-id="vorgang-exportieren-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
@@ -51,8 +51,8 @@
[vorgangWithEingang]="vorgangWithEingang"
(closeMenu)="closeMenu()"
></alfa-vorgang-export-container>
- </ods-dropdown-menu-item-text>
- <ods-dropdown-menu-item-text
+ </ods-dropdown-menu-text-item>
+ <ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.PROCESS_VORGANG"
data-test-id="vorgang-process-vorgang-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
@@ -66,5 +66,5 @@
[vorgangWithEingang]="vorgangWithEingang"
(closeMenu)="closeMenu()"
></alfa-vorgang-process-vorgang-container>
- </ods-dropdown-menu-item-text>
+ </ods-dropdown-menu-text-item>
</ods-dropdown-menu>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
index 6820ce5d8e66bd69015f25d19524ad18e7be2732..d0c87aaad278b342a811dced9ae6da0798268f19 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts
@@ -27,7 +27,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { ChangeDetectorRef, SimpleChanges } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DropdownMenuComponent, DropdownMenuItemTextComponent, FileIconComponent, MoreIconComponent } from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuTextItemComponent, FileIconComponent, MoreIconComponent } from '@ods/system';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
@@ -53,7 +53,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
MockComponent(ProcessVorgangContainerComponent),
MockComponent(VorgangArchiveContainerComponent),
MockComponent(DropdownMenuComponent),
- MockComponent(DropdownMenuItemTextComponent),
+ MockComponent(DropdownMenuTextItemComponent),
MockComponent(MoreIconComponent),
MockComponent(FileIconComponent),
HasLinkPipe,
@@ -113,7 +113,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
describe('hasMenuItems', () => {
it('should return true if at least 1 menu item exists', () => {
- component.menuItems.reset([new DropdownMenuItemTextComponent()]);
+ component.menuItems.reset([new DropdownMenuTextItemComponent()]);
const res: boolean = component.hasMenuItems();
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
index a2453950d283f9c0727049d491b7c5bc59aa0d50..fb0586eb844cc4fe4ff3904f454d4bad26ddad94 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.ts
@@ -23,7 +23,7 @@
*/
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ChangeDetectorRef, Component, Input, OnChanges, QueryList, SimpleChanges, ViewChild, ViewChildren } from '@angular/core';
-import { DropdownMenuComponent, DropdownMenuItemTextComponent } from '@ods/system';
+import { DropdownMenuComponent, DropdownMenuTextItemComponent } from '@ods/system';
import { has } from 'lodash-es';
@Component({
@@ -35,7 +35,7 @@ export class VorgangDetailMoreMenuComponent implements OnChanges {
@Input() vorgangWithEingang: VorgangWithEingangResource;
@ViewChild(DropdownMenuComponent) menu: DropdownMenuComponent;
- @ViewChildren(DropdownMenuItemTextComponent) menuItems!: QueryList<DropdownMenuItemTextComponent>;
+ @ViewChildren(DropdownMenuTextItemComponent) menuItems!: QueryList<DropdownMenuTextItemComponent>;
public buttonEnabled: boolean = false;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 9162f9d49920b81925da630d26c542013d2f423f..9c968357921c8978b4aa3441a22bc3434f98c732 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -60,7 +60,7 @@ import {
CheckIconComponent,
CloseIconComponent,
DropdownMenuComponent,
- DropdownMenuItemTextComponent,
+ DropdownMenuTextItemComponent,
ErrorMessageComponent,
ExclamationIconComponent,
FileIconComponent,
@@ -175,7 +175,7 @@ const routes: Routes = [
ArchiveIconComponent,
CheckIconComponent,
DropdownMenuComponent,
- DropdownMenuItemTextComponent,
+ DropdownMenuTextItemComponent,
MoreIconComponent,
FileIconComponent,
],