From 1f450870762a0a0106fff1c2e868fe8093ea060a Mon Sep 17 00:00:00 2001
From: Albert <Albert.Bruns@mgm-tp.com>
Date: Thu, 16 Jan 2025 11:10:26 +0100
Subject: [PATCH] OZG-6989-7502 guard
---
...anisationseinheit-form-page.component.html | 6 +-
...sationseinheit-form-page.component.spec.ts | 58 +------------------
...rganisationseinheit-form-page.component.ts | 21 +------
.../organisationseinheit-page.component.html | 6 +-
...rganisationseinheit-page.component.spec.ts | 58 +------------------
.../organisationseinheit-page.component.ts | 21 +------
.../statistik-page.component.html | 6 +-
.../statistik-page.component.spec.ts | 58 +------------------
.../statistik-page.component.ts | 20 +------
9 files changed, 15 insertions(+), 239 deletions(-)
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
index cb9bf3ffd0..676e114ce2 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.html
@@ -23,8 +23,4 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
- @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
- <admin-organisations-einheit-form-container data-test-id="organisations-einheit-form" />
- }
-</ng-container>
\ No newline at end of file
+<admin-organisations-einheit-form-container data-test-id="organisations-einheit-form" />
\ No newline at end of file
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
index 081e864d88..4777b881b3 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.spec.ts
@@ -22,33 +22,18 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
import { MockComponent } from 'ng-mocks';
-import { Observable, of } from 'rxjs';
import { OrganisationsEinheitFormPageComponent } from './organisationseinheit-form-page.component';
describe('OrganisationsEinheitFormPageComponent', () => {
let component: OrganisationsEinheitFormPageComponent;
let fixture: ComponentFixture<OrganisationsEinheitFormPageComponent>;
- const organisationsEinheitFormSelector: string = getDataTestIdOf('organisations-einheit-form');
-
- let apiRootService: Mock<ApiRootService>;
-
beforeEach(async () => {
- apiRootService = mock(ApiRootService);
-
await TestBed.configureTestingModule({
- imports: [CommonModule, TechSharedModule],
+ imports: [],
declarations: [OrganisationsEinheitFormPageComponent, MockComponent(OrganisationsEinheitFormContainerComponent)],
- providers: [{ provide: ApiRootService, useValue: apiRootService }],
}).compileComponents();
});
@@ -62,45 +47,4 @@ describe('OrganisationsEinheitFormPageComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
-
- describe('component', () => {
- describe('ngOnInit', () => {
- const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
- const apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(apiRootStateResource);
-
- beforeEach(() => {
- apiRootService.getApiRoot.mockReturnValue(apiRootStateResource$);
- });
-
- it('should call apiRootService getApiRoot', () => {
- component.ngOnInit();
-
- expect(apiRootService.getApiRoot).toHaveBeenCalled();
- });
-
- it('should get apiRootStateResource$', () => {
- component.ngOnInit();
-
- expect(component.apiRootStateResource$).toBeObservable(singleColdCompleted(apiRootStateResource));
- });
- });
- });
-
- describe('template', () => {
- describe('admin-organisationseinheit-form-container', () => {
- it('should be rendered if apiRootState has link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource([ApiRootLinkRel.ORGANISATIONS_EINHEIT])));
- fixture.detectChanges();
-
- existsAsHtmlElement(fixture, organisationsEinheitFormSelector);
- });
-
- it('should not be rendered if apiRootState has no link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
- fixture.detectChanges();
-
- notExistsAsHtmlElement(fixture, organisationsEinheitFormSelector);
- });
- });
- });
});
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.ts
index d92144b1e5..109509a372 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component.ts
@@ -22,27 +22,12 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
-import { UiModule } from '@alfa-client/ui';
-import { CommonModule } from '@angular/common';
-import { Component, inject, OnInit } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { Component } from '@angular/core';
@Component({
selector: 'organisationseinheit-form-page',
templateUrl: './organisationseinheit-form-page.component.html',
standalone: true,
- imports: [CommonModule, UiModule, OrganisationsEinheitFormContainerComponent],
+ imports: [OrganisationsEinheitFormContainerComponent],
})
-export class OrganisationsEinheitFormPageComponent implements OnInit {
- private apiRootService = inject(ApiRootService);
-
- public apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(createEmptyStateResource<ApiRootResource>());
-
- public readonly apiRootLinkRel = ApiRootLinkRel;
-
- ngOnInit(): void {
- this.apiRootStateResource$ = this.apiRootService.getApiRoot();
- }
-}
+export class OrganisationsEinheitFormPageComponent {}
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
index f1c8abdc40..33d2af56ff 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.html
@@ -23,8 +23,4 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
- @if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
- <admin-organisations-einheit-container data-test-id="organisations-einheit-container" />
- }
-</ng-container>
+<admin-organisations-einheit-container data-test-id="organisations-einheit-container" />
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
index d6b708a413..b106381fa7 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.spec.ts
@@ -22,33 +22,18 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
import { MockComponent } from 'ng-mocks';
-import { Observable, of } from 'rxjs';
import { OrganisationsEinheitPageComponent } from './organisationseinheit-page.component';
describe('OrganisationsEinheitPageComponent', () => {
let component: OrganisationsEinheitPageComponent;
let fixture: ComponentFixture<OrganisationsEinheitPageComponent>;
- const organisationsEinheitContainerSelector: string = getDataTestIdOf('organisations-einheit-container');
-
- let apiRootService: Mock<ApiRootService>;
-
beforeEach(async () => {
- apiRootService = mock(ApiRootService);
-
await TestBed.configureTestingModule({
- imports: [CommonModule, TechSharedModule],
+ imports: [],
declarations: [OrganisationsEinheitPageComponent, MockComponent(OrganisationsEinheitContainerComponent)],
- providers: [{ provide: ApiRootService, useValue: apiRootService }],
}).compileComponents();
});
@@ -62,45 +47,4 @@ describe('OrganisationsEinheitPageComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
-
- describe('component', () => {
- describe('ngOnInit', () => {
- const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
- const apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(apiRootStateResource);
-
- beforeEach(() => {
- apiRootService.getApiRoot.mockReturnValue(apiRootStateResource$);
- });
-
- it('should call apiRootService getApiRoot', () => {
- component.ngOnInit();
-
- expect(apiRootService.getApiRoot).toHaveBeenCalled();
- });
-
- it('should get apiRootStateResource$', () => {
- component.ngOnInit();
-
- expect(component.apiRootStateResource$).toBeObservable(singleColdCompleted(apiRootStateResource));
- });
- });
- });
-
- describe('template', () => {
- describe('admin-organisationseinheit-container', () => {
- it('should be rendered if apiRootState has link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource([ApiRootLinkRel.ORGANISATIONS_EINHEIT])));
- fixture.detectChanges();
-
- existsAsHtmlElement(fixture, organisationsEinheitContainerSelector);
- });
-
- it('should not be rendered if apiRootState has no link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
- fixture.detectChanges();
-
- notExistsAsHtmlElement(fixture, organisationsEinheitContainerSelector);
- });
- });
- });
});
diff --git a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.ts b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.ts
index 031470f244..d2d9e13340 100644
--- a/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component.ts
@@ -22,27 +22,12 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
-import { UiModule } from '@alfa-client/ui';
-import { CommonModule } from '@angular/common';
-import { Component, inject, OnInit } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { Component } from '@angular/core';
@Component({
selector: 'organisationseinheit-page',
templateUrl: './organisationseinheit-page.component.html',
standalone: true,
- imports: [CommonModule, OrganisationsEinheitContainerComponent, UiModule],
+ imports: [OrganisationsEinheitContainerComponent],
})
-export class OrganisationsEinheitPageComponent implements OnInit {
- private apiRootService = inject(ApiRootService);
-
- public apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(createEmptyStateResource<ApiRootResource>());
-
- public readonly apiRootLinkRel = ApiRootLinkRel;
-
- ngOnInit(): void {
- this.apiRootStateResource$ = this.apiRootService.getApiRoot();
- }
-}
+export class OrganisationsEinheitPageComponent {}
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html
index f0b1dd3ea6..5213f51259 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.html
@@ -23,8 +23,4 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
- @if (apiRoot | hasLink: apiRootLinkRel.AGGREGATION_MAPPING) {
- <admin-statistik-container data-test-id="statistik-container" />
- }
-</ng-container>
+<admin-statistik-container data-test-id="statistik-container" />
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts
index 39c25df53f..2166339888 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.spec.ts
@@ -22,33 +22,18 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { StatistikContainerComponent } from '@admin-client/statistik';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
-import { existsAsHtmlElement, mock, Mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { CommonModule } from '@angular/common';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { singleColdCompleted } from 'libs/tech-shared/test/marbles';
import { MockComponent } from 'ng-mocks';
-import { Observable, of } from 'rxjs';
import { StatistikPageComponent } from './statistik-page.component';
describe('StatistikPageComponent', () => {
let component: StatistikPageComponent;
let fixture: ComponentFixture<StatistikPageComponent>;
- const statistikContainerSelector: string = getDataTestIdOf('statistik-container');
-
- let apiRootService: Mock<ApiRootService>;
-
beforeEach(async () => {
- apiRootService = mock(ApiRootService);
-
await TestBed.configureTestingModule({
- imports: [CommonModule, TechSharedModule],
+ imports: [],
declarations: [StatistikPageComponent, MockComponent(StatistikContainerComponent)],
- providers: [{ provide: ApiRootService, useValue: apiRootService }],
}).compileComponents();
});
@@ -62,45 +47,4 @@ describe('StatistikPageComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
-
- describe('component', () => {
- describe('ngOnInit', () => {
- const apiRootStateResource: StateResource<ApiRootResource> = createStateResource(createApiRootResource());
- const apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(apiRootStateResource);
-
- beforeEach(() => {
- apiRootService.getApiRoot.mockReturnValue(apiRootStateResource$);
- });
-
- it('should call apiRootService getApiRoot', () => {
- component.ngOnInit();
-
- expect(apiRootService.getApiRoot).toHaveBeenCalled();
- });
-
- it('should get apiRootStateResource$', () => {
- component.ngOnInit();
-
- expect(component.apiRootStateResource$).toBeObservable(singleColdCompleted(apiRootStateResource));
- });
- });
- });
-
- describe('template', () => {
- describe('statistik-organisationseinheit-container', () => {
- it('should be rendered if apiRootState has link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource([ApiRootLinkRel.AGGREGATION_MAPPING])));
- fixture.detectChanges();
-
- existsAsHtmlElement(fixture, statistikContainerSelector);
- });
-
- it('should not be rendered if apiRootState has no link', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
- fixture.detectChanges();
-
- notExistsAsHtmlElement(fixture, statistikContainerSelector);
- });
- });
- });
});
diff --git a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
index 94ab9abca8..1e74b105df 100644
--- a/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/statistik/statistik-page/statistik-page.component.ts
@@ -22,26 +22,12 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { StatistikContainerComponent } from '@admin-client/statistik';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { createEmptyStateResource, StateResource, TechSharedModule } from '@alfa-client/tech-shared';
-import { CommonModule } from '@angular/common';
-import { Component, inject, OnInit } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { Component } from '@angular/core';
@Component({
selector: 'app-statistik-page',
standalone: true,
- imports: [CommonModule, StatistikContainerComponent, TechSharedModule],
+ imports: [StatistikContainerComponent],
templateUrl: './statistik-page.component.html',
})
-export class StatistikPageComponent implements OnInit {
- private readonly apiRootService = inject(ApiRootService);
-
- public apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(createEmptyStateResource<ApiRootResource>());
-
- public readonly apiRootLinkRel = ApiRootLinkRel;
-
- ngOnInit(): void {
- this.apiRootStateResource$ = this.apiRootService.getApiRoot();
- }
-}
+export class StatistikPageComponent {}
--
GitLab