From b6f6d936299a6792705ed04b68148a49bad58c09 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Nov 2024 11:52:54 +0100
Subject: [PATCH] OZG-7128 cleanup
---
alfa-client/Jenkinsfile.e2e | 2 +-
alfa-client/Jenkinsfile.e2e.static | 2 +-
alfa-client/apps/admin/src/app/app.routes.ts | 2 +-
alfa-client/apps/admin/src/main.ts | 20 ++++++++--------
...anisationseinheit-form-page.component.html | 2 +-
...sationseinheit-form-page.component.spec.ts | 2 +-
...rganisationseinheit-form-page.component.ts | 2 +-
.../organisationseinheit-page.component.html | 2 +-
...rganisationseinheit-page.component.spec.ts | 2 +-
.../organisationseinheit-page.component.ts | 2 +-
.../postfach-page.component.html | 2 +-
.../postfach-page.component.spec.ts | 2 +-
.../postfach-page/postfach-page.component.ts | 2 +-
.../user-add-page.component.html | 2 +-
.../user-add-page.component.spec.ts | 2 +-
.../user-add-page/user-add-page.component.ts | 2 +-
.../user-roles-page.component.html | 2 +-
.../user-roles-page.component.spec.ts | 2 +-
.../user-roles-page.component.ts | 2 +-
.../libs/admin/configuration/README.md | 4 ++--
.../libs/admin/configuration/jest.config.ts | 2 +-
.../libs/admin/configuration/project.json | 2 +-
.../libs/admin/configuration/src/index.ts | 1 -
.../src/lib/configuration.module.spec.ts | 14 -----------
.../src/lib/configuration.module.ts | 17 --------------
.../src/lib/configuration.providers.ts | 16 +++++++++++++
.../admin/configuration/test/configuration.ts | 2 +-
.../libs/admin/organisationseinheit/README.md | 4 ++--
.../admin/organisationseinheit/jest.config.ts | 2 +-
.../admin/organisationseinheit/project.json | 2 +-
.../admin/organisationseinheit/src/index.ts | 1 -
...nisations-einheit-list-resource.service.ts | 2 +-
.../organisations-einheit-resource.service.ts | 2 +-
.../lib/organisations-einheit.providers.ts | 23 +++++++++++++++++++
...anisationseinheit-container.component.html | 2 +-
...rganisationseinheit-container.component.ts | 2 +-
.../organisationseinheit-list.component.ts | 2 +-
...tionseinheit-form-container.component.html | 2 +-
...sationseinheit-form-container.component.ts | 2 +-
.../organisationseinheit-form.component.html | 2 +-
.../organisationseinheit-form.component.ts | 2 +-
...organisationseinheit-signatur.component.ts | 2 +-
alfa-client/libs/admin/postfach/README.md | 4 ++--
.../libs/admin/postfach/jest.config.ts | 2 +-
alfa-client/libs/admin/postfach/project.json | 2 +-
alfa-client/libs/admin/postfach/src/index.ts | 1 -
.../postfach-container.component.ts | 2 +-
.../postfach.formservice.spec.ts | 1 -
.../src/lib/postfach-resource.service.ts | 2 +-
.../admin/postfach/src/lib/postfach.model.ts | 2 +-
.../postfach/src/lib/postfach.module.spec.ts | 14 -----------
.../admin/postfach/src/lib/postfach.module.ts | 16 -------------
.../postfach/src/lib/postfach.providers.ts | 12 ++++++++++
.../postfach/src/lib/postfach.service.ts | 2 +-
.../libs/admin/postfach/test/postfach.ts | 4 ++--
alfa-client/libs/admin/settings/README.md | 4 ++--
.../libs/admin/settings/jest.config.ts | 2 +-
alfa-client/libs/admin/settings/project.json | 2 +-
alfa-client/libs/admin/settings/src/index.ts | 5 ++--
.../src/lib/admin-settings.module.spec.ts | 14 -----------
.../settings/src/lib/admin-settings.module.ts | 17 --------------
...ervice.ts => settings-resource.service.ts} | 6 ++---
...ettings.linkrel.ts => settings.linkrel.ts} | 0
...in-settings.model.ts => settings.model.ts} | 0
.../settings/src/lib/settings.providers.ts | 13 +++++++++++
...rvice.spec.ts => settings.service.spec.ts} | 10 ++++----
...ettings.service.ts => settings.service.ts} | 6 ++---
...ngs.util.spec.ts => settings.util.spec.ts} | 8 +++----
...dmin-settings.util.ts => settings.util.ts} | 6 ++---
.../admin/settings/test/admin-settings.ts | 21 -----------------
.../libs/admin/settings/test/settings.ts | 16 +++++++++++++
alfa-client/libs/admin/shared/README.md | 4 ++--
alfa-client/libs/admin/shared/jest.config.ts | 2 +-
alfa-client/libs/admin/shared/project.json | 2 +-
alfa-client/libs/admin/user/README.md | 4 ++--
alfa-client/libs/admin/user/jest.config.ts | 2 +-
alfa-client/libs/admin/user/project.json | 2 +-
alfa-client/libs/admin/user/src/index.ts | 2 +-
.../admin/user/src/lib/user.module.spec.ts | 14 -----------
.../libs/admin/user/src/lib/user.module.ts | 18 ---------------
.../libs/admin/user/src/lib/user.providers.ts | 14 +++++++++++
.../user-add-form/user-add-form.component.ts | 2 +-
.../users-roles/users-roles.component.spec.ts | 2 +-
.../lib/users-roles/users-roles.component.ts | 4 ++--
alfa-client/tsconfig.base.json | 12 +++++-----
85 files changed, 194 insertions(+), 250 deletions(-)
delete mode 100644 alfa-client/libs/admin/configuration/src/lib/configuration.module.spec.ts
delete mode 100644 alfa-client/libs/admin/configuration/src/lib/configuration.module.ts
create mode 100644 alfa-client/libs/admin/configuration/src/lib/configuration.providers.ts
create mode 100644 alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit.providers.ts
delete mode 100644 alfa-client/libs/admin/postfach/src/lib/postfach.module.spec.ts
delete mode 100644 alfa-client/libs/admin/postfach/src/lib/postfach.module.ts
create mode 100644 alfa-client/libs/admin/postfach/src/lib/postfach.providers.ts
delete mode 100644 alfa-client/libs/admin/settings/src/lib/admin-settings.module.spec.ts
delete mode 100644 alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts
rename alfa-client/libs/admin/settings/src/lib/{admin-settings-resource.service.ts => settings-resource.service.ts} (81%)
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.linkrel.ts => settings.linkrel.ts} (100%)
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.model.ts => settings.model.ts} (100%)
create mode 100644 alfa-client/libs/admin/settings/src/lib/settings.providers.ts
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.service.spec.ts => settings.service.spec.ts} (86%)
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.service.ts => settings.service.ts} (67%)
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.util.spec.ts => settings.util.spec.ts} (80%)
rename alfa-client/libs/admin/settings/src/lib/{admin-settings.util.ts => settings.util.ts} (83%)
delete mode 100644 alfa-client/libs/admin/settings/test/admin-settings.ts
create mode 100644 alfa-client/libs/admin/settings/test/settings.ts
delete mode 100644 alfa-client/libs/admin/user/src/lib/user.module.spec.ts
delete mode 100644 alfa-client/libs/admin/user/src/lib/user.module.ts
create mode 100644 alfa-client/libs/admin/user/src/lib/user.providers.ts
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 9b55f66a51..5483d632f0 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -802,7 +802,7 @@ Map getUserManagerEnv(String namespace, dbPort){
}
Map getUserManagerDatabaseSecret(String namespace) {
- return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
Void sendFailureMessage() {
diff --git a/alfa-client/Jenkinsfile.e2e.static b/alfa-client/Jenkinsfile.e2e.static
index 2e499f9abb..55ddf3568c 100644
--- a/alfa-client/Jenkinsfile.e2e.static
+++ b/alfa-client/Jenkinsfile.e2e.static
@@ -419,7 +419,7 @@ Map getUserManagerEnv(String namespace, dbPort){
}
Map getUserManagerDatabaseSecret(String namespace) {
- return readJSON(text: sh(script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+ return readJSON(text: sh(script: "kubectl get secret ozg-mongodb-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
String makePasswordUrlConform(String password) {
diff --git a/alfa-client/apps/admin/src/app/app.routes.ts b/alfa-client/apps/admin/src/app/app.routes.ts
index a1407e8901..4e28ce9c88 100644
--- a/alfa-client/apps/admin/src/app/app.routes.ts
+++ b/alfa-client/apps/admin/src/app/app.routes.ts
@@ -1,4 +1,4 @@
-import { ROUTES } from '@admin-client/admin-shared';
+import { ROUTES } from '@admin-client/shared';
import { Route } from '@angular/router';
import { OrganisationsEinheitFormPageComponent } from '../pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component';
import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
diff --git a/alfa-client/apps/admin/src/main.ts b/alfa-client/apps/admin/src/main.ts
index 77a7fdb10c..6d42d30201 100644
--- a/alfa-client/apps/admin/src/main.ts
+++ b/alfa-client/apps/admin/src/main.ts
@@ -2,11 +2,7 @@ import { EnvironmentModule, loadEnvironment } from '@alfa-client/environment-sha
import { enableProdMode, importProvidersFrom } from '@angular/core';
import { isNil } from 'lodash-es';
-import { ConfigurationModule } from '@admin-client/admin-configuration';
-import { OrganisationseinheitModule } from '@admin-client/admin-organisationseinheit';
-import { PostfachModule } from '@admin-client/admin-postfach';
-import { AdminSettingsModule } from '@admin-client/admin-settings';
-import { UserModule } from '@admin-client/admin-user';
+import { UserProviders } from '@admin-client/user';
import { ApiRootModule } from '@alfa-client/api-root-shared';
import { NavigationSharedModule } from '@alfa-client/navigation-shared';
import { registerLocaleData } from '@angular/common';
@@ -21,6 +17,10 @@ import { StoreModule } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { OAuthModule } from 'angular-oauth2-oidc';
import { HttpUnauthorizedInterceptor } from 'authentication';
+import { ConfigurationsProviders } from '../../../libs/admin/configuration/src/lib/configuration.providers';
+import { OrganisationEinheitProviders } from '../../../libs/admin/organisationseinheit/src/lib/organisations-einheit.providers';
+import { PostfachProviders } from '../../../libs/admin/postfach/src/lib/postfach.providers';
+import { SettingsProviders } from '../../../libs/admin/settings/src/lib/settings.providers';
import { AppComponent } from './app/app.component';
import { appRoutes } from './app/app.routes';
import { environment } from './environments/environment';
@@ -39,12 +39,12 @@ loadEnvironment(environment.environmentUrl).then((env) => {
bootstrapApplication(AppComponent, {
providers: [
+ ConfigurationsProviders,
+ PostfachProviders,
+ SettingsProviders,
+ OrganisationEinheitProviders,
+ UserProviders,
importProvidersFrom(
- UserModule,
- AdminSettingsModule,
- PostfachModule,
- OrganisationseinheitModule,
- ConfigurationModule,
NavigationSharedModule,
BrowserModule,
ApiRootModule,
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 2449a303b1..75c151319c 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
@@ -1 +1 @@
-<admin-organisationseinheit-form-container/>
\ No newline at end of file
+<organisations-einheit-form-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 cae449120c..042987a696 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
@@ -1,4 +1,4 @@
-import { OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-organisationseinheit';
+import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { OrganisationsEinheitFormPageComponent } from './organisationseinheit-form-page.component';
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 a0d0a0c18d..9b02173dd8 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
@@ -1,4 +1,4 @@
-import { OrganisationsEinheitFormContainerComponent } from '@admin-client/admin-organisationseinheit';
+import { OrganisationsEinheitFormContainerComponent } from '@admin-client/organisations-einheit';
import { Component } from '@angular/core';
@Component({
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 7929301587..93f35a4853 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
@@ -1 +1 @@
-<admin-organisationseinheit-container/>
+<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 b95283eed2..4884a375e7 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
@@ -1,4 +1,4 @@
-import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-organisationseinheit';
+import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { OrganisationsEinheitPageComponent } from './organisationseinheit-page.component';
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 5d75d5ac5e..a3ae0767d4 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
@@ -1,4 +1,4 @@
-import { OrganisationsEinheitContainerComponent } from '@admin-client/admin-organisationseinheit';
+import { OrganisationsEinheitContainerComponent } from '@admin-client/organisations-einheit';
import { Component } from '@angular/core';
@Component({
diff --git a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.html b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.html
index 7e5b718a32..d78390dd12 100644
--- a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.html
+++ b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.html
@@ -1 +1 @@
-<admin-postfach-container />
+<postfach-container />
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 2a3e066523..0dae4b1128 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
@@ -1,4 +1,4 @@
-import { PostfachContainerComponent } from '@admin-client/admin-postfach';
+import { PostfachContainerComponent } from '@admin-client/postfach';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { PostfachPageComponent } from './postfach-page.component';
diff --git a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.ts b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.ts
index a114705cb7..565eed45fd 100644
--- a/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/postfach/postfach-page/postfach-page.component.ts
@@ -1,4 +1,4 @@
-import { PostfachContainerComponent } from '@admin-client/admin-postfach';
+import { PostfachContainerComponent } from '@admin-client/postfach';
import { Component } from '@angular/core';
@Component({
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html
index dad58a8662..c711ea9af5 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html
@@ -1 +1 @@
-<admin-user-add-form />
+<user-add-form />
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 f96e2094a4..a84b69e962 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
@@ -1,4 +1,4 @@
-import { UserAddFormComponent } from '@admin-client/admin-user';
+import { UserAddFormComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { UserAddPageComponent } from './user-add-page.component';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts
index a8a2cf2791..2f80b7e922 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts
@@ -1,4 +1,4 @@
-import { UserAddFormComponent } from '@admin-client/admin-user';
+import { UserAddFormComponent } from '@admin-client/user';
import { Component } from '@angular/core';
@Component({
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.html b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.html
index 3000e0ffba..72359c0dd2 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.html
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.html
@@ -1 +1 @@
-<admin-users-roles />
\ No newline at end of file
+<users-roles />
\ No newline at end of file
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 39ee2da807..b23ab14371 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
@@ -1,4 +1,4 @@
-import { UsersRolesComponent } from '@admin-client/admin-user';
+import { UsersRolesComponent } from '@admin-client/user';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MockComponent } from 'ng-mocks';
import { UserRolesPageComponent } from './user-roles-page.component';
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.ts b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.ts
index c4f6c35ea0..12547cabcc 100644
--- a/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.ts
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-roles-page/user-roles-page.component.ts
@@ -1,4 +1,4 @@
-import { UsersRolesComponent } from '@admin-client/admin-user';
+import { UsersRolesComponent } from '@admin-client/user';
import { Component } from '@angular/core';
@Component({
diff --git a/alfa-client/libs/admin/configuration/README.md b/alfa-client/libs/admin/configuration/README.md
index 75c3409880..6f5030b70b 100644
--- a/alfa-client/libs/admin/configuration/README.md
+++ b/alfa-client/libs/admin/configuration/README.md
@@ -1,7 +1,7 @@
-# admin-configuration
+# configuration
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-configuration` to execute the unit tests.
+Run `nx test configuration` to execute the unit tests.
diff --git a/alfa-client/libs/admin/configuration/jest.config.ts b/alfa-client/libs/admin/configuration/jest.config.ts
index 7b8ab3df6e..31985e8242 100644
--- a/alfa-client/libs/admin/configuration/jest.config.ts
+++ b/alfa-client/libs/admin/configuration/jest.config.ts
@@ -1,5 +1,5 @@
export default {
- displayName: 'admin-configuration',
+ displayName: 'configuration',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../../coverage/libs/admin/configuration',
diff --git a/alfa-client/libs/admin/configuration/project.json b/alfa-client/libs/admin/configuration/project.json
index 85442c982e..638cb4c43b 100644
--- a/alfa-client/libs/admin/configuration/project.json
+++ b/alfa-client/libs/admin/configuration/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-configuration",
+ "name": "configuration",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/configuration/src",
"prefix": "admin",
diff --git a/alfa-client/libs/admin/configuration/src/index.ts b/alfa-client/libs/admin/configuration/src/index.ts
index be95b9e0ab..fa9624f0dd 100644
--- a/alfa-client/libs/admin/configuration/src/index.ts
+++ b/alfa-client/libs/admin/configuration/src/index.ts
@@ -1,5 +1,4 @@
export * from './lib/configuration-resource.service';
export * from './lib/configuration.linkrel';
export * from './lib/configuration.model';
-export * from './lib/configuration.module';
export * from './lib/configuration.service';
diff --git a/alfa-client/libs/admin/configuration/src/lib/configuration.module.spec.ts b/alfa-client/libs/admin/configuration/src/lib/configuration.module.spec.ts
deleted file mode 100644
index 171f2dcd9f..0000000000
--- a/alfa-client/libs/admin/configuration/src/lib/configuration.module.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { ConfigurationModule } from './configuration.module';
-
-describe('ConfigurationModule', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [ConfigurationModule],
- });
- });
-
- it('should create', () => {
- expect(ConfigurationModule).toBeDefined();
- });
-});
diff --git a/alfa-client/libs/admin/configuration/src/lib/configuration.module.ts b/alfa-client/libs/admin/configuration/src/lib/configuration.module.ts
deleted file mode 100644
index 71e91dbf8e..0000000000
--- a/alfa-client/libs/admin/configuration/src/lib/configuration.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ApiRootService } from '@alfa-client/api-root-shared';
-import { ResourceRepository } from '@alfa-client/tech-shared';
-import { NgModule } from '@angular/core';
-import { ConfigurationResourceService, createConfigurationResourceService } from './configuration-resource.service';
-import { ConfigurationService } from './configuration.service';
-
-@NgModule({
- providers: [
- ConfigurationService,
- {
- provide: ConfigurationResourceService,
- useFactory: createConfigurationResourceService,
- deps: [ResourceRepository, ApiRootService],
- },
- ],
-})
-export class ConfigurationModule {}
diff --git a/alfa-client/libs/admin/configuration/src/lib/configuration.providers.ts b/alfa-client/libs/admin/configuration/src/lib/configuration.providers.ts
new file mode 100644
index 0000000000..3db339434a
--- /dev/null
+++ b/alfa-client/libs/admin/configuration/src/lib/configuration.providers.ts
@@ -0,0 +1,16 @@
+import {
+ ConfigurationResourceService,
+ ConfigurationService,
+ createConfigurationResourceService,
+} from '@admin-client/configuration';
+import { ApiRootService } from '@alfa-client/api-root-shared';
+import { ResourceRepository } from '@alfa-client/tech-shared';
+
+export const ConfigurationsProviders = [
+ ConfigurationService,
+ {
+ provide: ConfigurationResourceService,
+ useFactory: createConfigurationResourceService,
+ deps: [ResourceRepository, ApiRootService],
+ },
+];
diff --git a/alfa-client/libs/admin/configuration/test/configuration.ts b/alfa-client/libs/admin/configuration/test/configuration.ts
index 932423fc12..90bdcb7efe 100644
--- a/alfa-client/libs/admin/configuration/test/configuration.ts
+++ b/alfa-client/libs/admin/configuration/test/configuration.ts
@@ -1,4 +1,4 @@
-import { ConfigurationLinkRel, ConfigurationResource } from '@admin-client/admin-configuration';
+import { ConfigurationLinkRel, ConfigurationResource } from '@admin-client/configuration';
import { toResource } from '../../../tech-shared/test/resource';
export function createConfigurationResource(): ConfigurationResource {
diff --git a/alfa-client/libs/admin/organisationseinheit/README.md b/alfa-client/libs/admin/organisationseinheit/README.md
index 7d627068f2..b9448bd56f 100644
--- a/alfa-client/libs/admin/organisationseinheit/README.md
+++ b/alfa-client/libs/admin/organisationseinheit/README.md
@@ -1,7 +1,7 @@
-# admin-organisationseinheit
+# organisations-einheit
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-organisationseinheit` to execute the unit tests.
+Run `nx test organisations-einheit` to execute the unit tests.
diff --git a/alfa-client/libs/admin/organisationseinheit/jest.config.ts b/alfa-client/libs/admin/organisationseinheit/jest.config.ts
index 06431d02fc..bb7924e912 100644
--- a/alfa-client/libs/admin/organisationseinheit/jest.config.ts
+++ b/alfa-client/libs/admin/organisationseinheit/jest.config.ts
@@ -1,5 +1,5 @@
export default {
- displayName: 'admin-organisationseinheit',
+ displayName: 'organisations-einheit',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../../coverage/libs/admin/organisationseinheit',
diff --git a/alfa-client/libs/admin/organisationseinheit/project.json b/alfa-client/libs/admin/organisationseinheit/project.json
index b25d8809c3..cbe704bffa 100644
--- a/alfa-client/libs/admin/organisationseinheit/project.json
+++ b/alfa-client/libs/admin/organisationseinheit/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-organisationseinheit",
+ "name": "organisations-einheit",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/organisationseinheit/src",
"prefix": "admin",
diff --git a/alfa-client/libs/admin/organisationseinheit/src/index.ts b/alfa-client/libs/admin/organisationseinheit/src/index.ts
index fa37d254b4..dbee0e0e6a 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/index.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/index.ts
@@ -1,4 +1,3 @@
export * from './lib/organisationseinheit-container/organisationseinheit-container.component';
export * from './lib/organisationseinheit-form-container/organisationseinheit-form-container.component';
-export * from './lib/organisationseinheit.module';
export * from './lib/organisationseinheit.service';
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-list-resource.service.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-list-resource.service.ts
index 7754fa6a24..e701eb0b2c 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-list-resource.service.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-list-resource.service.ts
@@ -1,4 +1,4 @@
-import { ConfigurationResource } from '@admin-client/admin-configuration';
+import { ConfigurationResource } from '@admin-client/configuration';
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { ListResourceServiceConfig, ResourceListService, ResourceRepository } from '@alfa-client/tech-shared';
import { OrganisationsEinheitListLinkRel } from './organisations-einheit.linkrel';
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-resource.service.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-resource.service.ts
index 5a0d5034f7..3c9fed8384 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-resource.service.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit-resource.service.ts
@@ -1,4 +1,4 @@
-import { ConfigurationResource } from '@admin-client/admin-configuration';
+import { ConfigurationResource } from '@admin-client/configuration';
import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
import { OrganisationsEinheitListResourceService } from './organisations-einheit-list-resource.service';
import { OrganisationsEinheitLinkRel } from './organisations-einheit.linkrel';
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit.providers.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit.providers.ts
new file mode 100644
index 0000000000..e3ffd49a2a
--- /dev/null
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisations-einheit.providers.ts
@@ -0,0 +1,23 @@
+import { ApiRootService } from '@alfa-client/api-root-shared';
+import { ResourceRepository } from '@alfa-client/tech-shared';
+import {
+ createOrganisationsEinheitListResourceService,
+ OrganisationsEinheitListResourceService,
+} from './organisations-einheit-list-resource.service';
+import {
+ createOrganisationsEinheitResourceService,
+ OrganisationsEinheitResourceService,
+} from './organisations-einheit-resource.service';
+
+export const OrganisationEinheitProviders = [
+ {
+ provide: OrganisationsEinheitListResourceService,
+ useFactory: createOrganisationsEinheitListResourceService,
+ deps: [ResourceRepository, ApiRootService],
+ },
+ {
+ provide: OrganisationsEinheitResourceService,
+ useFactory: createOrganisationsEinheitResourceService,
+ deps: [ResourceRepository, OrganisationsEinheitListResourceService],
+ },
+];
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.html b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.html
index 15147aaf6e..a0a8f4ec34 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.html
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.html
@@ -2,7 +2,7 @@
<ng-container *ngIf="organisationsEinheitListStateResource$ | async as organisationsEinheitListStateResource">
<ozgcloud-spinner [stateResource]="organisationsEinheitListStateResource">
- <admin-organisationseinheit-list
+ <organisations-einheit-list
[organisationsEinheitResources]="organisationsEinheitListStateResource.resource | toEmbeddedResources: OrganisationsEinheitListLinkRel.LIST"
data-test-id="organisations-einheit-list"
/>
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.ts
index 9fefc9ea0f..97bca14239 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-container.component.ts
@@ -9,7 +9,7 @@ import { OrganisationsEinheitService } from '../organisationseinheit.service';
import { OrganisationsEinheitListComponent } from './organisationseinheit-list/organisationseinheit-list.component';
@Component({
- selector: 'admin-organisationseinheit-container',
+ selector: 'organisations-einheit-container',
templateUrl: './organisationseinheit-container.component.html',
standalone: true,
imports: [CommonModule, UiModule, OrganisationsEinheitListComponent, TechSharedModule],
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts
index 03fd826fc8..43b119c603 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.ts
@@ -6,7 +6,7 @@ import { ExclamationIconComponent, ListComponent, ListItemComponent } from '@ods
import { AdminOrganisationsEinheitResource, AdminOrganisationsEinheitSyncResult } from '../../organisations-einheit.model';
@Component({
- selector: 'admin-organisationseinheit-list',
+ selector: 'organisations-einheit-list',
templateUrl: './organisationseinheit-list.component.html',
standalone: true,
imports: [CommonModule, ListComponent, ListItemComponent, ExclamationIconComponent, MatTooltip, TechSharedModule],
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.html b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.html
index 097bae6dc2..1f38835512 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.html
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.html
@@ -2,7 +2,7 @@
<ozgcloud-spinner [stateResource]="organisationsEinheitStateResource">
<h1 class="heading-1" data-test-id="organisations-form-container-headline">{{ organisationsEinheitStateResource.resource?.name }}</h1>
- <admin-organisationseinheit-form
+ <organisations-einheit-form
[organisationsEinheitStateResource]="organisationsEinheitStateResource"
data-test-id="organisations-form"
/>
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.ts
index 72d085a227..36cd70a2f2 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form-container.component.ts
@@ -9,7 +9,7 @@ import { OrganisationsEinheitService } from '../organisationseinheit.service';
import { OrganisationsEinheitFormComponent } from './organisationseinheit-form/organisationseinheit-form.component';
@Component({
- selector: 'admin-organisationseinheit-form-container',
+ selector: 'organisations-einheit-form-container',
templateUrl: './organisationseinheit-form-container.component.html',
standalone: true,
imports: [CommonModule, UiModule, OrganisationsEinheitFormComponent],
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.html b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.html
index 3b1b1f0673..9e3e525857 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.html
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.html
@@ -1,5 +1,5 @@
<form class="form flex-col" [formGroup]="formService.form">
- <admin-organisationseinheit-signatur class="mb-6 block" data-test-id="organisations-einheit-signatur-component" />
+ <organisations-einheit-signatur class="mb-6 block" data-test-id="organisations-einheit-signatur-component" />
<ods-button-with-spinner
data-test-id="save-button"
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.ts
index 074d5ef4b3..6c19d78235 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.ts
@@ -10,7 +10,7 @@ import { OrganisationsEinheitSignaturComponent } from './organisationseinheit-si
import { OrganisationsEinheitFormService } from './organisationseinheit.formservice';
@Component({
- selector: 'admin-organisationseinheit-form',
+ selector: 'organisations-einheit-form',
templateUrl: './organisationseinheit-form.component.html',
providers: [OrganisationsEinheitFormService],
standalone: true,
diff --git a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-signatur/organisationseinheit-signatur.component.ts b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-signatur/organisationseinheit-signatur.component.ts
index ab4d6fc2fe..bf01f6d472 100644
--- a/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-signatur/organisationseinheit-signatur.component.ts
+++ b/alfa-client/libs/admin/organisationseinheit/src/lib/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-signatur/organisationseinheit-signatur.component.ts
@@ -4,7 +4,7 @@ import { TextareaEditorComponent } from '@ods/component';
import { OrganisationsEinheitFormService } from '../organisationseinheit.formservice';
@Component({
- selector: 'admin-organisationseinheit-signatur',
+ selector: 'organisations-einheit-signatur',
templateUrl: './organisationseinheit-signatur.component.html',
standalone: true,
imports: [FormsModule, ReactiveFormsModule, TextareaEditorComponent],
diff --git a/alfa-client/libs/admin/postfach/README.md b/alfa-client/libs/admin/postfach/README.md
index de52686c43..b12df49b56 100644
--- a/alfa-client/libs/admin/postfach/README.md
+++ b/alfa-client/libs/admin/postfach/README.md
@@ -1,7 +1,7 @@
-# admin-postfach
+# postfach
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-postfach` to execute the unit tests.
+Run `nx test postfach` to execute the unit tests.
diff --git a/alfa-client/libs/admin/postfach/jest.config.ts b/alfa-client/libs/admin/postfach/jest.config.ts
index 1756408867..dc57cca42c 100644
--- a/alfa-client/libs/admin/postfach/jest.config.ts
+++ b/alfa-client/libs/admin/postfach/jest.config.ts
@@ -1,5 +1,5 @@
export default {
- displayName: 'admin-postfach',
+ displayName: 'postfach',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../../coverage/libs/admin/postfach',
diff --git a/alfa-client/libs/admin/postfach/project.json b/alfa-client/libs/admin/postfach/project.json
index f50acee3ba..4ceafb1b08 100644
--- a/alfa-client/libs/admin/postfach/project.json
+++ b/alfa-client/libs/admin/postfach/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-postfach",
+ "name": "postfach",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/postfach/src",
"prefix": "admin",
diff --git a/alfa-client/libs/admin/postfach/src/index.ts b/alfa-client/libs/admin/postfach/src/index.ts
index a5c22affe3..55f5130ea0 100644
--- a/alfa-client/libs/admin/postfach/src/index.ts
+++ b/alfa-client/libs/admin/postfach/src/index.ts
@@ -1,4 +1,3 @@
export * from './lib/postfach-container/postfach-container.component';
export * from './lib/postfach.model';
-export * from './lib/postfach.module';
export * from './lib/postfach.service';
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.ts b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.ts
index 48e8b9ec96..34ed0f3621 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-container.component.ts
@@ -7,7 +7,7 @@ import { PostfachService } from '../postfach.service';
import { PostfachFormComponent } from './postfach-form/postfach-form.component';
@Component({
- selector: 'admin-postfach-container',
+ selector: 'postfach-container',
templateUrl: './postfach-container.component.html',
standalone: true,
imports: [CommonModule, PostfachFormComponent],
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-form/postfach.formservice.spec.ts b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-form/postfach.formservice.spec.ts
index 2734ba6c1c..86522c1075 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-form/postfach.formservice.spec.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach-container/postfach-form/postfach.formservice.spec.ts
@@ -20,7 +20,6 @@ describe('PostfachFormService', () => {
});
formService = TestBed.inject(PostfachFormService);
- TestBed.inject(PostfachService);
});
it('should create', () => {
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach-resource.service.ts b/alfa-client/libs/admin/postfach/src/lib/postfach-resource.service.ts
index cdf05c0670..a897bd3451 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach-resource.service.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach-resource.service.ts
@@ -1,4 +1,4 @@
-import { SettingsService } from '@admin-client/admin-settings';
+import { SettingsService } from '@admin-client/settings';
import { ApiResourceService, ResourceRepository, ResourceServiceConfig } from '@alfa-client/tech-shared';
import { PostfachLinkRel } from './postfach.linkrel';
import { PostfachResource } from './postfach.model';
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach.model.ts b/alfa-client/libs/admin/postfach/src/lib/postfach.model.ts
index e41257ffba..b0fba66f99 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach.model.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach.model.ts
@@ -21,8 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { SettingName } from '@admin-client/admin-settings';
import { Resource } from '@ngxp/rest';
+import { SettingName } from '../../../settings/src/lib/settings.model';
export interface Absender {
name: string;
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach.module.spec.ts b/alfa-client/libs/admin/postfach/src/lib/postfach.module.spec.ts
deleted file mode 100644
index 843ba94cc8..0000000000
--- a/alfa-client/libs/admin/postfach/src/lib/postfach.module.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { PostfachModule } from './postfach.module';
-
-describe('PostfachModule', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [PostfachModule],
- });
- });
-
- it('should create', () => {
- expect(PostfachModule).toBeDefined();
- });
-});
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach.module.ts b/alfa-client/libs/admin/postfach/src/lib/postfach.module.ts
deleted file mode 100644
index 637b83bda9..0000000000
--- a/alfa-client/libs/admin/postfach/src/lib/postfach.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { SettingsService } from '@admin-client/admin-settings';
-import { ResourceRepository } from '@alfa-client/tech-shared';
-import { NgModule } from '@angular/core';
-import { createPostfachResourceService, PostfachResourceService } from './postfach-resource.service';
-
-@NgModule({
- providers: [
- SettingsService,
- {
- provide: PostfachResourceService,
- useFactory: createPostfachResourceService,
- deps: [ResourceRepository, SettingsService],
- },
- ],
-})
-export class PostfachModule {}
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach.providers.ts b/alfa-client/libs/admin/postfach/src/lib/postfach.providers.ts
new file mode 100644
index 0000000000..dd226175ad
--- /dev/null
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach.providers.ts
@@ -0,0 +1,12 @@
+import { SettingsService } from '@admin-client/settings';
+import { ResourceRepository } from '@alfa-client/tech-shared';
+import { createPostfachResourceService, PostfachResourceService } from './postfach-resource.service';
+
+export const PostfachProviders = [
+ SettingsService,
+ {
+ provide: PostfachResourceService,
+ useFactory: createPostfachResourceService,
+ deps: [ResourceRepository, SettingsService],
+ },
+];
diff --git a/alfa-client/libs/admin/postfach/src/lib/postfach.service.ts b/alfa-client/libs/admin/postfach/src/lib/postfach.service.ts
index fdc6be8f05..b65a0d14fe 100644
--- a/alfa-client/libs/admin/postfach/src/lib/postfach.service.ts
+++ b/alfa-client/libs/admin/postfach/src/lib/postfach.service.ts
@@ -1,4 +1,4 @@
-import { SettingName } from '@admin-client/admin-settings';
+import { SettingName } from '@admin-client/settings';
import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
import { SnackBarService } from '@alfa-client/ui';
import { Injectable } from '@angular/core';
diff --git a/alfa-client/libs/admin/postfach/test/postfach.ts b/alfa-client/libs/admin/postfach/test/postfach.ts
index 18031ef7f0..30d6a30b66 100644
--- a/alfa-client/libs/admin/postfach/test/postfach.ts
+++ b/alfa-client/libs/admin/postfach/test/postfach.ts
@@ -1,6 +1,6 @@
import { faker } from '@faker-js/faker';
-import { toResource } from '../../../tech-shared/test/resource';
-import { SettingItemResource, SettingName } from '../../settings/src/lib/admin-settings.model';
+import { SettingItemResource, SettingName } from 'libs/admin/settings/src/lib/settings.model';
+import { toResource } from 'libs/tech-shared/test/resource';
import { Postfach, PostfachResource, PostfachSettingsItem } from '../src/lib/postfach.model';
export function createPostfach(): Postfach {
diff --git a/alfa-client/libs/admin/settings/README.md b/alfa-client/libs/admin/settings/README.md
index 01b723f840..f9766192c1 100644
--- a/alfa-client/libs/admin/settings/README.md
+++ b/alfa-client/libs/admin/settings/README.md
@@ -1,7 +1,7 @@
-# admin-settings
+# settings
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-settings` to execute the unit tests via [Jest](https://jestjs.io).
+Run `nx test settings` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/alfa-client/libs/admin/settings/jest.config.ts b/alfa-client/libs/admin/settings/jest.config.ts
index a18cd0593e..df8618e878 100644
--- a/alfa-client/libs/admin/settings/jest.config.ts
+++ b/alfa-client/libs/admin/settings/jest.config.ts
@@ -1,5 +1,5 @@
export default {
- displayName: 'admin-settings',
+ displayName: 'settings',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
globals: {},
diff --git a/alfa-client/libs/admin/settings/project.json b/alfa-client/libs/admin/settings/project.json
index 2749cb93e4..137c80b918 100644
--- a/alfa-client/libs/admin/settings/project.json
+++ b/alfa-client/libs/admin/settings/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-settings",
+ "name": "settings",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/settings/src",
"projectType": "library",
diff --git a/alfa-client/libs/admin/settings/src/index.ts b/alfa-client/libs/admin/settings/src/index.ts
index c27d1e74f5..5bf279d2ee 100644
--- a/alfa-client/libs/admin/settings/src/index.ts
+++ b/alfa-client/libs/admin/settings/src/index.ts
@@ -1,3 +1,2 @@
-export * from './lib/admin-settings.model';
-export * from './lib/admin-settings.module';
-export * from './lib/admin-settings.service';
+export * from './lib/settings.model';
+export * from './lib/settings.service';
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.module.spec.ts b/alfa-client/libs/admin/settings/src/lib/admin-settings.module.spec.ts
deleted file mode 100644
index 088fd75aa2..0000000000
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.module.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { AdminSettingsModule } from './admin-settings.module';
-
-describe('AdminSettingsModule', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [AdminSettingsModule],
- });
- });
-
- it('should create', () => {
- expect(AdminSettingsModule).toBeDefined();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts b/alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts
deleted file mode 100644
index fd73bab528..0000000000
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ConfigurationService } from '@admin-client/admin-configuration';
-import { ResourceRepository } from '@alfa-client/tech-shared';
-import { NgModule } from '@angular/core';
-import { createSettingListResourceService, SettingListResourceService } from './admin-settings-resource.service';
-import { SettingsService } from './admin-settings.service';
-
-@NgModule({
- providers: [
- SettingsService,
- {
- provide: SettingListResourceService,
- useFactory: createSettingListResourceService,
- deps: [ResourceRepository, ConfigurationService],
- },
- ],
-})
-export class AdminSettingsModule {}
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings-resource.service.ts b/alfa-client/libs/admin/settings/src/lib/settings-resource.service.ts
similarity index 81%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings-resource.service.ts
rename to alfa-client/libs/admin/settings/src/lib/settings-resource.service.ts
index 228b1093dc..6f49e2e19e 100644
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings-resource.service.ts
+++ b/alfa-client/libs/admin/settings/src/lib/settings-resource.service.ts
@@ -1,8 +1,8 @@
-import { ConfigurationLinkRel, ConfigurationResource, ConfigurationService } from '@admin-client/admin-configuration';
+import { ConfigurationLinkRel, ConfigurationResource, ConfigurationService } from '@admin-client/configuration';
import { ListResourceServiceConfig, ResourceListService, ResourceRepository } from '@alfa-client/tech-shared';
import { Resource } from '@ngxp/rest';
-import { SettingListLinkRel } from './admin-settings.linkrel';
-import { SettingItemResource, SettingListResource } from './admin-settings.model';
+import { SettingListLinkRel } from './settings.linkrel';
+import { SettingItemResource, SettingListResource } from './settings.model';
export class SettingListResourceService extends ResourceListService<Resource, SettingListResource, SettingItemResource> {}
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.linkrel.ts b/alfa-client/libs/admin/settings/src/lib/settings.linkrel.ts
similarity index 100%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.linkrel.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.linkrel.ts
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.model.ts b/alfa-client/libs/admin/settings/src/lib/settings.model.ts
similarity index 100%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.model.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.model.ts
diff --git a/alfa-client/libs/admin/settings/src/lib/settings.providers.ts b/alfa-client/libs/admin/settings/src/lib/settings.providers.ts
new file mode 100644
index 0000000000..06cf7321fd
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/settings.providers.ts
@@ -0,0 +1,13 @@
+import { ConfigurationService } from '@admin-client/configuration';
+import { SettingsService } from '@admin-client/settings';
+import { ResourceRepository } from '@alfa-client/tech-shared';
+import { createSettingListResourceService, SettingListResourceService } from './settings-resource.service';
+
+export const SettingsProviders = [
+ SettingsService,
+ {
+ provide: SettingListResourceService,
+ useFactory: createSettingListResourceService,
+ deps: [ResourceRepository, ConfigurationService],
+ },
+];
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.service.spec.ts b/alfa-client/libs/admin/settings/src/lib/settings.service.spec.ts
similarity index 86%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.service.spec.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.service.spec.ts
index ef25265a38..28c24c5848 100644
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.service.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/settings.service.spec.ts
@@ -1,13 +1,13 @@
-import { PostfachResource } from '@admin-client/admin-postfach';
+import { PostfachResource } from '@admin-client/postfach';
import { StateResource, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { createPostfachResource, createSettingItemResource } from 'libs/admin/postfach/test/postfach';
import { singleCold } from 'libs/tech-shared/test/marbles';
import { Observable, of } from 'rxjs';
-import { createSettingsListResource } from '../../test/admin-settings';
-import { SettingListResourceService } from './admin-settings-resource.service';
-import { SettingListResource } from './admin-settings.model';
-import { SettingsService } from './admin-settings.service';
+import { createSettingsListResource } from '../../test/settings';
+import { SettingListResourceService } from './settings-resource.service';
+import { SettingListResource } from './settings.model';
+import { SettingsService } from './settings.service';
describe('SettingsService', () => {
let service: SettingsService;
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.service.ts b/alfa-client/libs/admin/settings/src/lib/settings.service.ts
similarity index 67%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.service.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.service.ts
index c5fa4e8a9c..708f71a8c4 100644
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.service.ts
+++ b/alfa-client/libs/admin/settings/src/lib/settings.service.ts
@@ -1,9 +1,9 @@
-import { PostfachResource } from '@admin-client/admin-postfach';
+import { PostfachResource } from '@admin-client/postfach';
import { StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { Observable, map } from 'rxjs';
-import { SettingListResourceService } from './admin-settings-resource.service';
-import { getPostfachResource } from './admin-settings.util';
+import { SettingListResourceService } from './settings-resource.service';
+import { getPostfachResource } from './settings.util';
@Injectable()
export class SettingsService {
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.util.spec.ts b/alfa-client/libs/admin/settings/src/lib/settings.util.spec.ts
similarity index 80%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.util.spec.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.util.spec.ts
index 6ca54319e5..2b2bb063c4 100644
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.util.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/settings.util.spec.ts
@@ -1,9 +1,9 @@
-import { PostfachResource } from '@admin-client/admin-postfach';
+import { PostfachResource } from '@admin-client/postfach';
import { createEmptyStateResource, createStateResource, StateResource } from '@alfa-client/tech-shared';
import { createPostfachResource } from 'libs/admin/postfach/test/postfach';
-import { createFilledSettingsListResource } from '../../test/admin-settings';
-import { SettingListResource } from './admin-settings.model';
-import { getPostfachResource } from './admin-settings.util';
+import { createFilledSettingsListResource } from '../../test/settings';
+import { SettingListResource } from './settings.model';
+import { getPostfachResource } from './settings.util';
describe('get postfach resource', () => {
it('should return state resource with postfach resource if exists', () => {
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.util.ts b/alfa-client/libs/admin/settings/src/lib/settings.util.ts
similarity index 83%
rename from alfa-client/libs/admin/settings/src/lib/admin-settings.util.ts
rename to alfa-client/libs/admin/settings/src/lib/settings.util.ts
index 0a773fe337..69ab6adc30 100644
--- a/alfa-client/libs/admin/settings/src/lib/admin-settings.util.ts
+++ b/alfa-client/libs/admin/settings/src/lib/settings.util.ts
@@ -1,4 +1,4 @@
-import { PostfachResource } from '@admin-client/admin-postfach';
+import { PostfachResource } from '@admin-client/postfach';
import {
createEmptyStateResource,
createStateResource,
@@ -6,8 +6,8 @@ import {
isNotNil,
StateResource,
} from '@alfa-client/tech-shared';
-import { SettingListLinkRel } from './admin-settings.linkrel';
-import { SettingItemResource, SettingListResource, SettingName } from './admin-settings.model';
+import { SettingListLinkRel } from './settings.linkrel';
+import { SettingItemResource, SettingListResource, SettingName } from './settings.model';
export function getPostfachResource(settingsListResource: StateResource<SettingListResource>): StateResource<PostfachResource> {
const entries: SettingItemResource[] = getEmbeddedResources(settingsListResource, SettingListLinkRel.LIST);
diff --git a/alfa-client/libs/admin/settings/test/admin-settings.ts b/alfa-client/libs/admin/settings/test/admin-settings.ts
deleted file mode 100644
index 56cc3ea62b..0000000000
--- a/alfa-client/libs/admin/settings/test/admin-settings.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Resource } from '@ngxp/rest';
-import { toResource } from '../../../tech-shared/test/resource';
-import { SettingListLinkRel } from '../src/lib/admin-settings.linkrel';
-import { SettingItemResource, SettingListResource } from '../src/lib/admin-settings.model';
-
-export function createSettingsListResource(
- settingsItems: SettingItemResource[],
-): SettingListResource {
- return toResource({}, [], {
- settings: settingsItems,
- });
-}
-
-export function createFilledSettingsListResource(
- resources: Resource[],
- linkRelations: string[] = [],
-): SettingListResource {
- return toResource({}, [...linkRelations], {
- [SettingListLinkRel.LIST]: resources,
- });
-}
diff --git a/alfa-client/libs/admin/settings/test/settings.ts b/alfa-client/libs/admin/settings/test/settings.ts
new file mode 100644
index 0000000000..c3b9478ea5
--- /dev/null
+++ b/alfa-client/libs/admin/settings/test/settings.ts
@@ -0,0 +1,16 @@
+import { Resource } from '@ngxp/rest';
+import { toResource } from 'libs/tech-shared/test/resource';
+import { SettingListLinkRel } from '../src/lib/settings.linkrel';
+import { SettingItemResource, SettingListResource } from '../src/lib/settings.model';
+
+export function createSettingsListResource(settingsItems: SettingItemResource[]): SettingListResource {
+ return toResource({}, [], {
+ settings: settingsItems,
+ });
+}
+
+export function createFilledSettingsListResource(resources: Resource[], linkRelations: string[] = []): SettingListResource {
+ return toResource({}, [...linkRelations], {
+ [SettingListLinkRel.LIST]: resources,
+ });
+}
diff --git a/alfa-client/libs/admin/shared/README.md b/alfa-client/libs/admin/shared/README.md
index 3641b68ff1..0c35b5b818 100644
--- a/alfa-client/libs/admin/shared/README.md
+++ b/alfa-client/libs/admin/shared/README.md
@@ -1,7 +1,7 @@
-# admin-shared
+# shared
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-shared` to execute the unit tests.
+Run `nx test shared` to execute the unit tests.
diff --git a/alfa-client/libs/admin/shared/jest.config.ts b/alfa-client/libs/admin/shared/jest.config.ts
index 7b401d4507..c04b4d2974 100644
--- a/alfa-client/libs/admin/shared/jest.config.ts
+++ b/alfa-client/libs/admin/shared/jest.config.ts
@@ -1,5 +1,5 @@
export default {
- displayName: 'admin-shared',
+ displayName: 'shared',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../../coverage/libs/admin/shared',
diff --git a/alfa-client/libs/admin/shared/project.json b/alfa-client/libs/admin/shared/project.json
index a2e9e40a7e..c7f727c3ee 100644
--- a/alfa-client/libs/admin/shared/project.json
+++ b/alfa-client/libs/admin/shared/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-shared",
+ "name": "shared",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/shared/src",
"projectType": "library",
diff --git a/alfa-client/libs/admin/user/README.md b/alfa-client/libs/admin/user/README.md
index 3b981aa014..17504529db 100644
--- a/alfa-client/libs/admin/user/README.md
+++ b/alfa-client/libs/admin/user/README.md
@@ -1,7 +1,7 @@
-# admin-user
+# user
This library was generated with [Nx](https://nx.dev).
## Running unit tests
-Run `nx test admin-user` to execute the unit tests.
+Run `nx test user` to execute the unit tests.
diff --git a/alfa-client/libs/admin/user/jest.config.ts b/alfa-client/libs/admin/user/jest.config.ts
index f3d44acd57..4bb4f26845 100644
--- a/alfa-client/libs/admin/user/jest.config.ts
+++ b/alfa-client/libs/admin/user/jest.config.ts
@@ -1,6 +1,6 @@
const esModules = ['@keycloak/keycloak-admin-client', 'url-join', 'url-template', 'camelize-ts'];
export default {
- displayName: 'admin-user',
+ displayName: 'user',
preset: '../../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../../coverage/libs/admin/user',
diff --git a/alfa-client/libs/admin/user/project.json b/alfa-client/libs/admin/user/project.json
index 000d7263a9..206b050ef3 100644
--- a/alfa-client/libs/admin/user/project.json
+++ b/alfa-client/libs/admin/user/project.json
@@ -1,5 +1,5 @@
{
- "name": "admin-user",
+ "name": "user",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/admin/user/src",
"prefix": "admin",
diff --git a/alfa-client/libs/admin/user/src/index.ts b/alfa-client/libs/admin/user/src/index.ts
index 0107623d23..bd715f031e 100644
--- a/alfa-client/libs/admin/user/src/index.ts
+++ b/alfa-client/libs/admin/user/src/index.ts
@@ -1,3 +1,3 @@
-export * from './lib/user.module';
+export * from './lib/user.providers';
export * from './lib/users-roles/user-add-form/user-add-form.component';
export * from './lib/users-roles/users-roles.component';
diff --git a/alfa-client/libs/admin/user/src/lib/user.module.spec.ts b/alfa-client/libs/admin/user/src/lib/user.module.spec.ts
deleted file mode 100644
index 17e67d2ac5..0000000000
--- a/alfa-client/libs/admin/user/src/lib/user.module.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { UserModule } from './user.module';
-
-describe('UserModule', () => {
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [UserModule],
- });
- });
-
- it('should create', () => {
- expect(UserModule).toBeDefined();
- });
-});
diff --git a/alfa-client/libs/admin/user/src/lib/user.module.ts b/alfa-client/libs/admin/user/src/lib/user.module.ts
deleted file mode 100644
index d5857afc31..0000000000
--- a/alfa-client/libs/admin/user/src/lib/user.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Environment, ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
-import { NgModule } from '@angular/core';
-import KcAdminClient from '@keycloak/keycloak-admin-client';
-
-@NgModule({
- providers: [
- {
- provide: KcAdminClient,
- useFactory: (env: Environment) =>
- new KcAdminClient({
- baseUrl: env.authServer,
- realmName: env.realm,
- }),
- deps: [ENVIRONMENT_CONFIG],
- },
- ],
-})
-export class UserModule {}
diff --git a/alfa-client/libs/admin/user/src/lib/user.providers.ts b/alfa-client/libs/admin/user/src/lib/user.providers.ts
new file mode 100644
index 0000000000..6b5ce929c5
--- /dev/null
+++ b/alfa-client/libs/admin/user/src/lib/user.providers.ts
@@ -0,0 +1,14 @@
+import { Environment, ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
+import KcAdminClient from '@keycloak/keycloak-admin-client';
+
+export const UserProviders = [
+ {
+ provide: KcAdminClient,
+ useFactory: (env: Environment) =>
+ new KcAdminClient({
+ baseUrl: env.authServer,
+ realmName: env.realm,
+ }),
+ deps: [ENVIRONMENT_CONFIG],
+ },
+];
diff --git a/alfa-client/libs/admin/user/src/lib/users-roles/user-add-form/user-add-form.component.ts b/alfa-client/libs/admin/user/src/lib/users-roles/user-add-form/user-add-form.component.ts
index ba51cd5a95..1eaeae719b 100644
--- a/alfa-client/libs/admin/user/src/lib/users-roles/user-add-form/user-add-form.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/users-roles/user-add-form/user-add-form.component.ts
@@ -4,7 +4,7 @@ import { ButtonWithSpinnerComponent, CheckboxEditorComponent, TextEditorComponen
import { UserAddFormService } from './user-add-form.service';
@Component({
- selector: 'admin-user-add-form',
+ selector: 'user-add-form',
providers: [UserAddFormService],
templateUrl: './user-add-form.component.html',
standalone: true,
diff --git a/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.spec.ts b/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.spec.ts
index 784b40b204..dcc37e5e2a 100644
--- a/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.spec.ts
+++ b/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.spec.ts
@@ -1,4 +1,4 @@
-import { ROUTES } from '@admin-client/admin-shared';
+import { ROUTES } from '@admin-client/shared';
import { createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
diff --git a/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.ts b/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.ts
index 0dc968a453..f7fa6395d4 100644
--- a/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.ts
+++ b/alfa-client/libs/admin/user/src/lib/users-roles/users-roles.component.ts
@@ -1,4 +1,4 @@
-import { ROUTES } from '@admin-client/admin-shared';
+import { ROUTES } from '@admin-client/shared';
import { StateResource } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, inject, OnInit } from '@angular/core';
@@ -11,7 +11,7 @@ import { User } from '../user/user.model';
import { UserService } from './user.service';
@Component({
- selector: 'admin-users-roles',
+ selector: 'users-roles',
templateUrl: './users-roles.component.html',
standalone: true,
imports: [
diff --git a/alfa-client/tsconfig.base.json b/alfa-client/tsconfig.base.json
index e4abde2efa..308049fd9d 100644
--- a/alfa-client/tsconfig.base.json
+++ b/alfa-client/tsconfig.base.json
@@ -16,12 +16,12 @@
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
- "@admin-client/admin-configuration": ["libs/admin/configuration/src/index.ts"],
- "@admin-client/admin-organisationseinheit": ["libs/admin/organisationseinheit/src/index.ts"],
- "@admin-client/admin-postfach": ["libs/admin/postfach/src/index.ts"],
- "@admin-client/admin-settings": ["libs/admin/settings/src/index.ts"],
- "@admin-client/admin-shared": ["libs/admin/shared/src/index.ts"],
- "@admin-client/admin-user": ["libs/admin/user/src/index.ts"],
+ "@admin-client/configuration": ["libs/admin/configuration/src/index.ts"],
+ "@admin-client/organisations-einheit": ["libs/admin/organisationseinheit/src/index.ts"],
+ "@admin-client/postfach": ["libs/admin/postfach/src/index.ts"],
+ "@admin-client/settings": ["libs/admin/settings/src/index.ts"],
+ "@admin-client/shared": ["libs/admin/shared/src/index.ts"],
+ "@admin-client/user": ["libs/admin/user/src/index.ts"],
"@alfa-client/api-root-shared": ["libs/api-root-shared/src/index.ts"],
"@alfa-client/app-shared": ["libs/app-shared/src/index.ts"],
"@alfa-client/bescheid": ["libs/bescheid/src/index.ts"],
--
GitLab