diff --git a/alfa-client/apps/admin-e2e/.eslintrc.json b/alfa-client/apps/admin-e2e/.eslintrc.json
index 49e02c1b508f10717345cdf4e227058a27709110..a6ed4fc38ce116720dadc42b267267b38ab6e9bf 100644
--- a/alfa-client/apps/admin-e2e/.eslintrc.json
+++ b/alfa-client/apps/admin-e2e/.eslintrc.json
@@ -1,22 +1,22 @@
{
- "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
- "ignorePatterns": ["!**/*"],
- "overrides": [
- {
- "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
- "rules": {}
- },
- {
- "files": ["*.ts", "*.tsx"],
- "rules": {}
- },
- {
- "files": ["*.js", "*.jsx"],
- "rules": {}
- },
- {
- "files": ["*.cy.{ts,js,tsx,jsx}", "src/**/*.{ts,js,tsx,jsx}"],
- "rules": {}
- }
- ]
+ "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.js", "*.jsx"],
+ "rules": {}
+ },
+ {
+ "files": ["*.cy.{ts,js,tsx,jsx}", "src/**/*.{ts,js,tsx,jsx}"],
+ "rules": {}
+ }
+ ]
}
diff --git a/alfa-client/apps/admin-e2e/cypress.config.ts b/alfa-client/apps/admin-e2e/cypress.config.ts
index 149e58f0bcd4b5fb12eca13dd85dcb883523f91d..293ed2fa6d2ada5588d9d952e8385eecbd7d92dc 100644
--- a/alfa-client/apps/admin-e2e/cypress.config.ts
+++ b/alfa-client/apps/admin-e2e/cypress.config.ts
@@ -1,6 +1,6 @@
-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset'
-import { defineConfig } from 'cypress'
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+import { defineConfig } from 'cypress';
export default defineConfig({
- e2e: nxE2EPreset(__filename, { cypressDir: 'src' })
-})
+ e2e: nxE2EPreset(__filename, { cypressDir: 'src' }),
+});
diff --git a/alfa-client/apps/admin-e2e/project.json b/alfa-client/apps/admin-e2e/project.json
index 4e38cbc6e35a39e984c56e38ec8fcd7eb8f74be1..dbccf874dea20e68b2485ef6b9f9f06e72972da2 100644
--- a/alfa-client/apps/admin-e2e/project.json
+++ b/alfa-client/apps/admin-e2e/project.json
@@ -1,33 +1,33 @@
{
- "name": "admin-e2e",
- "$schema": "../../node_modules/nx/schemas/project-schema.json",
- "projectType": "application",
- "sourceRoot": "apps/admin-e2e/src",
- "targets": {
- "e2e": {
- "executor": "@nx/cypress:cypress",
- "options": {
- "cypressConfig": "apps/admin-e2e/cypress.config.ts",
- "testingType": "e2e",
- "devServerTarget": "admin:serve:development"
- },
- "configurations": {
- "production": {
- "devServerTarget": "admin:serve:production"
- },
- "ci": {
- "devServerTarget": "admin:serve-static"
- }
- }
- },
- "lint": {
- "executor": "@nx/eslint:lint",
- "outputs": ["{options.outputFile}"],
- "options": {
- "lintFilePatterns": ["apps/admin-e2e/**/*.{js,ts}"]
- }
- }
- },
- "tags": [],
- "implicitDependencies": ["admin"]
+ "name": "admin-e2e",
+ "$schema": "../../node_modules/nx/schemas/project-schema.json",
+ "projectType": "application",
+ "sourceRoot": "apps/admin-e2e/src",
+ "targets": {
+ "e2e": {
+ "executor": "@nx/cypress:cypress",
+ "options": {
+ "cypressConfig": "apps/admin-e2e/cypress.config.ts",
+ "testingType": "e2e",
+ "devServerTarget": "admin:serve:development"
+ },
+ "configurations": {
+ "production": {
+ "devServerTarget": "admin:serve:production"
+ },
+ "ci": {
+ "devServerTarget": "admin:serve-static"
+ }
+ }
+ },
+ "lint": {
+ "executor": "@nx/eslint:lint",
+ "outputs": ["{options.outputFile}"],
+ "options": {
+ "lintFilePatterns": ["apps/admin-e2e/**/*.{js,ts}"]
+ }
+ }
+ },
+ "tags": [],
+ "implicitDependencies": ["admin"]
}
diff --git a/alfa-client/apps/admin-e2e/src/e2e/app.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/app.cy.ts
index e5d14dd6d830f5639313c11c183b7e260513a0ca..4a9fe8c305fdfba9d5d7afddb9d8ca5c8e7713a8 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/app.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/app.cy.ts
@@ -1,13 +1,13 @@
-import { getGreeting } from '../support/app.po'
+import { getGreeting } from '../support/app.po';
describe('admin-e2e', () => {
- beforeEach(() => cy.visit('/'))
+ beforeEach(() => cy.visit('/'));
- it('should display welcome message', () => {
- // Custom command example, see `../support/commands.ts` file
- cy.login('my-email@something.com', 'myPassword')
+ it('should display welcome message', () => {
+ // Custom command example, see `../support/commands.ts` file
+ cy.login('my-email@something.com', 'myPassword');
- // Function helper example, see `../support/app.po.ts` file
- getGreeting().contains(/Welcome/)
- })
-})
+ // Function helper example, see `../support/app.po.ts` file
+ getGreeting().contains(/Welcome/);
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/example.json b/alfa-client/apps/admin-e2e/src/fixtures/example.json
index 0ff2d645bf3905f729f4493ac372e165ac9b4b67..02e4254378e9785f013be7cc8d94a8229dcbcbb7 100644
--- a/alfa-client/apps/admin-e2e/src/fixtures/example.json
+++ b/alfa-client/apps/admin-e2e/src/fixtures/example.json
@@ -1,5 +1,5 @@
{
- "name": "Using fixtures to represent data",
- "email": "hello@cypress.io",
- "body": "Fixtures are a great way to mock data for responses to routes"
+ "name": "Using fixtures to represent data",
+ "email": "hello@cypress.io",
+ "body": "Fixtures are a great way to mock data for responses to routes"
}
diff --git a/alfa-client/apps/admin-e2e/src/support/app.po.ts b/alfa-client/apps/admin-e2e/src/support/app.po.ts
index 00f556e10333fcd914c3f288a7a35cbb47ce2424..32934246969c2ecb827ac05677785933a707a54d 100644
--- a/alfa-client/apps/admin-e2e/src/support/app.po.ts
+++ b/alfa-client/apps/admin-e2e/src/support/app.po.ts
@@ -1 +1 @@
-export const getGreeting = () => cy.get('h1')
+export const getGreeting = () => cy.get('h1');
diff --git a/alfa-client/apps/admin-e2e/src/support/commands.ts b/alfa-client/apps/admin-e2e/src/support/commands.ts
index 6bd729215f73cdd3b1f6b12a700a19494cb6993f..c421a3c47c1aa0f82f17f545268ec5965e6b5a79 100644
--- a/alfa-client/apps/admin-e2e/src/support/commands.ts
+++ b/alfa-client/apps/admin-e2e/src/support/commands.ts
@@ -12,16 +12,16 @@
// eslint-disable-next-line @typescript-eslint/no-namespace
declare namespace Cypress {
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- interface Chainable<Subject> {
- login(email: string, password: string): void
- }
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ interface Chainable<Subject> {
+ login(email: string, password: string): void;
+ }
}
// -- This is a parent command --
Cypress.Commands.add('login', (email, password) => {
- console.log('Custom command example: Login', email, password)
-})
+ console.log('Custom command example: Login', email, password);
+});
//
// -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
diff --git a/alfa-client/apps/admin-e2e/src/support/e2e.ts b/alfa-client/apps/admin-e2e/src/support/e2e.ts
index a00021c4faf2dc643fe89753dee02aa3fa594399..1c1a9e772baea367e08b1c7b15e65b3fede3d17f 100644
--- a/alfa-client/apps/admin-e2e/src/support/e2e.ts
+++ b/alfa-client/apps/admin-e2e/src/support/e2e.ts
@@ -14,4 +14,4 @@
// ***********************************************************
// Import commands.ts using ES2015 syntax:
-import './commands'
+import './commands';
diff --git a/alfa-client/apps/admin-e2e/tsconfig.json b/alfa-client/apps/admin-e2e/tsconfig.json
index 4e17336cf8eb3fb7105ec13ec666731a14842236..e28de1d7913d8d554fee7f55bdf42f0bd4125191 100644
--- a/alfa-client/apps/admin-e2e/tsconfig.json
+++ b/alfa-client/apps/admin-e2e/tsconfig.json
@@ -1,17 +1,17 @@
{
- "extends": "../../tsconfig.base.json",
- "compilerOptions": {
- "allowJs": true,
- "outDir": "../../dist/out-tsc",
- "module": "commonjs",
- "types": ["cypress", "node"],
- "sourceMap": false,
- "forceConsistentCasingInFileNames": true,
- "strict": true,
- "noImplicitOverride": true,
- "noPropertyAccessFromIndexSignature": true,
- "noImplicitReturns": true,
- "noFallthroughCasesInSwitch": true
- },
- "include": ["**/*.ts", "**/*.js", "cypress.config.ts", "**/*.cy.ts", "**/*.cy.js", "**/*.d.ts"]
+ "extends": "../../tsconfig.base.json",
+ "compilerOptions": {
+ "allowJs": true,
+ "outDir": "../../dist/out-tsc",
+ "module": "commonjs",
+ "types": ["cypress", "node"],
+ "sourceMap": false,
+ "forceConsistentCasingInFileNames": true,
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true
+ },
+ "include": ["**/*.ts", "**/*.js", "cypress.config.ts", "**/*.cy.ts", "**/*.cy.js", "**/*.d.ts"]
}
diff --git a/alfa-client/apps/admin/.eslintrc.json b/alfa-client/apps/admin/.eslintrc.json
index cfbc7e3f0480336dfea270c2674f4ff0fcad172a..437641b9a11a424b46bcf2606b683998a3a6bba1 100644
--- a/alfa-client/apps/admin/.eslintrc.json
+++ b/alfa-client/apps/admin/.eslintrc.json
@@ -1,33 +1,33 @@
{
- "extends": ["../../.eslintrc.json"],
- "ignorePatterns": ["!**/*"],
- "overrides": [
- {
- "files": ["*.ts"],
- "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
- "rules": {
- "@angular-eslint/directive-selector": [
- "error",
- {
- "type": "attribute",
- "prefix": "app",
- "style": "camelCase"
- }
- ],
- "@angular-eslint/component-selector": [
- "error",
- {
- "type": "element",
- "prefix": "app",
- "style": "kebab-case"
- }
- ]
- }
- },
- {
- "files": ["*.html"],
- "extends": ["plugin:@nx/angular-template"],
- "rules": {}
- }
- ]
+ "extends": ["../../.eslintrc.json"],
+ "ignorePatterns": ["!**/*"],
+ "overrides": [
+ {
+ "files": ["*.ts"],
+ "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+ "rules": {
+ "@angular-eslint/directive-selector": [
+ "error",
+ {
+ "type": "attribute",
+ "prefix": "app",
+ "style": "camelCase"
+ }
+ ],
+ "@angular-eslint/component-selector": [
+ "error",
+ {
+ "type": "element",
+ "prefix": "app",
+ "style": "kebab-case"
+ }
+ ]
+ }
+ },
+ {
+ "files": ["*.html"],
+ "extends": ["plugin:@nx/angular-template"],
+ "rules": {}
+ }
+ ]
}
diff --git a/alfa-client/apps/admin/jest.config.ts b/alfa-client/apps/admin/jest.config.ts
index b6beb1fafb678da78dde68bec6ebc5eab3607b2f..b8fbfc40ae34d94376865a08d95411b48c03ffa6 100644
--- a/alfa-client/apps/admin/jest.config.ts
+++ b/alfa-client/apps/admin/jest.config.ts
@@ -1,6 +1,11 @@
/* eslint-disable */
-const esModules: string[] = ['@keycloak/keycloak-admin-client', 'url-join', 'url-template', 'camelize-ts'];
+const esModules: string[] = [
+ '@keycloak/keycloak-admin-client',
+ 'url-join',
+ 'url-template',
+ 'camelize-ts',
+];
export default {
displayName: 'admin',
preset: '../../jest.preset.js',
diff --git a/alfa-client/apps/admin/src/app/app.component.spec.ts b/alfa-client/apps/admin/src/app/app.component.spec.ts
index 2087fcc0dba93e3c6252c71d9ca22b968e09be06..a8dfa9a539e491d0e62a2b1e76170d08911315e9 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -1,28 +1,28 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { AppComponent } from './app.component';
+import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import {
+ HasLinkPipe,
+ createEmptyStateResource,
+ createStateResource,
+} from '@alfa-client/tech-shared';
+import {
+ Mock,
existsAsHtmlElement,
getElementFromFixture,
mock,
- Mock,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import {
- createEmptyStateResource,
- createStateResource,
- HasLinkPipe,
-} from '@alfa-client/tech-shared';
-import { of } from 'rxjs';
-import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
-import { MockComponent } from 'ng-mocks';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Router } from '@angular/router';
-import { NavigationComponent } from 'libs/admin-settings/src/lib/navigation/navigation.component';
+import { RouterTestingModule } from '@angular/router/testing';
import { AuthenticationService } from 'authentication';
+import { NavigationComponent } from 'libs/admin-settings/src/lib/navigation/navigation.component';
+import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { MockComponent } from 'ng-mocks';
+import { of } from 'rxjs';
import { UserProfileButtonContainerComponent } from '../common/user-profile-button-container/user-profile.button-container.component';
import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
+import { AppComponent } from './app.component';
describe('AppComponent', () => {
let component: AppComponent;
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index cffa4bd597c449b8057f42f10f959fc1823ad230..bccefbebc1e14ca084e18329ba7f604e28434731 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -1,9 +1,9 @@
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
import { StateResource } from '@alfa-client/tech-shared';
+import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AuthenticationService } from 'libs/authentication/src/lib/authentication.service';
+import { Observable } from 'rxjs';
@Component({
selector: 'app-root',
diff --git a/alfa-client/apps/admin/src/app/app.routes.ts b/alfa-client/apps/admin/src/app/app.routes.ts
index 2cb992c5f7b2bfca598f6df515176bce01bb5642..80dafdcc1dfdf77729e2041e3ca263ac9a0cd2fe 100644
--- a/alfa-client/apps/admin/src/app/app.routes.ts
+++ b/alfa-client/apps/admin/src/app/app.routes.ts
@@ -1,6 +1,6 @@
import { Route } from '@angular/router';
-import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
import { OrganisationseinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
+import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
export const appRoutes: Route[] = [
{
diff --git a/alfa-client/apps/admin/src/assets/silent-check-sso.html b/alfa-client/apps/admin/src/assets/silent-check-sso.html
index f4de3a9df4c51b382447ae3e27fa09a16d684fff..b3bd540ded4c630912948ece8724dfc2d4bc7911 100644
--- a/alfa-client/apps/admin/src/assets/silent-check-sso.html
+++ b/alfa-client/apps/admin/src/assets/silent-check-sso.html
@@ -4,4 +4,4 @@
parent.postMessage(location.href, location.origin);
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
index f96d0b911d20d6e9c4da08c2c7cce135b3d4f863..bf2390e5130e235721a9eeaacbef88f7cb49f7b9 100644
--- a/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
+++ b/alfa-client/apps/admin/src/common/user-profile-button-container/user-profile-button-container.component.spec.ts
@@ -6,9 +6,9 @@ import {
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
-import { UserProfileButtonContainerComponent } from './user-profile.button-container.component';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { AuthenticationService } from 'authentication';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { UserProfileButtonContainerComponent } from './user-profile.button-container.component';
describe('UserProfileButtonContainerComponent', () => {
let component: UserProfileButtonContainerComponent;
diff --git a/alfa-client/apps/admin/src/environments/environment.prod.ts b/alfa-client/apps/admin/src/environments/environment.prod.ts
index 8a6d639364da456e454e104a81c9c81886dbc7eb..2fe1167acb0efa94f13f4552c3596b0857cd1ffc 100644
--- a/alfa-client/apps/admin/src/environments/environment.prod.ts
+++ b/alfa-client/apps/admin/src/environments/environment.prod.ts
@@ -22,6 +22,6 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
export const environment = {
- production: true,
- environmentUrl: null,
+ production: true,
+ environmentUrl: null,
};
diff --git a/alfa-client/apps/admin/src/environments/environment.ts b/alfa-client/apps/admin/src/environments/environment.ts
index 29c2e42bfad7c0fc9d65d75097fbb8045db5eb1a..fad837602d220b0cd9f31ffd34bdea0064c491a0 100644
--- a/alfa-client/apps/admin/src/environments/environment.ts
+++ b/alfa-client/apps/admin/src/environments/environment.ts
@@ -26,8 +26,8 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
- production: false,
- environmentUrl: ''
+ production: false,
+ environmentUrl: '',
};
/*
diff --git a/alfa-client/apps/admin/src/main.ts b/alfa-client/apps/admin/src/main.ts
index 3199db2879e8a93ad807dd20615329948b7e0373..5e507cb8a70d469b135d4962f92d26b6a9cc53ea 100644
--- a/alfa-client/apps/admin/src/main.ts
+++ b/alfa-client/apps/admin/src/main.ts
@@ -1,8 +1,8 @@
import { loadEnvironment } from '@alfa-client/environment-shared';
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
import { isNil } from 'lodash-es';
+import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
loadEnvironment(environment.environmentUrl).then((env) => {
diff --git a/alfa-client/apps/admin/src/main/helm/Chart.yaml b/alfa-client/apps/admin/src/main/helm/Chart.yaml
index 9eb16e0fb51251efe05f1a127ac1f9e2c2397b52..49da0c2dcc79891b5ec3516891916a1f01d48390 100644
--- a/alfa-client/apps/admin/src/main/helm/Chart.yaml
+++ b/alfa-client/apps/admin/src/main/helm/Chart.yaml
@@ -23,8 +23,8 @@
#
apiVersion: v1
-appVersion: "1.0"
+appVersion: '1.0'
description: A Helm chart for Admin Client
-name: admin-client
+name: admin-client
version: 0.0.0-MANAGED-BY-JENKINS
icon: https://simpleicons.org/icons/helm.svg
diff --git a/alfa-client/apps/admin/src/main/helm/values.yaml b/alfa-client/apps/admin/src/main/helm/values.yaml
index 4b56c1a8c3b42ca13dbcfa2e960058daa215ad6e..d35c990fe80e2c387f13065be052e83be3e15820 100644
--- a/alfa-client/apps/admin/src/main/helm/values.yaml
+++ b/alfa-client/apps/admin/src/main/helm/values.yaml
@@ -5,4 +5,4 @@ image:
replicaCount: 1
ozgcloud:
- adminDomainSuffix: admin
\ No newline at end of file
+ adminDomainSuffix: admin
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 2e3212e6c35716eb1e2c351d2898f52fe503d25a..e5c52e8433943e7eaedee4c2cc541400b7eb873c 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,7 +1,7 @@
+import { OrganisationseinheitContainerComponent } from '@admin-client/admin-settings';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrganisationseinheitPageComponent } from './organisationseinheit-page.component';
import { MockComponent } from 'ng-mocks';
-import { OrganisationseinheitContainerComponent } from '@admin-client/admin-settings';
+import { OrganisationseinheitPageComponent } from './organisationseinheit-page.component';
describe('OrganisationseinheitPageComponent', () => {
let component: OrganisationseinheitPageComponent;
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 230071cd15059b2ce6401cdd9d333ee811d32703..5ebec9f21a5002eea14557838b3af6aa0f724196 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,7 +1,7 @@
+import { PostfachContainerComponent } from '@admin-client/admin-settings';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PostfachPageComponent } from './postfach-page.component';
import { MockComponent } from 'ng-mocks';
-import { PostfachContainerComponent } from '@admin-client/admin-settings';
+import { PostfachPageComponent } from './postfach-page.component';
describe('PostfachPageComponent', () => {
let component: PostfachPageComponent;
diff --git a/alfa-client/apps/admin/src/test-setup.ts b/alfa-client/apps/admin/src/test-setup.ts
index 8b53d2a67e1b1a2507056457168690db3550f62b..ef358fbdf02a6bfc0ca9a7c2f5c73766b01ef584 100644
--- a/alfa-client/apps/admin/src/test-setup.ts
+++ b/alfa-client/apps/admin/src/test-setup.ts
@@ -1,7 +1,7 @@
globalThis.ngJest = {
- testEnvironmentOptions: {
- errorOnUnknownElements: true,
- errorOnUnknownProperties: true
- }
+ testEnvironmentOptions: {
+ errorOnUnknownElements: true,
+ errorOnUnknownProperties: true,
+ },
};
import 'jest-preset-angular/setup-jest';
diff --git a/alfa-client/apps/admin/tsconfig.app.json b/alfa-client/apps/admin/tsconfig.app.json
index 2a170234b5b9459bd92f548dff1937b3c8033251..fff4a41d444a486d4cf163be19f8601e0510c270 100644
--- a/alfa-client/apps/admin/tsconfig.app.json
+++ b/alfa-client/apps/admin/tsconfig.app.json
@@ -1,10 +1,10 @@
{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "outDir": "../../dist/out-tsc",
- "types": []
- },
- "files": ["src/main.ts"],
- "include": ["src/**/*.d.ts"],
- "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../dist/out-tsc",
+ "types": []
+ },
+ "files": ["src/main.ts"],
+ "include": ["src/**/*.d.ts"],
+ "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
}
diff --git a/alfa-client/apps/admin/tsconfig.editor.json b/alfa-client/apps/admin/tsconfig.editor.json
index 7d2d35b1e5c112ff92d7fe4c1a1e6c0c9bfd04fd..8ae117d96293c675141bebfc2fad8c5df58429d3 100644
--- a/alfa-client/apps/admin/tsconfig.editor.json
+++ b/alfa-client/apps/admin/tsconfig.editor.json
@@ -1,7 +1,7 @@
{
- "extends": "./tsconfig.json",
- "include": ["src/**/*.ts"],
- "compilerOptions": {
- "types": ["jest", "node"]
- }
+ "extends": "./tsconfig.json",
+ "include": ["src/**/*.ts"],
+ "compilerOptions": {
+ "types": ["jest", "node"]
+ }
}
diff --git a/alfa-client/apps/admin/tsconfig.json b/alfa-client/apps/admin/tsconfig.json
index 22cdb1cd653f7f576f9d481b3c000360732aaa1d..3d14eb0f33fa0447b1ab6a871eacd616e044c6c7 100644
--- a/alfa-client/apps/admin/tsconfig.json
+++ b/alfa-client/apps/admin/tsconfig.json
@@ -1,32 +1,32 @@
{
- "compilerOptions": {
- "target": "es2022",
- "useDefineForClassFields": false,
- // "forceConsistentCasingInFileNames": true,
- // "strict": true,
- // "noImplicitOverride": true,
- // "noPropertyAccessFromIndexSignature": true,
- // "noImplicitReturns": true,
- // "noFallthroughCasesInSwitch": true
- },
- "files": [],
- "include": [],
- "references": [
- {
- "path": "./tsconfig.app.json"
- },
- {
- "path": "./tsconfig.spec.json"
- },
- {
- "path": "./tsconfig.editor.json"
- }
- ],
- "extends": "../../tsconfig.base.json",
- "angularCompilerOptions": {
- // "enableI18nLegacyMessageIdFormat": false,
- // "strictInjectionParameters": true,
- // "strictInputAccessModifiers": true,
- // "strictTemplates": true
- }
+ "compilerOptions": {
+ "target": "es2022",
+ "useDefineForClassFields": false
+ // "forceConsistentCasingInFileNames": true,
+ // "strict": true,
+ // "noImplicitOverride": true,
+ // "noPropertyAccessFromIndexSignature": true,
+ // "noImplicitReturns": true,
+ // "noFallthroughCasesInSwitch": true
+ },
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.app.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ },
+ {
+ "path": "./tsconfig.editor.json"
+ }
+ ],
+ "extends": "../../tsconfig.base.json",
+ "angularCompilerOptions": {
+ // "enableI18nLegacyMessageIdFormat": false,
+ // "strictInjectionParameters": true,
+ // "strictInputAccessModifiers": true,
+ // "strictTemplates": true
+ }
}
diff --git a/alfa-client/apps/admin/tsconfig.spec.json b/alfa-client/apps/admin/tsconfig.spec.json
index 457941b37601d23560331aa6fe86a651646978b2..7870b7c011681fb77d6114001f44d3eeca69975b 100644
--- a/alfa-client/apps/admin/tsconfig.spec.json
+++ b/alfa-client/apps/admin/tsconfig.spec.json
@@ -1,11 +1,11 @@
{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "outDir": "../../dist/out-tsc",
- "module": "commonjs",
- "target": "es2016",
- "types": ["jest", "node"]
- },
- "files": ["src/test-setup.ts"],
- "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../dist/out-tsc",
+ "module": "commonjs",
+ "target": "es2016",
+ "types": ["jest", "node"]
+ },
+ "files": ["src/test-setup.ts"],
+ "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
}
diff --git a/alfa-client/libs/admin-settings/src/index.ts b/alfa-client/libs/admin-settings/src/index.ts
index 3d084df97dc2f7c3d8017257bbb86270dfe0af00..8d33b086734e167bd7ba0f3b40e56033948b02a1 100644
--- a/alfa-client/libs/admin-settings/src/index.ts
+++ b/alfa-client/libs/admin-settings/src/index.ts
@@ -1,4 +1,4 @@
export * from './lib/admin-settings.module';
-export * from './lib/postfach/postfach-container/postfach-container.component';
export * from './lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component';
+export * from './lib/postfach/postfach-container/postfach-container.component';
export * from './lib/shared/navigation-item/navigation-item.component';
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
index 414a929008988e7cddd1dff320d5c941f3fc1d4a..0f864996e0e4291c2b3a8ee1228b7755a5b27485 100644
--- a/alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts
@@ -1,28 +1,28 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Environment, ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
import { TechSharedModule } from '@alfa-client/tech-shared';
-import { NavigationItemComponent } from './shared/navigation-item/navigation-item.component';
-import { RouterModule } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
-import { PostfachContainerComponent } from './postfach/postfach-container/postfach-container.component';
-import { PostfachFormComponent } from './postfach/postfach-container/postfach-form/postfach-form.component';
-import { TextFieldComponent } from './shared/text-field/text-field.component';
+import { RouterModule } from '@angular/router';
+import KcAdminClient from '@keycloak/keycloak-admin-client';
+import { SettingsService } from './admin-settings.service';
+import { ConfigurationService } from './configuration/configuration.service';
+import { NavigationComponent } from './navigation/navigation.component';
import { OrganisationseinheitContainerComponent } from './organisationseinheit/organisationseinheit-container/organisationseinheit-container.component';
import { OrganisationseinheitFormComponent } from './organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component';
-import { PrimaryButtonComponent } from './shared/primary-button/primary-button.component';
-import { SecondaryButtonComponent } from './shared/secondary-button/secondary-button.component';
import { OrganisationseinheitListComponent } from './organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component';
+import { OrganisationseinheitNavigationItemComponent } from './organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component';
+import { PostfachContainerComponent } from './postfach/postfach-container/postfach-container.component';
+import { PostfachFormComponent } from './postfach/postfach-container/postfach-form/postfach-form.component';
import { PostfachNavigationItemComponent } from './postfach/postfach-navigation-item/postfach-navigation-item.component';
-import { SettingsService } from './admin-settings.service';
import { PostfachService } from './postfach/postfach.service';
-import { ConfigurationService } from './configuration/configuration.service';
-import { NavigationComponent } from './navigation/navigation.component';
-import { OrganisationseinheitNavigationItemComponent } from './organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component';
-import KcAdminClient from '@keycloak/keycloak-admin-client';
-import { Environment, ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
-import { MoreMenuComponent } from './shared/more-menu/more-menu.component';
import { MoreItemButtonComponent } from './shared/more-menu/more-item-button/more-item-button.component';
+import { MoreMenuComponent } from './shared/more-menu/more-menu.component';
+import { NavigationItemComponent } from './shared/navigation-item/navigation-item.component';
+import { PrimaryButtonComponent } from './shared/primary-button/primary-button.component';
+import { SecondaryButtonComponent } from './shared/secondary-button/secondary-button.component';
import { SpinnerComponent } from './shared/spinner/spinner.component';
+import { TextFieldComponent } from './shared/text-field/text-field.component';
@NgModule({
declarations: [
diff --git a/alfa-client/libs/admin-settings/src/lib/admin-settings.service.spec.ts b/alfa-client/libs/admin-settings/src/lib/admin-settings.service.spec.ts
index e9e03a8b1e658319e5d9a5c649bf53959b17c94b..aba45f95f3ac0cf117cb1d17f0c51bec82deef86 100644
--- a/alfa-client/libs/admin-settings/src/lib/admin-settings.service.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings.service.spec.ts
@@ -1,22 +1,22 @@
-import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
-import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
-import { SettingsService } from './admin-settings.service';
-import { SettingListResource } from './admin-settings.model';
import {
+ StateResource,
createEmptyStateResource,
createStateResource,
- StateResource,
} from '@alfa-client/tech-shared';
-import { Observable, of } from 'rxjs';
+import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { ListResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
-import { PostfachResource } from './postfach/postfach.model';
-import { createSettingItemResource, createPostfachResource } from '../../test/postfach/postfach';
+import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
+import { Observable, of } from 'rxjs';
+import { singleCold } from '../../../tech-shared/src/lib/resource/marbles';
import { createSettingsListResource } from '../../test/admin-settings';
-import { ConfigurationService } from './configuration/configuration.service';
import { createConfigurationResource } from '../../test/configuration/configuration';
-import { ConfigurationResource } from './configuration/configuration.model';
-import { singleCold } from '../../../tech-shared/src/lib/resource/marbles';
+import { createPostfachResource, createSettingItemResource } from '../../test/postfach/postfach';
import { SettingListLinkRel } from './admin-settings.linkrel';
+import { SettingListResource } from './admin-settings.model';
+import { SettingsService } from './admin-settings.service';
+import { ConfigurationResource } from './configuration/configuration.model';
+import { ConfigurationService } from './configuration/configuration.service';
+import { PostfachResource } from './postfach/postfach.model';
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/admin-settings.service.ts
index d87daa538d4abdba448b4ea696507255adab2b15..9494e41a4315d82031647106428744bca3f04a81 100644
--- a/alfa-client/libs/admin-settings/src/lib/admin-settings.service.ts
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings.service.ts
@@ -1,15 +1,15 @@
+import { StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { ResourceListService } from 'libs/tech-shared/src/lib/resource/list-resource.service';
-import { SettingItemResource, SettingListResource } from './admin-settings.model';
-import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
import { ListResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
-import { map, Observable } from 'rxjs';
-import { StateResource } from '@alfa-client/tech-shared';
-import { PostfachResource } from './postfach/postfach.model';
-import { ConfigurationService } from './configuration/configuration.service';
-import { ConfigurationResource } from './configuration/configuration.model';
-import { getPostfachResource } from './admin-settings.util';
+import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
+import { Observable, map } from 'rxjs';
import { SettingListLinkRel } from './admin-settings.linkrel';
+import { SettingItemResource, SettingListResource } from './admin-settings.model';
+import { getPostfachResource } from './admin-settings.util';
+import { ConfigurationResource } from './configuration/configuration.model';
+import { ConfigurationService } from './configuration/configuration.service';
+import { PostfachResource } from './postfach/postfach.model';
@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/admin-settings.util.spec.ts
index 0139638d32fda4d6d34a72836e29574c4b3f1a21..a47364325aea520613568316163208dd86675d07 100644
--- a/alfa-client/libs/admin-settings/src/lib/admin-settings.util.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings.util.spec.ts
@@ -1,13 +1,13 @@
-import { PostfachResource } from './postfach/postfach.model';
-import { createPostfachResource } from '../../test/postfach/postfach';
import {
createEmptyStateResource,
createStateResource,
StateResource,
} from '@alfa-client/tech-shared';
-import { SettingListResource } from './admin-settings.model';
import { createFilledSettingsListResource } from '../../test/admin-settings';
+import { createPostfachResource } from '../../test/postfach/postfach';
+import { SettingListResource } from './admin-settings.model';
import { getPostfachResource } from './admin-settings.util';
+import { PostfachResource } from './postfach/postfach.model';
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/admin-settings.util.ts
index dad56bcb51a28d9750d181abe8e4d90909f07bce..5bbec5b99801b80ce94274f13d61f6fc5cbb7a56 100644
--- a/alfa-client/libs/admin-settings/src/lib/admin-settings.util.ts
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings.util.ts
@@ -5,9 +5,9 @@ import {
isNotNil,
StateResource,
} from '@alfa-client/tech-shared';
-import { PostfachResource } from './postfach/postfach.model';
-import { SettingItemResource, SettingListResource, SettingName } from './admin-settings.model';
import { SettingListLinkRel } from './admin-settings.linkrel';
+import { SettingItemResource, SettingListResource, SettingName } from './admin-settings.model';
+import { PostfachResource } from './postfach/postfach.model';
export function getPostfachResource(
settingsListResource: StateResource<SettingListResource>,
diff --git a/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.spec.ts b/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.spec.ts
index fde7d8d37cf5eaba6f574c82f081faab92ea6ff8..5f59c46fdfebab987d5df7654d3b040bf030f364 100644
--- a/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.spec.ts
@@ -1,13 +1,13 @@
-import { ApiRootService, ApiRootResource } from '@alfa-client/api-root-shared';
+import { ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
+import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
import { Observable, of } from 'rxjs';
+import { createConfigurationResource } from '../../../test/configuration/configuration';
import { ConfigurationResource } from './configuration.model';
import { ConfigurationService } from './configuration.service';
-import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
-import { createConfigurationResource } from '../../../test/configuration/configuration';
describe('ConfigurationService', () => {
let service: ConfigurationService;
diff --git a/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.ts b/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.ts
index 8ee3ac8766a11f1783de631ab3171a0481716860..4f7b48f9f3b5181b772a170ee49a1920a140f075 100644
--- a/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.ts
+++ b/alfa-client/libs/admin-settings/src/lib/configuration/configuration.service.ts
@@ -3,8 +3,8 @@ import { StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { ResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
-import { Observable } from 'rxjs';
import { ResourceService } from 'libs/tech-shared/src/lib/resource/resource.service';
+import { Observable } from 'rxjs';
import { ConfigurationResource } from './configuration.model';
@Injectable()
diff --git a/alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.spec.ts
index 630ee854bd2a77aa2b5d96efe016cf9fc772a75d..2598e618c4eb36e2762d7f34ac87260719706a99 100644
--- a/alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.spec.ts
@@ -1,8 +1,8 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { NavigationComponent } from './navigation.component';
import { MockComponent } from 'ng-mocks';
-import { PostfachNavigationItemComponent } from '../postfach/postfach-navigation-item/postfach-navigation-item.component';
import { OrganisationseinheitNavigationItemComponent } from '../organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component';
+import { PostfachNavigationItemComponent } from '../postfach/postfach-navigation-item/postfach-navigation-item.component';
+import { NavigationComponent } from './navigation.component';
describe('NavigationComponent', () => {
let component: NavigationComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.spec.ts
index 3d5ccfed1a905798d750cdf3487c8eae5b71c654..f991a1e9ae065cfe7e84d72ee527503183205821 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.spec.ts
@@ -1,27 +1,27 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrganisationseinheitContainerComponent } from './organisationseinheit-container.component';
-import { OrganisationseinheitFormComponent } from './organisationseinheit-form/organisationseinheit-form.component';
-import { MockComponent } from 'ng-mocks';
-import { SecondaryButtonComponent } from '../../shared/secondary-button/secondary-button.component';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import {
+ Mock,
dispatchEventFromFixture,
existsAsHtmlElement,
getElementFromFixtureByType,
mock,
- Mock,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
-import { OrganisationseinheitListComponent } from './organisationseinheit-list/organisationseinheit-list.component';
-import { UserService } from '../../user/user.service';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
+import { singleCold } from '../../../../../tech-shared/src/lib/resource/marbles';
import {
createOrganisationseinheit,
createOrganisationseinheitState,
} from '../../../../test/user/user';
-import { Organisationseinheit } from '../../user/user.model';
-import { singleCold } from '../../../../../tech-shared/src/lib/resource/marbles';
+import { SecondaryButtonComponent } from '../../shared/secondary-button/secondary-button.component';
import { SpinnerComponent } from '../../shared/spinner/spinner.component';
+import { Organisationseinheit } from '../../user/user.model';
+import { UserService } from '../../user/user.service';
+import { OrganisationseinheitContainerComponent } from './organisationseinheit-container.component';
+import { OrganisationseinheitFormComponent } from './organisationseinheit-form/organisationseinheit-form.component';
+import { OrganisationseinheitListComponent } from './organisationseinheit-list/organisationseinheit-list.component';
describe('OrganisationseinheitContainerComponent', () => {
let component: OrganisationseinheitContainerComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.ts
index efa637313dfce71fe1904be3658658cb2dd34518..f2bc2061e143c013c4d7f9f3096c2020c8852d3a 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
+import { Observable, of } from 'rxjs';
import { Organisationseinheit } from '../../user/user.model';
import { UserService } from '../../user/user.service';
-import { Observable, of } from 'rxjs';
import { OrganisationseinheitFormComponent } from './organisationseinheit-form/organisationseinheit-form.component';
@Component({
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
index 72226bb29f71728ebf8f242b0bca09593532aeb2..0418653a9be772a8adc99ba50aa1a7f4dfda142f 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
@@ -1,5 +1,3 @@
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { OrganisationseinheitFormComponent } from './organisationseinheit-form.component';
import {
dispatchEventFromFixture,
getDebugElementFromFixtureByCss,
@@ -7,6 +5,8 @@ import {
mock,
Mock,
} from '@alfa-client/test-utils';
+import { DebugElement } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
import {
AbstractControl,
FormsModule,
@@ -15,14 +15,14 @@ import {
} from '@angular/forms';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, ngMocks } from 'ng-mocks';
-import { PrimaryButtonComponent } from '../../../shared/primary-button/primary-button.component';
-import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
-import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
import { of, throwError } from 'rxjs';
-import { UserService } from '../../../user/user.service';
-import { DebugElement } from '@angular/core';
import { createOrganisationseinheit } from '../../../../../test/user/user';
+import { PrimaryButtonComponent } from '../../../shared/primary-button/primary-button.component';
+import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
import { Organisationseinheit } from '../../../user/user.model';
+import { UserService } from '../../../user/user.service';
+import { OrganisationseinheitFormComponent } from './organisationseinheit-form.component';
+import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
describe('OrganisationseinheitFormComponent', () => {
let component: OrganisationseinheitFormComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.ts
index a751de2bce0712f5d8bc5a1d97b9000fa6ed78ec..5224f6db0c0c1abd27fba74b2adc3067fe00a460 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.ts
@@ -1,7 +1,7 @@
import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';
-import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
import { Observable, of, tap } from 'rxjs';
import { Organisationseinheit } from '../../../user/user.model';
+import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
@Component({
selector: 'admin-organisationseinheit-form',
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
index 1319b8d93554b29e92dfc3f46aee07a2b82f5eae..b66d692d85419798d0111c42621b0607cfc459a5 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
@@ -1,7 +1,9 @@
-import { AbstractControl, FormBuilder } from '@angular/forms';
-import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
-import { UserService } from '../../../user/user.service';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { AbstractControl, FormBuilder } from '@angular/forms';
+import { hot } from 'jest-marbles';
+import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
+import { Observable, lastValueFrom, throwError } from 'rxjs';
import {
createOrganisationseinheit,
createOrganisationseinheitError,
@@ -11,11 +13,9 @@ import {
OrganisationseinheitError,
OrganisationseinheitErrorType,
} from '../../../user/user.model';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
-import { lastValueFrom, Observable, throwError } from 'rxjs';
-import { hot } from 'jest-marbles';
+import { UserService } from '../../../user/user.service';
import { getOrganisationseinheitErrorMessage } from '../../../user/user.util';
+import { OrganisationseinheitFormservice } from './organisationseinheit.formservice';
describe('OrganisationseinheitFormService', () => {
let formService: OrganisationseinheitFormservice;
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
index ecad82623c8f1f5f192fd77ba5e96d381efedfa8..850b5f775f723f0b27073ac5de0b99d7a2c877e8 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
@@ -1,14 +1,14 @@
+import { isNotNil } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { AbstractControl, FormControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { UserService } from '../../../user/user.service';
-import { catchError, Observable, of } from 'rxjs';
+import { Observable, catchError, of } from 'rxjs';
import {
Organisationseinheit,
OrganisationseinheitError,
OrganisationseinheitErrorType,
} from '../../../user/user.model';
+import { UserService } from '../../../user/user.service';
import { getOrganisationseinheitErrorMessage } from '../../../user/user.util';
-import { isNotNil } from '@alfa-client/tech-shared';
@Injectable()
export class OrganisationseinheitFormservice {
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts
index 310a0ecbfc5e795d1aa2dc49a22deff2304803c3..912a82f8a93e2865f011ec5a8f0c40905a910d85 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.spec.ts
@@ -1,18 +1,18 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrganisationseinheitListComponent } from './organisationseinheit-list.component';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { ConvertForDataTestPipe, convertForDataTest } from '@alfa-client/tech-shared';
import {
dispatchEventFromFixture,
existsAsHtmlElement,
getElementFromFixture,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
-import { createOrganisationseinheit } from '../../../../../test/user/user';
-import { Organisationseinheit } from '../../../user/user.model';
-import { convertForDataTest, ConvertForDataTestPipe } from '@alfa-client/tech-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
-import { MoreMenuComponent } from '../../../shared/more-menu/more-menu.component';
+import { createOrganisationseinheit } from '../../../../../test/user/user';
import { MoreItemButtonComponent } from '../../../shared/more-menu/more-item-button/more-item-button.component';
+import { MoreMenuComponent } from '../../../shared/more-menu/more-menu.component';
+import { Organisationseinheit } from '../../../user/user.model';
+import { OrganisationseinheitListComponent } from './organisationseinheit-list.component';
describe('OrganisationseinheitListComponent', () => {
let component: OrganisationseinheitListComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component.spec.ts
index fe87a7a7d2d7e67d6de7bbc90c570229f41d48a6..b855265b14e0b5ec4e03e1db4b4af27cd1528b23 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-navigation-item/organisationseinheit-navigation-item.component.spec.ts
@@ -1,7 +1,7 @@
+import { NavigationItemComponent } from '@admin-client/admin-settings';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrganisationseinheitNavigationItemComponent } from './organisationseinheit-navigation-item.component';
import { MockComponent } from 'ng-mocks';
-import { NavigationItemComponent } from '@admin-client/admin-settings';
+import { OrganisationseinheitNavigationItemComponent } from './organisationseinheit-navigation-item.component';
describe('OrganisationseinheitNavigationItemComponent', () => {
let component: OrganisationseinheitNavigationItemComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.spec.ts
index 4c0374da1f1157d0d9269be251ce6759350383ff..70ddcc4aa707edf50dcafb86ce569d0ba1fd982f 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.spec.ts
@@ -1,14 +1,14 @@
+import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
-import { PostfachFormComponent } from './postfach-form/postfach-form.component';
-import { MockComponent } from 'ng-mocks';
-import { Mock, mock } from 'libs/test-utils/src/lib/mocking';
import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
-import { createStateResource, StateResource } from '@alfa-client/tech-shared';
+import { Mock, mock } from 'libs/test-utils/src/lib/mocking';
+import { MockComponent } from 'ng-mocks';
import { createPostfachResource } from '../../../../test/postfach/postfach';
import { PostfachResource } from '../postfach.model';
import { PostfachService } from '../postfach.service';
import { PostfachContainerComponent } from './postfach-container.component';
+import { PostfachFormComponent } from './postfach-form/postfach-form.component';
describe('PostfachContainerComponent', () => {
let component: PostfachContainerComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.ts
index d68e73975d4ada5061d0cfa958ca0f34a1f0e274..abba013042591826c89ef4adde6db5b5aae54a28 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-container.component.ts
@@ -1,6 +1,6 @@
+import { StateResource } from '@alfa-client/tech-shared';
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
-import { StateResource } from '@alfa-client/tech-shared';
import { PostfachResource } from '../postfach.model';
import { PostfachService } from '../postfach.service';
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
index a1cea49d6140724fd3f32c367ecd56937d112f3d..6d0759982eb8dec5cc5d5ca0235f36b8817e0c88 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts
@@ -1,28 +1,28 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PostfachFormComponent } from './postfach-form.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import {
+ Mock,
dispatchEventFromFixture,
existsAsHtmlElement,
getDebugElementFromFixtureByCss,
getElementFromFixture,
- Mock,
mock,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { PostfachFormComponent } from './postfach-form.component';
-import { PostfachFormService } from './postfach.formservice';
+import { ProblemDetail, createStateResource } from '@alfa-client/tech-shared';
import { MockComponent, ngMocks } from 'ng-mocks';
-import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
-import { createPostfachResource } from '../../../../../test/postfach/postfach';
-import { createStateResource, ProblemDetail } from '@alfa-client/tech-shared';
-import { PostfachService } from '../../postfach.service';
-import { PostfachResource } from '../../postfach.model';
import { EMPTY, of } from 'rxjs';
+import { singleCold } from '../../../../../../tech-shared/src/lib/resource/marbles';
import { createInvalidParam, createProblemDetail } from '../../../../../../tech-shared/test/error';
+import { createPostfachResource } from '../../../../../test/postfach/postfach';
import { PrimaryButtonComponent } from '../../../shared/primary-button/primary-button.component';
-import { singleCold } from '../../../../../../tech-shared/src/lib/resource/marbles';
+import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
+import { PostfachResource } from '../../postfach.model';
+import { PostfachService } from '../../postfach.service';
+import { PostfachFormService } from './postfach.formservice';
describe('PostfachFormComponent', () => {
let component: PostfachFormComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.ts
index 95f118fa77c60925e3e003441038824edfdf90ac..be240d7c1e9f5439bb24fe222501ab20c9c2fc72 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.ts
@@ -1,8 +1,8 @@
+import { StateResource, isNotNil } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
-import { PostfachFormService } from './postfach.formservice';
-import { isNotNil, StateResource } from '@alfa-client/tech-shared';
-import { PostfachResource } from '../../postfach.model';
import { Observable, of } from 'rxjs';
+import { PostfachResource } from '../../postfach.model';
+import { PostfachFormService } from './postfach.formservice';
@Component({
selector: 'postfach-form',
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.spec.ts
index f615c6ce868a39449363184dd6643f96680e3e38..d5a884c0f1379fcf3172de5de2743f8a30d691bd 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.spec.ts
@@ -1,14 +1,16 @@
-import { FormBuilder } from '@angular/forms';
-import { PostfachFormService } from './postfach.formservice';
+import {
+ createEmptyStateResource,
+ createStateResource,
+ StateResource,
+} from '@alfa-client/tech-shared';
import { mock, Mock, useFromMock } from '@alfa-client/test-utils';
-import { PostfachService } from '../../postfach.service';
-import { createPostfach, createPostfachResource } from '../../../../../test/postfach/postfach';
-import { PostfachResource } from '../../postfach.model';
-import { createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { Postfach } from '../../postfach.model';
-import { Observable, of } from 'rxjs';
+import { FormBuilder } from '@angular/forms';
import { cold } from 'jest-marbles';
-import { createEmptyStateResource } from '@alfa-client/tech-shared';
+import { Observable, of } from 'rxjs';
+import { createPostfach, createPostfachResource } from '../../../../../test/postfach/postfach';
+import { Postfach, PostfachResource } from '../../postfach.model';
+import { PostfachService } from '../../postfach.service';
+import { PostfachFormService } from './postfach.formservice';
describe('PostfachFormService', () => {
let formService: PostfachFormService;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.ts
index 7f0a67b336a0b1adad0affc350741be662664de1..c6d801bdd90f6f27101dd9d621c497083c57f6ac 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach.formservice.ts
@@ -7,10 +7,10 @@ import {
} from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
import { FormControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { map, Observable } from 'rxjs';
-import { PostfachService } from '../../postfach.service';
-import { Postfach, PostfachResource } from '../../postfach.model';
import { isNil } from 'lodash-es';
+import { Observable, map } from 'rxjs';
+import { Postfach, PostfachResource } from '../../postfach.model';
+import { PostfachService } from '../../postfach.service';
@Injectable()
export class PostfachFormService extends AbstractFormService {
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-navigation-item/postfach-navigation-item.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-navigation-item/postfach-navigation-item.component.spec.ts
index 40288da836e1ed2a1fae575c4bcf3932955a7ce8..78ced8dcace6a475a7d5bda4c1f2d2be6a60171a 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-navigation-item/postfach-navigation-item.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-navigation-item/postfach-navigation-item.component.spec.ts
@@ -1,9 +1,9 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PostfachNavigationItemComponent } from './postfach-navigation-item.component';
-import { MockComponent } from 'ng-mocks';
import { NavigationItemComponent } from '@admin-client/admin-settings';
import { getMockComponent } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
import { SettingName } from '../../admin-settings.model';
+import { PostfachNavigationItemComponent } from './postfach-navigation-item.component';
describe('PostfachNavigationItemComponent', () => {
let component: PostfachNavigationItemComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.spec.ts
index a22ea2bf2cb75298d86fd606486a6a34aec3b0b5..c4584e738e1e54c409b67665dd5cd6f25c48d713 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.spec.ts
@@ -1,14 +1,14 @@
+import { HttpError, StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
-import { PostfachResource, PostfachSettingsItem } from './postfach.model';
+import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
+import { ResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
-import { PostfachService } from './postfach.service';
-import { SettingsService } from '../admin-settings.service';
-import { createPostfachResource, createPostfachSettingItem } from '../../../test/postfach/postfach';
-import { createStateResource, HttpError, StateResource } from '@alfa-client/tech-shared';
import { Observable, of } from 'rxjs';
-import { ResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
-import { singleCold, singleHot } from 'libs/tech-shared/src/lib/resource/marbles';
+import { createPostfachResource, createPostfachSettingItem } from '../../../test/postfach/postfach';
+import { SettingsService } from '../admin-settings.service';
import { PostfachLinkRel } from './postfach.linkrel';
+import { PostfachResource, PostfachSettingsItem } from './postfach.model';
+import { PostfachService } from './postfach.service';
describe('PostfachService', () => {
let service: PostfachService;
diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.ts
index b35600877d2dffe3f97f487ac94b5a295ab04fc0..27d8e129088eb99dd103cb7fb0684b32accfcd95 100644
--- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.ts
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach.service.ts
@@ -1,13 +1,13 @@
+import { HttpError, StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
+import { ResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
import { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
-import { Postfach, PostfachResource, PostfachSettingsItem } from './postfach.model';
import { ResourceService } from 'libs/tech-shared/src/lib/resource/resource.service';
-import { SettingsService } from '../admin-settings.service';
-import { ResourceServiceConfig } from 'libs/tech-shared/src/lib/resource/resource.model';
import { Observable } from 'rxjs';
-import { HttpError, StateResource } from '@alfa-client/tech-shared';
import { SettingName } from '../admin-settings.model';
+import { SettingsService } from '../admin-settings.service';
import { PostfachLinkRel } from './postfach.linkrel';
+import { Postfach, PostfachResource, PostfachSettingsItem } from './postfach.model';
@Injectable()
export class PostfachService {
diff --git a/alfa-client/libs/admin-settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.spec.ts
index eb37c9e2e75a4429b4cd381b4fbe8641bc9a1b2b..8d9b522ce93961b555b8c26e0621734e33af7237 100644
--- a/alfa-client/libs/admin-settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.spec.ts
@@ -1,6 +1,6 @@
+import { dispatchEventFromFixture, getElementFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MoreItemButtonComponent } from './more-item-button.component';
-import { dispatchEventFromFixture, getElementFromFixture } from '@alfa-client/test-utils';
describe('MoreItemButtonComponent', () => {
let component: MoreItemButtonComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/shared/navigation-item/navigation-item.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/shared/navigation-item/navigation-item.component.spec.ts
index e800d7acf9df48a08b81190c029858010e332ad3..21822ae354e1a6a11629a652220a62edc5d100a0 100644
--- a/alfa-client/libs/admin-settings/src/lib/shared/navigation-item/navigation-item.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/shared/navigation-item/navigation-item.component.spec.ts
@@ -1,10 +1,10 @@
+import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
+import { getElementFromFixture } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
-import { NavigationItemComponent } from './navigation-item.component';
-import { getElementFromFixture } from '@alfa-client/test-utils';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { RouterTestingModule } from '@angular/router/testing';
-import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { NavigationItemComponent } from './navigation-item.component';
describe('NavigationItemComponent', () => {
let component: NavigationItemComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.spec.ts
index c11f13af836f9ef51ddca63e29c91368a362397d..44f27c6b31b79144a38f750312ba6404f2e00647 100644
--- a/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.spec.ts
@@ -1,9 +1,9 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TextFieldComponent } from './text-field.component';
+import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
import { getElementFromFixture, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormControl, NgControl, ReactiveFormsModule, ValidationErrors } from '@angular/forms';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
+import { TextFieldComponent } from './text-field.component';
describe('TextFieldComponent', () => {
let component: TextFieldComponent;
diff --git a/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.ts b/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.ts
index b55df0b1523d9546964ee06d8e041ea4fd374a4a..66db648e5e870b40619f321f04321b35b763e93d 100644
--- a/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.ts
+++ b/alfa-client/libs/admin-settings/src/lib/shared/text-field/text-field.component.ts
@@ -1,6 +1,6 @@
+import { isNotNil } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
import { FormControlEditorAbstractComponent } from 'libs/ui/src/lib/ui/editor/formcontrol-editor.abstract.component';
-import { isNotNil } from '@alfa-client/tech-shared';
@Component({
selector: 'text-field',
diff --git a/alfa-client/libs/admin-settings/src/lib/user/user.repository.service.ts b/alfa-client/libs/admin-settings/src/lib/user/user.repository.service.ts
index 1ffcf2ad2d2e366b31e85c6041dc930f4e9e70c0..293806db24c520afa4b0907811092ee0bf023979 100644
--- a/alfa-client/libs/admin-settings/src/lib/user/user.repository.service.ts
+++ b/alfa-client/libs/admin-settings/src/lib/user/user.repository.service.ts
@@ -1,10 +1,10 @@
import { Injectable } from '@angular/core';
-import { Organisationseinheit, OrganisationseinheitError } from './user.model';
-import { catchError, from, map, Observable, OperatorFunction, throwError } from 'rxjs';
import KcAdminClient, { NetworkError } from '@keycloak/keycloak-admin-client';
+import { TokenProvider } from '@keycloak/keycloak-admin-client/lib/client';
import GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation';
import { OAuthService } from 'angular-oauth2-oidc';
-import { TokenProvider } from '@keycloak/keycloak-admin-client/lib/client';
+import { Observable, OperatorFunction, catchError, from, map, throwError } from 'rxjs';
+import { Organisationseinheit, OrganisationseinheitError } from './user.model';
import { KEYCLOAK_CREATE_GROUPS_ERROR_STATUS } from './user.util';
@Injectable({
diff --git a/alfa-client/libs/admin-settings/src/lib/user/user.repository.spec.ts b/alfa-client/libs/admin-settings/src/lib/user/user.repository.spec.ts
index 11f613f9817b70c5b15ff175358b4e0672527314..0702269f6c686c4fc7b33289f3e2b91f7234212b 100644
--- a/alfa-client/libs/admin-settings/src/lib/user/user.repository.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/user/user.repository.spec.ts
@@ -1,24 +1,24 @@
+import { Mock, mock } from '@alfa-client/test-utils';
import { fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { UserRepository } from './user.repository.service';
+import { faker } from '@faker-js/faker';
import KcAdminClient, { NetworkError } from '@keycloak/keycloak-admin-client';
-import { Mock, mock } from '@alfa-client/test-utils';
+import { TokenProvider } from '@keycloak/keycloak-admin-client/lib/client';
+import GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation';
+import { Groups } from '@keycloak/keycloak-admin-client/lib/resources/groups';
+import { OAuthService } from 'angular-oauth2-oidc';
+import { catchError, firstValueFrom, Observable, of, OperatorFunction, throwError } from 'rxjs';
import {
createGroupRepresentation,
createNetworkError,
createOrganisationseinheit,
createOrganisationseinheitError,
} from '../../../test/user/user';
-import GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation';
import {
Organisationseinheit,
OrganisationseinheitError,
OrganisationseinheitErrorType,
} from './user.model';
-import { TokenProvider } from '@keycloak/keycloak-admin-client/lib/client';
-import { catchError, firstValueFrom, Observable, of, OperatorFunction, throwError } from 'rxjs';
-import { faker } from '@faker-js/faker';
-import { OAuthService } from 'angular-oauth2-oidc';
-import { Groups } from '@keycloak/keycloak-admin-client/lib/resources/groups';
+import { UserRepository } from './user.repository.service';
describe('UserRepository', () => {
const accessToken: string = faker.random.alphaNumeric(40);
diff --git a/alfa-client/libs/admin-settings/src/lib/user/user.service.spec.ts b/alfa-client/libs/admin-settings/src/lib/user/user.service.spec.ts
index 32e15e4bd393873c8d336a918180c714fb66bcb6..7395bc1faf5efd5553ef1a618d94345214ec2794 100644
--- a/alfa-client/libs/admin-settings/src/lib/user/user.service.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/user/user.service.spec.ts
@@ -1,15 +1,15 @@
-import { UserService } from './user.service';
-import { UserRepository } from './user.repository.service';
import { mock, Mock, useFromMock } from '@alfa-client/test-utils';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { cold } from 'jest-marbles';
+import { firstValueFrom, lastValueFrom, Observable, of } from 'rxjs';
+import { singleCold } from '../../../../tech-shared/src/lib/resource/marbles';
import {
createOrganisationseinheit,
createOrganisationseinheitState,
} from '../../../test/user/user';
-import { firstValueFrom, lastValueFrom, Observable, of } from 'rxjs';
import { Organisationseinheit } from './user.model';
-import { cold } from 'jest-marbles';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { singleCold } from '../../../../tech-shared/src/lib/resource/marbles';
+import { UserRepository } from './user.repository.service';
+import { UserService } from './user.service';
describe('UserService', () => {
let service: UserService;
diff --git a/alfa-client/libs/admin-settings/src/lib/user/user.service.ts b/alfa-client/libs/admin-settings/src/lib/user/user.service.ts
index 21b5dfc8ebefe44762cd5fc4f657a28f83ffc9f7..9ec08995ed49a91e48c044690c9770f121fcf9a5 100644
--- a/alfa-client/libs/admin-settings/src/lib/user/user.service.ts
+++ b/alfa-client/libs/admin-settings/src/lib/user/user.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable, first, map, startWith, tap } from 'rxjs';
import { Organisationseinheit, OrganisationseinheitState } from './user.model';
-import { BehaviorSubject, first, map, Observable, startWith, tap } from 'rxjs';
import { UserRepository } from './user.repository.service';
@Injectable({
diff --git a/alfa-client/libs/admin-settings/src/lib/user/user.util.spec.ts b/alfa-client/libs/admin-settings/src/lib/user/user.util.spec.ts
index 0459c56f17adff420dc85eef851f297c9d0ec93e..7c0a60daa8b3f7e03fc2b974ada2d7b4ae2f4d13 100644
--- a/alfa-client/libs/admin-settings/src/lib/user/user.util.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/user/user.util.spec.ts
@@ -1,6 +1,6 @@
import { createOrganisationseinheitError } from '../../../test/user/user';
import { OrganisationseinheitError, OrganisationseinheitErrorType } from './user.model';
-import { getOrganisationseinheitErrorMessage, KEYCLOAK_ERROR_MESSAGES } from './user.util';
+import { KEYCLOAK_ERROR_MESSAGES, getOrganisationseinheitErrorMessage } from './user.util';
describe('get organisationseinheit error message', () => {
it('should map known error message', () => {
diff --git a/alfa-client/libs/admin-settings/test/admin-settings.ts b/alfa-client/libs/admin-settings/test/admin-settings.ts
index cddc0ef72f75df27b32b26de83416c5de4a03cd9..d81dbd8109f79ac5eff68526de2aced072605d05 100644
--- a/alfa-client/libs/admin-settings/test/admin-settings.ts
+++ b/alfa-client/libs/admin-settings/test/admin-settings.ts
@@ -1,7 +1,7 @@
import { Resource } from '@ngxp/rest';
-import { SettingItemResource, SettingListResource } from '../src/lib/admin-settings.model';
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[],
diff --git a/alfa-client/libs/admin-settings/test/configuration/configuration.ts b/alfa-client/libs/admin-settings/test/configuration/configuration.ts
index b634c257c5acd62e073cae78f7893361dd00e48e..32e4ed5cac791a9c3c9ea0c6520f9df6decfe905 100644
--- a/alfa-client/libs/admin-settings/test/configuration/configuration.ts
+++ b/alfa-client/libs/admin-settings/test/configuration/configuration.ts
@@ -1,6 +1,6 @@
-import { ConfigurationResource } from '../../src/lib/configuration/configuration.model';
import { toResource } from '../../../tech-shared/test/resource';
import { ConfigurationLinkRel } from '../../src/lib/configuration/configuration.linkrel';
+import { ConfigurationResource } from '../../src/lib/configuration/configuration.model';
export function createConfigurationResource(): ConfigurationResource {
return toResource({}, [ConfigurationLinkRel.SETTING]);
diff --git a/alfa-client/libs/admin-settings/test/postfach/postfach.ts b/alfa-client/libs/admin-settings/test/postfach/postfach.ts
index 31fbf8b79bc0a23c2cbfae6a19d6f8ecd5d3c481..65dc1159f333f5aa897ff759b2a9de5a1c307398 100644
--- a/alfa-client/libs/admin-settings/test/postfach/postfach.ts
+++ b/alfa-client/libs/admin-settings/test/postfach/postfach.ts
@@ -1,11 +1,11 @@
+import faker from '@faker-js/faker';
+import { toResource } from '../../../tech-shared/test/resource';
+import { SettingItemResource, SettingName } from '../../src/lib/admin-settings.model';
import {
Postfach,
PostfachResource,
PostfachSettingsItem,
} from '../../src/lib/postfach/postfach.model';
-import { toResource } from '../../../tech-shared/test/resource';
-import { SettingItemResource, SettingName } from '../../src/lib/admin-settings.model';
-import faker from '@faker-js/faker';
export function createPostfach(): Postfach {
return {
diff --git a/alfa-client/libs/admin-settings/test/user/user.ts b/alfa-client/libs/admin-settings/test/user/user.ts
index 6668ac960823f7ae965dfefed7d37a883eb9116f..090c729b48a5a0bea9f37ea4ec790793bf49b1f5 100644
--- a/alfa-client/libs/admin-settings/test/user/user.ts
+++ b/alfa-client/libs/admin-settings/test/user/user.ts
@@ -1,12 +1,12 @@
+import { faker } from '@faker-js/faker';
+import { NetworkError } from '@keycloak/keycloak-admin-client';
+import type GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation';
import {
Organisationseinheit,
OrganisationseinheitError,
OrganisationseinheitErrorType,
OrganisationseinheitState,
} from '../../src/lib/user/user.model';
-import { faker } from '@faker-js/faker';
-import type GroupRepresentation from '@keycloak/keycloak-admin-client/lib/defs/groupRepresentation';
-import { NetworkError } from '@keycloak/keycloak-admin-client';
export function createOrganisationseinheit(): Organisationseinheit {
return {