Merge branch 'main' into OZG-7507-admin-organisationsEinheit-loeschen

alfa-client/apps/admin-e2e/docker-compose.yml

@@ -79,7 +79,7 @@ services:
     depends_on:
       - user-manager
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'
 
   alfa-cors-proxy:
     image: alfa-cors-proxy
@@ -91,7 +91,6 @@ services:
       alfa:
         condition: service_started
 
-
   user-manager:
     image: docker.ozg-sh.de/user-manager:${USER_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
@@ -132,6 +131,7 @@ services:
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb:27017/config-db
       - OZGCLOUD_OAUTH2_REALM=${KEYCLOAK_REALM:-by-e2e-tests-local-dev}
       - ozgcloud_organisationeinheit_zufisearchuri=http://localhost:8082/api/organisationseinheits
+      - OZGCLOUD_USER-ASSISTANCE_DOCUMENTATION_URL=http://dummy-leitfaden.url
       - BPL_DEBUG_ENABLED=true
       - BPL_DEBUG_PORT=5100
     ports:
@@ -145,4 +145,4 @@ services:
       user-manager:
         condition: service_started
     extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - 'host.docker.internal:host-gateway'

alfa-client/apps/admin-e2e/src/components/user-profile/current-user-profile.component.e2e.ts

@@ -26,6 +26,7 @@ import { UserProfileE2EComponent } from './user-profile.component.e2e';
 export class CurrentUserProfileE2EComponent {
   private readonly locatorUserIconButton: string = 'popup-button-content';
   private readonly locatorLogoutButton: string = 'popup-logout-button';
+  private readonly locatorDocumentation: string = 'admin-documentation';
 
   private readonly locatorRoot: string = 'current-user';
 
@@ -46,7 +47,11 @@ export class CurrentUserProfileE2EComponent {
     return cy.getTestElement(this.locatorUserIconButton);
   }
 
-  private getLogoutButton() {
+  public getLogoutButton() {
     return cy.getTestElement(this.locatorLogoutButton);
   }
+
+  public getDocumentation() {
+    return cy.getTestElement(this.locatorDocumentation);
+  }
 }

alfa-client/libs/user-assistance/src/lib/help-menu/documentation/open-documentation-button/open-documentation-button.component.spec.ts → alfa-client/apps/admin-e2e/src/e2e/main-tests/app/user-profile-menu.cy.ts

 /*
- * Copyright (C) 2023 Das Land Schleswig-Holstein vertreten durch den
+ * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein
  * Staatskanzlei
  * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
@@ -21,27 +21,36 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HeaderE2EComponent } from '../../../page-objects/header.po';
+import { MainPage } from '../../../page-objects/main.po';
+import { exist, shouldHaveAttribute } from '../../../support/cypress.util';
+import { loginAsAriane } from '../../../support/user-util';
 
-import { OpenDocumentationButtonComponent } from './open-documentation-button.component';
-import { MockComponent } from 'ng-mocks';
-import { OpenUrlButtonComponent } from '@alfa-client/ui';
+describe('User Profile Menu', () => {
+  const mainPage: MainPage = new MainPage();
+  const header: HeaderE2EComponent = mainPage.getHeader();
 
-describe('OpenDocumentationButtonComponent', () => {
-  let component: OpenDocumentationButtonComponent;
-  let fixture: ComponentFixture<OpenDocumentationButtonComponent>;
+  const documentationLink: string = 'http://dummy-leitfaden.url';
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [OpenDocumentationButtonComponent, MockComponent(OpenUrlButtonComponent)],
-    }).compileComponents();
+  before(() => {
+    loginAsAriane();
+  });
+
+  describe('open user profile menu', () => {
+    before(() => {
+      header.getCurrentUserProfile().getUserIconButton().click();
+    });
 
-    fixture = TestBed.createComponent(OpenDocumentationButtonComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+    it('should show logout button', () => {
+      exist(header.getCurrentUserProfile().getLogoutButton());
     });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+    it('should show documentation', () => {
+      exist(header.getCurrentUserProfile().getDocumentation());
+    });
+
+    it('should find documentation link', () => {
+      shouldHaveAttribute(header.getCurrentUserProfile().getDocumentation().find('a'), 'href', documentationLink);
+    });
   });
 });

alfa-client/apps/admin/package.json

 {
   "name": "admin",
-  "version": "null"
+  "version": "1.6.0-SNAPSHOT"
 }

alfa-client/apps/admin/src/app/app.component.html

@@ -36,7 +36,10 @@
     >
       <ods-admin-logo-icon />
     </a>
-    <user-profile-button-container data-test-id="user-profile-button"></user-profile-button-container>
+    <user-profile-button-container
+      [apiRootStateResource]="apiRootStateResource$ | async"
+      data-test-id="user-profile-button"
+    ></user-profile-button-container>
   </header>
   <div class="flex h-screen w-full justify-center overflow-y-auto">
     <ods-navbar data-test-id="navigation">

alfa-client/apps/admin/src/app/app.component.spec.ts

@@ -27,31 +27,18 @@ import { KeycloakTokenService } from '@admin/keycloak-shared';
 import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
 import { BuildInfoComponent } from '@alfa-client/common';
 import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
-import {
-  existsAsHtmlElement,
-  getElementComponentFromFixtureByCss,
-  Mock,
-  mock,
-  notExistsAsHtmlElement,
-} from '@alfa-client/test-utils';
+import { existsAsHtmlElement, getElementComponentFromFixtureByCss, Mock, mock, notExistsAsHtmlElement, } from '@alfa-client/test-utils';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
 import { AuthenticationService } from '@authentication';
-import {
-  AdminLogoIconComponent,
-  MailboxIconComponent,
-  NavbarComponent,
-  NavItemComponent,
-  OrgaUnitIconComponent,
-  UsersIconComponent,
-} from '@ods/system';
+import { AdminLogoIconComponent, MailboxIconComponent, NavbarComponent, NavItemComponent, OrgaUnitIconComponent, UsersIconComponent, } from '@ods/system';
 import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
 import { MenuContainerComponent } from 'libs/admin/configuration/src/lib/menu-container/menu-container.component';
 import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
 import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { of, Subscription } from 'rxjs';
-import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
+import { UserProfileButtonContainerComponent } from '../../../../libs/admin/user-profile/src/lib/user-menu/user-profile.button-container.component';
 import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
 import { AppComponent } from './app.component';
 

alfa-client/apps/admin/src/app/app.component.ts

@@ -41,7 +41,7 @@ import {
   UsersIconComponent,
 } from '@ods/system';
 import { filter, Observable, Subscription } from 'rxjs';
-import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
+import { UserProfileButtonContainerComponent } from '../../../../libs/admin/user-profile/src/lib/user-menu/user-profile.button-container.component';
 import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
 
 @Component({

alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts

-import { shouldHaveAttribute } from "../../support/cypress.util";
+import { shouldHaveAttribute } from '../../support/cypress.util';
 
 /*
  * Copyright (C) 2023 Das Land Schleswig-Holstein vertreten durch den
@@ -27,7 +27,7 @@ export class HelpMenuE2EComponent {
   private readonly root: string = 'help-menu';
   private readonly button: string = 'help-menu-button';
   private readonly dropdownButton: string = 'dropdown-button';
-  private readonly openDocumentationButton: string = 'open-documentation-button';
+  private readonly documentation: string = 'documentation';
   private readonly openImpressumButton: string = 'impressum';
 
   public getRoot() {
@@ -42,15 +42,15 @@ export class HelpMenuE2EComponent {
     return this.getRoot().getTestElement(this.dropdownButton);
   }
 
-  public getOpenDocumentationButton() {
-    return this.getRoot().getTestElementWithOid(this.openDocumentationButton);
+  public getDocumentation() {
+    return this.getRoot().getTestElementWithOid(this.documentation);
   }
 
   public getImpressumButton(): Cypress.Chainable<Element> {
-    return cy.getTestElement(this.openImpressumButton)
+    return cy.getTestElement(this.openImpressumButton);
   }
 
   public impressumLinkIs(link: string): void {
-    shouldHaveAttribute(this.getImpressumButton().find('a'),'href', link)
+    shouldHaveAttribute(this.getImpressumButton().find('a'), 'href', link);
   }
 }

alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-assistance/help-menu.cy.ts

@@ -25,7 +25,7 @@ import { HelpMenuE2EComponent } from 'apps/alfa-e2e/src/components/user-assistan
 import { HeaderE2EComponent } from 'apps/alfa-e2e/src/page-objects/header.po';
 import { MainPage, waitForSpinnerToDisappear } from 'apps/alfa-e2e/src/page-objects/main.po';
 import { dropCollections } from 'apps/alfa-e2e/src/support/cypress-helper';
-import { contains, exist, shouldHaveAttribute } from 'apps/alfa-e2e/src/support/cypress.util';
+import { exist } from 'apps/alfa-e2e/src/support/cypress.util';
 import { loginAsSabine } from 'apps/alfa-e2e/src/support/user-util';
 
 describe('Help Menu', () => {
@@ -33,7 +33,7 @@ describe('Help Menu', () => {
   const header: HeaderE2EComponent = mainPage.getHeader();
   const helpMenu: HelpMenuE2EComponent = header.getHelpMenu();
 
-  const impressumLink: string = 'https://static.dev.sh.ozg-cloud.de/impressum'
+  const impressumLink: string = 'https://static.dev.sh.ozg-cloud.de/impressum';
 
   before(() => {
     loginAsSabine();
@@ -50,7 +50,7 @@ describe('Help Menu', () => {
     it('should show "open documentation"', () => {
       helpMenu.getRoot().click();
 
-      exist(helpMenu.getOpenDocumentationButton());
+      exist(helpMenu.getDocumentation());
     });
 
     it('should show Impressum button and find link', () => {
@@ -59,13 +59,7 @@ describe('Help Menu', () => {
     });
 
     it('should open documentation', () => {
-      helpMenu
-        .getOpenDocumentationButton()
-        .find('a')
-        .invoke('removeAttr', 'target')
-        .click()
-        .url()
-        .should('include', 'benutzerleitfaden');
+      helpMenu.getDocumentation().find('a').invoke('removeAttr', 'target').click().url().should('include', 'benutzerleitfaden');
     });
   });
 });

alfa-client/libs/admin/user-profile/.eslintrc.json

+{
+  "extends": ["../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "lib",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "lib",
+            "style": "kebab-case"
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@nx/angular-template"],
+      "rules": {}
+    }
+  ]
+}

alfa-client/libs/admin/user-profile/README.md

+# admin-user-profile
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test admin-user-profile` to execute the unit tests.

alfa-client/libs/admin/user-profile/jest.config.ts

+export default {
+  displayName: 'admin-user-profile',
+  preset: '../../../jest.preset.js',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+  coverageDirectory: '../../../coverage/libs/admin/user-profile',
+  transform: {
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+  snapshotSerializers: [
+    'jest-preset-angular/build/serializers/no-ng-attributes',
+    'jest-preset-angular/build/serializers/ng-snapshot',
+    'jest-preset-angular/build/serializers/html-comment',
+  ],
+};

alfa-client/libs/admin/user-profile/project.json

+{
+  "name": "admin-user-profile",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/admin/user-profile/src",
+  "prefix": "lib",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": [
+        "{workspaceRoot}/coverage/{projectRoot}"
+      ],
+      "options": {
+        "jestConfig": "libs/admin/user-profile/jest.config.ts"
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    }
+  }
+}

alfa-client/libs/admin/user-profile/src/lib/documentation/documentation.component.html

+<ods-dropdown-menu-link-item caption="Leitfaden für die Administration" text="PDF öffnen" [url]="url">
+  <ods-file-icon icon fileType="pdf" size="medium" />
+</ods-dropdown-menu-link-item>

alfa-client/libs/admin/user-profile/src/lib/documentation/documentation.component.scss

+:host {
+  white-space: nowrap;
+}

alfa-client/libs/admin/user-profile/src/lib/documentation/documentation.component.spec.ts

+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { DropdownMenuLinkItemComponent, FileIconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
+import { DocumentationComponent } from './documentation.component';
+
+describe('DocumentationComponent', () => {
+  let component: DocumentationComponent;
+  let fixture: ComponentFixture<DocumentationComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [DocumentationComponent, MockComponent(DropdownMenuLinkItemComponent), MockComponent(FileIconComponent)],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DocumentationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

alfa-client/libs/admin/user-profile/src/lib/documentation/documentation.component.ts

+import { Component, Input } from '@angular/core';
+import { DropdownMenuLinkItemComponent, FileIconComponent } from '@ods/system';
+
+@Component({
+  selector: 'admin-documentation',
+  templateUrl: './documentation.component.html',
+  styleUrls: ['./documentation.component.scss'],
+  standalone: true,
+  imports: [DropdownMenuLinkItemComponent, FileIconComponent],
+})
+export class DocumentationComponent {
+  @Input() url: string;
+}

alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.html

+<ods-dropdown-menu-button-item caption="Abmelden" (clickEmitter)="logout.emit()" data-test-id="popup-logout-button">
+  <ods-logout-icon icon class="fill-primary" />
+</ods-dropdown-menu-button-item>

alfa-client/libs/admin/user-profile/src/lib/user-logout-button/admin-user-logout-button.component.spec.ts

+import { dispatchEventFromFixture, MockEvent } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { expect } from '@jest/globals';
+import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
+import { AdminUserLogoutButtonComponent } from './admin-user-logout-button.component';
+
+describe('AdminUserLogoutButtonComponent', () => {
+  let component: AdminUserLogoutButtonComponent;
+  let fixture: ComponentFixture<AdminUserLogoutButtonComponent>;
+
+  const logoutButtonTestId: string = getDataTestIdOf('popup-logout-button');
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [AdminUserLogoutButtonComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(AdminUserLogoutButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('template', () => {
+    describe('menu button item', () => {
+      describe('output', () => {
+        describe('clickEmitter', () => {
+          it('should emit', () => {
+            component.logout.emit = jest.fn();
+
+            dispatchEventFromFixture(fixture, logoutButtonTestId, MockEvent.CLICK);
+
+            expect(component.logout.emit).toHaveBeenCalled();
+          });
+        });
+      });
+    });
+  });
+});