diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 9b55f66a5146de14b99bdb88d22821c906c2d13e..5483d632f0f90a11e2581031a94435ca7781f220 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 2e499f9abbaf8c2918628b462f2f79a056df66d6..55ddf3568c35388436ffd98d9a9bce6533ea1ce2 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 a1407e890156161d3d1f62a2bd22abe832e94c5f..4e28ce9c883178214df30cf52db6cee0d60169e9 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 77a7fdb10c49acddcd9ee8efc945d4a877c75c18..6d42d30201df9c316b14c5f05c90afcc7d1de68f 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 2449a303b186022b68d062f7b59ba73c5cb6a790..75c151319cc32f047188bb34338f2d11c1ad85e1 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 cae449120c2d373c91a2fc3b5f76ebe5b618dad7..042987a6968ec3409f5acd1e5f42983ee151634b 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 a0d0a0c18d4bb2cbdd71063eccdd626c9b0a9a07..9b02173dd8451ad62d391164ed4cf32884660253 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 792930158756ab6bea2bf0e8fbd5c164c5037c0a..93f35a4853d9915c527b4e3884576e8ee71ce7a2 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 b95283eed2e0459c91dd73191085a9cfa945f00e..4884a375e7f0188ea509e5b976a88aa5bb3f1015 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 5d75d5ac5e217b14ed9f04c92188f7d6ae38ec3c..a3ae0767d4be152d8e35ad2c8570a43873d79ed1 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 7e5b718a32e20455b13fd3c17277652506b10a4a..d78390dd12e87d37f4b280d0bdf7778b182f4f52 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 2a3e066523ff0eef386f4cafc104a7f79f2cb8cd..0dae4b11287c2a8f6f0e42af83d88c03d65df684 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 a114705cb760ba2cdc2801056430ac1407897a78..565eed45fd161bbba58544bf64706f420df06457 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 dad58a8662dd19eb059273474e2df1474305d3b4..c711ea9af5d30c5212d9ed7b83aae10da2547969 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 f96e2094a47f5156df5456b12e1daeb1b82852ef..a84b69e96271d7bf6eb5288c272f6fd17305cc55 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 a8a2cf2791b68d58abd0f175c1c3c8315ea6ddca..2f80b7e9222340990eea5066507d622c61a4eec4 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 3000e0ffbac09b63c3d12d715638ab67f610bc39..72359c0dd21edbc5cdcb7108ca9f9ee8bbe106a4 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 39ee2da807bb9f975c334db1cc624eb2f19776fa..b23ab14371bbfe4d4fcd72db1c1b6024ea8316fd 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 c4f6c35ea01bd717191a84b61294fa01495d92a9..12547cabccc98bacadddba01cb94025eb1c8c016 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 75c3409880aea9b18864b6f851856d1749c46c09..6f5030b70bcee5425a71ad582b478c8007bb6169 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 7b8ab3df6e12af6c69e5a52778822c7fd33ec9e3..31985e8242de6a721fe0c3cfc7f7da1c94ce9cad 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 85442c982e002b2b89a47b9876f95fdf93f02d4f..638cb4c43bb189ff40298ace4bdaa10ccb60d99c 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 be95b9e0ab81942d397638482ddb6d01a5edc7ec..fa9624f0ddb7cb788ef5732ae12412f4bcb84138 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 171f2dcd9fac2d253e542cdd872805ccd94941be..0000000000000000000000000000000000000000
--- 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 71e91dbf8ef414651121e464aae99d3eadb7bbeb..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..3db339434aad35ecf12d583e2e8098e599fd7a45
--- /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 932423fc12f8e785b66f8fb1178cafd0a99e27ce..90bdcb7efed69087d61b7981de0b416de2f4d729 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 7d627068f230e8d24592173e36fd6e97b7025d26..b9448bd56f8ab68884bf1b91f12b11efbc3125b0 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 06431d02fcfc158be0d762ce8965603064e87932..bb7924e912b0df780f590686f6f8f60e49b9125b 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 b25d8809c389ce1ba35045b5e39c30aac2bebf05..cbe704bffa5e49fda3e3d98bb466f61341092926 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 fa37d254b4ab8276726e4bb9ca9490200ce282b7..dbee0e0e6a798679f5723f12d71d1c59980ab089 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 7754fa6a24417a716461b3d4b05e01794eed9122..e701eb0b2c0afee56f7ea923045e304ea8c5100b 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 5a0d5034f7c8bae7512b55fc03ab068a50d32fae..3c9fed838439e133513c57621a67b5f0bd7344a8 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 0000000000000000000000000000000000000000..e3ffd49a2ab0b97cc65a941694ce8ac7d693fec4
--- /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 15147aaf6e7a835c2392340bb18c2d02c9d80f88..a0a8f4ec34cf3dc334ce4fa8a9e83b0492bf9c9a 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 9fefc9ea0f862ff0df8ec0aef7931200a5299d50..97bca14239031ba71669f966c03cb3e421c138a3 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 03fd826fc8f0681e6a9e293dcea0f269f44b15b6..43b119c603d919bca9cbb23e9a2d7fb1cff86ab6 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 097bae6dc28c04048164fcc07896dee8a37ff43f..1f3883551279ca1887c98483ffcaab6e44b61c52 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 72d085a227a820ff582be274310054cb762fe029..36cd70a2f2955bdee25dde1b93f6db9724ede77b 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 3b1b1f0673cb2d42afa4b6d5a67a0fa14a3b0f1f..9e3e5258578cba0827727e62331bb7fe22729c01 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 074d5ef4b3a069be2eae774e979173fad9e982b9..6c19d78235770d92ad60af1dfc5bd46f1ba8d363 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 ab4d6fc2fedc844469177638f9004a9773d67207..bf01f6d47277ceaf590b2a4c1398a8c4e64cbb91 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 de52686c434fb14d991ea0494603aabe4264f0db..b12df49b566013390d991563573397edcab2f3df 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 17564088672789bf1937421fc459159f663d0aff..dc57cca42c0289914262a7654b12d332edf03160 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 f50acee3bac59dd1ef8814a51fcd6716865e60e9..4ceafb1b08178952a29cecb301c1f3ec208b68f6 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 a5c22affe3f685c08762fa7a1886dab91c200fe1..55f5130ea01ba5327ebdb325982296d7c6defbba 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 48e8b9ec962fbfc4887451ac2250af06cf1bb76f..34ed0f36219a8b1085ef154dd59d89f1d2d1fbe9 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 2734ba6c1c7e0c4409d64ec1cd0c7c231c7b21b8..86522c10755477ff61e28878c43b846284ee1ff5 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 cdf05c067021b3b826abb7f51ad1c2663257eb6f..a897bd345119c79233515c5621c77ff9ad7913bf 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 e41257ffba977c77427513a104288c74f4083de8..b0fba66f993d9bf47c7166b8933a2d2a1bb99b7c 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 843ba94cc8d73c1e83c90be9d6933594178eb3e2..0000000000000000000000000000000000000000
--- 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 637b83bda9d7a86ac76e03e0dc09322c57051e79..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..dd226175ad52ab8091f98e5db9292c26322eeca5
--- /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 fdc6be8f05e50bca2b61681f5dcfc02f4eb9e83d..b65a0d14fe0d75e1ec593c846a9c7c937ebe11a5 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 18031ef7f0aadae1e9132a44f2f49479c253e273..30d6a30b66576e1a99bcf010a779730179987b8d 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 01b723f8400c9c3dd0f79fe697c5b1be2441a3eb..f9766192c1c33458d8091f1171cc9ac47d136426 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 a18cd0593eed0671bc1998e884dd773535f2964b..df8618e8782a77ace1cfd698ff2df9f8a47d9157 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 2749cb93e4ed471d107b091fece1a677debe2edc..137c80b9183dd98f9fcd918f52f2d55cf28f1319 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 c27d1e74f5d1c5cb5c4a49ef766c614563a42ce4..5bf279d2ee74379b049743c71d0b77be847085c1 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 088fd75aa2076bf00593453f508704a6e6634344..0000000000000000000000000000000000000000
--- 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 fd73bab52846a0923274538ed5ed004fe5d43d56..0000000000000000000000000000000000000000
--- 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 228b1093dcf25742994102c655b7dfa21305e53d..6f49e2e19e19fc173ee32aa32fb92921bb6b604a 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 0000000000000000000000000000000000000000..06cf7321fda15fb700eaba4f1a0f9ada5a662879
--- /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 ef25265a388a42d0b41439e49593be3042359934..28c24c584839f16a91dde0dba1d8a41892baee3f 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 c5fa4e8a9c7ce0153782f55bafc7fdafe6b3a949..708f71a8c4bbaac2de629901042af828f40adc51 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 6ca54319e585b7f5506ef70e275eaa258541d644..2b2bb063c4f2864c4513ef79568b3026befd40ab 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 0a773fe33707abe61675154a2c03d2092e14d4fc..69ab6adc30925cb7476a4d277e7b2db9a89370d8 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 56cc3ea62b8ac65078f16e7d4494ab4371a54e59..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..c3b9478ea57d373b18ad6315c0e5161fd7d9b008
--- /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 3641b68ff1f29bb976785620b8c6769fda09e532..0c35b5b818bea8bf169771020693b753b5c10b47 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 7b401d4507388d7294cc9a3d352c6f80dad5c3f1..c04b4d29749677eb4cd5e418a57722d9f659b0ee 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 a2e9e40a7ec2e50df4bf02831f559aced291d240..c7f727c3ee131fd1dae3a7b2c51ac87d913b5535 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 3b981aa014ca0899f7bbee4eccd7661d72d13452..17504529dbe6f966697e245b6a53ddcb597b1bda 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 f3d44acd574b48b05ac2acd515e2ceef998650c6..4bb4f26845511b4ce3780e01fede88dc343cfe9b 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 000d7263a98e42b5843d72c76ab95389ed836e06..206b050ef3c092d5c2512b77b9dbd70e5e45a2f5 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 0107623d23842244c82f9bf6dddc69d79a8d2dc6..bd715f031e48dffc8f3feec335fbd3ec472929e4 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 17e67d2ac5f8b11bdbc215228e81ca8092e0173f..0000000000000000000000000000000000000000
--- 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 d5857afc31c148081e3dacf8d6dd480fa9cf9150..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..6b5ce929c521b4c7939226434358ab77184e4717
--- /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 ba51cd5a95dbaceebeb16684ee01e78cad30de8e..1eaeae719ba57cb3802bf52bacc16e12394dbc08 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 784b40b20453fd1eb36a097281be2403c6a0831b..dcc37e5e2ac0dcbdaca2bd2908121862eead3dc3 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 0dc968a4537f75c01ab84d6ff890781808901da0..f7fa6395d4633052106c5459e156abe199b9670e 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 e4abde2efaff8c48d4d2f89722344e57772901e8..308049fd9da625da5c0274b5cc465c30e444d2a9 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"],