Skip to content
Snippets Groups Projects
Commit f7726093 authored by Alexander Reifschneider's avatar Alexander Reifschneider
Browse files

OZG-7405 Rename dropdown items

parent bc38ed08
Branches
Tags
1 merge request!3OZG-7405 Replace ozgcloud-menu with ods-dropdown-menu
Showing
with 85 additions and 76 deletions
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
{{ currentUserInitials }} {{ currentUserInitials }}
</p> </p>
</div> </div>
<ods-dropdown-menu-item-button <ods-dropdown-menu-button-item
caption="Abmelden" caption="Abmelden"
(itemClicked)="authenticationService.logout()" (itemClicked)="authenticationService.logout()"
data-test-id="popup-logout-button" data-test-id="popup-logout-button"
> >
<ods-logout-icon icon /> <ods-logout-icon icon />
</ods-dropdown-menu-item-button> </ods-dropdown-menu-button-item>
</ods-dropdown-menu> </ods-dropdown-menu>
...@@ -21,19 +21,10 @@ ...@@ -21,19 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { import { dispatchEventFromFixture, getElementFromFixture, mock, Mock } from '@alfa-client/test-utils';
dispatchEventFromFixture,
getElementFromFixture,
mock,
Mock,
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
DropdownMenuItemButtonComponent,
DropdownMenuComponent,
LogoutIconComponent,
} from '@ods/system';
import { AuthenticationService } from 'authentication'; import { AuthenticationService } from 'authentication';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
...@@ -54,7 +45,7 @@ describe('UserProfileButtonContainerComponent', () => { ...@@ -54,7 +45,7 @@ describe('UserProfileButtonContainerComponent', () => {
imports: [ imports: [
RouterTestingModule, RouterTestingModule,
MockComponent(DropdownMenuComponent), MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuItemButtonComponent), MockComponent(DropdownMenuButtonItemComponent),
MockComponent(LogoutIconComponent), MockComponent(LogoutIconComponent),
], ],
providers: [ providers: [
...@@ -89,10 +80,7 @@ describe('UserProfileButtonContainerComponent', () => { ...@@ -89,10 +80,7 @@ describe('UserProfileButtonContainerComponent', () => {
component.currentUserInitials = 'AV'; component.currentUserInitials = 'AV';
fixture.detectChanges(); fixture.detectChanges();
const popupButtonContentElement: HTMLElement = getElementFromFixture( const popupButtonContentElement: HTMLElement = getElementFromFixture(fixture, popupButtonContent);
fixture,
popupButtonContent,
);
expect(popupButtonContentElement.textContent.trim()).toEqual('AV'); expect(popupButtonContentElement.textContent.trim()).toEqual('AV');
}); });
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { DropdownMenuItemButtonComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system'; import { DropdownMenuButtonItemComponent, DropdownMenuComponent, LogoutIconComponent } from '@ods/system';
import { AuthenticationService } from 'authentication'; import { AuthenticationService } from 'authentication';
@Component({ @Component({
selector: 'user-profile-button-container', selector: 'user-profile-button-container',
templateUrl: './user-profile-button-container.component.html', templateUrl: './user-profile-button-container.component.html',
standalone: true, standalone: true,
imports: [DropdownMenuComponent, DropdownMenuItemButtonComponent, LogoutIconComponent], imports: [DropdownMenuComponent, DropdownMenuButtonItemComponent, LogoutIconComponent],
}) })
export class UserProfileButtonContainerComponent implements OnInit { export class UserProfileButtonContainerComponent implements OnInit {
public currentUserInitials: string; public currentUserInitials: string;
......
...@@ -28,9 +28,9 @@ export * from './lib/bescheid-status-text/bescheid-status-text.component'; ...@@ -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/bescheid-wrapper/bescheid-wrapper.component';
export * from './lib/button-card/button-card.component'; export * from './lib/button-card/button-card.component';
export * from './lib/button/button.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-button-item/dropdown-menu-button-item.component';
export * from './lib/dropdown-menu/dropdown-menu-item-text/dropdown-menu-item-text.component';
export * from './lib/dropdown-menu/dropdown-menu-item/dropdown-menu-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/dropdown-menu/dropdown-menu/dropdown-menu.component';
export * from './lib/form/button-toggle/button-toggle.component'; export * from './lib/form/button-toggle/button-toggle.component';
export * from './lib/form/checkbox/checkbox.component'; export * from './lib/form/checkbox/checkbox.component';
......
...@@ -23,18 +23,18 @@ ...@@ -23,18 +23,18 @@
*/ */
import { dispatchEventFromFixture } from '@alfa-client/test-utils'; import { dispatchEventFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing'; 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', () => { describe('DropdownMenuButtonItemComponent', () => {
let component: DropdownMenuItemButtonComponent; let component: DropdownMenuButtonItemComponent;
let fixture: ComponentFixture<DropdownMenuItemButtonComponent>; let fixture: ComponentFixture<DropdownMenuButtonItemComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [DropdownMenuItemButtonComponent], imports: [DropdownMenuButtonItemComponent],
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(DropdownMenuItemButtonComponent); fixture = TestBed.createComponent(DropdownMenuButtonItemComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
...@@ -25,7 +25,7 @@ import { CommonModule } from '@angular/common'; ...@@ -25,7 +25,7 @@ import { CommonModule } from '@angular/common';
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
@Component({ @Component({
selector: 'ods-dropdown-menu-item-button', selector: 'ods-dropdown-menu-button-item',
standalone: true, standalone: true,
imports: [CommonModule], imports: [CommonModule],
template: `<button template: `<button
...@@ -37,7 +37,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; ...@@ -37,7 +37,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
<p class="text-text">{{ caption }}</p> <p class="text-text">{{ caption }}</p>
</button>`, </button>`,
}) })
export class DropdownMenuItemButtonComponent { export class DropdownMenuButtonItemComponent {
@Input({ required: true }) caption!: string; @Input({ required: true }) caption!: string;
@Output() itemClicked: EventEmitter<MouseEvent> = new EventEmitter(); @Output() itemClicked: EventEmitter<MouseEvent> = new EventEmitter();
......
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DropdownMenuItemTextComponent } from './dropdown-menu-item-text.component'; import { DropdownMenuTextItemComponent } from './dropdown-menu-text-item.component';
describe('DropdownMenuItemTextComponent', () => { describe('DropdownMenuTextItemComponent', () => {
let component: DropdownMenuItemTextComponent; let component: DropdownMenuTextItemComponent;
let fixture: ComponentFixture<DropdownMenuItemTextComponent>; let fixture: ComponentFixture<DropdownMenuTextItemComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [DropdownMenuItemTextComponent], imports: [DropdownMenuTextItemComponent],
}).compileComponents(); }).compileComponents();
fixture = TestBed.createComponent(DropdownMenuItemTextComponent); fixture = TestBed.createComponent(DropdownMenuTextItemComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
...@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; ...@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
@Component({ @Component({
selector: 'ods-dropdown-menu-item-text', selector: 'ods-dropdown-menu-text-item',
standalone: true, standalone: true,
imports: [CommonModule], 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}'], 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'; ...@@ -15,7 +15,7 @@ import { Component, Input } from '@angular/core';
</div> </div>
`, `,
}) })
export class DropdownMenuItemTextComponent { export class DropdownMenuTextItemComponent {
@Input({ required: true }) title!: string; @Input({ required: true }) title!: string;
@Input({ required: true }) description!: string; @Input({ required: true }) description!: string;
} }
...@@ -25,9 +25,9 @@ import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, t ...@@ -25,9 +25,9 @@ import { argsToTemplate, componentWrapperDecorator, moduleMetadata, type Meta, t
import { SaveIconComponent } from '../../icons/save-icon/save-icon.component'; import { SaveIconComponent } from '../../icons/save-icon/save-icon.component';
import { UserIconComponent } from '../../icons/user-icon/user-icon.component'; import { UserIconComponent } from '../../icons/user-icon/user-icon.component';
import { DropdownMenuItemButtonComponent } from '../dropdown-menu-item-button/dropdown-menu-item-button.component'; import { DropdownMenuButtonItemComponent } from '../dropdown-menu-button-item/dropdown-menu-button-item.component';
import { DropdownMenuItemTextComponent } from '../dropdown-menu-item-text/dropdown-menu-item-text.component';
import { DropdownMenuItemComponent } from '../dropdown-menu-item/dropdown-menu-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'; import { DropdownMenuComponent } from './dropdown-menu.component';
const meta: Meta<DropdownMenuComponent> = { const meta: Meta<DropdownMenuComponent> = {
...@@ -38,8 +38,8 @@ const meta: Meta<DropdownMenuComponent> = { ...@@ -38,8 +38,8 @@ const meta: Meta<DropdownMenuComponent> = {
imports: [ imports: [
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemComponent, DropdownMenuItemComponent,
DropdownMenuItemButtonComponent, DropdownMenuButtonItemComponent,
DropdownMenuItemTextComponent, DropdownMenuTextItemComponent,
SaveIconComponent, SaveIconComponent,
UserIconComponent, UserIconComponent,
], ],
...@@ -70,9 +70,9 @@ export const Button: Story = { ...@@ -70,9 +70,9 @@ export const Button: Story = {
props: args, props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}> template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<ods-user-icon button-content /> <ods-user-icon button-content />
<ods-dropdown-menu-item-button caption="Lorem" /> <ods-dropdown-menu-button-item caption="Lorem" />
<ods-dropdown-menu-item-button caption="Ipsum" /> <ods-dropdown-menu-button-item caption="Ipsum" />
<ods-dropdown-menu-item-button caption="Dolor" /> <ods-dropdown-menu-button-item caption="Dolor" />
</ods-dropdown-menu>`, </ods-dropdown-menu>`,
}), }),
}; };
...@@ -82,8 +82,8 @@ export const ButtonLongText: Story = { ...@@ -82,8 +82,8 @@ export const ButtonLongText: Story = {
props: args, props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}> template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p> <p button-content>Trigger menu</p>
<ods-dropdown-menu-item-button caption="Lorem" /> <ods-dropdown-menu-button-item caption="Lorem" />
<ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet" /> <ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet" />
</ods-dropdown-menu>`, </ods-dropdown-menu>`,
}), }),
}; };
...@@ -93,12 +93,12 @@ export const ButtonWithIcon: Story = { ...@@ -93,12 +93,12 @@ export const ButtonWithIcon: Story = {
props: args, props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}> template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p> <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-save-icon icon size="small" />
</ods-dropdown-menu-item-button> </ods-dropdown-menu-button-item>
<ods-dropdown-menu-item-button caption="Lorem ipsum dolor sit amet"> <ods-dropdown-menu-button-item caption="Lorem ipsum dolor sit amet">
<ods-save-icon icon size="small" /> <ods-save-icon icon size="small" />
</ods-dropdown-menu-item-button> </ods-dropdown-menu-button-item>
</ods-dropdown-menu>`, </ods-dropdown-menu>`,
}), }),
}; };
...@@ -108,15 +108,15 @@ export const StructuredContent: Story = { ...@@ -108,15 +108,15 @@ export const StructuredContent: Story = {
props: args, props: args,
template: `<ods-dropdown-menu ${argsToTemplate(args)}> template: `<ods-dropdown-menu ${argsToTemplate(args)}>
<p button-content>Trigger menu</p> <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-text-item title="Item 1" description="The quick brown fox jumps over the lazy dog">
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
<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 2" description="The quick brown fox jumps over the lazy dog">
<ods-save-icon icon size="large" /> <ods-save-icon icon size="large" />
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
<ods-dropdown-menu-item-text title="Item 3" description="The quick brown fox jumps over the lazy dog"> <ods-dropdown-menu-text-item title="Item 3" description="The quick brown fox jumps over the lazy dog">
<ods-save-icon icon size="large" /> <ods-save-icon icon size="large" />
<button additionalContent class="border">Button</button> <button additionalContent class="border">Button</button>
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
</ods-dropdown-menu>`, </ods-dropdown-menu>`,
}), }),
}; };
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="ml-1 text-sm font-medium">Hilfe</div> <div class="ml-1 text-sm font-medium">Hilfe</div>
</div> </div>
<ods-dropdown-menu-item-text <ods-dropdown-menu-text-item
*ngIf="apiRootStateResource?.resource | hasLink: apiRootLinkRel.DOCUMENTATIONS" *ngIf="apiRootStateResource?.resource | hasLink: apiRootLinkRel.DOCUMENTATIONS"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t" class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
title="Benutzerleitfaden" title="Benutzerleitfaden"
...@@ -49,5 +49,5 @@ ...@@ -49,5 +49,5 @@
[url]="apiRootStateResource.resource | getUrl: apiRootLinkRel.DOCUMENTATIONS" [url]="apiRootStateResource.resource | getUrl: apiRootLinkRel.DOCUMENTATIONS"
> >
</alfa-documentation> </alfa-documentation>
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
</ods-dropdown-menu> </ods-dropdown-menu>
...@@ -27,7 +27,7 @@ import { getElementFromDomRoot } from '@alfa-client/test-utils'; ...@@ -27,7 +27,7 @@ import { getElementFromDomRoot } from '@alfa-client/test-utils';
import { UiModule } from '@alfa-client/ui'; import { UiModule } from '@alfa-client/ui';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; 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 { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
import { createApiRootResource } from '../../../../../libs/api-root-shared/test/api-root'; import { createApiRootResource } from '../../../../../libs/api-root-shared/test/api-root';
...@@ -49,7 +49,7 @@ describe('HelpMenuComponent', () => { ...@@ -49,7 +49,7 @@ describe('HelpMenuComponent', () => {
MockComponent(DocumentationComponent), MockComponent(DocumentationComponent),
MockComponent(FileIconComponent), MockComponent(FileIconComponent),
MockComponent(HelpIconComponent), MockComponent(HelpIconComponent),
MockComponent(DropdownMenuItemTextComponent), MockComponent(DropdownMenuTextItemComponent),
MockComponent(DropdownMenuComponent), MockComponent(DropdownMenuComponent),
], ],
imports: [NoopAnimationsModule, UiModule], imports: [NoopAnimationsModule, UiModule],
......
...@@ -25,7 +25,7 @@ import { TechSharedModule } from '@alfa-client/tech-shared'; ...@@ -25,7 +25,7 @@ import { TechSharedModule } from '@alfa-client/tech-shared';
import { UiModule } from '@alfa-client/ui'; import { UiModule } from '@alfa-client/ui';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; 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 { DocumentationComponent } from './help-menu/documentation/documentation.component';
import { OpenDocumentationButtonComponent } from './help-menu/documentation/open-documentation-button/open-documentation-button.component'; import { OpenDocumentationButtonComponent } from './help-menu/documentation/open-documentation-button/open-documentation-button.component';
import { HelpMenuComponent } from './help-menu/help-menu.component'; import { HelpMenuComponent } from './help-menu/help-menu.component';
...@@ -37,7 +37,7 @@ import { HelpMenuComponent } from './help-menu/help-menu.component'; ...@@ -37,7 +37,7 @@ import { HelpMenuComponent } from './help-menu/help-menu.component';
FileIconComponent, FileIconComponent,
HelpIconComponent, HelpIconComponent,
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemTextComponent, DropdownMenuTextItemComponent,
UiModule, UiModule,
], ],
declarations: [HelpMenuComponent, DocumentationComponent, OpenDocumentationButtonComponent], declarations: [HelpMenuComponent, DocumentationComponent, OpenDocumentationButtonComponent],
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
class="user-profile-icon" class="user-profile-icon"
> >
</alfa-user-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-logout-icon icon />
</ods-dropdown-menu-item-button> </ods-dropdown-menu-button-item>
</ods-dropdown-menu> </ods-dropdown-menu>
...@@ -29,7 +29,7 @@ import { EventEmitter } from '@angular/core'; ...@@ -29,7 +29,7 @@ import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIcon } from '@angular/material/icon'; import { MatIcon } from '@angular/material/icon';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; 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 { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile'; import { createUserProfileResource } from 'libs/user-profile-shared/test/user-profile';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
...@@ -51,7 +51,7 @@ describe('UserProfileInHeaderComponent', () => { ...@@ -51,7 +51,7 @@ describe('UserProfileInHeaderComponent', () => {
MatIcon, MatIcon,
MockComponent(UserIconComponent), MockComponent(UserIconComponent),
MockComponent(DropdownMenuComponent), MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuItemButtonComponent), MockComponent(DropdownMenuButtonItemComponent),
MockComponent(LogoutIconComponent), MockComponent(LogoutIconComponent),
], ],
imports: [NoopAnimationsModule], imports: [NoopAnimationsModule],
......
...@@ -28,8 +28,8 @@ import { CommonModule } from '@angular/common'; ...@@ -28,8 +28,8 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { import {
DropdownMenuButtonItemComponent,
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemButtonComponent,
DropdownMenuItemComponent, DropdownMenuItemComponent,
ErrorIconComponent, ErrorIconComponent,
LogoutIconComponent, LogoutIconComponent,
...@@ -67,7 +67,7 @@ import { UserProfileComponent } from './user-profile/user-profile.component'; ...@@ -67,7 +67,7 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
ErrorIconComponent, ErrorIconComponent,
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemComponent, DropdownMenuItemComponent,
DropdownMenuItemButtonComponent, DropdownMenuButtonItemComponent,
], ],
declarations: [ declarations: [
UserIconComponent, UserIconComponent,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
--> -->
<ods-dropdown-menu> <ods-dropdown-menu>
<ods-more-icon button-content *ngIf="buttonEnabled" data-test-id="more-menu-button" /> <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" *ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.ARCHIVE"
data-test-id="vorgang-archive-button" data-test-id="vorgang-archive-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t" class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
> >
<ods-file-icon icon size="large" fileType="xdomea" /> <ods-file-icon icon size="large" fileType="xdomea" />
<alfa-vorgang-archive-container additionalContent [vorgangWithEingang]="vorgangWithEingang"></alfa-vorgang-archive-container> <alfa-vorgang-archive-container additionalContent [vorgangWithEingang]="vorgangWithEingang"></alfa-vorgang-archive-container>
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
<ods-dropdown-menu-item-text <ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT" *ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.EXPORT"
data-test-id="vorgang-exportieren-button" data-test-id="vorgang-exportieren-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t" class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
[vorgangWithEingang]="vorgangWithEingang" [vorgangWithEingang]="vorgangWithEingang"
(closeMenu)="closeMenu()" (closeMenu)="closeMenu()"
></alfa-vorgang-export-container> ></alfa-vorgang-export-container>
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
<ods-dropdown-menu-item-text <ods-dropdown-menu-text-item
*ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.PROCESS_VORGANG" *ngIf="vorgangWithEingang | hasLink: vorgangWithEingangLinkRel.PROCESS_VORGANG"
data-test-id="vorgang-process-vorgang-button" data-test-id="vorgang-process-vorgang-button"
class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t" class="border-b border-b-grayborder border-t-grayborder bg-white first:border-t"
...@@ -66,5 +66,5 @@ ...@@ -66,5 +66,5 @@
[vorgangWithEingang]="vorgangWithEingang" [vorgangWithEingang]="vorgangWithEingang"
(closeMenu)="closeMenu()" (closeMenu)="closeMenu()"
></alfa-vorgang-process-vorgang-container> ></alfa-vorgang-process-vorgang-container>
</ods-dropdown-menu-item-text> </ods-dropdown-menu-text-item>
</ods-dropdown-menu> </ods-dropdown-menu>
...@@ -27,7 +27,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli ...@@ -27,7 +27,7 @@ import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-cli
import { ChangeDetectorRef, SimpleChanges } from '@angular/core'; import { ChangeDetectorRef, SimpleChanges } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; 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 { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks'; import { MockComponent } from 'ng-mocks';
...@@ -53,7 +53,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -53,7 +53,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
MockComponent(ProcessVorgangContainerComponent), MockComponent(ProcessVorgangContainerComponent),
MockComponent(VorgangArchiveContainerComponent), MockComponent(VorgangArchiveContainerComponent),
MockComponent(DropdownMenuComponent), MockComponent(DropdownMenuComponent),
MockComponent(DropdownMenuItemTextComponent), MockComponent(DropdownMenuTextItemComponent),
MockComponent(MoreIconComponent), MockComponent(MoreIconComponent),
MockComponent(FileIconComponent), MockComponent(FileIconComponent),
HasLinkPipe, HasLinkPipe,
...@@ -113,7 +113,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -113,7 +113,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
describe('hasMenuItems', () => { describe('hasMenuItems', () => {
it('should return true if at least 1 menu item exists', () => { 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(); const res: boolean = component.hasMenuItems();
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { ChangeDetectorRef, Component, Input, OnChanges, QueryList, SimpleChanges, ViewChild, ViewChildren } from '@angular/core'; 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'; import { has } from 'lodash-es';
@Component({ @Component({
...@@ -35,7 +35,7 @@ export class VorgangDetailMoreMenuComponent implements OnChanges { ...@@ -35,7 +35,7 @@ export class VorgangDetailMoreMenuComponent implements OnChanges {
@Input() vorgangWithEingang: VorgangWithEingangResource; @Input() vorgangWithEingang: VorgangWithEingangResource;
@ViewChild(DropdownMenuComponent) menu: DropdownMenuComponent; @ViewChild(DropdownMenuComponent) menu: DropdownMenuComponent;
@ViewChildren(DropdownMenuItemTextComponent) menuItems!: QueryList<DropdownMenuItemTextComponent>; @ViewChildren(DropdownMenuTextItemComponent) menuItems!: QueryList<DropdownMenuTextItemComponent>;
public buttonEnabled: boolean = false; public buttonEnabled: boolean = false;
......
...@@ -60,7 +60,7 @@ import { ...@@ -60,7 +60,7 @@ import {
CheckIconComponent, CheckIconComponent,
CloseIconComponent, CloseIconComponent,
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemTextComponent, DropdownMenuTextItemComponent,
ErrorMessageComponent, ErrorMessageComponent,
ExclamationIconComponent, ExclamationIconComponent,
FileIconComponent, FileIconComponent,
...@@ -175,7 +175,7 @@ const routes: Routes = [ ...@@ -175,7 +175,7 @@ const routes: Routes = [
ArchiveIconComponent, ArchiveIconComponent,
CheckIconComponent, CheckIconComponent,
DropdownMenuComponent, DropdownMenuComponent,
DropdownMenuItemTextComponent, DropdownMenuTextItemComponent,
MoreIconComponent, MoreIconComponent,
FileIconComponent, FileIconComponent,
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment