From be5338cdba6dfb33c231b21a36d377d64b3e2283 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 29 Apr 2025 16:13:53 +0200
Subject: [PATCH] OZG-7774 improve code quality
---
.../src/lib/configuration.linkrel.ts | 2 +-
.../menu-container/menu-container.component.html | 1 -
.../menu-container.component.spec.ts | 9 +--------
.../lib/menu-container/menu-container.component.ts | 3 +--
.../lib/menu-container/menu/menu.component.html | 1 +
.../lib/menu-container/menu/menu.component.spec.ts | 14 +++++++++++---
.../src/lib/menu-container/menu/menu.component.ts | 3 ++-
.../statistik-menu/statistik-menu.component.html | 0
.../statistik-menu.component.spec.ts | 5 +++--
.../statistik-menu/statistik-menu.component.ts | 0
.../lib/navbar/nav-item/nav-item.component.spec.ts | 2 +-
11 files changed, 21 insertions(+), 19 deletions(-)
rename alfa-client/libs/admin/configuration/src/lib/menu-container/{ => menu}/statistik-menu/statistik-menu.component.html (100%)
rename alfa-client/libs/admin/configuration/src/lib/menu-container/{ => menu}/statistik-menu/statistik-menu.component.spec.ts (96%)
rename alfa-client/libs/admin/configuration/src/lib/menu-container/{ => menu}/statistik-menu/statistik-menu.component.ts (100%)
diff --git a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.linkrel.ts b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.linkrel.ts
index a49d99231e..e9346ae8ac 100644
--- a/alfa-client/libs/admin/configuration-shared/src/lib/configuration.linkrel.ts
+++ b/alfa-client/libs/admin/configuration-shared/src/lib/configuration.linkrel.ts
@@ -23,7 +23,7 @@
*/
export enum ConfigurationLinkRel {
SETTING = 'settings',
- AGGREGATION_MAPPINGS = 'aggregationMappings',
+ AGGREGATION_MAPPINGS = 'auswertungs',
DATENFREIGABE = 'datenfreigabes',
DATENANFRAGE = 'datenanfrages',
}
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.html
index b7e703fc1d..88920c510e 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.html
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.html
@@ -1,2 +1 @@
<admin-menu [configurationStateResource]="configurationStateResource$ | async" />
-<admin-statistik-menu [configurationStateResource]="configurationStateResource$ | async" />
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.spec.ts
index b6354f4641..69d8eb3bd3 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.spec.ts
@@ -7,7 +7,6 @@ import { of } from 'rxjs';
import { createConfigurationResource } from '../../../../configuration-shared/test/configuration';
import { MenuContainerComponent } from './menu-container.component';
import { MenuComponent } from './menu/menu.component';
-import { StatistikMenuComponent } from './statistik-menu/statistik-menu.component';
describe('MenuContainerComponent', () => {
let component: MenuContainerComponent;
@@ -22,7 +21,7 @@ describe('MenuContainerComponent', () => {
await TestBed.configureTestingModule({
imports: [MenuContainerComponent],
- declarations: [MockComponent(MenuComponent), MockComponent(StatistikMenuComponent)],
+ declarations: [MockComponent(MenuComponent)],
providers: [
{
provide: ConfigurationService,
@@ -53,10 +52,4 @@ describe('MenuContainerComponent', () => {
expect(menu.configurationStateResource).toBe(configurationStateResource);
});
-
- it('should call statistic menu', () => {
- const statisticMenu: StatistikMenuComponent = getMockComponent(fixture, StatistikMenuComponent);
-
- expect(statisticMenu.configurationStateResource).toBe(configurationStateResource);
- });
});
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.ts
index 50be1f39d5..7cb838c535 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu-container.component.ts
@@ -4,12 +4,11 @@ import { CommonModule } from '@angular/common';
import { Component, inject, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { MenuComponent } from './menu/menu.component';
-import { StatistikMenuComponent } from './statistik-menu/statistik-menu.component';
@Component({
selector: 'admin-menu-container',
standalone: true,
- imports: [CommonModule, MenuComponent, StatistikMenuComponent],
+ imports: [CommonModule, MenuComponent],
templateUrl: './menu-container.component.html',
})
export class MenuContainerComponent implements OnInit {
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
index 5d7b258f2f..00078d1e25 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.html
@@ -3,3 +3,4 @@
<ods-icon icon name="mailbox" fill="text" />
</ods-nav-item>
}
+<admin-statistik-menu [configurationStateResource]="configurationStateResource" />
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
index 5f5b3c7c54..731b103bff 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.spec.ts
@@ -1,12 +1,13 @@
import { ConfigurationLinkRel } from '@admin-client/configuration-shared';
import { createEmptyStateResource, createStateResource, HasLinkPipe } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { existsAsHtmlElement, getMockComponent, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { IconComponent, NavItemComponent } from '@ods/system';
import { createConfigurationResource } from 'libs/admin/configuration-shared/test/configuration';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { MenuComponent } from './menu.component';
+import { StatistikMenuComponent } from './statistik-menu/statistik-menu.component';
describe('MenuComponent', () => {
let component: MenuComponent;
@@ -17,8 +18,7 @@ describe('MenuComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [MenuComponent, HasLinkPipe],
- declarations: [MockComponent(NavItemComponent), MockComponent(IconComponent)],
+ imports: [MenuComponent, HasLinkPipe, MockComponent(NavItemComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(MenuComponent);
@@ -48,4 +48,12 @@ describe('MenuComponent', () => {
notExistsAsHtmlElement(fixture, postfachNavigation);
});
});
+
+ describe('statistik menu', () => {
+ it('should call with configurationStateResource', () => {
+ const statisticMenu: StatistikMenuComponent = getMockComponent(fixture, StatistikMenuComponent);
+
+ expect(statisticMenu.configurationStateResource).toBe(component.configurationStateResource);
+ });
+ });
});
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
index ad10332330..79b5da74ee 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/menu.component.ts
@@ -4,11 +4,12 @@ import { HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { IconComponent, NavItemComponent } from '@ods/system';
+import { StatistikMenuComponent } from './statistik-menu/statistik-menu.component';
@Component({
selector: 'admin-menu',
standalone: true,
- imports: [CommonModule, NavItemComponent, IconComponent, HasLinkPipe],
+ imports: [CommonModule, NavItemComponent, IconComponent, HasLinkPipe, StatistikMenuComponent],
templateUrl: './menu.component.html',
})
export class MenuComponent {
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.html b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.html
similarity index 100%
rename from alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.html
rename to alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.html
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.spec.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.spec.ts
similarity index 96%
rename from alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.spec.ts
rename to alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.spec.ts
index ca2aacff02..24008266f3 100644
--- a/alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.spec.ts
+++ b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.spec.ts
@@ -18,8 +18,7 @@ describe('StatistikMenuComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [StatistikMenuComponent, HasLinkPipe],
- declarations: [MockComponent(NavItemComponent), MockComponent(IconComponent)],
+ imports: [StatistikMenuComponent, HasLinkPipe, MockComponent(NavItemComponent), MockComponent(IconComponent)],
}).compileComponents();
fixture = TestBed.createComponent(StatistikMenuComponent);
@@ -52,6 +51,7 @@ describe('StatistikMenuComponent', () => {
notExistsAsHtmlElement(fixture, auswertungNavigationSelector);
});
});
+
describe('datenfreigaben', () => {
it('should show if datenfreigabe link is present', () => {
component.configurationStateResource = createStateResource(
@@ -71,6 +71,7 @@ describe('StatistikMenuComponent', () => {
notExistsAsHtmlElement(fixture, datenfreigabenNavigationSelector);
});
});
+
describe('datenanfragen', () => {
it('should show if datenanfrage link is present', () => {
component.configurationStateResource = createStateResource(
diff --git a/alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.ts b/alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.ts
similarity index 100%
rename from alfa-client/libs/admin/configuration/src/lib/menu-container/statistik-menu/statistik-menu.component.ts
rename to alfa-client/libs/admin/configuration/src/lib/menu-container/menu/statistik-menu/statistik-menu.component.ts
diff --git a/alfa-client/libs/design-system/src/lib/navbar/nav-item/nav-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/navbar/nav-item/nav-item.component.spec.ts
index e4c06ac31c..9ca22bdf1b 100644
--- a/alfa-client/libs/design-system/src/lib/navbar/nav-item/nav-item.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/navbar/nav-item/nav-item.component.spec.ts
@@ -33,7 +33,7 @@ describe('NavItemComponent', () => {
let component: NavItemComponent;
let fixture: ComponentFixture<NavItemComponent>;
- const badgeLocator = getDataTestIdOf('nav-item-badge');
+ const badgeLocator: string = getDataTestIdOf('nav-item-badge');
const router: Mock<Router> = mock(Router);
--
GitLab