From 9d1842dcda6fbb458f4ad0a4c44fd61b712f9b92 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 16:45:12 +0100
Subject: [PATCH] OZG-7128 after merge conflicts
---
alfa-client/apps/admin/src/app/app.component.ts | 3 +--
.../organisationseinheit-form-page.component.html | 2 +-
...rganisationseinheit-form-page.component.spec.ts | 3 ++-
.../organisationseinheit-page.component.html | 2 +-
.../organisationseinheit-page.component.spec.ts | 6 +++---
.../postfach-page/postfach-page.component.spec.ts | 3 +--
.../user-add-page/user-add-page.component.spec.ts | 3 +--
.../user-roles-page.component.spec.ts | 3 +--
.../organisations-einheit-list-resource.service.ts | 1 -
.../lib/organisations-einheit-resource.service.ts | 1 -
.../src/lib/organisations-einheit.service.spec.ts | 1 -
.../src/lib/organisations-einheit.service.ts | 5 -----
...ganisations-einheit-container.component.spec.ts | 1 -
.../organisations-einheit-list.component.spec.ts | 2 --
.../organisations-einheit-list.component.ts | 1 -
...ations-einheit-form-container.component.spec.ts | 1 -
.../organisations-einheit-form.component.spec.ts | 1 -
.../organisations-einheit-form.component.ts | 1 -
.../organisations-einheit.formservice.spec.ts | 1 -
.../organisations-einheit.formservice.ts | 1 -
.../src/lib/postfach-resource.service.ts | 6 ------
.../src/lib/postfach.service.spec.ts | 8 +-------
.../postfach-container.component.spec.ts | 1 -
.../src/lib/settings.service.spec.ts | 6 ------
.../settings-shared/src/lib/settings.util.spec.ts | 14 ++------------
.../src/lib/keycloak.resource.service.spec.ts | 3 +--
.../user-shared/src/lib/to-user-name.pipe.spec.ts | 1 -
.../admin/user-shared/src/lib/user.util.spec.ts | 1 -
28 files changed, 15 insertions(+), 67 deletions(-)
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index 58ab634d7b..11944356c6 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -22,9 +22,8 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { Environment, getEnvironmentFactory } from '@alfa-client/environment-shared';
-import { StateResource } from '@alfa-client/tech-shared';
import { BuildInfoComponent } from '@alfa-client/common';
+import { Environment, getEnvironmentFactory } from '@alfa-client/environment-shared';
import { StateResource, TechSharedModule } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, OnInit } from '@angular/core';
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 b2b68278c1..cb9bf3ffd0 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
@@ -25,6 +25,6 @@
-->
<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
@if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
- <admin-organisationseinheit-form-container data-test-id="organisations-einheit-form" />
+ <admin-organisations-einheit-form-container data-test-id="organisations-einheit-form" />
}
</ng-container>
\ 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 684561a85a..081e864d88 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
@@ -25,6 +25,7 @@ import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organi
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';
@@ -45,7 +46,7 @@ describe('OrganisationsEinheitFormPageComponent', () => {
apiRootService = mock(ApiRootService);
await TestBed.configureTestingModule({
- imports: [TechSharedModule],
+ imports: [CommonModule, TechSharedModule],
declarations: [OrganisationsEinheitFormPageComponent, MockComponent(OrganisationsEinheitFormContainerComponent)],
providers: [{ provide: ApiRootService, useValue: apiRootService }],
}).compileComponents();
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 c6b911fd2b..f1c8abdc40 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
@@ -25,6 +25,6 @@
-->
<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
@if (apiRoot | hasLink: apiRootLinkRel.ORGANISATIONS_EINHEIT) {
- <admin-organisationseinheit-container data-test-id="organisations-einheit-container" />
+ <admin-organisations-einheit-container data-test-id="organisations-einheit-container" />
}
</ng-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 8dd6e2537e..d6b708a413 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
@@ -21,11 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-settings';
+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 { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
+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';
@@ -46,7 +46,7 @@ describe('OrganisationsEinheitPageComponent', () => {
apiRootService = mock(ApiRootService);
await TestBed.configureTestingModule({
- imports: [TechSharedModule],
+ imports: [CommonModule, TechSharedModule],
declarations: [OrganisationsEinheitPageComponent, MockComponent(OrganisationsEinheitContainerComponent)],
providers: [{ provide: ApiRootService, useValue: apiRootService }],
}).compileComponents();
diff --git a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
index c99ec7b504..1b1555bcac 100644
--- a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.spec.ts
@@ -21,10 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { PostfachContainerComponent } from '@admin-client/admin-settings';
+import { PostfachContainerComponent } from '@admin-client/postfach';
import { getEnvironmentFactory } from '@alfa-client/environment-shared';
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { PostfachContainerComponent } from '@admin-client/postfach';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createEnvironment } from 'libs/environment-shared/test/environment';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
index 8c01a03c82..facb1f6d4f 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
@@ -21,10 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { UserAddFormComponent } from '@admin-client/admin-settings';
+import { UserAddFormComponent } from '@admin-client/user';
import { getEnvironmentFactory } from '@alfa-client/environment-shared';
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { UserAddFormComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createEnvironment } from 'libs/environment-shared/test/environment';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
index a5dd751692..77b415071c 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.spec.ts
@@ -21,10 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { UsersRolesComponent } from '@admin-client/admin-settings';
+import { UsersRolesComponent } from '@admin-client/user';
import { getEnvironmentFactory } from '@alfa-client/environment-shared';
import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
-import { UsersRolesComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { createEnvironment } from 'libs/environment-shared/test/environment';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
index 59c700778b..4c7f294dbd 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-list-resource.service.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitItemResource, AdminOrganisationsEinheitListResource } from '@admin-client/admin-settings';
import { ConfigurationResource } from '@admin-client/configuration-shared';
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { ListResourceServiceConfig, ResourceListService, ResourceRepository } from '@alfa-client/tech-shared';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
index 42e19e804c..304671d285 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit-resource.service.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { ConfigurationResource } from '@admin-client/configuration-shared';
import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
import { OrganisationsEinheitListResourceService } from './organisations-einheit-list-resource.service';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
index 96a20c8289..36f737d585 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitListResource, AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { NavigationService } from '@alfa-client/navigation-shared';
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
index bd96a7fddd..dd246b5c64 100644
--- a/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
+++ b/alfa-client/libs/admin/organisations-einheit-shared/src/lib/organisations-einheit.service.ts
@@ -21,11 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- AdminOrganisationsEinheitListResource,
- AdminOrganisationsEinheitResource,
- AdminOrganisationsEinheitSettings,
-} from '@admin-client/admin-settings';
import { NavigationService } from '@alfa-client/navigation-shared';
import { StateResource, createEmptyStateResource, isNotUndefined } from '@alfa-client/tech-shared';
import { SnackBarService } from '@alfa-client/ui';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
index 8282af1ba3..2760d6e214 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-container.component.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitListResource, OrganisationsEinheitContainerComponent } from '@admin-client/admin-settings';
import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
import { StateResource, ToEmbeddedResourcesPipe, createStateResource } from '@alfa-client/tech-shared';
import { Mock, existsAsHtmlElement, getMockComponent, mock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
index 15f4b3279b..f7ce733a74 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
@@ -21,8 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '@admin-client/admin-settings';
-import { ConvertForDataTestPipe, ToResourceUriPipe } from '@alfa-client/tech-shared';
import {
existsAsHtmlElement,
getElementFromFixture,
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
index f2315cc3da..826556819e 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '@admin-client/admin-settings';
import {
AdminOrganisationsEinheitResource,
AdminOrganisationsEinheitSyncResult,
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
index aeca645d1e..52ff5b3475 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form-container.component.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource, OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-settings';
import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
index efcdbd8ddd..b329e45f49 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
import { createEmptyStateResource, createStateResource, ProblemDetail } from '@alfa-client/tech-shared';
import { existsAsHtmlElement, Mock, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
index 2cc76d3b79..ac251ee802 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit-form.component.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { AdminOrganisationsEinheitResource } from '@admin-client/organisations-einheit-shared';
import { StateResource, createEmptyStateResource, isNotNil } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
index 636f555a48..d44e2084f0 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { FormBuilder } from '@angular/forms';
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
index 1b7731eb39..0654a19ed8 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-form-container/organisations-einheit-form/organisations-einheit.formservice.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { AdminOrganisationsEinheitResource } from '@admin-client/admin-settings';
import { AdminOrganisationsEinheitResource, OrganisationsEinheitService } from '@admin-client/organisations-einheit-shared';
import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
diff --git a/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts b/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
index 06ff016008..48043163de 100644
--- a/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
+++ b/alfa-client/libs/admin/postfach-shared/src/lib/postfach-resource.service.ts
@@ -21,12 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- ApiResourceService,
- ResourceRepository,
- ResourceServiceConfig,
-} from '@alfa-client/tech-shared';
-import { SettingsService } from '../admin-settings.service';
import { SettingsService } from '@admin-client/settings-shared';
import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
import { PostfachLinkRel } from './postfach.linkrel';
diff --git a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
index 73df6c3816..d779cb50dc 100644
--- a/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
+++ b/alfa-client/libs/admin/postfach-shared/src/lib/postfach.service.spec.ts
@@ -21,20 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- StateResource,
- createEmptyStateResource,
- createStateResource,
-} from '@alfa-client/tech-shared';
-import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
import { SnackBarService } from '@alfa-client/ui';
import { Type } from '@angular/core';
import { fakeAsync, TestBed, tick } from '@angular/core/testing';
import { cold } from 'jest-marbles';
+import { singleCold, singleHot } from 'libs/tech-shared/test/marbles';
import { Observable, of } from 'rxjs';
-import { singleCold, singleHot } from '../../../../tech-shared/test/marbles';
import { createPostfachResource, createPostfachSettingItem } from '../test/postfach';
import { PostfachResourceService } from './postfach-resource.service';
import { PostfachResource, PostfachSettingsItem } from './postfach.model';
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
index bd54907da7..7cf10044a0 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { createStateResource, StateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
index 6e9e56a45f..9b24d56767 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.service.spec.ts
@@ -21,12 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- StateResource,
- createEmptyStateResource,
- createStateResource,
-} from '@alfa-client/tech-shared';
-import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { PostfachResource } from '@admin-client/postfach-shared';
import { StateResource, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
diff --git a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
index 4f6ac59227..5b78df34aa 100644
--- a/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
+++ b/alfa-client/libs/admin/settings-shared/src/lib/settings.util.spec.ts
@@ -21,21 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- createEmptyStateResource,
- createStateResource,
- StateResource,
-} from '@alfa-client/tech-shared';
-import { createFilledSettingsListResource } from '../../test/admin-settings';
-import { createPostfachResource } from '../../test/postfach/postfach';
-import { SettingListResource } from './admin-settings.model';
-import { getPostfachResource } from './admin-settings.util';
-import { PostfachResource } from './postfach/postfach.model';
import { PostfachResource } from '@admin-client/postfach-shared';
+import { SettingListResource } from '@admin-client/settings-shared';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { createPostfachResource } from '../../../postfach-shared/src/test/postfach';
+import { createPostfachResource } from 'libs/admin/postfach-shared/src/test/postfach';
import { createFilledSettingsListResource } from '../../test/settings';
-import { SettingListResource } from './settings.model';
import { getPostfachResource } from './settings.util';
describe('get postfach resource', () => {
diff --git a/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
index 0a67c73f65..228f1b0cfa 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/keycloak.resource.service.spec.ts
@@ -21,15 +21,14 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { fakeAsync, tick } from '@angular/core/testing';
import { TestBed, fakeAsync, tick } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
import { cold } from 'jest-marbles';
+import * as resourceUtil from 'libs/tech-shared/src/lib/resource/resource.util';
import { StateResource, createEmptyStateResource } from 'libs/tech-shared/src/lib/resource/resource.util';
import { Dummy, createDummy } from 'libs/tech-shared/test/dummy';
import { singleCold } from 'libs/tech-shared/test/marbles';
import { Observable, of } from 'rxjs';
-import * as resourceUtil from 'libs/tech-shared/src/lib/resource/resource.util';
import { KeycloakResourceService } from './keycloak.resource.service';
describe('KeycloakResourceService', () => {
diff --git a/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
index f740818067..6b7a91ae4d 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/to-user-name.pipe.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { createUser } from '../../../test/user/user';
import { createUser } from '../../test/user';
import { ToUserNamePipe } from './to-user-name.pipe';
import { User } from './user.model';
diff --git a/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts b/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
index a78f75a348..78afbd546e 100644
--- a/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
+++ b/alfa-client/libs/admin/user-shared/src/lib/user.util.spec.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { createUser } from '../../../test/user/user';
import { createUser } from '../../test/user';
import { User } from './user.model';
import { sortUsersByLastName } from './user.util';
--
GitLab