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

OZG-7774 improve code quality

parent d6770838
No related branches found
No related tags found
1 merge request!128OZG-7774 add new menu items
Showing
with 21 additions and 19 deletions
......@@ -23,7 +23,7 @@
*/
export enum ConfigurationLinkRel {
SETTING = 'settings',
AGGREGATION_MAPPINGS = 'aggregationMappings',
AGGREGATION_MAPPINGS = 'auswertungs',
DATENFREIGABE = 'datenfreigabes',
DATENANFRAGE = 'datenanfrages',
}
<admin-menu [configurationStateResource]="configurationStateResource$ | async" />
<admin-statistik-menu [configurationStateResource]="configurationStateResource$ | async" />
......@@ -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);
});
});
......@@ -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 {
......
......@@ -3,3 +3,4 @@
<ods-icon icon name="mailbox" fill="text" />
</ods-nav-item>
}
<admin-statistik-menu [configurationStateResource]="configurationStateResource" />
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);
});
});
});
......@@ -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 {
......
......@@ -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(
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment