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/apps/alfa-e2e/README.md b/alfa-client/apps/alfa-e2e/README.md
index b8daf6bedad35c68b22cb82eda4527878d5ae8a5..e54e685002d7a1d2eddf7ddbcf68214f741a5f0f 100644
--- a/alfa-client/apps/alfa-e2e/README.md
+++ b/alfa-client/apps/alfa-e2e/README.md
@@ -19,3 +19,11 @@ Beispiel Namespace: sh-mastere2emain-dev
3. Host Eintrag ergänzen: In `/etc/hosts` folgenden Eintrag ergänzen: `127.0.0.1 vorgang-manager-database-0.vorgang-manager-database-svc.sh-mastere2emain-dev.svc.cluster.local`
4. Cypress mit entsprechender config starten: `npm run cypress:open -- --config-file cypress-master-main.json`
+
+## docker-compose
+
+### -march Architektur
+
+In die `.env` Datei eintragen:
+
+ USER_MANAGER_DOCKER_IMAGE=march-snapshot-latest
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index c27955be603132e6ae731d4c2a8b6d1acd9341a6..154c8acf1c8bc8699222bda82de1282a1a3b8bd2 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -49,6 +49,13 @@ services:
- SPRING_DATA_MONGODB_DATABASE=local
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-local,e2e}
- LOGGING_CONFIG=classpath:log4j2-local.xml
+ - GRPC_CLIENT_PLUTO_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_CLIENT_VORGANG-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_CLIENT_EMAIL_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_CLIENT_NACHRICHTEN-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_CLIENT_INFO-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_CLIENT_COMMAND-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
+ - GRPC_SERVER_SECURITY_ENABLED=false
ports:
- 9091:9090
depends_on:
@@ -64,6 +71,7 @@ services:
- GRPC_CLIENT_USER-MANAGER_ADDRESS=static://user-manager:9000
- GRPC_CLIENT_USER-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
- GRPC_CLIENT_VORGANG-MANAGER_ADDRESS=static://vorgang-manager:9090
+ - GRPC_CLIENT_VORGANG-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
- KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
- KEYCLOAK_REALM=${KEYCLOAK_REALM:-by-e2e-tests-local-dev}
- KEYCLOAK_RESOURCE=${KEYCLOAK_CLIENT:-alfa}
diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
index c5a5333dfb746e774089d38f7759a8f40e19e5c0..9e0f6784b1f9f88bfdfcc492ca198dfa47babbbb 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
@@ -45,7 +45,7 @@ export class VorgangBescheidWizardE2EComponent {
private readonly bescheidSpeichernButton: string =
'bescheiderstellung-abbrechen-entwurf-speichern';
private readonly uploadBescheidFile: string = '-single-file-upload-button';
- private readonly uploadAttachment: string = 'Attachment_hochladen-file-upload-button';
+ private readonly uploadAttachment: string = 'Anhang_hochladen-file-upload-button';
private readonly saveBescheid: string = 'save-button';
private readonly confirmAndSaveButton: string = 'confirm-and-save-button';
diff --git a/alfa-client/apps/demo/src/app/app.component.html b/alfa-client/apps/demo/src/app/app.component.html
index 25380dd9f3c8fee4758246b0af005928d2cffd1f..693f99b0c88cd5577c6d4b42c9cab445ab2554a8 100644
--- a/alfa-client/apps/demo/src/app/app.component.html
+++ b/alfa-client/apps/demo/src/app/app.component.html
@@ -17,28 +17,24 @@
<div class="w-96">
<ods-attachment-container>
<ods-attachment
- documentName="Mein_2Bescheid.pdf"
+ caption="Mein_2Bescheid.pdf"
description="234 kB"
fileType="pdf"
isLoading="true"
>
</ods-attachment>
- <ods-attachment documentName="Mein_Bescheid.xml" description="234 kB" fileType="xml">
+ <ods-attachment caption="Mein_Bescheid.xml" description="234 kB" fileType="xml">
</ods-attachment>
- <ods-attachment documentName="Mein_Bescheid.xml" description="234 kB" fileType="image">
+ <ods-attachment caption="Mein_Bescheid.xml" description="234 kB" fileType="image">
</ods-attachment>
- <ods-attachment documentName="Mein_Bescheid.doc" description="234 kB" fileType="doc">
+ <ods-attachment caption="Mein_Bescheid.doc" description="234 kB" fileType="doc">
</ods-attachment>
- <ods-attachment documentName="Mein_Bescheid.doc" description="234 kB" fileType="doc">
+ <ods-attachment caption="Mein_Bescheid.doc" description="234 kB" fileType="doc">
</ods-attachment>
- <ods-attachment
- documentName="Mein_Bescheid.doc"
- description="234 kB"
- fileType="exclamation"
- >
+ <ods-attachment caption="Mein_Bescheid.doc" description="234 kB" fileType="exclamation">
</ods-attachment>
<ods-attachment
- documentName="Katzenanmeldung_1231231_eingsdfsdsdfdsfdsfsdfang.pdf"
+ caption="Katzenanmeldung_1231231_eingsdfsdsdfdsfdsfsdfang.pdf"
description="234 kB"
fileType="pdf"
>
@@ -153,7 +149,7 @@
<ods-button-card
class="w-72"
[isLoading]="false"
- text="Bescheid-Dokument"
+ text="Bescheiddokument"
subText="automatisch erstellen"
>
<ods-bescheid-generate-icon icon />
@@ -164,7 +160,7 @@
<ods-button-card
class="w-72"
[isLoading]="true"
- text="Bescheid-Dokument"
+ text="Bescheiddokument"
subText="automatisch erstellen"
>
<ods-bescheid-generate-icon icon />
@@ -175,7 +171,7 @@
<ods-button-card
class="w-72"
[isLoading]="true"
- text="Bescheid-Dokument"
+ text="Bescheiddokument"
subText="automatisch erstellen"
>
<ods-bescheid-generate-icon icon />
@@ -186,7 +182,7 @@
<ods-button-card
class="w-96"
[isLoading]="true"
- text="Bescheid-Dokument und noch mehr"
+ text="Bescheiddokument und noch mehr"
subText="Subtext in der 2ten Reihe"
>
<ods-bescheid-generate-icon icon />
@@ -194,7 +190,7 @@
</div>
<div class="mt-4">
- <ods-button-card class="w-72" [isLoading]="true" text="Bescheid-Dokument">
+ <ods-button-card class="w-72" [isLoading]="true" text="Bescheiddokument">
<ods-bescheid-generate-icon icon />
</ods-button-card>
</div>
@@ -203,14 +199,14 @@
<ods-file-upload-button class="w-72" [isLoading]="false" id="upload117">
<ods-bescheid-upload-icon icon />
<ods-spinner-icon spinner size="extra-large" />
- <p text class="text-center">Bescheid-Dokument<br />hochladen</p></ods-file-upload-button
+ <p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
<div class="mt-4">
<ods-file-upload-button class="w-72" [isLoading]="true" id="upload117">
<ods-bescheid-upload-icon icon />
<ods-spinner-icon spinner size="extra-large" />
- <p text class="text-center">Bescheid-Dokument<br />hochladen</p></ods-file-upload-button
+ <p text class="text-center">Bescheiddokument<br />hochladen</p></ods-file-upload-button
>
</div>
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-resource.service.ts b/alfa-client/libs/admin-settings/src/lib/admin-settings-resource.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..67ded869c2c64e15d7a382d8ede37ee6e3eb458b
--- /dev/null
+++ b/alfa-client/libs/admin-settings/src/lib/admin-settings-resource.service.ts
@@ -0,0 +1,34 @@
+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 { ConfigurationLinkRel } from './configuration/configuration.linkrel';
+import { ConfigurationResource } from './configuration/configuration.model';
+import { ConfigurationService } from './configuration/configuration.service';
+
+export class SettingListResourceService extends ResourceListService<
+ Resource,
+ SettingListResource,
+ SettingItemResource
+> {}
+
+export function createSettingListResourceService(
+ repository: ResourceRepository,
+ configurationService: ConfigurationService,
+) {
+ return new ResourceListService(buildConfig(configurationService), repository);
+}
+function buildConfig(
+ configurationService: ConfigurationService,
+): ListResourceServiceConfig<ConfigurationResource> {
+ return {
+ baseResource: configurationService.get(),
+ createLinkRel: SettingListLinkRel.CREATE,
+ listLinkRel: ConfigurationLinkRel.SETTING,
+ listResourceListLinkRel: SettingListLinkRel.LIST,
+ };
+}
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..99b04e136805e4fec867cfe801aa82ab6ded3936 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,41 @@
-import { NgModule } from '@angular/core';
+import { ApiRootService } from '@alfa-client/api-root-shared';
+import { Environment, ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
+import { ResourceRepository, TechSharedModule } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
-import { TechSharedModule } from '@alfa-client/tech-shared';
-import { NavigationItemComponent } from './shared/navigation-item/navigation-item.component';
-import { RouterModule } from '@angular/router';
+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 {
+ createSettingListResourceService,
+ SettingListResourceService,
+} from './admin-settings-resource.service';
+import { SettingsService } from './admin-settings.service';
+import {
+ ConfigurationResourceService,
+ createConfigurationResourceService,
+} from './configuration/configuration-resource.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 {
+ createPostfachResourceService,
+ PostfachResourceService,
+} from './postfach/postfach-resource.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: [
@@ -62,6 +75,21 @@ import { SpinnerComponent } from './shared/spinner/spinner.component';
}),
deps: [ENVIRONMENT_CONFIG],
},
+ {
+ provide: PostfachResourceService,
+ useFactory: createPostfachResourceService,
+ deps: [ResourceRepository, SettingsService],
+ },
+ {
+ provide: ConfigurationResourceService,
+ useFactory: createConfigurationResourceService,
+ deps: [ResourceRepository, ApiRootService],
+ },
+ {
+ provide: SettingListResourceService,
+ useFactory: createSettingListResourceService,
+ deps: [ResourceRepository, ConfigurationService],
+ },
],
})
export class AdminSettingsModule {}
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..0dae05ec7a255b758dc57b5041376fafc1894b7f 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,69 +1,32 @@
-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 { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { Observable, of } from 'rxjs';
-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 { singleCold } from '../../../tech-shared/test/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 { SettingListLinkRel } from './admin-settings.linkrel';
+import { createPostfachResource, createSettingItemResource } from '../../test/postfach/postfach';
+import { SettingListResourceService } from './admin-settings-resource.service';
+import { SettingListResource } from './admin-settings.model';
+import { SettingsService } from './admin-settings.service';
+import { PostfachResource } from './postfach/postfach.model';
describe('SettingsService', () => {
let service: SettingsService;
- let configurationService: Mock<ConfigurationService>;
- let repository: Mock<ResourceRepository>;
-
- const configurationStateResource$: Observable<StateResource<ConfigurationResource>> = of(
- createStateResource(createConfigurationResource()),
- );
+ let settingListResourceService: Mock<SettingListResourceService>;
beforeEach(() => {
- configurationService = mock(ConfigurationService);
- configurationService.getConfigurationResource.mockReturnValue(configurationStateResource$);
-
- repository = mock(ResourceRepository);
+ settingListResourceService = mock(SettingListResourceService);
- service = new SettingsService(useFromMock(configurationService), useFromMock(repository));
+ service = new SettingsService(useFromMock(settingListResourceService));
});
it('should create', () => {
expect(service).toBeTruthy();
});
- it('should create resourceService', () => {
- expect(service.resourceService).toBeTruthy();
- });
-
- describe('build config', () => {
- it('should have baseResource', () => {
- const config: ListResourceServiceConfig<ConfigurationResource> = service.buildConfig();
-
- expect(config.baseResource).toBe(configurationStateResource$);
- });
-
- it('should have createLinkRel', () => {
- const config: ListResourceServiceConfig<ConfigurationResource> = service.buildConfig();
-
- expect(config.createLinkRel).toBe(SettingListLinkRel.CREATE);
- });
-
- it('should have istLinKRel', () => {
- const config: ListResourceServiceConfig<ConfigurationResource> = service.buildConfig();
-
- expect(config.listLinkRel).toBe(SettingListLinkRel.LIST);
- });
- });
-
describe('get Postfach', () => {
const postfachResource = createPostfachResource();
const postfachStateResource: StateResource<PostfachResource> =
@@ -73,13 +36,13 @@ describe('SettingsService', () => {
);
beforeEach(() => {
- service.resourceService.getList = jest.fn().mockReturnValue(of(settingsListResource));
+ settingListResourceService.getList = jest.fn().mockReturnValue(of(settingsListResource));
});
it('should call resource service', () => {
service.getPostfach();
- expect(service.resourceService.getList).toHaveBeenCalled();
+ expect(settingListResourceService.getList).toHaveBeenCalled();
});
it('should return null for non postfach resource', () => {
@@ -87,7 +50,7 @@ describe('SettingsService', () => {
createSettingsListResource([createSettingItemResource()]),
);
- service.resourceService.getList = jest
+ settingListResourceService.getList = jest
.fn()
.mockReturnValue(singleCold(emptySettingsListResource));
@@ -96,7 +59,9 @@ describe('SettingsService', () => {
});
it('should return item resource as postfach resource', () => {
- service.resourceService.getList = jest.fn().mockReturnValue(singleCold(settingsListResource));
+ settingListResourceService.getList = jest
+ .fn()
+ .mockReturnValue(singleCold(settingsListResource));
const postfach: Observable<StateResource<PostfachResource>> = service.getPostfach();
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..10697e4a4b6e128637d423fa7340b8f6dec11c15 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,40 +1,15 @@
-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 { Injectable } from '@angular/core';
+import { Observable, map } from 'rxjs';
+import { SettingListResourceService } from './admin-settings-resource.service';
import { getPostfachResource } from './admin-settings.util';
-import { SettingListLinkRel } from './admin-settings.linkrel';
+import { PostfachResource } from './postfach/postfach.model';
@Injectable()
export class SettingsService {
- resourceService: ResourceListService<
- ConfigurationResource,
- SettingListResource,
- SettingItemResource
- >;
-
- constructor(
- private configurationService: ConfigurationService,
- repository: ResourceRepository,
- ) {
- this.resourceService = new ResourceListService(this.buildConfig(), repository);
- }
-
- buildConfig(): ListResourceServiceConfig<ConfigurationResource> {
- return {
- baseResource: this.configurationService.getConfigurationResource(),
- createLinkRel: SettingListLinkRel.CREATE,
- listLinkRel: SettingListLinkRel.LIST,
- };
- }
+ constructor(private settingListResourceService: SettingListResourceService) {}
public getPostfach(): Observable<StateResource<PostfachResource>> {
- return this.resourceService.getList().pipe(map(getPostfachResource));
+ return this.settingListResourceService.getList().pipe(map(getPostfachResource));
}
}
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-resource.service.ts b/alfa-client/libs/admin-settings/src/lib/configuration/configuration-resource.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f73458583b348631669fe5479cbcc597f0cf5c61
--- /dev/null
+++ b/alfa-client/libs/admin-settings/src/lib/configuration/configuration-resource.service.ts
@@ -0,0 +1,26 @@
+import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
+import {
+ ApiResourceService,
+ ResourceRepository,
+ ResourceServiceConfig,
+} from '@alfa-client/tech-shared';
+import { ConfigurationResource } from './configuration.model';
+
+export class ConfigurationResourceService extends ApiResourceService<
+ ApiRootResource,
+ ConfigurationResource
+> {}
+
+export function createConfigurationResourceService(
+ repository: ResourceRepository,
+ apiRootService: ApiRootService,
+) {
+ return new ApiResourceService(buildConfig(apiRootService), repository);
+}
+
+function buildConfig(apiRootService: ApiRootService): ResourceServiceConfig<ApiRootResource> {
+ return {
+ resource: apiRootService.getApiRoot(),
+ getLinkRel: ApiRootLinkRel.CONFIGURATION,
+ };
+}
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..df7a4250f9fdd077594d0743e2c82cef23c5b059 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,61 +1,47 @@
-import { ApiRootService, ApiRootResource } 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 { ResourceRepository } from 'libs/tech-shared/src/lib/resource/resource.repository';
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs';
+import { singleCold, singleHot } from '../../../../tech-shared/test/marbles';
+import { createConfigurationResource } from '../../../test/configuration/configuration';
+import { ConfigurationResourceService } from './configuration-resource.service';
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;
- let apiRootService: Mock<ApiRootService>;
- let repository: Mock<ResourceRepository>;
-
- const apiRootStateResource$: Observable<StateResource<ApiRootResource>> = of(
- createStateResource(createApiRootResource()),
- );
+ let configurationResourceService: Mock<ConfigurationResourceService>;
beforeEach(() => {
- apiRootService = mock(ApiRootService);
- apiRootService.getApiRoot.mockReturnValue(apiRootStateResource$);
+ configurationResourceService = mock(ConfigurationResourceService);
- repository = mock(ResourceRepository);
-
- service = new ConfigurationService(useFromMock(apiRootService), useFromMock(repository));
+ service = new ConfigurationService(useFromMock(configurationResourceService));
});
it('should create', () => {
expect(service).toBeTruthy();
});
- it('should create resourceService', () => {
- expect(service.resourceService).toBeTruthy();
- });
-
- describe('get configuration resource', () => {
+ describe('get', () => {
const configurationResource: ConfigurationResource = createConfigurationResource();
const configurationStateResource: StateResource<ConfigurationResource> =
createStateResource(configurationResource);
beforeEach(() => {
- service.resourceService.get = jest
+ configurationResourceService.get = jest
.fn()
.mockReturnValue(singleHot(configurationStateResource));
});
it('should call resourceService', () => {
- service.resourceService.get = jest.fn();
+ configurationResourceService.get = jest.fn();
- service.getConfigurationResource();
+ service.get();
- expect(service.resourceService.get).toHaveBeenCalled();
+ expect(configurationResourceService.get).toHaveBeenCalled();
});
it('should return value', () => {
const loadedConfigurationResource: Observable<StateResource<ConfigurationResource>> =
- service.getConfigurationResource();
+ service.get();
expect(loadedConfigurationResource).toBeObservable(singleCold(configurationStateResource));
});
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..6c0ed41b4b3aadaa3efed0aebdf87d9268c6d297 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
@@ -1,33 +1,14 @@
-import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
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 { ConfigurationResourceService } from './configuration-resource.service';
import { ConfigurationResource } from './configuration.model';
@Injectable()
export class ConfigurationService {
- resourceService: ResourceService<ApiRootResource, ConfigurationResource>;
+ constructor(private configurationResourceService: ConfigurationResourceService) {}
- constructor(
- private apiRootService: ApiRootService,
- repository: ResourceRepository,
- ) {
- this.resourceService = new ResourceService(this.buildConfig(), repository);
- }
-
- buildConfig(): ResourceServiceConfig<ApiRootResource> {
- return {
- resource: this.apiRootService.getApiRoot(),
- getLinkRel: ApiRootLinkRel.CONFIGURATION,
- deleteLinkRel: null,
- editLinkRel: null,
- };
- }
-
- public getConfigurationResource(): Observable<StateResource<ConfigurationResource>> {
- return this.resourceService.get();
+ public get(): Observable<StateResource<ConfigurationResource>> {
+ return this.configurationResourceService.get();
}
}
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..417eec4616318c4c8b39eb639906e3433eaa78fe 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/test/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..03bef4912b7d8a510ee06cfaa2ec438ae318b278 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 { Observable, lastValueFrom, throwError } from 'rxjs';
+import { singleCold, singleHot } from '../../../../../../tech-shared/test/marbles';
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..49de353525058623dc206167d4e3344437ffc439 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 { singleCold, singleHot } from '../../../../../tech-shared/test/marbles';
+import { Mock, mock } from '../../../../../test-utils/src/lib/mocking';
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..f786c3e04a73e2bc719cacf654aaf0c01d77039d 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,27 @@
-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 { ProblemDetail, createStateResource } from '@alfa-client/tech-shared';
import {
+ Mock,
dispatchEventFromFixture,
existsAsHtmlElement,
getDebugElementFromFixtureByCss,
getElementFromFixture,
- Mock,
mock,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
-
-import { PostfachFormService } from './postfach.formservice';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
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 { createInvalidParam, createProblemDetail } from '../../../../../../tech-shared/test/error';
+import { singleCold } from '../../../../../../tech-shared/test/marbles';
+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 { PostfachFormComponent } from './postfach-form.component';
+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-resource.service.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-resource.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..07f664fc2293fa9b9e5418d0ffc4a5cfe847a084
--- /dev/null
+++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-resource.service.ts
@@ -0,0 +1,28 @@
+import {
+ ApiResourceService,
+ ResourceRepository,
+ ResourceServiceConfig,
+} from '@alfa-client/tech-shared';
+import { SettingsService } from '../admin-settings.service';
+import { PostfachLinkRel } from './postfach.linkrel';
+import { PostfachResource } from './postfach.model';
+
+export class PostfachResourceService extends ApiResourceService<
+ PostfachResource,
+ PostfachResource
+> {}
+
+export function createPostfachResourceService(
+ repository: ResourceRepository,
+ settingService: SettingsService,
+) {
+ return new ApiResourceService(buildConfig(settingService), repository);
+}
+
+function buildConfig(settingService: SettingsService): ResourceServiceConfig<PostfachResource> {
+ return {
+ resource: settingService.getPostfach(),
+ getLinkRel: PostfachLinkRel.SELF,
+ edit: { linkRel: PostfachLinkRel.SELF },
+ };
+}
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..ca41b7c408ecec8a94ed38459aae668038c8f0ee 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,81 +1,40 @@
+import { HttpError, StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { Type } from '@angular/core';
+import { Observable } from 'rxjs';
+import { singleCold, singleHot } from '../../../../tech-shared/test/marbles';
+import { createPostfachResource, createPostfachSettingItem } from '../../../test/postfach/postfach';
+import { PostfachResourceService } from './postfach-resource.service';
import { PostfachResource, PostfachSettingsItem } from './postfach.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 { PostfachLinkRel } from './postfach.linkrel';
describe('PostfachService', () => {
let service: PostfachService;
- let settingsService: Mock<SettingsService>;
- let repository: Mock<ResourceRepository>;
-
- const postfachStateResource$: Observable<StateResource<PostfachResource>> = of(
- createStateResource(createPostfachResource()),
- );
+ let resourceService: Mock<PostfachResourceService>;
beforeEach(() => {
- repository = mock(ResourceRepository);
- settingsService = mock(SettingsService);
- settingsService.getPostfach.mockReturnValue(postfachStateResource$);
+ resourceService = mockResourceService(PostfachResourceService);
- service = new PostfachService(useFromMock(settingsService), useFromMock(repository));
+ service = new PostfachService(useFromMock(resourceService));
});
it('should create', () => {
expect(service).toBeTruthy();
});
- it('should create resourceService', () => {
- expect(service.resourceService).toBeTruthy();
- });
-
- describe('build config', () => {
- it('should have resource', () => {
- const config: ResourceServiceConfig<PostfachResource> = service.buildConfig();
-
- expect(config.resource).toBe(postfachStateResource$);
- });
-
- it('should have editLinkRel', () => {
- const config: ResourceServiceConfig<PostfachResource> = service.buildConfig();
-
- expect(config.editLinkRel).toBe(PostfachLinkRel.SELF);
- });
-
- it('should have deleteLinkRel', () => {
- const config: ResourceServiceConfig<PostfachResource> = service.buildConfig();
-
- expect(config.deleteLinkRel).toBe(PostfachLinkRel.SELF);
- });
-
- it('should have getLinkRel', () => {
- const config: ResourceServiceConfig<PostfachResource> = service.buildConfig();
-
- expect(config.getLinkRel).toBe(PostfachLinkRel.SELF);
- });
- });
-
describe('get', () => {
const postfachResource: PostfachResource = createPostfachResource();
const postfachStateResource: StateResource<PostfachResource> =
createStateResource(postfachResource);
it('should call resourceservice get', () => {
- service.resourceService.get = jest.fn();
-
service.get();
- expect(service.resourceService.get).toHaveBeenCalled();
+ expect(resourceService.get).toHaveBeenCalled();
});
it('should reurn value', () => {
- service.resourceService.get = jest.fn().mockReturnValue(singleCold(postfachStateResource));
+ resourceService.get.mockReturnValue(singleCold(postfachStateResource));
const returnedPostfachResource: Observable<StateResource<PostfachResource | HttpError>> =
service.get();
@@ -88,18 +47,16 @@ describe('PostfachService', () => {
const postfachSettingsItem: PostfachSettingsItem = createPostfachSettingItem();
it('should call resourceService', () => {
- service.resourceService.save = jest.fn();
-
service.save(postfachSettingsItem.settingBody);
- expect(service.resourceService.save).toHaveBeenCalledWith(postfachSettingsItem);
+ expect(resourceService.save).toHaveBeenCalledWith(postfachSettingsItem);
});
it('should return saved value', () => {
const postfachResource: PostfachResource = createPostfachResource();
const postfachStateResource: StateResource<PostfachResource> =
createStateResource(postfachResource);
- service.resourceService.save = jest.fn().mockReturnValue(singleCold(postfachStateResource));
+ resourceService.save.mockReturnValue(singleCold(postfachStateResource));
const savedPostfach: Observable<StateResource<PostfachResource | HttpError>> = service.save(
postfachResource.settingBody,
@@ -109,3 +66,7 @@ describe('PostfachService', () => {
});
});
});
+
+export function mockResourceService<T>(service: Type<T>): Mock<T> {
+ return <Mock<T>>{ ...mock(service), get: jest.fn(), save: jest.fn() };
+}
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..24eb2f3b5b2ad34101a7ba4cfe920a709949e88c 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,40 +1,20 @@
+import { HttpError, StateResource } from '@alfa-client/tech-shared';
import { Injectable } from '@angular/core';
-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 { PostfachLinkRel } from './postfach.linkrel';
+import { PostfachResourceService } from './postfach-resource.service';
+import { Postfach, PostfachResource, PostfachSettingsItem } from './postfach.model';
@Injectable()
export class PostfachService {
- resourceService: ResourceService<PostfachResource, PostfachResource>;
-
- constructor(
- private settingsService: SettingsService,
- repository: ResourceRepository,
- ) {
- this.resourceService = new ResourceService(this.buildConfig(), repository);
- }
-
- buildConfig(): ResourceServiceConfig<PostfachResource> {
- return {
- resource: this.settingsService.getPostfach(),
- editLinkRel: PostfachLinkRel.SELF,
- deleteLinkRel: PostfachLinkRel.SELF,
- getLinkRel: PostfachLinkRel.SELF,
- };
- }
+ constructor(private postfachResourceService: PostfachResourceService) {}
public get(): Observable<StateResource<PostfachResource>> {
- return this.resourceService.get();
+ return this.postfachResourceService.get();
}
public save(postfach: Postfach): Observable<StateResource<PostfachResource | HttpError>> {
- return this.resourceService.save(this.buildPostfachSettingItem(postfach));
+ return this.postfachResourceService.save(this.buildPostfachSettingItem(postfach));
}
private buildPostfachSettingItem(postfach: Postfach): PostfachSettingsItem {
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..47926c8e111e9ab28bc517ef13add588011b0d1e 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 { fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { UserRepository } from './user.repository.service';
-import KcAdminClient, { NetworkError } from '@keycloak/keycloak-admin-client';
import { Mock, mock } from '@alfa-client/test-utils';
+import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { faker } from '@faker-js/faker';
+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 { Groups } from '@keycloak/keycloak-admin-client/lib/resources/groups';
+import { OAuthService } from 'angular-oauth2-oidc';
+import { Observable, OperatorFunction, catchError, firstValueFrom, of, 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..f15073e7d7fc75be636949747d6189d6650b6c6f 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/test/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 {
diff --git a/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts b/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
index 3b6aec231b071a2237cb64bb74efbd83ce41e0cd..557766ea0c2423c63d1d249548489dcbbeee0001 100644
--- a/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
+++ b/alfa-client/libs/api-root-shared/src/lib/api-root.service.spec.ts
@@ -28,17 +28,17 @@ import {
StateResource,
} from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { fakeAsync, tick } from '@angular/core/testing';
import { getUrl } from '@ngxp/rest';
import { cold, hot } from 'jest-marbles';
import { Observable, of } from 'rxjs';
import { createBinaryFileResource } from '../../../binary-file-shared/test/binary-file';
+import { singleCold } from '../../../tech-shared/test/marbles';
import { createApiRootResource } from '../../test/api-root';
import { ApiRootFacade } from './+state/api-root.facade';
import { ApiRootResource } from './api-root.model';
import { ApiRootRepository } from './api-root.repository';
import { ApiRootService } from './api-root.service';
-import { singleCold } from '../../../tech-shared/src/lib/resource/marbles';
-import { fakeAsync, tick } from '@angular/core/testing';
describe('ApiRootService', () => {
let service: ApiRootService;
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
index c46e27fb7f765e4c4b62d554aa614e0497b0ca16..71dc21f419656314c564a01cf6f51cd6907b19d9 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
@@ -11,12 +11,12 @@ import {
} from '@alfa-client/command-shared';
import {
ApiError,
- EMPTY_STRING,
- HttpError,
- StateResource,
createEmptyStateResource,
createErrorStateResource,
createStateResource,
+ EMPTY_STRING,
+ HttpError,
+ StateResource,
} from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import {
@@ -27,24 +27,25 @@ import {
} from '@alfa-client/vorgang-shared';
import { fakeAsync, tick } from '@angular/core/testing';
import faker from '@faker-js/faker';
-import { ResourceUri, getUrl } from '@ngxp/rest';
+import { getUrl, ResourceUri } from '@ngxp/rest';
import { cold } from 'jest-marbles';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
import { createApiError } from 'libs/tech-shared/test/error';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { Observable, first, of } from 'rxjs';
+import { first, Observable, of } from 'rxjs';
import {
createBinaryFileListResource,
createBinaryFileResource,
} from '../../../binary-file-shared/test/binary-file';
import {
+ createCommandErrorResource,
createCommandResource,
createCommandStateResource,
createCreateCommandProps,
} from '../../../command-shared/test/command';
-import { singleCold, singleColdCompleted } from '../../../tech-shared/src/lib/resource/marbles';
import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository';
import { createFile } from '../../../tech-shared/test/file';
+import { singleCold, singleColdCompleted } from '../../../tech-shared/test/marbles';
import {
createBescheid,
createBescheidListResource,
@@ -458,10 +459,10 @@ describe('BescheidService', () => {
});
it('should clear create bescheid document in progress', (done) => {
- service.createBescheidDocumentInProgress$.next(createUploadFileInProgress());
+ service.createBescheidDocumentInProgress$.next(createCommandStateResource());
service.updateBescheid(bescheid).subscribe(() => {
- expect(service.createBescheidDocumentInProgress$.value).toEqual({ loading: false });
+ expect(service.createBescheidDocumentInProgress$.value).toEqual(createEmptyStateResource());
done();
});
});
@@ -479,8 +480,7 @@ describe('BescheidService', () => {
describe('send bescheid', () => {
const bescheidResource: BescheidResource = createBescheidResource();
const createCommandProps: CreateCommandProps = createCreateCommandProps();
- const commandStateResource: StateResource<CommandResource> =
- createStateResource(createCommandResource());
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
const linkRel: string = 'link_rel';
let buildSendBescheidCommandPropsSpy: jest.SpyInstance;
@@ -527,8 +527,7 @@ describe('BescheidService', () => {
describe('sendBescheidManually', () => {
const bescheidResource: BescheidResource = createBescheidResource();
- const sendBescheidCommand: StateResource<CommandResource> =
- createStateResource(createCommandResource());
+ const sendBescheidCommand: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
service.sendBescheid = jest.fn().mockReturnValue(of(sendBescheidCommand));
@@ -553,8 +552,7 @@ describe('BescheidService', () => {
describe('sendBescheidToAntragsteller', () => {
const bescheidResource: BescheidResource = createBescheidResource();
- const sendBescheidCommand: StateResource<CommandResource> =
- createStateResource(createCommandResource());
+ const sendBescheidCommand: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
service.sendBescheid = jest.fn().mockReturnValue(of(sendBescheidCommand));
@@ -582,9 +580,15 @@ describe('BescheidService', () => {
const bescheidResource: BescheidResource = createBescheidResource();
const createCommandProps: CreateCommandProps = createCreateCommandProps();
- const buildUpdateBescheidCommandPropsSpy: jest.SpyInstance = jest
- .spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
- .mockReturnValue(createCommandProps);
+ let buildUpdateBescheidCommandPropsSpy: jest.SpyInstance;
+
+ beforeEach(() => {
+ buildUpdateBescheidCommandPropsSpy = jest
+ .spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
+ .mockReturnValue(createCommandProps);
+ commandService.createCommandByProps.mockClear();
+ commandService.createCommandByProps.mockReturnValue(of(createCommandStateResource()));
+ });
it('should build update bescheid command props', () => {
service.doUpdateBescheid(bescheidResource, bescheid);
@@ -592,7 +596,7 @@ describe('BescheidService', () => {
expect(buildUpdateBescheidCommandPropsSpy).toHaveBeenCalledWith(bescheidResource, bescheid);
});
- it.skip('should call command service', () => {
+ it('should call command service', () => {
service.doUpdateBescheid(bescheidResource, bescheid).subscribe();
expect(commandService.createCommandByProps).toHaveBeenCalledWith(createCommandProps);
@@ -680,16 +684,10 @@ describe('BescheidService', () => {
});
it('should clear create bescheid document', () => {
- service.createBescheidDocumentInProgress$.next({
- loading: true,
- fileName: 'Dummy',
- error: createApiError(),
- });
+ service.createBescheidDocumentInProgress$.next(createCommandStateResource());
service.uploadBescheidDocument(bescheid, file);
- expect(service.createBescheidDocumentInProgress$.value).toEqual({
- loading: false,
- });
+ expect(service.createBescheidDocumentInProgress$.value).toEqual(createEmptyStateResource());
});
it('should call do upload bescheid document', () => {
@@ -788,8 +786,7 @@ describe('BescheidService', () => {
const createCommandProps: CreateCommandProps = createCreateCommandProps();
let buildCreateBescheidDocumentFromFilePropsSpy;
- const commandStateResource: StateResource<CommandResource> =
- createStateResource(createCommandResource());
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
buildCreateBescheidDocumentFromFilePropsSpy = jest
@@ -919,6 +916,14 @@ describe('BescheidService', () => {
singleCold(createEmptyStateResource()),
);
});
+
+ it('should emit empty state resource uploaded attachment', () => {
+ service.init();
+
+ expect(service.getUploadedAttachment()).toBeObservable(
+ singleCold(createEmptyStateResource()),
+ );
+ });
});
describe('create bescheid document', () => {
@@ -996,20 +1001,20 @@ describe('BescheidService', () => {
});
describe('on error', () => {
- const apiError: HttpError = createApiError();
- const commandErrorStateResource: StateResource<CommandResource> =
- createErrorStateResource(apiError);
+ const commandErrorStateResource: StateResource<CommandResource> = createStateResource(
+ createCommandErrorResource(),
+ );
- it('should set error ', () => {
+ it('should emit command state resource', () => {
commandService.createCommandByProps.mockReturnValue(of(commandErrorStateResource));
service.createBescheidDocument();
- expect(service.createBescheidDocumentInProgress$.value.error).toBe(apiError);
+ expect(service.createBescheidDocumentInProgress$.value).toBe(commandErrorStateResource);
});
it('should set create bescheid document in progress loading false', () => {
- service.createBescheidDocumentInProgress$.next({ loading: true });
+ service.createBescheidDocumentInProgress$.next(createEmptyStateResource(true));
commandService.createCommandByProps.mockReturnValue(of(commandErrorStateResource));
service.createBescheidDocument();
@@ -1152,7 +1157,7 @@ describe('BescheidService', () => {
});
it('should set create bescheid document in progress loading false', () => {
- service.createBescheidDocumentInProgress$.next({ loading: true });
+ service.createBescheidDocumentInProgress$.next(createEmptyStateResource(true));
service.loadBescheidDocumentFile(document);
@@ -1228,33 +1233,22 @@ describe('BescheidService', () => {
describe('get last bescheid', () => {
const bescheid: BescheidResource = createBescheidResource();
const bescheide: BescheidResource[] = [bescheid];
- const bescheidListStateResource: StateResource<BescheidListResource> = createStateResource(
- createBescheidListResource(bescheide),
- );
+
let sortByGermanDateStrSpy: jest.SpyInstance;
- let getEmbeddedBescheidResourcesSpy: jest.SpyInstance;
+ let getItemsSpy: jest.SpyInstance;
beforeEach(() => {
- service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
sortByGermanDateStrSpy = jest
.spyOn(DateUtil, 'sortByGermanDateStr')
.mockReturnValue(bescheide);
- getEmbeddedBescheidResourcesSpy = jest
- .spyOn(BescheidUtil, 'getEmbeddedBescheidResources')
- .mockReturnValue(bescheide);
+ getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
});
- it('should get bescheid list', () => {
+ it('should get items', () => {
service.getLastBescheid().pipe(first()).subscribe();
- expect(service.getBescheidList).toHaveBeenCalled();
- });
-
- it('should get embedded bescheid resource from list', () => {
- service.getLastBescheid().pipe(first()).subscribe();
-
- expect(getEmbeddedBescheidResourcesSpy).toHaveBeenCalledWith(bescheidListStateResource);
+ expect(getItemsSpy).toHaveBeenCalled();
});
it('should filter by sent status', () => {
@@ -1282,25 +1276,18 @@ describe('BescheidService', () => {
const bescheidListStateResource: StateResource<BescheidListResource> = createStateResource(
createBescheidListResource(bescheide),
);
- let getEmbeddedBescheidResourcesSpy: jest.SpyInstance;
+ let getItemsSpy: jest.SpyInstance;
beforeEach(() => {
service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
- getEmbeddedBescheidResourcesSpy = jest
- .spyOn(BescheidUtil, 'getEmbeddedBescheidResources')
- .mockReturnValue(bescheide);
- });
- it('should get bescheid list', () => {
- service.existBescheid().pipe(first()).subscribe();
-
- expect(service.getBescheidList).toHaveBeenCalled();
+ getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
});
- it('should get embedded bescheid resources from list', () => {
+ it('should get items', () => {
service.existBescheid().pipe(first()).subscribe();
- expect(getEmbeddedBescheidResourcesSpy).toHaveBeenCalledWith(bescheidListStateResource);
+ expect(getItemsSpy).toHaveBeenCalled();
});
it('should filter by sent status', () => {
@@ -1361,4 +1348,98 @@ describe('BescheidService', () => {
expect(service.bescheidListService.refresh).toHaveBeenCalled();
});
});
+
+ describe('uploadAttachment', () => {
+ const bescheidResource: BescheidResource = createBescheidResource([
+ BescheidLinkRel.UPLOAD_ATTACHMENT,
+ ]);
+ const file: File = createFile();
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
+ createBinaryFileResource(),
+ );
+
+ beforeEach(() => {
+ binaryFileService.uploadFile.mockReturnValue(of(binaryFileStateResource));
+ service.handleAttachmentUpload = jest.fn();
+ });
+
+ it('should emit upload in progress', () => {
+ service.uploadAttachment(bescheidResource, file).subscribe();
+
+ expect(service.getUploadAttachmentInProgress()).toBeObservable(
+ singleCold({ fileName: file.name, loading: true } as UploadFileInProgress),
+ );
+ });
+
+ it('should upload file', (done) => {
+ service.uploadAttachment(bescheidResource, file).subscribe(() => {
+ expect(binaryFileService.uploadFile).toBeCalledWith(
+ bescheidResource,
+ BescheidLinkRel.UPLOAD_ATTACHMENT,
+ file,
+ false,
+ );
+ done();
+ });
+ });
+
+ it('should handle attachment upload', (done) => {
+ service.uploadAttachment(bescheidResource, file).subscribe(() => {
+ expect(service.handleAttachmentUpload).toBeCalledWith(binaryFileStateResource);
+ done();
+ });
+ });
+
+ it('should emit uploaded binary file', () => {
+ expect(service.uploadAttachment(bescheidResource, file)).toBeObservable(
+ singleColdCompleted(binaryFileStateResource),
+ );
+ });
+ });
+
+ describe('handleAttachmentUpload', () => {
+ describe('on error', () => {
+ const binaryFileStateResource: StateResource<BinaryFileResource> =
+ createErrorStateResource(createApiError());
+
+ it('should emit upload in progress', () => {
+ service.handleAttachmentUpload(binaryFileStateResource);
+
+ expect(service.getUploadAttachmentInProgress()).toBeObservable(
+ singleCold({
+ loading: false,
+ error: binaryFileStateResource.error,
+ } as UploadFileInProgress),
+ );
+ });
+
+ it('should emit binary file', () => {
+ service.handleAttachmentUpload(binaryFileStateResource);
+
+ expect(service.getUploadedAttachment()).toBeObservable(singleCold(binaryFileStateResource));
+ });
+ });
+
+ describe('on success', () => {
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
+ createBinaryFileResource(),
+ );
+
+ it('should emit upload in progress', () => {
+ service.handleAttachmentUpload(binaryFileStateResource);
+
+ expect(service.getUploadAttachmentInProgress()).toBeObservable(
+ singleCold({
+ loading: false,
+ } as UploadFileInProgress),
+ );
+ });
+
+ it('should emit binary file', () => {
+ service.handleAttachmentUpload(binaryFileStateResource);
+
+ expect(service.getUploadedAttachment()).toBeObservable(singleCold(binaryFileStateResource));
+ });
+ });
+ });
});
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
index ed30ed6a5c79c3ca59cb7a08329bfb8f4c371353..1319d619d0cd50d9aefbf616003409ca3a9ebf3e 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
@@ -6,22 +6,24 @@ import {
import {
CommandOrder,
CommandResource,
+ CommandResourceService,
CommandService,
getEffectedResourceUrl,
+ hasCommandError,
tapOnCommandSuccessfullyDone,
} from '@alfa-client/command-shared';
import {
- HttpError,
- ResourceListService,
- StateResource,
createEmptyStateResource,
createStateResource,
filterIsLoadedOrHasError,
getEmbeddedResources,
- hasError,
+ hasStateResourceError,
+ HttpError,
isLoaded,
isNotEmpty,
+ ResourceListService,
sortByGermanDateStr,
+ StateResource,
} from '@alfa-client/tech-shared';
import {
VorgangCommandService,
@@ -31,16 +33,17 @@ import {
} from '@alfa-client/vorgang-shared';
import { getEmpfaenger } from '@alfa-client/vorgang-shared-ui';
import { Injectable } from '@angular/core';
-import { ResourceUri, getUrl, hasLink } from '@ngxp/rest';
+import { getUrl, hasLink, ResourceUri } from '@ngxp/rest';
import {
BehaviorSubject,
- Observable,
- Subscription,
filter,
first,
map,
+ Observable,
startWith,
+ Subscription,
switchMap,
+ tap,
} from 'rxjs';
import {
ListResourceServiceConfig,
@@ -49,7 +52,7 @@ import {
import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository';
import { ResourceService } from '../../../tech-shared/src/lib/resource/resource.service';
import { BescheidFacade } from './+state/bescheid.facade';
-import { BescheidLinkRel } from './bescheid.linkrel';
+import { BescheidLinkRel, BescheidListLinkRel } from './bescheid.linkrel';
import {
Bescheid,
BescheidListResource,
@@ -64,7 +67,6 @@ import {
buildDeleteBescheidCommandProps,
buildSendBescheidCommandProps,
buildUpdateBescheidCommandProps,
- getEmbeddedBescheidResources,
} from './bescheid.util';
import { DocumentLinkRel } from './document.linkrel';
import { DocumentResource } from './document.model';
@@ -91,12 +93,19 @@ export class BescheidService {
readonly bescheidList$: BehaviorSubject<StateResource<BescheidListResource>> =
new BehaviorSubject(createEmptyStateResource<BescheidListResource>());
- readonly createBescheidDocumentInProgress$: BehaviorSubject<UploadFileInProgress> =
- new BehaviorSubject<UploadFileInProgress>({ loading: false });
+ readonly createBescheidDocumentInProgress$: BehaviorSubject<StateResource<CommandResource>> =
+ new BehaviorSubject<StateResource<CommandResource>>(createEmptyStateResource());
readonly uploadBescheidDocumentInProgress$: BehaviorSubject<UploadFileInProgress> =
new BehaviorSubject<UploadFileInProgress>({ loading: false });
+ readonly uploadAttachmentInProgress$: BehaviorSubject<UploadFileInProgress> = new BehaviorSubject(
+ { loading: false },
+ );
+
+ readonly uploadedAttachment$: BehaviorSubject<StateResource<BinaryFileResource>> =
+ new BehaviorSubject(createEmptyStateResource());
+
loadBescheidDocumentSubscription: Subscription;
constructor(
@@ -107,9 +116,10 @@ export class BescheidService {
private readonly binaryFileService: BinaryFileService,
private readonly repository: ResourceRepository,
) {
- this.bescheidDraftService = new ResourceService(
+ this.bescheidDraftService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(),
repository,
+ this.commandService,
);
this.bescheidListService = new ResourceListService(
this.buildBescheidListServiceConfig(),
@@ -121,26 +131,28 @@ export class BescheidService {
return {
resource: this.vorgangService.getVorgangWithEingang(),
getLinkRel: VorgangWithEingangLinkRel.BESCHEID_DRAFT,
- deleteLinkRel: null,
- editLinkRel: null,
+ delete: { linkRel: BescheidLinkRel.DELETE, order: CommandOrder.DELETE_BESCHEID },
+ edit: { linkRel: BescheidLinkRel.UPDATE, order: CommandOrder.UPDATE_BESCHEID },
};
}
buildBescheidListServiceConfig(): ListResourceServiceConfig<VorgangWithEingangResource> {
return {
baseResource: this.vorgangService.getVorgangWithEingang(),
- createLinkRel: null,
listLinkRel: VorgangWithEingangLinkRel.BESCHEIDE,
+ listResourceListLinkRel: BescheidListLinkRel.BESCHEID_LIST,
};
}
public init(): void {
- this.bescheidDraftService = new ResourceService(
+ this.bescheidDraftService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(),
this.repository,
+ this.commandService,
);
this.bescheidDocumentFile$.next(createEmptyStateResource());
this.bescheidDocumentUri$.next(null);
+ this.uploadedAttachment$.next(createEmptyStateResource());
}
public getBescheidDraft(): Observable<StateResource<BescheidResource>> {
@@ -319,12 +331,13 @@ export class BescheidService {
}
private clearCreateBescheidDocumentInProgress(): void {
- this.createBescheidDocumentInProgress$.next({ loading: false });
+ this.createBescheidDocumentInProgress$.next(createEmptyStateResource());
}
private initUploadBescheidDocumentInProgress(fileName: string): void {
this.uploadBescheidDocumentInProgress$.next({ fileName, loading: true });
}
+
public getUploadBescheidDocumentInProgress(): Observable<UploadFileInProgress> {
return this.uploadBescheidDocumentInProgress$.asObservable();
}
@@ -342,7 +355,7 @@ export class BescheidService {
bescheid: BescheidResource,
binaryFileStateResource: StateResource<BinaryFileResource>,
): void {
- if (hasError(binaryFileStateResource)) {
+ if (hasStateResourceError(binaryFileStateResource)) {
this.setUploadBescheidDocumentInProgressError(binaryFileStateResource.error);
} else {
this.createBescheidDocumentFromFile(bescheid, binaryFileStateResource.resource);
@@ -362,7 +375,7 @@ export class BescheidService {
commandStateResource: StateResource<CommandResource>,
binaryFile: BinaryFileResource,
): void {
- if (hasError(commandStateResource)) {
+ if (hasStateResourceError(commandStateResource)) {
this.setUploadBescheidDocumentInProgressError(commandStateResource.error);
} else {
this.bescheidDocument$.next(createEmptyStateResource());
@@ -382,9 +395,9 @@ export class BescheidService {
this.bescheidDocument$.next(createEmptyStateResource());
}
- public createBescheidDocument(): Observable<UploadFileInProgress> {
+ public createBescheidDocument(): Observable<StateResource<CommandResource>> {
this.clearUploadBescheidDocumentInProgress();
- this.setCreateBescheidDocumenInProgress();
+ this.setCreateBescheidDocumentInProgress();
this.doCreateBescheidDocument()
.pipe(filterIsLoadedOrHasError(), first())
.subscribe((commandStateResource: StateResource<CommandResource>) =>
@@ -397,12 +410,12 @@ export class BescheidService {
this.uploadBescheidDocumentInProgress$.next({ loading: false });
}
- public getCreateBescheidDocumentInProgress(): Observable<UploadFileInProgress> {
+ public getCreateBescheidDocumentInProgress(): Observable<StateResource<CommandResource>> {
return this.createBescheidDocumentInProgress$.asObservable();
}
- private setCreateBescheidDocumenInProgress(): void {
- this.createBescheidDocumentInProgress$.next({ loading: true });
+ private setCreateBescheidDocumentInProgress(): void {
+ this.createBescheidDocumentInProgress$.next(createEmptyStateResource(true));
}
doCreateBescheidDocument(): Observable<StateResource<CommandResource>> {
@@ -414,8 +427,8 @@ export class BescheidService {
private handleCreateBescheidDocumentResponse(
commandStateResource: StateResource<CommandResource>,
): void {
- if (hasError(commandStateResource)) {
- this.setCreateBescheidDocumentInProgressError(commandStateResource.error);
+ if (hasCommandError(commandStateResource.resource)) {
+ this.createBescheidDocumentInProgress$.next(commandStateResource);
} else {
const documentUri: ResourceUri = getEffectedResourceUrl(commandStateResource.resource);
this.bescheidDocumentUri$.next(documentUri);
@@ -429,17 +442,10 @@ export class BescheidService {
.pipe(filterIsLoadedOrHasError(), first())
.subscribe((binaryFile) => {
this.bescheidDocumentFile$.next(binaryFile);
- this.createBescheidDocumentInProgress$.next({ loading: false });
+ this.createBescheidDocumentInProgress$.next(createEmptyStateResource());
});
}
- private setCreateBescheidDocumentInProgressError(error: HttpError): void {
- this.createBescheidDocumentInProgress$.next({
- error,
- loading: false,
- });
- }
-
public getBescheidDocumentCommand(): Observable<StateResource<CommandResource>> {
return this.commandService.getCommandByOrder(CommandOrder.CREATE_BESCHEID_DOCUMENT);
}
@@ -483,11 +489,7 @@ export class BescheidService {
}
public getLastBescheid(): Observable<BescheidResource> {
- return this.getBescheidList().pipe(
- filter(isLoaded),
- map((bescheidListStateResource: StateResource<BescheidListResource>) =>
- getEmbeddedBescheidResources(bescheidListStateResource),
- ),
+ return this.bescheidListService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => this.sortByBeschiedenAm(bescheide)),
map((bescheide: BescheidResource[]) => bescheide[0]),
@@ -502,11 +504,7 @@ export class BescheidService {
}
public existBescheid(): Observable<boolean> {
- return this.getBescheidList().pipe(
- filter(isLoaded),
- map((bescheidListStateResource: StateResource<BescheidListResource>) =>
- getEmbeddedBescheidResources(bescheidListStateResource),
- ),
+ return this.bescheidListService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => isNotEmpty(bescheide)),
);
@@ -527,4 +525,41 @@ export class BescheidService {
public refreshList(): void {
this.bescheidListService.refresh();
}
+
+ public uploadAttachment(
+ bescheidResource: BescheidResource,
+ file: File,
+ ): Observable<StateResource<BinaryFileResource>> {
+ this.uploadAttachmentInProgress$.next({ fileName: file.name, loading: true });
+ return this.binaryFileService
+ .uploadFile(bescheidResource, BescheidLinkRel.UPLOAD_ATTACHMENT, file, false)
+ .pipe(
+ tap((binaryFileStateResource: StateResource<BinaryFileResource>) =>
+ this.handleAttachmentUpload(binaryFileStateResource),
+ ),
+ );
+ }
+
+ handleAttachmentUpload(binaryFileStateResource: StateResource<BinaryFileResource>) {
+ if (hasStateResourceError(binaryFileStateResource)) {
+ this.uploadAttachmentInProgress$.next({
+ loading: false,
+ error: binaryFileStateResource.error,
+ });
+ } else {
+ this.uploadAttachmentInProgress$.next({
+ ...this.uploadAttachmentInProgress$.value,
+ loading: binaryFileStateResource.loading,
+ });
+ }
+ this.uploadedAttachment$.next(binaryFileStateResource);
+ }
+
+ public getUploadAttachmentInProgress(): Observable<UploadFileInProgress> {
+ return this.uploadAttachmentInProgress$.asObservable();
+ }
+
+ public getUploadedAttachment(): Observable<StateResource<BinaryFileResource>> {
+ return this.uploadedAttachment$.asObservable();
+ }
}
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index a8a263633434e0dc3f4693d414b9427470a1348e..cd64683430db122e9d8411e606f9f80be75d2028 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -1,5 +1,5 @@
<ods-attachment
- [documentName]="file.name"
+ [caption]="file.name"
[description]="file.size | fileSizePlain"
[fileType]="getIconType(file.contentType)"
(click)="downloadFile()"
diff --git a/alfa-client/libs/command-shared/src/index.ts b/alfa-client/libs/command-shared/src/index.ts
index 83e4b56711c89009afda143da9599d66d94a958c..ebafbac511a499d1cea385d069c8fe876d21373f 100644
--- a/alfa-client/libs/command-shared/src/index.ts
+++ b/alfa-client/libs/command-shared/src/index.ts
@@ -22,6 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
export * from './lib/+state/command.actions';
+export * from './lib/command-resource.service';
export * from './lib/command-shared.module';
export * from './lib/command.linkrel';
export * from './lib/command.message';
diff --git a/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts b/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
index d9521a3ab95f6879515b7b398392fb57f2095d7c..3d7151381f57a1c9843bf17179f320bd3c28022c 100644
--- a/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
+++ b/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
@@ -8,7 +8,7 @@ import { catchError, delay, map, mergeMap, switchMap, tap } from 'rxjs/operators
import { COMMAND_ERROR_MESSAGES, CREATE_COMMAND_MESSAGE_BY_ORDER } from '../command.message';
import { CommandListResource, CommandResource, CreateCommandProps } from '../command.model';
import { CommandRepository } from '../command.repository';
-import { hasError, isConcurrentModification, isPending, isRevokeable } from '../command.util';
+import { hasCommandError, isConcurrentModification, isPending, isRevokeable } from '../command.util';
import {
CommandProps,
LoadCommandListProps,
@@ -97,7 +97,7 @@ export class CommandEffects {
if (isRevokeable(command)) {
return [createCommandSuccess({ command }), showRevokeSnackbar({ command })];
}
- if (hasError(command) && isConcurrentModification(command.errorMessage)) {
+ if (hasCommandError(command) && isConcurrentModification(command.errorMessage)) {
this.showError(command);
return [createCommandSuccess({ command }), publishConcurrentModificationAction()];
}
diff --git a/alfa-client/libs/command-shared/src/lib/+state/command.reducer.spec.ts b/alfa-client/libs/command-shared/src/lib/+state/command.reducer.spec.ts
index be256c5e2d6dd61e2bceebbd1012bb4f0f1b0dff..0f1608566b39496da4c29248ac4d94975df6d5c8 100644
--- a/alfa-client/libs/command-shared/src/lib/+state/command.reducer.spec.ts
+++ b/alfa-client/libs/command-shared/src/lib/+state/command.reducer.spec.ts
@@ -1,4 +1,3 @@
-import { CommandResource, CreateCommand } from '@alfa-client/command-shared';
import {
ApiError,
createEmptyStateResource,
@@ -8,14 +7,15 @@ import {
import { HttpErrorResponse } from '@angular/common/http';
import { Action } from '@ngrx/store';
import { Resource, ResourceUri } from '@ngxp/rest';
-import { createCommandResource, createCreateCommand } from 'libs/command-shared/test/command';
-import { createApiError, createHttpErrorResponse } from 'libs/tech-shared/test/error';
-import { createDummyResource } from 'libs/tech-shared/test/resource';
+import { createApiError, createHttpErrorResponse } from '../../../../tech-shared/test/error';
+import { createDummyResource } from '../../../../tech-shared/test/resource';
+import { createCommandResource, createCreateCommand } from '../../../test/command';
+import { CommandResource, CreateCommand } from '../command.model';
import { CommandState, initialState, reducer } from './command.reducer';
import faker from '@faker-js/faker';
-import * as CommandActions from '@alfa-client/command-shared';
+import * as CommandActions from '../+state/command.actions';
describe('Command Reducer', () => {
describe('unknown action', () => {
diff --git a/alfa-client/libs/command-shared/src/lib/+state/command.selectors.ts b/alfa-client/libs/command-shared/src/lib/+state/command.selectors.ts
index 65ab3989b73be46cc1631f535d6655981426aacd..fcfe5311cce57fa663f06048bd636ce649803df8 100644
--- a/alfa-client/libs/command-shared/src/lib/+state/command.selectors.ts
+++ b/alfa-client/libs/command-shared/src/lib/+state/command.selectors.ts
@@ -1,7 +1,7 @@
-import { CommandOrder } from '@alfa-client/command-shared';
import { createEmptyStateResource } from '@alfa-client/tech-shared';
import { MemoizedSelector, createFeatureSelector, createSelector } from '@ngrx/store';
import { isUndefined } from 'lodash-es';
+import { CommandOrder } from '../command.model';
import { COMMAND_FEATURE_KEY, CommandState } from './command.reducer';
const getCommandState: MemoizedSelector<object, CommandState> =
diff --git a/alfa-client/libs/command-shared/src/lib/command-resource.service.spec.ts b/alfa-client/libs/command-shared/src/lib/command-resource.service.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..73c60da70421cec72dc85f7be6a696a3e7884aae
--- /dev/null
+++ b/alfa-client/libs/command-shared/src/lib/command-resource.service.spec.ts
@@ -0,0 +1,97 @@
+import {
+ EMPTY_STRING,
+ LinkRelationName,
+ ResourceRepository,
+ ResourceServiceConfig,
+ StateResource,
+ createStateResource,
+} from '@alfa-client/tech-shared';
+import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { Resource } from '@ngxp/rest';
+import { Observable, of } from 'rxjs';
+import { createCommandResource } from '../../../command-shared/test/command';
+import { singleCold, singleHot } from '../../../tech-shared/test/marbles';
+import { createDummyResource } from '../../../tech-shared/test/resource';
+import { CommandResourceService } from './command-resource.service';
+import { CommandResource } from './command.model';
+import { CommandService } from './command.service';
+
+describe('CommandResourceService', () => {
+ let service: CommandResourceService<Resource, Resource>;
+ let config: ResourceServiceConfig<Resource>;
+ let repository: Mock<ResourceRepository>;
+ let commandService: Mock<CommandService>;
+
+ const configResource: Resource = createDummyResource();
+ const configStateResource: StateResource<Resource> = createStateResource(configResource);
+ const configStateResource$: Observable<StateResource<Resource>> = of(configStateResource);
+
+ const editLinkRel: string = 'dummyEditLinkRel';
+ const getLinkRel: LinkRelationName = 'dummyGetLinkRel';
+
+ const deleteOrder: string = 'dummyDeleteOrder';
+ const deleteLinkRel: string = 'dummyDeleteLinkRel';
+
+ beforeEach(() => {
+ config = {
+ resource: configStateResource$,
+ getLinkRel,
+ edit: { linkRel: editLinkRel },
+ delete: { order: deleteOrder, linkRel: deleteLinkRel },
+ };
+ repository = mock(ResourceRepository);
+ commandService = mock(CommandService);
+
+ service = new CommandResourceService(
+ config,
+ useFromMock(repository),
+ useFromMock(commandService),
+ );
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+
+ describe('delete', () => {
+ const resourceWithDeleteLinkRel: Resource = createDummyResource([deleteLinkRel]);
+ const stateResourceWithDeleteLink: StateResource<Resource> =
+ createStateResource(resourceWithDeleteLinkRel);
+
+ beforeEach(() => {
+ commandService.createCommandByProps.mockReturnValue(
+ of(createStateResource(createCommandResource())),
+ );
+ service.stateResource.next(stateResourceWithDeleteLink);
+ });
+
+ it('should throw error if delete linkRel not exists on current stateresource', () => {
+ service.stateResource.next(createStateResource(createDummyResource()));
+
+ expect(() => service.delete()).toThrowError(
+ 'No delete link exists on current stateresource.',
+ );
+ });
+
+ it('should call command service', () => {
+ service.delete();
+
+ expect(commandService.createCommandByProps).toHaveBeenCalledWith({
+ resource: resourceWithDeleteLinkRel,
+ linkRel: deleteLinkRel,
+ command: { order: deleteOrder, body: null },
+ snackBarMessage: EMPTY_STRING,
+ });
+ });
+
+ it('should return value', () => {
+ const deleteResource: Resource = createDummyResource();
+ const deleteStateResource: StateResource<Resource> = createStateResource(deleteResource);
+ commandService.createCommandByProps.mockReturnValue(singleHot(deleteStateResource));
+
+ const deletedResource: Observable<StateResource<CommandResource>> = service.delete();
+
+ expect(deletedResource).toBeObservable(singleCold(deleteStateResource));
+ });
+ });
+});
diff --git a/alfa-client/libs/command-shared/src/lib/command-resource.service.ts b/alfa-client/libs/command-shared/src/lib/command-resource.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0eb9f03aa4979479a1bcb27c9d79d7d959d6ff2d
--- /dev/null
+++ b/alfa-client/libs/command-shared/src/lib/command-resource.service.ts
@@ -0,0 +1,47 @@
+import {
+ EMPTY_STRING,
+ ResourceRepository,
+ ResourceService,
+ ResourceServiceConfig,
+ StateResource,
+ createEmptyStateResource,
+} from '@alfa-client/tech-shared';
+import { Resource } from '@ngxp/rest';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { CommandResource, CreateCommandProps } from './command.model';
+import { CommandService } from './command.service';
+
+export class CommandResourceService<B extends Resource, T extends Resource> extends ResourceService<
+ B,
+ T
+> {
+ deleteStateCommandResource: BehaviorSubject<StateResource<CommandResource>> = new BehaviorSubject<
+ StateResource<CommandResource>
+ >(createEmptyStateResource());
+
+ constructor(
+ protected config: ResourceServiceConfig<B>,
+ protected repository: ResourceRepository,
+ private commandService: CommandService,
+ ) {
+ super(config, repository);
+ }
+
+ doSave(resource: T, toSave: unknown): Observable<T> {
+ throw new Error('Method not implemented.');
+ }
+
+ public delete(): Observable<StateResource<CommandResource>> {
+ this.verifyDeleteLinkRel();
+ return this.commandService.createCommandByProps(this.buildDeleteCommandProps());
+ }
+
+ private buildDeleteCommandProps(): CreateCommandProps {
+ return {
+ resource: this.stateResource.value.resource,
+ linkRel: this.config.delete.linkRel,
+ command: { order: this.config.delete.order, body: null },
+ snackBarMessage: EMPTY_STRING,
+ };
+ }
+}
diff --git a/alfa-client/libs/command-shared/src/lib/command.util.spec.ts b/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
index cd3f65d6bda037c9552175f7b5c81cdfc821b70c..7567dbc61f0de2a129af59416b91e373ace7e40d 100644
--- a/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
+++ b/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
@@ -31,7 +31,7 @@ import { CommandErrorMessage } from './command.message';
import { CommandListResource, CommandResource } from './command.model';
import {
getPendingCommandByOrder,
- hasError,
+ hasCommandError,
isConcurrentModification,
isDone,
isPending,
@@ -81,19 +81,19 @@ describe('CommandUtil', () => {
describe('hasError', () => {
it('should be true if no update link is present and command has error message', () => {
- const result = hasError(createCommandErrorResource());
+ const result = hasCommandError(createCommandErrorResource());
expect(result).toBeTruthy();
});
it('should be false if update link is present', () => {
- const result = hasError(createCommandResource([CommandLinkRel.UPDATE]));
+ const result = hasCommandError(createCommandResource([CommandLinkRel.UPDATE]));
expect(result).toBeFalsy();
});
it('should be false if error message is not present', () => {
- const result = hasError(createCommandResource());
+ const result = hasCommandError(createCommandResource());
expect(result).toBeFalsy();
});
diff --git a/alfa-client/libs/command-shared/src/lib/command.util.ts b/alfa-client/libs/command-shared/src/lib/command.util.ts
index 8132a7d316e04b69db6af9aa5360895f5b4ae406..2dc64f425d39048734607a64cc12b984a47f3c03 100644
--- a/alfa-client/libs/command-shared/src/lib/command.util.ts
+++ b/alfa-client/libs/command-shared/src/lib/command.util.ts
@@ -43,7 +43,7 @@ export function hasErrorMessage(commandResource: CommandResource): boolean {
return !isNil(commandResource.errorMessage) && !isEmpty(commandResource.errorMessage);
}
-export function hasError(commandResource: CommandResource): boolean {
+export function hasCommandError(commandResource: CommandResource): boolean {
return hasErrorMessage(commandResource) && !isPending(commandResource);
}
@@ -73,7 +73,7 @@ export function isConcurrentModification(errorMessage: string): boolean {
}
export function isSuccessfulDone(commandResource: CommandResource): boolean {
- return isDone(commandResource) && !hasError(commandResource);
+ return isDone(commandResource) && !hasCommandError(commandResource);
}
export function getEffectedResourceUrl(command: CommandResource): ResourceUri {
diff --git a/alfa-client/libs/command-shared/test/command.ts b/alfa-client/libs/command-shared/test/command.ts
index e33eef79d37a8936182390dfcb392e4f587c68f6..22dfc484d7137b928ec35e74de5a5902ef42a519 100644
--- a/alfa-client/libs/command-shared/test/command.ts
+++ b/alfa-client/libs/command-shared/test/command.ts
@@ -21,21 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { createStateResource, StateResource } from '@alfa-client/tech-shared';
import { faker } from '@faker-js/faker';
import { toResource } from 'libs/tech-shared/test/resource';
import { times } from 'lodash-es';
import { CommandListLinkRel } from '../src/lib/command.linkrel';
import { CommandErrorMessage } from '../src/lib/command.message';
-import {
- Command,
- CommandListResource,
- CommandOrder,
- CommandResource,
- CommandStatus,
- CreateCommand,
- CreateCommandProps,
-} from '../src/lib/command.model';
-import { createStateResource, StateResource } from '@alfa-client/tech-shared';
+import { Command, CommandListResource, CommandOrder, CommandResource, CommandStatus, CreateCommand, CreateCommandProps, } from '../src/lib/command.model';
export function createCommand(): Command {
return {
@@ -76,6 +68,12 @@ export function createCommandErrorResource(linkRelations: string[] = []): Comman
};
}
+export function createCommandErrorStateResource(
+ linkRelations: string[] = [],
+): StateResource<CommandResource> {
+ return createStateResource(createCommandErrorResource(linkRelations));
+}
+
export function createCreateCommand(
order: CommandOrder = CommandOrder.VORGANG_ANNEHMEN,
): CreateCommand {
diff --git a/alfa-client/libs/design-system/src/index.ts b/alfa-client/libs/design-system/src/index.ts
index f111f0697b84d7755dcd24acc5592842f73c0bb9..a9985e3b05d257cb3b535c1b79ca6cbdfa1a252a 100644
--- a/alfa-client/libs/design-system/src/index.ts
+++ b/alfa-client/libs/design-system/src/index.ts
@@ -1,5 +1,4 @@
export * from './lib/attachment-container/attachment-container.component';
-export * from './lib/attachment-error/attachment-error.component';
export * from './lib/attachment/attachment.component';
export * from './lib/bescheid-container/bescheid-container.component';
export * from './lib/bescheid-status-text/bescheid-status-text.component';
diff --git a/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.spec.ts b/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.spec.ts
deleted file mode 100644
index a155514b9bcbb86221c54595fed6f5b21daf740d..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AttachmentErrorComponent } from './attachment-error.component';
-
-describe('AttachmentErrorComponent', () => {
- let component: AttachmentErrorComponent;
- let fixture: ComponentFixture<AttachmentErrorComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [AttachmentErrorComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(AttachmentErrorComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.ts b/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.ts
deleted file mode 100644
index 83cd48a099a4e0a06d18a4848d1e06793f8039bd..0000000000000000000000000000000000000000
--- a/alfa-client/libs/design-system/src/lib/attachment-error/attachment-error.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { Component, Input } from '@angular/core';
-import { FileIconComponent } from '../icons/file-icon/file-icon.component';
-
-@Component({
- selector: 'ods-attachment-error',
- standalone: true,
- imports: [CommonModule, FileIconComponent],
- styles: [':host {@apply flex border-b border-black/25 last:border-b-0}'],
- template: `<div
- class="relative flex w-full items-start gap-3 border-b bg-background-100 px-3 py-2"
- >
- <div class="flex-shrink">
- <ods-file-icon fileType="exclamation" size="large" />
- </div>
- <div class="flex grow flex-col items-start break-all text-text">
- <p class="text-start text-sm text-error">Fehler beim Hochladen</p>
- <p class="text-xs text-ozggray-600" *ngFor="let error of errorList">{{ error }}</p>
- </div>
- </div>`,
-})
-export class AttachmentErrorComponent {
- @Input({ required: true }) errorList!: string[];
-}
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.spec.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.spec.ts
index f712d3c0cfe3ea0a8e1ed86d7be1a7a38f12a539..26ee7299e31f26003789e8eeaf5b8d77b68d4b31 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.spec.ts
@@ -1,8 +1,8 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AttachmentComponent } from './attachment.component';
import { ReactiveFormsModule } from '@angular/forms';
+import { AttachmentComponent } from './attachment.component';
-xdescribe('AttachmentComponent', () => {
+describe('AttachmentComponent', () => {
let component: AttachmentComponent;
let fixture: ComponentFixture<AttachmentComponent>;
@@ -19,4 +19,41 @@ xdescribe('AttachmentComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
+
+ describe('set error messages', () => {
+ it('should mark as has error', () => {
+ component.errorMessages = ['Fehler'];
+
+ fixture.detectChanges();
+
+ expect(component.hasError).toBeTruthy();
+ });
+
+ it.each([null, undefined])(
+ 'should mark as has not error when error messages %s',
+ (errorMessages: string[]) => {
+ component.errorMessages = errorMessages;
+
+ fixture.detectChanges();
+
+ expect(component.hasError).toBeFalsy();
+ },
+ );
+
+ it('should mark as has not error', () => {
+ component.errorMessages = [];
+
+ fixture.detectChanges();
+
+ expect(component.hasError).toBeFalsy();
+ });
+
+ it('should set errors', () => {
+ component.errorMessages = ['Fehler'];
+
+ fixture.detectChanges();
+
+ expect(component.errors).toEqual(['Fehler']);
+ });
+ });
});
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
index b3578d40175fbf30dfbd3abaf66a2afac0797740..4a4fe3ee5844e2db722ccfc25cd48214b3d4a068 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.component.ts
@@ -1,6 +1,7 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
+import { isNotEmpty } from '@alfa-client/tech-shared';
import { FileIconComponent } from '../icons/file-icon/file-icon.component';
import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.component';
@@ -9,25 +10,51 @@ import { SpinnerIconComponent } from '../icons/spinner-icon/spinner-icon.compone
standalone: true,
imports: [CommonModule, SpinnerIconComponent, FileIconComponent],
styles: [':host {@apply flex}'],
- template: `<button
- class="border-b-grayborder relative flex w-full items-start gap-3 border-b bg-background-100 px-3 py-2 hover:bg-background-200"
+ template: ` <button
+ class="relative flex w-full items-start gap-3 border-b border-b-grayborder bg-background-100 px-3 py-2 hover:bg-background-200"
>
<div class="flex-shrink">
- <ods-file-icon *ngIf="!isLoading" [fileType]="fileType" size="large" />
- <ods-spinner-icon *ngIf="isLoading" size="large" />
+ <ods-file-icon
+ *ngIf="fileType && !isLoading && !hasError"
+ [fileType]="fileType"
+ size="large"
+ />
+ <ods-file-icon *ngIf="!isLoading && hasError" fileType="exclamation" size="large" />
+ <ods-spinner-icon *ngIf="isLoading && !hasError" size="large" />
</div>
- <div class="flex grow flex-col items-start break-all text-text">
- <p class="text-start text-sm">
- {{ documentName }}
+ <div class="flex grow flex-col items-start break-all text-start text-text">
+ <p *ngIf="!hasError && !isLoading && caption" class="text-sm">
+ {{ caption }}
+ </p>
+ <p *ngIf="hasError && errorCaption" class="text-sm text-error">
+ {{ errorCaption }}
+ </p>
+ <p *ngIf="isLoading && loadingCaption" class="text-sm">
+ {{ loadingCaption }}
+ </p>
+ <p *ngIf="description && !hasError" class="text-xs text-text/65">
+ {{ description }}
+ </p>
+ <p *ngFor="let error of errors" class="text-xs text-text/65">
+ {{ error }}
</p>
- <p class="text-xs text-text/65">{{ description }}</p>
</div>
<ng-content select="[close]" *ngIf="!isLoading"></ng-content>
</button>`,
})
export class AttachmentComponent {
- @Input({ required: true }) documentName!: string;
- @Input({ required: true }) fileType!: string;
+ @Input() caption: string = '';
+ @Input() errorCaption: string = '';
+ @Input() loadingCaption: string = '';
+ @Input() fileType: string = '';
@Input() description = '';
@Input() isLoading: boolean = false;
+
+ @Input() set errorMessages(errorMessages: string[]) {
+ this.hasError = isNotEmpty(errorMessages);
+ this.errors = errorMessages;
+ }
+
+ public errors: string[] = [];
+ public hasError: boolean = false;
}
diff --git a/alfa-client/libs/design-system/src/lib/attachment/attachment.stories.ts b/alfa-client/libs/design-system/src/lib/attachment/attachment.stories.ts
index 814e9ac5e9c27a11955bbac5ec538e92a35f7e4d..b485cf6a12ea32ef33c0906a85176ccfb9bdedd2 100644
--- a/alfa-client/libs/design-system/src/lib/attachment/attachment.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/attachment/attachment.stories.ts
@@ -14,14 +14,14 @@ type Story = StoryObj<AttachmentComponent>;
export const Default: Story = {
name: 'File with pdf icon',
args: {
- documentName: 'Katzenanmeldung_1231231_eingang.pdf',
+ caption: 'Katzenanmeldung_1231231_eingang.pdf',
description: '450 kB',
fileType: 'pdf',
},
argTypes: {
- documentName: {
+ caption: {
table: {
- type: { summary: 'Name of the document' },
+ type: { summary: 'Name of the document or title' },
},
},
description: {
@@ -35,18 +35,26 @@ export const Default: Story = {
export const Doc: Story = {
name: 'File with doc icon',
args: {
- documentName: 'Katzenanmeldung_1231231_eingang.doc',
+ caption: 'Katzenanmeldung_1231231_eingang.doc',
description: '573 kB',
fileType: 'doc',
},
};
export const Loading: Story = {
- name: 'File with doc icon',
+ name: 'File with loading icon',
args: {
- documentName: 'Katzenanmeldung_1231231_eingang.doc',
+ caption: 'Katzenanmeldung_1231231_eingang.doc',
description: '573 kB',
fileType: 'doc',
isLoading: true,
},
};
+
+export const Error: Story = {
+ name: 'Error message in file',
+ args: {
+ caption: 'Fehler beim Hochladen',
+ errorMessages: ['Erlaubte Dateiendungen: pdf, jpg, png, jpeg'],
+ },
+};
diff --git a/alfa-client/libs/design-system/src/lib/button/button.stories.ts b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
index bb64d56b0a7aeca2598a8dfeb8efe33b361586ce..9739685d3479512e4ee3deea340727d0c296f049 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.stories.ts
@@ -20,9 +20,9 @@ export default meta;
type Story = StoryObj<ButtonComponent>;
export const Default: Story = {
- args: { text: 'Hello world!', isLoading: false, type: 'primary' },
+ args: { text: 'Hello world!', isLoading: false, variant: 'primary' },
argTypes: {
- type: {
+ variant: {
options: ['primary', 'outline'],
control: { type: 'radio' },
},
@@ -30,7 +30,7 @@ export const Default: Story = {
};
export const WithIcon: Story = {
- args: { text: 'I have an icon', isLoading: false, type: 'outline' },
+ args: { text: 'I have an icon', isLoading: false, variant: 'outline' },
render: (args: ButtonComponent) => ({
props: args,
template: `<ods-button ${argsToTemplate(args)}>
diff --git a/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.component.ts b/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.component.ts
index 4f526397ea2c1eaebf645e6ff055510ee28cf1fb..3a4280cc26c8dc3c9ac0542649290e9e4ff41422 100644
--- a/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.component.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.component.ts
@@ -80,7 +80,6 @@ type FileiconVariants = VariantProps<typeof fileiconVariants>;
export class FileIconComponent {
@Input() fileType: FileiconVariants['fileType'];
@Input() size: FileiconVariants['size'];
- @Input() isLoading: boolean = false;
fileiconVariants = fileiconVariants;
}
diff --git a/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.stories.ts b/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.stories.ts
index 99f7c5e5022779e1cb0740900c68b9b3c65c5ebd..a2ffc07ff732f6d8253b547895b420128767b7d6 100644
--- a/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/icons/file-icon/file-icon.stories.ts
@@ -13,5 +13,5 @@ export default meta;
type Story = StoryObj<FileIconComponent>;
export const Default: Story = {
- args: { type: 'pdf', size: 'xl', color: 'pdf' },
+ args: { fileType: 'pdf', size: 'large' },
};
diff --git a/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts b/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
index c425ea44e5bb2ef00586dd52fbf41cfb7af75e4b..21f33261b1d95be374068cd02b2fd9b3f063a075 100644
--- a/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
+++ b/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
@@ -35,7 +35,7 @@ import {
StateResource,
createEmptyStateResource,
createStateResource,
- hasError,
+ hasStateResourceError,
} from '@alfa-client/tech-shared';
import {
ForwardRequest,
@@ -162,7 +162,7 @@ export class ForwardingService implements OnDestroy {
}
reloadCurrentVorgang(command: StateResource<CommandResource>): void {
- if (!hasError(command)) {
+ if (!hasStateResourceError(command)) {
this.vorgangService.reloadCurrentVorgang();
}
}
diff --git a/alfa-client/libs/navigation/src/lib/header-container/header/header-logo/header-logo.component.html b/alfa-client/libs/navigation/src/lib/header-container/header/header-logo/header-logo.component.html
index 081ee7129d8b6e5ce000f8e32832fd24a102c404..577999c3b2ec12f49e39fd9813d1ceb462e998d9 100644
--- a/alfa-client/libs/navigation/src/lib/header-container/header/header-logo/header-logo.component.html
+++ b/alfa-client/libs/navigation/src/lib/header-container/header/header-logo/header-logo.component.html
@@ -1,3 +1,3 @@
<a routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
- <img src="/assets/img/logo.svg" alt="Alfa Logo" data-test-id="alfa-logo" />
+ <img src="/assets/img/logo.svg" alt="Alfa Logo. Zur Vorgangsliste" data-test-id="alfa-logo" />
</a>
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
index dec067e551da7b7af88fdfdaf84bae1997f9b400..f4bc26e4687c2ce05b1cc7b3d36560b76a5a21df 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
@@ -31,7 +31,7 @@ import {
CommandResource,
CommandService,
doIfCommandIsDone,
- hasError,
+ hasCommandError,
isDone,
isPending,
} from '@alfa-client/command-shared';
@@ -152,7 +152,7 @@ export class PostfachService {
}
private showSnackbar(commandResource: CommandResource): void {
- if (hasError(commandResource)) {
+ if (hasCommandError(commandResource)) {
this.snackbarService.showError(PostfachMessages.SEND_FAILED);
} else {
this.snackbarService.show(commandResource, PostfachMessages.SEND_SUCCESSFUL);
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
index 6a4d16d49caa38d8901b8f352fded1be89bd7b59..e52afef42b76c88e8ddc22ddad0d5c59f1ffd8d5 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
@@ -28,7 +28,7 @@ import {
PostfachMailListResource,
PostfachService,
} from '@alfa-client/postfach-shared';
-import { StateResource, hasError, isNotNull, isNotUndefined } from '@alfa-client/tech-shared';
+import { StateResource, hasStateResourceError, isNotNull, isNotUndefined } from '@alfa-client/tech-shared';
import { DialogService, FixedDialogComponent } from '@alfa-client/ui';
import { VorgangHeaderLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { getEmpfaenger } from '@alfa-client/vorgang-shared-ui';
@@ -89,7 +89,7 @@ export class PostfachMailButtonContainerComponent {
closeDialog(commandStateResource: StateResource<CommandResource>): void {
if (
- !hasError(commandStateResource) &&
+ !hasStateResourceError(commandStateResource) &&
commandStateResource.loaded &&
isNotUndefined(this.dialogRef)
) {
diff --git a/alfa-client/libs/tech-shared/src/index.ts b/alfa-client/libs/tech-shared/src/index.ts
index 088c5882daa55ed253d820a75a9fbcbe22438fc0..64e34b9ffcb66244bb7687070f685ed6090b4950 100644
--- a/alfa-client/libs/tech-shared/src/index.ts
+++ b/alfa-client/libs/tech-shared/src/index.ts
@@ -31,6 +31,7 @@ export * from './lib/form.util';
export * from './lib/http.util';
export * from './lib/message-code';
export * from './lib/ngrx/actions';
+export * from './lib/pipe/convert-api-error-to-error-messages.pipe';
export * from './lib/pipe/convert-for-data-test.pipe';
export * from './lib/pipe/convert-to-boolean.pipe';
export * from './lib/pipe/enum-to-label.pipe';
@@ -45,10 +46,12 @@ export * from './lib/pipe/to-embedded-resource.pipe';
export * from './lib/pipe/to-resource-uri.pipe';
export * from './lib/pipe/to-traffic-light-tooltip.pipe';
export * from './lib/pipe/to-traffic-light.pipe';
+export * from './lib/resource/api-resource.service';
export * from './lib/resource/list-resource.service';
export * from './lib/resource/resource.model';
export * from './lib/resource/resource.repository';
export * from './lib/resource/resource.rxjs.operator';
+export * from './lib/resource/resource.service';
export * from './lib/resource/resource.util';
export * from './lib/service/formservice.abstract';
export * from './lib/tech-shared.module';
diff --git a/alfa-client/libs/tech-shared/src/lib/assistive-technologies.util.spec.ts b/alfa-client/libs/tech-shared/src/lib/assistive-technologies.util.spec.ts
index 85677d89699f6287043b22853246d7e6a047a361..8d4f98c231fd11e38aed3562bf23171b1b25387d 100644
--- a/alfa-client/libs/tech-shared/src/lib/assistive-technologies.util.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/assistive-technologies.util.spec.ts
@@ -1,5 +1,5 @@
+import { EMPTY_STRING } from '../lib/tech.util';
import { createAriaLabelForIconButton } from './assistive-technologies.util';
-import { EMPTY_STRING } from '@alfa-client/tech-shared';
describe('createAriaLabelForIconButton', () => {
const tooltip = 'Tooltip text';
diff --git a/alfa-client/libs/tech-shared/src/lib/date.util.spec.ts b/alfa-client/libs/tech-shared/src/lib/date.util.spec.ts
index 6a30b34fafdeb786e45347c1da6be75b25674e4c..f9277c5ac4d3b76a1b15e66a0bc718c558c1b497 100644
--- a/alfa-client/libs/tech-shared/src/lib/date.util.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/date.util.spec.ts
@@ -24,6 +24,7 @@
import { formatDate, registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import {
+ add2000Years,
formatDateWithoutYearWithTime,
formatForDatabase,
formatFullDate,
@@ -207,4 +208,23 @@ describe('Date Util', () => {
dateStrField: string;
}
});
+
+ describe('add2000Years', () => {
+ it('should return Date in the 2000 millennium for 2 digit year value', () => {
+ const dateInput: Date = new Date('0023-10-22');
+ const yearExpected: number = 2023;
+
+ const result: Date = add2000Years(dateInput);
+
+ expect(result.getFullYear()).toBe(yearExpected);
+ });
+
+ it('should return Date unchanged for non 2 digit year value', () => {
+ const dateInput: Date = new Date('2023-10-22');
+
+ const result: Date = add2000Years(dateInput);
+
+ expect(result).toBe(dateInput);
+ });
+ });
});
diff --git a/alfa-client/libs/tech-shared/src/lib/date.util.ts b/alfa-client/libs/tech-shared/src/lib/date.util.ts
index 0d1cbfed27ae543a464047f2f7964b8638aeefb0..5531d5cf09625ac35d85da39bddc6c5c57b42a19 100644
--- a/alfa-client/libs/tech-shared/src/lib/date.util.ts
+++ b/alfa-client/libs/tech-shared/src/lib/date.util.ts
@@ -101,3 +101,13 @@ export function sortByGermanDateStr<T>(entries: T[], getCompareField: (entry: T)
function convertGermanDateString(dateStr: string): Date {
return new Date(dateStr.replace(/(.*)\.(.*)\.(.*)/, '$3-$2-$1'));
}
+
+// Workaround, solange MatDatepicker genutzt wird.
+export function add2000Years(date: Date): Date {
+ const year: number = date.getFullYear();
+ if (year.toString().length !== 2) {
+ return date;
+ }
+
+ return dateFns.addYears(date, 2000);
+}
diff --git a/alfa-client/libs/tech-shared/src/lib/decorator/catch-http-error.decorator.spec.ts b/alfa-client/libs/tech-shared/src/lib/decorator/catch-http-error.decorator.spec.ts
index 10b94e399d82a1ef6c97eb156995e20584aebd4e..b28c779d60e0cc7f1a1e9e4517ae9b480c86e7e7 100644
--- a/alfa-client/libs/tech-shared/src/lib/decorator/catch-http-error.decorator.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/decorator/catch-http-error.decorator.spec.ts
@@ -21,8 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CatchHttpError } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { CatchHttpError } from '../decorator/catch-http-error.decorator';
import { HttpErrorHandler } from '../error/error.handler';
import {
catchHttpErrorHandleErrorResponse,
diff --git a/alfa-client/libs/tech-shared/src/lib/decorator/skip-error-interceptor.decorator.ts b/alfa-client/libs/tech-shared/src/lib/decorator/skip-error-interceptor.decorator.ts
index 3b4e3082a758ae9b5739f2ca415d1c95a828a9cc..b458fd3d70280cb5e9eeecf5976286683173074c 100644
--- a/alfa-client/libs/tech-shared/src/lib/decorator/skip-error-interceptor.decorator.ts
+++ b/alfa-client/libs/tech-shared/src/lib/decorator/skip-error-interceptor.decorator.ts
@@ -21,8 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { HttpErrorHandler } from '@alfa-client/tech-shared';
import { finalize } from 'rxjs/operators';
+import { HttpErrorHandler } from '../error/error.handler';
import {
disableInterceptorDefaultHandling,
enableInterceptorDefaultHandling,
diff --git a/alfa-client/libs/tech-shared/src/lib/interceptor/http-xsrf.interceptor.ts b/alfa-client/libs/tech-shared/src/lib/interceptor/http-xsrf.interceptor.ts
index a7dcd4c44cf9af5283a5af62eda4c707cababcf7..b7bc5aa087526edd757c5dc66365f93040bcc8ec 100644
--- a/alfa-client/libs/tech-shared/src/lib/interceptor/http-xsrf.interceptor.ts
+++ b/alfa-client/libs/tech-shared/src/lib/interceptor/http-xsrf.interceptor.ts
@@ -29,9 +29,9 @@ import {
HttpXsrfTokenExtractor,
} from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { addRequestHeader, isNotNull } from '@alfa-client/tech-shared';
import { Observable } from 'rxjs';
-import { existRequestHeader, isChangingDataRequest } from '../http.util';
+import { addRequestHeader, existRequestHeader, isChangingDataRequest } from '../http.util';
+import { isNotNull } from '../tech.util';
@Injectable()
export class HttpXsrfInterceptor implements HttpInterceptor {
diff --git a/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.spec.ts b/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f2d421bb49d41f593662ba2bbccd22f87255d396
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.spec.ts
@@ -0,0 +1,37 @@
+import { ApiError, getMessageForIssue } from '@alfa-client/tech-shared';
+import { createApiError } from '../../../test/error';
+import { ConvertApiErrorToErrorMessagesPipe } from './convert-api-error-to-error-messages.pipe';
+
+jest.mock('@alfa-client/tech-shared');
+const getMessageForIssueMock = getMessageForIssue as jest.Mock;
+
+describe('convertApiErrorToErrorMessagesPipe', () => {
+ const pipe = new ConvertApiErrorToErrorMessagesPipe();
+
+ it('create an instance', () => {
+ expect(pipe).toBeTruthy();
+ });
+
+ describe('transform', () => {
+ it.each([null, undefined])('should return empty array for %s value', (value: ApiError) => {
+ const errorMessages: string[] = pipe.transform(value);
+
+ expect(errorMessages).toEqual([]);
+ });
+
+ it('should get message for issue', () => {
+ pipe.transform(createApiError());
+
+ expect(getMessageForIssueMock).toHaveBeenCalled();
+ });
+
+ it('should return array of error messages', () => {
+ const expectedErrorMessage = 'Fehler';
+ getMessageForIssueMock.mockReturnValue(expectedErrorMessage);
+
+ const errorMessages: string[] = pipe.transform(createApiError());
+
+ expect(errorMessages).toEqual([expectedErrorMessage]);
+ });
+ });
+});
diff --git a/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.ts b/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.ts
new file mode 100644
index 0000000000000000000000000000000000000000..7dc36b4163976990d1172d2fa6860c3efeba1b33
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/pipe/convert-api-error-to-error-messages.pipe.ts
@@ -0,0 +1,13 @@
+import { ApiError, EMPTY_STRING, getMessageForIssue, Issue } from '@alfa-client/tech-shared';
+import { Pipe, PipeTransform } from '@angular/core';
+import { isNil } from 'lodash-es';
+
+@Pipe({ name: 'convertApiErrorToErrorMessages' })
+export class ConvertApiErrorToErrorMessagesPipe implements PipeTransform {
+ transform(value: ApiError) {
+ if (isNil(value)) {
+ return [];
+ }
+ return value.issues.map((issue: Issue) => getMessageForIssue(EMPTY_STRING, issue));
+ }
+}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1a742a30f09f4f382d0fbedfca96bbe4a9dd8bdf
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.spec.ts
@@ -0,0 +1,135 @@
+import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { Resource } from '@ngxp/rest';
+import { Observable, of, throwError } from 'rxjs';
+import { singleCold, singleHot } from '../../../test//marbles';
+import { createProblemDetail } from '../../../test/error';
+import { createDummyResource } from '../../../test/resource';
+import { HttpError, ProblemDetail } from '../tech.model';
+import { ApiResourceService } from './api-resource.service';
+import { LinkRelationName, ResourceServiceConfig, SaveResourceData } from './resource.model';
+import { ResourceRepository } from './resource.repository';
+import { StateResource, createStateResource } from './resource.util';
+
+describe('ApiResourceService', () => {
+ let service: ApiResourceService<Resource, Resource>;
+ let config: ResourceServiceConfig<Resource>;
+ let repository: Mock<ResourceRepository>;
+
+ const configResource: Resource = createDummyResource();
+ const configStateResource: StateResource<Resource> = createStateResource(configResource);
+ const configStateResource$: Observable<StateResource<Resource>> = of(configStateResource);
+
+ const editLinkRel: string = 'dummyEditLinkRel';
+ const getLinkRel: LinkRelationName = 'dummyGetLinkRel';
+ const deleteLinkRel: LinkRelationName = 'dummyDeleteLinkRel';
+
+ beforeEach(() => {
+ config = {
+ resource: configStateResource$,
+ getLinkRel,
+ edit: { linkRel: editLinkRel },
+ delete: { linkRel: deleteLinkRel },
+ };
+ repository = mock(ResourceRepository);
+
+ service = new ApiResourceService(config, useFromMock(repository));
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+
+ describe('save', () => {
+ const dummyToSave: unknown = {};
+ const loadedResource: Resource = createDummyResource();
+
+ const resourceWithEditLinkRel: Resource = createDummyResource([editLinkRel]);
+
+ it('should throw error if edit link not exists', () => {
+ service.stateResource.next(createStateResource(createDummyResource()));
+
+ expect(() => service.save(dummyToSave)).toThrowError(
+ 'No edit link exists on current stateresource.',
+ );
+ });
+
+ it('should call repository', fakeAsync(() => {
+ service.stateResource.next(createStateResource(resourceWithEditLinkRel));
+ repository.save.mockReturnValue(of(loadedResource));
+
+ service.save(dummyToSave).subscribe();
+ tick();
+
+ const expectedSaveResourceData: SaveResourceData<Resource> = {
+ resource: resourceWithEditLinkRel,
+ linkRel: editLinkRel,
+ toSave: dummyToSave,
+ };
+ expect(repository.save).toHaveBeenCalledWith(expectedSaveResourceData);
+ }));
+
+ it('should return saved object', () => {
+ service.stateResource.next(createStateResource(resourceWithEditLinkRel));
+ repository.save.mockReturnValue(singleHot(loadedResource));
+
+ const saved: Observable<StateResource<Resource | HttpError>> = service.save(dummyToSave);
+
+ expect(saved).toBeObservable(singleCold(createStateResource(loadedResource)));
+ });
+
+ it('should call handleError', () => {
+ service.stateResource.next(createStateResource(createDummyResource([config.edit.linkRel])));
+ const errorResponse: ProblemDetail = createProblemDetail();
+ repository.save.mockReturnValue(throwError(() => errorResponse));
+ service.handleError = jest.fn();
+
+ service.save(<any>{}).subscribe();
+
+ expect(service.handleError).toHaveBeenCalledWith(errorResponse);
+ });
+
+ it('should update state resource subject', fakeAsync(() => {
+ service.stateResource.next(createStateResource(resourceWithEditLinkRel));
+ repository.save.mockReturnValue(of(loadedResource));
+
+ service.save(dummyToSave).subscribe();
+ tick();
+
+ expect(service.stateResource.value).toEqual(createStateResource(loadedResource));
+ }));
+ });
+
+ describe('delete', () => {
+ const resourceWithDeleteLinkRel: Resource = createDummyResource([deleteLinkRel]);
+ const stateResourceWithDeleteLink: StateResource<Resource> =
+ createStateResource(resourceWithDeleteLinkRel);
+
+ beforeEach(() => {
+ service.stateResource.next(stateResourceWithDeleteLink);
+ });
+
+ it('should throw error if delete linkRel not exists on current stateresource', () => {
+ service.stateResource.next(createStateResource(createDummyResource()));
+
+ expect(() => service.delete()).toThrowError(
+ 'No delete link exists on current stateresource.',
+ );
+ });
+
+ it('should call repository', () => {
+ service.delete();
+
+ expect(repository.delete).toHaveBeenCalledWith(resourceWithDeleteLinkRel, deleteLinkRel);
+ });
+
+ it('should return value', () => {
+ const deleteResource: Resource = createDummyResource();
+ repository.delete.mockReturnValue(singleHot(deleteResource));
+
+ const deletedResource: Observable<Resource> = service.delete();
+
+ expect(deletedResource).toBeObservable(singleCold(deleteResource));
+ });
+ });
+});
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.ts b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..2f328bcfd4ada2264cfc13c8df28b33a2ac81691
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/resource/api-resource.service.ts
@@ -0,0 +1,30 @@
+import { Resource } from '@ngxp/rest';
+import { Observable } from 'rxjs';
+import { ResourceServiceConfig } from './resource.model';
+import { ResourceRepository } from './resource.repository';
+import { ResourceService } from './resource.service';
+
+export class ApiResourceService<B extends Resource, T extends Resource> extends ResourceService<
+ B,
+ T
+> {
+ constructor(
+ protected config: ResourceServiceConfig<B>,
+ protected repository: ResourceRepository,
+ ) {
+ super(config, repository);
+ }
+
+ doSave(resource: T, toSave: unknown): Observable<T> {
+ return <Observable<T>>this.repository.save({
+ resource,
+ linkRel: this.config.edit.linkRel,
+ toSave,
+ });
+ }
+
+ public delete(): Observable<Resource> {
+ this.verifyDeleteLinkRel();
+ return this.repository.delete(this.getResource(), this.config.delete.linkRel);
+ }
+}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.itcase.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.itcase.spec.ts
index 3d0235dc49cbf3cd0cef473247ec788dcebb6578..9e8d68e04cac794472b2a4142bf9d8888c31a452 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.itcase.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.itcase.spec.ts
@@ -21,6 +21,7 @@ describe.skip('ResourceListService ITCase', () => {
let resourceRepository: Mock<ResourceRepository>;
const listLinkRel: string = DummyListLinkRel.LIST;
+ const listResourceListLinkRel: string = DummyListLinkRel.LIST;
const createLinkRel: string = DummyLinkRel.DUMMY;
const baseResource: StateResource<Resource> = createStateResource(createDummyResource());
@@ -134,6 +135,7 @@ describe.skip('ResourceListService ITCase', () => {
return {
baseResource,
listLinkRel,
+ listResourceListLinkRel,
createLinkRel,
};
}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts
index 146a20daa825d85c5fb4725609fdf633428e2b48..9983f8acf61e11a6c642761e7b0d6e8e3351c253 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.spec.ts
@@ -10,9 +10,14 @@ import {
createFilledDummyListResource,
} from 'libs/tech-shared/test/resource';
import { BehaviorSubject, Observable, of } from 'rxjs';
+import { singleCold, singleHot } from '../../../test/marbles';
import { ResourceListService } from './list-resource.service';
-import { singleCold, singleHot } from './marbles';
-import { CreateResourceData, ListItemResource, ListResourceServiceConfig } from './resource.model';
+import {
+ CreateResourceData,
+ LinkRelationName,
+ ListItemResource,
+ ListResourceServiceConfig,
+} from './resource.model';
import { ResourceRepository } from './resource.repository';
import {
ListResource,
@@ -21,6 +26,8 @@ import {
createStateResource,
} from './resource.util';
+import { EMPTY_ARRAY } from '../tech.util';
+
import * as ResourceUtil from './resource.util';
describe('ListResourceService', () => {
@@ -28,8 +35,9 @@ describe('ListResourceService', () => {
let config: ListResourceServiceConfig<Resource>;
let resourceRepository: Mock<ResourceRepository>;
- const listLinkRel: string = DummyListLinkRel.LIST;
- const createLinkRel: string = DummyLinkRel.DUMMY;
+ const listLinkRel: LinkRelationName = DummyListLinkRel.LIST;
+ const createLinkRel: LinkRelationName = DummyLinkRel.DUMMY;
+ const listResourceListLinkRel: LinkRelationName = DummyListLinkRel.LIST;
const listResource: ListResource = createDummyListResource([listLinkRel, createLinkRel]);
const baseResource: Resource = createDummyResource();
@@ -42,6 +50,7 @@ describe('ListResourceService', () => {
config = {
baseResource: baseResourceSubj,
listLinkRel,
+ listResourceListLinkRel,
createLinkRel,
};
resourceRepository = mock(ResourceRepository);
@@ -473,4 +482,54 @@ describe('ListResourceService', () => {
expect(isFirst).toBe(true);
});
});
+
+ describe('get items', () => {
+ const listResourceItems: ListItemResource[] = [createDummyResource()];
+ const stateListResource: StateResource<ListResource> = createStateResource(
+ createFilledDummyListResource(listResourceItems),
+ );
+ let getListSpy: jest.SpyInstance;
+
+ beforeEach(() => {
+ getListSpy = service.getList = jest.fn().mockReturnValue(of(stateListResource));
+ });
+
+ it('should get list', () => {
+ service.getItems();
+
+ expect(getListSpy).toHaveBeenCalled();
+ });
+
+ it('should call get embedded resources', () => {
+ const spy = jest.spyOn(ResourceUtil, 'getEmbeddedResources');
+ service.getItems().subscribe();
+
+ expect(spy).toHaveBeenCalledWith(stateListResource, listResourceListLinkRel);
+ });
+
+ it('should return empty array on empty stateResource', (done) => {
+ service.getList = jest.fn().mockReturnValue(of(createEmptyStateResource()));
+
+ service.getItems().subscribe((items) => {
+ expect(items).toEqual(EMPTY_ARRAY);
+ done();
+ });
+ });
+
+ it('should return listresource items', (done) => {
+ service.getItems().subscribe((items) => {
+ expect(items).toEqual(listResourceItems);
+ done();
+ });
+ });
+
+ it('should not emit on loading state resource', () => {
+ service.getList = jest.fn().mockReturnValue(of(createEmptyStateResource(true)));
+
+ const spy = jest.spyOn(ResourceUtil, 'getEmbeddedResources').mockClear();
+ service.getItems().subscribe();
+
+ expect(spy).not.toHaveBeenCalled();
+ });
+ });
});
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts
index 90922c68665d85ef4b4657c3c7c3dde3c928af7f..631e1c685eba0e9f96e5a4e1d97e1314a1cb7e9f 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/list-resource.service.ts
@@ -1,6 +1,15 @@
import { Resource, ResourceUri, getUrl, hasLink } from '@ngxp/rest';
import { isEqual, isNull } from 'lodash-es';
-import { BehaviorSubject, Observable, combineLatest, filter, first, startWith, tap } from 'rxjs';
+import {
+ BehaviorSubject,
+ Observable,
+ combineLatest,
+ filter,
+ first,
+ map,
+ startWith,
+ tap,
+} from 'rxjs';
import { isNotNull, isNotUndefined } from '../tech.util';
import { CreateResourceData, ListItemResource, ListResourceServiceConfig } from './resource.model';
import { ResourceRepository } from './resource.repository';
@@ -220,4 +229,16 @@ export class ResourceListService<
private getListResource(): T {
return this.listResource.value.resource;
}
+
+ public getItems(): Observable<ListItemResource[]> {
+ return this.getList().pipe(
+ filter((listStateResource: StateResource<T>) => !listStateResource.loading),
+ map((listStateResource: StateResource<T>) =>
+ getEmbeddedResources<ListItemResource>(
+ listStateResource,
+ this.config.listResourceListLinkRel,
+ ),
+ ),
+ );
+ }
}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.model.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.model.ts
index a4b311320545c984f038169015d9ef49021ffcdb..5fa5264f32b11a057af8755641f61d02b001fc46 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.model.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.model.ts
@@ -5,7 +5,8 @@ import { StateResource } from './resource.util';
export interface ListResourceServiceConfig<B> {
baseResource: Observable<StateResource<B>>;
listLinkRel: LinkRelationName;
- createLinkRel: LinkRelationName;
+ listResourceListLinkRel: LinkRelationName;
+ createLinkRel?: LinkRelationName;
}
export interface CreateResourceData<T> {
@@ -26,6 +27,6 @@ export declare type LinkRelationName = string;
export interface ResourceServiceConfig<B> {
resource: Observable<StateResource<B>>;
getLinkRel: LinkRelationName;
- deleteLinkRel: LinkRelationName;
- editLinkRel: LinkRelationName;
+ delete?: { linkRel: LinkRelationName; order?: string };
+ edit?: { linkRel: LinkRelationName; order?: string };
}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts
index 794c5979ace7f163d3874c8ecd3da0e75aef0fda..d9b2b8cd5662996a5c8eb0129e54779ee289a105 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.repository.spec.ts
@@ -1,13 +1,13 @@
-import { ResourceRepository } from './resource.repository';
-import { Resource, ResourceFactory, ResourceUri, getUrl } from '@ngxp/rest';
import { mock, useFromMock } from '@alfa-client/test-utils';
-import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource';
-import { ListResource } from './resource.util';
+import { faker } from '@faker-js/faker';
+import { Resource, ResourceFactory, ResourceUri, getUrl } from '@ngxp/rest';
import { DummyLinkRel, DummyListLinkRel } from 'libs/tech-shared/test/dummy';
+import { createDummyListResource, createDummyResource } from 'libs/tech-shared/test/resource';
import { Observable } from 'rxjs';
-import { faker } from '@faker-js/faker';
+import { singleCold, singleHot } from '../../../test/marbles';
import { CreateResourceData, LinkRelationName, SaveResourceData } from './resource.model';
-import { singleHot, singleCold } from './marbles';
+import { ResourceRepository } from './resource.repository';
+import { ListResource } from './resource.util';
describe('ResourceRepository', () => {
let repository: ResourceRepository;
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
index b7bc23b1732d5ce0f2e3c5a941acde157a18b0e5..c2d7bc185fefd6f2fa682076a278fb962b413ce1 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
@@ -1,6 +1,6 @@
import { Resource } from '@ngxp/rest';
import { Observable, filter, map } from 'rxjs';
-import { StateResource, hasError, isLoaded } from './resource.util';
+import { StateResource, hasStateResourceError, isLoaded } from './resource.util';
export function filterIsLoadedOrHasError<T>(): (
source: Observable<StateResource<T>>,
@@ -8,7 +8,7 @@ export function filterIsLoadedOrHasError<T>(): (
return (source: Observable<StateResource<T>>): Observable<StateResource<T>> => {
return source.pipe(
filter(
- (stateResource: StateResource<T>) => hasError(stateResource) || isLoaded(stateResource),
+ (stateResource: StateResource<T>) => hasStateResourceError(stateResource) || isLoaded(stateResource),
),
);
};
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts
index a5cedb5dddf56a441f94e02ca4e55ebab913c46c..cff64cc4e17979a6d14e59a8f017e1b7cd2c9076 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.itcase.spec.ts
@@ -2,29 +2,29 @@ import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { fakeAsync, tick } from '@angular/core/testing';
import faker from '@faker-js/faker';
import { Resource, getUrl } from '@ngxp/rest';
-import { createDummyResource } from 'libs/tech-shared/test/resource';
import { BehaviorSubject, of } from 'rxjs';
+import { createDummyResource } from '../../../test/resource';
import { LinkRelationName, ResourceServiceConfig } from './resource.model';
import { ResourceRepository } from './resource.repository';
-import { ResourceService } from './resource.service';
+import { DummyResourceService } from './resource.service.spec';
import { StateResource, createEmptyStateResource, createStateResource } from './resource.util';
-describe('ResourceService ITCase', () => {
- let service: ResourceService<Resource, Resource>;
+describe.skip('FIXME: mocking.ts issue due to module test | ResourceService ITCase', () => {
+ let service: DummyResourceService<Resource, Resource>;
let config: ResourceServiceConfig<Resource>;
let repository: Mock<ResourceRepository>;
const getLinkRel: LinkRelationName = faker.random.word();
- const deleteLinkRel: LinkRelationName = faker.random.word();
const editLinkRel: LinkRelationName = faker.random.word();
+ const deleteLinkRel: LinkRelationName = faker.random.word();
- const configResource: Resource = createDummyResource([deleteLinkRel, getLinkRel, editLinkRel]);
+ const configResource: Resource = createDummyResource([getLinkRel, editLinkRel]);
const configStateResource: StateResource<Resource> = createStateResource(configResource);
const configResourceSubj: BehaviorSubject<StateResource<Resource>> = new BehaviorSubject<
StateResource<Resource>
>(configStateResource);
- const loadedResource: Resource = createDummyResource([deleteLinkRel, getLinkRel, editLinkRel]);
+ const loadedResource: Resource = createDummyResource([getLinkRel, editLinkRel]);
const EXPECTED_EMITTED_TIMES_FOR_GET: number = 3;
@@ -32,12 +32,12 @@ describe('ResourceService ITCase', () => {
config = {
resource: configResourceSubj,
getLinkRel,
- deleteLinkRel,
- editLinkRel,
+ edit: { linkRel: editLinkRel },
+ delete: { linkRel: deleteLinkRel },
};
repository = mock(ResourceRepository);
- service = new ResourceService<Resource, Resource>(config, useFromMock(repository));
+ service = new DummyResourceService<Resource, Resource>(config, useFromMock(repository));
repository.getResource.mockReturnValueOnce(of(loadedResource));
service.stateResource.next(createEmptyStateResource());
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts
index 5a109bb9057d915f0c5140dc0b1d08f1a4b84225..8c6b5ae5092d8b62833fbd72d357ec1f48801c40 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.spec.ts
@@ -4,14 +4,13 @@ import { fakeAsync, tick } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
import { Resource, ResourceUri, getUrl } from '@ngxp/rest';
import { cold } from 'jest-marbles';
-import { createProblemDetail } from 'libs/tech-shared/test/error';
-import { createDummyResource } from 'libs/tech-shared/test/resource';
import { Observable, lastValueFrom, of, throwError } from 'rxjs';
+import { createProblemDetail } from '../../../test//error';
+import { singleCold, singleHot } from '../../../test/marbles';
+import { createDummyResource } from '../../../test/resource';
import { HttpError, ProblemDetail } from '../tech.model';
-import { singleCold, singleHot } from './marbles';
-import { LinkRelationName, ResourceServiceConfig, SaveResourceData } from './resource.model';
+import { LinkRelationName, ResourceServiceConfig } from './resource.model';
import { ResourceRepository } from './resource.repository';
-import { ResourceService } from './resource.service';
import {
StateResource,
createEmptyStateResource,
@@ -19,10 +18,11 @@ import {
createStateResource,
} from './resource.util';
+import { ResourceService } from './resource.service';
import * as ResourceUtil from './resource.util';
describe('ResourceService', () => {
- let service: ResourceService<Resource, Resource>;
+ let service: DummyResourceService<Resource, Resource>;
let config: ResourceServiceConfig<Resource>;
let repository: Mock<ResourceRepository>;
@@ -31,20 +31,20 @@ describe('ResourceService', () => {
const configStateResource: StateResource<Resource> = createStateResource(configResource);
const configStateResource$: Observable<StateResource<Resource>> = of(configStateResource);
- const deleteLinkRel: string = 'dummyDeleteLinkRel';
const editLinkRel: string = 'dummyEditLinkRel';
const getLinkRel: LinkRelationName = 'dummyGetLinkRel';
+ const deleteLinkRel: LinkRelationName = 'dummyDeleteLinkRel';
beforeEach(() => {
config = {
resource: configStateResource$,
getLinkRel,
- deleteLinkRel,
- editLinkRel,
+ edit: { linkRel: editLinkRel },
+ delete: { linkRel: deleteLinkRel },
};
repository = mock(ResourceRepository);
- service = new ResourceService(config, useFromMock(repository));
+ service = new DummyResourceService(config, useFromMock(repository));
});
it('should be created', () => {
@@ -351,24 +351,22 @@ describe('ResourceService', () => {
);
});
- it('should call repository', fakeAsync(() => {
- service.stateResource.next(createStateResource(resourceWithEditLinkRel));
- repository.save.mockReturnValue(of(loadedResource));
+ it('should do save', fakeAsync(() => {
+ const stateResource: StateResource<Resource> = createStateResource(resourceWithEditLinkRel);
+ service.stateResource.next(stateResource);
+ const doSaveMock: jest.Mock = (service.doSave = jest.fn()).mockReturnValue(
+ of(loadedResource),
+ );
service.save(dummyToSave).subscribe();
tick();
- const expectedSaveResourceData: SaveResourceData<Resource> = {
- resource: resourceWithEditLinkRel,
- linkRel: editLinkRel,
- toSave: dummyToSave,
- };
- expect(repository.save).toHaveBeenCalledWith(expectedSaveResourceData);
+ expect(doSaveMock).toHaveBeenCalledWith(resourceWithEditLinkRel, dummyToSave);
}));
it('should return saved object', () => {
service.stateResource.next(createStateResource(resourceWithEditLinkRel));
- repository.save.mockReturnValue(singleHot(loadedResource));
+ service.doSave = jest.fn().mockReturnValue(singleHot(loadedResource));
const saved: Observable<StateResource<Resource | HttpError>> = service.save(dummyToSave);
@@ -376,9 +374,9 @@ describe('ResourceService', () => {
});
it('should call handleError', () => {
- service.stateResource.next(createStateResource(createDummyResource([config.editLinkRel])));
+ service.stateResource.next(createStateResource(createDummyResource([config.edit.linkRel])));
const errorResponse: ProblemDetail = createProblemDetail();
- repository.save.mockReturnValue(throwError(() => errorResponse));
+ service.doSave = jest.fn().mockReturnValue(throwError(() => errorResponse));
service.handleError = jest.fn();
service.save(<any>{}).subscribe();
@@ -388,7 +386,7 @@ describe('ResourceService', () => {
it('should update state resource subject', fakeAsync(() => {
service.stateResource.next(createStateResource(resourceWithEditLinkRel));
- repository.save.mockReturnValue(of(loadedResource));
+ service.doSave = jest.fn().mockReturnValue(of(loadedResource));
service.save(dummyToSave).subscribe();
tick();
@@ -398,7 +396,7 @@ describe('ResourceService', () => {
});
describe('handleError', () => {
- it('should return error stateresource on problem unprocessable entity', (done) => {
+ it('should return error stateresource on problem unprocessable entity', (done: jest.DoneCallback) => {
const error: ProblemDetail = createProblemDetail();
service
@@ -480,39 +478,6 @@ describe('ResourceService', () => {
});
});
- describe('delete', () => {
- const resourceWithDeleteLinkRel: Resource = createDummyResource([deleteLinkRel]);
- const stateResourceWithDeleteLink: StateResource<Resource> =
- createStateResource(resourceWithDeleteLinkRel);
-
- beforeEach(() => {
- service.stateResource.next(stateResourceWithDeleteLink);
- });
-
- it('should throw error if delete linkRel not exists on current stateresource', () => {
- service.stateResource.next(createStateResource(createDummyResource()));
-
- expect(() => service.delete()).toThrowError(
- 'No delete link exists on current stateresource.',
- );
- });
-
- it('should call repository', () => {
- service.delete();
-
- expect(repository.delete).toHaveBeenCalledWith(resourceWithDeleteLinkRel, deleteLinkRel);
- });
-
- it('should return value', () => {
- const deleteResource: Resource = createDummyResource();
- repository.delete.mockReturnValue(singleHot(deleteResource));
-
- const deletedResource: Observable<Resource> = service.delete();
-
- expect(deletedResource).toBeObservable(singleCold(deleteResource));
- });
- });
-
describe('get resource', () => {
it('should return resource from stateResource', () => {
const resource: Resource = createDummyResource();
@@ -543,3 +508,19 @@ describe('ResourceService', () => {
});
});
});
+
+export class DummyResourceService<B extends Resource, T extends Resource> extends ResourceService<
+ B,
+ T
+> {
+ constructor(
+ protected config: ResourceServiceConfig<B>,
+ protected repository: ResourceRepository,
+ ) {
+ super(config, repository);
+ }
+
+ doSave(resource: T, toSave: unknown): Observable<T> {
+ return of(resource);
+ }
+}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts
index 6f24fa00a4ebcf3b8a17dc44f850b18aa5236163..b87ef49e8d89a71752b6cd6b793aa6d6a4bb05c0 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.service.ts
@@ -15,7 +15,7 @@ import {
throwError,
} from 'rxjs';
import { isUnprocessableEntity } from '../http.util';
-import { HttpError, ProblemDetail } from '../tech.model';
+import { HttpError } from '../tech.model';
import { isNotNull } from '../tech.util';
import { ResourceServiceConfig } from './resource.model';
import { ResourceRepository } from './resource.repository';
@@ -34,7 +34,7 @@ import {
* B = Type of baseresource
* T = Type of the resource which is working on
*/
-export class ResourceService<B extends Resource, T extends Resource> {
+export abstract class ResourceService<B extends Resource, T extends Resource> {
readonly stateResource: BehaviorSubject<StateResource<T>> = new BehaviorSubject(
createEmptyStateResource(),
);
@@ -42,8 +42,8 @@ export class ResourceService<B extends Resource, T extends Resource> {
configResource: B;
constructor(
- private config: ResourceServiceConfig<B>,
- private repository: ResourceRepository,
+ protected config: ResourceServiceConfig<B>,
+ protected repository: ResourceRepository,
) {}
public get(): Observable<StateResource<T>> {
@@ -138,58 +138,56 @@ export class ResourceService<B extends Resource, T extends Resource> {
handleError(errorResponse: HttpErrorResponse): Observable<StateResource<HttpError>> {
if (isUnprocessableEntity(errorResponse.status)) {
- return of(createErrorStateResource((<any>errorResponse) as ProblemDetail));
+ return of(createErrorStateResource((<any>errorResponse) as HttpError));
}
return throwError(() => errorResponse);
}
- private verifyEditLinkRel(): void {
+ public verifyEditLinkRel(): void {
throwErrorOn(
- !this.hasLinkRel(this.config.editLinkRel),
+ !this.hasLinkRel(this.config.edit.linkRel),
'No edit link exists on current stateresource.',
);
}
- private doSave(resource: T, toSave: unknown): Observable<T> {
- return <Observable<T>>this.repository.save({
- resource,
- linkRel: this.config.editLinkRel,
- toSave,
- });
- }
+ abstract doSave(resource: T, toSave: unknown): Observable<T>;
public refresh(): void {
this.stateResource.next({ ...this.stateResource.value, reload: true });
}
+ /**
+ * @deprecated
+ */
public canEdit(): boolean {
- return this.hasLinkRel(this.config.editLinkRel);
- }
-
- public canDelete(): boolean {
- return this.hasLinkRel(this.config.deleteLinkRel);
+ return this.hasLinkRel(this.config.edit.linkRel);
}
- private hasLinkRel(linkRel: string): boolean {
+ protected hasLinkRel(linkRel: string): boolean {
return hasLink(this.getResource(), linkRel);
}
+ /**
+ * @deprecated
+ */
public getResource(): T {
return this.stateResource.value.resource;
}
- public delete(): Observable<Resource> {
- this.verifyDeleteLinkRel();
- return this.repository.delete(this.getResource(), this.config.deleteLinkRel);
+ /**
+ * @deprecated
+ */
+ public canDelete(): boolean {
+ return this.hasLinkRel(this.config.delete.linkRel);
}
- private verifyDeleteLinkRel(): void {
- throwErrorOn(
- !this.hasLinkRel(this.config.deleteLinkRel),
- 'No delete link exists on current stateresource.',
- );
+ protected verifyDeleteLinkRel(): void {
+ throwErrorOn(!this.canDelete(), 'No delete link exists on current stateresource.');
}
+ /**
+ * @deprecated
+ */
public exists(): boolean {
return isNotNull(this.stateResource.value.resource);
}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.spec.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.spec.ts
index 2e6894ecb1529b743a0ce877c406421b95bd5c2f..e5a9f28f281136f4ac735e04259cc76ce15a051e 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.spec.ts
@@ -22,25 +22,19 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- containsLoading,
- createErrorStateResource,
- EMPTY_ARRAY,
- getSuccessfullyLoaded,
- StateResource,
-} from '@alfa-client/tech-shared';
import { Resource } from '@ngxp/rest';
-import {
- createDummyListResource,
- createDummyResource,
- toResource,
-} from 'libs/tech-shared/test/resource';
import { DummyListLinkRel } from '../../../test/dummy';
import { createApiError } from '../../../test/error';
+import { createDummyListResource, createDummyResource, toResource } from '../../../test/resource';
+import { EMPTY_ARRAY } from '../tech.util';
import {
+ StateResource,
+ containsLoading,
createEmptyStateResource,
+ createErrorStateResource,
createStateResource,
getEmbeddedResources,
+ getSuccessfullyLoaded,
isInvalidResourceCombination,
isLoaded,
isLoadingRequired,
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
index b5f9b3660e8e3db0f24042fa82c180fa918fcce1..17394d5b91f600d6882f82fca324a97cdb046449 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { encodeUrlForEmbedding, isNotNull } from '@alfa-client/tech-shared';
import { Resource, ResourceUri, getEmbeddedResource, getUrl, hasLink } from '@ngxp/rest';
import { isEqual, isNil, isNull } from 'lodash-es';
import { HttpError } from '../tech.model';
+import { encodeUrlForEmbedding, isNotNull } from '../tech.util';
export interface ListResource extends Resource {
_embedded;
@@ -69,7 +69,7 @@ export function isLoaded<T>(stateResource: StateResource<T>): boolean {
return !stateResource.loading && !stateResource.reload && isNotNull(stateResource.resource);
}
-export function hasError(stateResource: StateResource<any>): boolean {
+export function hasStateResourceError(stateResource: StateResource<any>): boolean {
return !isNil(stateResource.error);
}
@@ -115,7 +115,7 @@ export function getSuccessfullyLoaded<T extends Resource>(
stateResources: StateResource<T>[],
): StateResource<T>[] {
return stateResources.filter(
- (stateResource) => isLoaded(stateResource) && !hasError(stateResource),
+ (stateResource) => isLoaded(stateResource) && !hasStateResourceError(stateResource),
);
}
diff --git a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.spec.ts b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.spec.ts
index 384a9bfc4845cdce367acc86791b4139bbb33f17..65c4b159b81ac89cca0b3d82e7f086d9ccf921c0 100644
--- a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.spec.ts
+++ b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.spec.ts
@@ -21,19 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { CommandResource } from '@alfa-client/command-shared';
-import {
- ApiError,
- createEmptyStateResource,
- createErrorStateResource,
- HttpError,
- InvalidParam,
- Issue,
- ProblemDetail,
- StateResource,
-} from '@alfa-client/tech-shared';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { Resource } from '@ngxp/rest';
+import { cold } from 'jest-marbles';
import {
createApiError,
createInvalidParam,
@@ -42,7 +33,13 @@ import {
} from 'libs/tech-shared/test/error';
import { Observable, of } from 'rxjs';
import { AbstractFormService } from './formservice.abstract';
-import { cold } from 'jest-marbles';
+
+import {
+ StateResource,
+ createEmptyStateResource,
+ createErrorStateResource,
+} from '../resource/resource.util';
+import { ApiError, HttpError, InvalidParam, Issue, ProblemDetail } from '../tech.model';
import * as ValidationUtil from '../validation/tech.validation.util';
diff --git a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
index 753c7422643ab606489987684c13e1ee097ae31b..a02d2bab0a0eadcc998270d2d06adc277961d236 100644
--- a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
+++ b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
@@ -27,7 +27,7 @@ import { Resource } from '@ngxp/rest';
import { isNil } from 'lodash-es';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
-import { StateResource, hasError } from '../resource/resource.util';
+import { StateResource, hasStateResourceError } from '../resource/resource.util';
import { ApiError, HttpError, InvalidParam, Issue, ProblemDetail } from '../tech.model';
import { isNotUndefined } from '../tech.util';
import {
@@ -56,7 +56,7 @@ export abstract class AbstractFormService {
handleResponse(result: StateResource<Resource | HttpError>): StateResource<Resource | HttpError> {
if (result.loading) return result;
- if (hasError(result)) {
+ if (hasStateResourceError(result)) {
this.handleError(result.error);
}
return result;
diff --git a/alfa-client/libs/tech-shared/src/lib/tech-shared.module.ts b/alfa-client/libs/tech-shared/src/lib/tech-shared.module.ts
index 6d81cbece935b0b247a3c77cc8ea765c6e92861f..ecb138d23695a7111038967cf2d80147cbac5206 100644
--- a/alfa-client/libs/tech-shared/src/lib/tech-shared.module.ts
+++ b/alfa-client/libs/tech-shared/src/lib/tech-shared.module.ts
@@ -27,6 +27,7 @@ import { Injector, NgModule } from '@angular/core';
import { HttpBinaryFileInterceptor } from './interceptor/http-binary-file.interceptor';
import { HttpXsrfInterceptor } from './interceptor/http-xsrf.interceptor';
import { XhrInterceptor } from './interceptor/xhr.interceptor';
+import { ConvertApiErrorToErrorMessagesPipe } from './pipe/convert-api-error-to-error-messages.pipe';
import { ConvertForDataTestPipe } from './pipe/convert-for-data-test.pipe';
import { ConvertToBooleanPipe } from './pipe/convert-to-boolean.pipe';
import { EnumToLabelPipe } from './pipe/enum-to-label.pipe';
@@ -65,6 +66,7 @@ import { ToTrafficLightPipe } from './pipe/to-traffic-light.pipe';
FileSizePlainPipe,
GetUrlPipe,
ConvertToBooleanPipe,
+ ConvertApiErrorToErrorMessagesPipe,
],
exports: [
FormatToPrettyDatePipe,
@@ -84,6 +86,7 @@ import { ToTrafficLightPipe } from './pipe/to-traffic-light.pipe';
FileSizePlainPipe,
GetUrlPipe,
ConvertToBooleanPipe,
+ ConvertApiErrorToErrorMessagesPipe,
],
providers: [
{
diff --git a/alfa-client/libs/tech-shared/src/lib/tech.util.ts b/alfa-client/libs/tech-shared/src/lib/tech.util.ts
index e6d580a0745b01fa3e330321820b03e861ee1164..9431d613c3e1d542bfce24dcc5747f859e046d0d 100644
--- a/alfa-client/libs/tech-shared/src/lib/tech.util.ts
+++ b/alfa-client/libs/tech-shared/src/lib/tech.util.ts
@@ -135,7 +135,7 @@ export function convertToBoolean(booleanStr: string): boolean {
try {
return JSON.parse(booleanStr.toLowerCase());
} catch (e: unknown) {
- console.warn('Error parsing ' + booleanStr + ' to boolean value.', e);
+ console.debug('Error parsing ' + booleanStr + ' to boolean value.', e);
return undefined;
}
}
diff --git a/alfa-client/libs/tech-shared/test/file.ts b/alfa-client/libs/tech-shared/test/file.ts
index 4664c7c07c48b29995dfbef49dc2a27b7ad9b0f9..3f0fd180a866e86a1f9c2747bfae8b876a19950c 100644
--- a/alfa-client/libs/tech-shared/test/file.ts
+++ b/alfa-client/libs/tech-shared/test/file.ts
@@ -1,3 +1,5 @@
+import { faker } from '@faker-js/faker';
+
export function createFile(): File {
- return <any>{};
-}
\ No newline at end of file
+ return <any>{ name: faker.datatype.string(10), type: 'image/png', size: 512 };
+}
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/marbles.ts b/alfa-client/libs/tech-shared/test/marbles.ts
similarity index 79%
rename from alfa-client/libs/tech-shared/src/lib/resource/marbles.ts
rename to alfa-client/libs/tech-shared/test/marbles.ts
index e3b89dff4d7a268654a6cfd53a93b3cd6b444680..199c8726cb43b889816929635014861fc19d19df 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/marbles.ts
+++ b/alfa-client/libs/tech-shared/test/marbles.ts
@@ -1,6 +1,4 @@
-//In das Generelle Test File verschieben
-
-import { cold, hot, ObservableWithSubscriptions } from 'jest-marbles';
+import { ObservableWithSubscriptions, cold, hot } from 'jest-marbles';
export function singleHot(object: any, frame: string = 'a'): ObservableWithSubscriptions {
return hot(frame, { a: object });
diff --git a/alfa-client/libs/tech-shared/test/resource.ts b/alfa-client/libs/tech-shared/test/resource.ts
index 38a7df88ca44c1289197a8cec8641496a9015487..cf93fb97578b9e4f707014f4441d746b86a740be 100644
--- a/alfa-client/libs/tech-shared/test/resource.ts
+++ b/alfa-client/libs/tech-shared/test/resource.ts
@@ -26,7 +26,7 @@ import { Resource } from '@ngxp/rest';
import { times, zipObject } from 'lodash-es';
import { ListResource } from '../src/lib/resource/resource.util';
import { isNotUndefined } from '../src/lib/tech.util';
-import { createDummy, DummyListLinkRel } from './dummy';
+import { DummyListLinkRel, createDummy } from './dummy';
// @ts-ignore
export function toResource<R = T & Resource, T = any>(
diff --git a/alfa-client/libs/test-utils/src/lib/mocking.ts b/alfa-client/libs/test-utils/src/lib/mocking.ts
index d62e8815a4fc9d1cc224d12288fe3f2ad0dce98e..72e14a2dfa9a34aaf5940844a6f7b5a8812fa45a 100644
--- a/alfa-client/libs/test-utils/src/lib/mocking.ts
+++ b/alfa-client/libs/test-utils/src/lib/mocking.ts
@@ -21,8 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, EventEmitter, Type } from '@angular/core';
+import { Type } from '@angular/core';
+// Cannot find namespace 'jest'.ts(2503)
+// Exported type alias 'Mock' has or is using private name 'jest'
export type Mock<T> = { [K in keyof T]: jest.Mock };
export function mock<T>(service: Type<T>): Mock<T> {
@@ -34,29 +36,10 @@ export function mock<T>(service: Type<T>): Mock<T> {
<any>{},
);
}
-
export function useFromMock<T>(mockToUse: Mock<T>): T {
return <T>(<any>mockToUse);
}
-export function mockComponent(options: Component): Component {
- const metadata: Component = {
- selector: options.selector,
- template: options.template || '',
- inputs: options.inputs,
- outputs: options.outputs || [],
- exportAs: options.exportAs || '',
- };
-
- class Mock {}
-
- metadata.outputs.forEach((method) => {
- Mock.prototype[method] = new EventEmitter<any>();
- });
-
- return Component(metadata)(Mock as any);
-}
-
export function mockClass(clazz: any): Mock<any> {
return clazz as jest.Mocked<typeof clazz>; //NOSONAR
}
diff --git a/alfa-client/libs/ui/src/lib/assets/delete_finally.svg b/alfa-client/libs/ui/src/lib/assets/delete_finally.svg
index 984131c06be936d6d55c1ef3607b035ba6997b4a..37d3c9eac065773b24fa8dfaa85559920528dcde 100644
--- a/alfa-client/libs/ui/src/lib/assets/delete_finally.svg
+++ b/alfa-client/libs/ui/src/lib/assets/delete_finally.svg
@@ -1,5 +1,4 @@
<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2632_33815)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.4866 13V3.11101H12.1905L7.49777 8.05811L7.49777 13H5.5V8.05811C5.5 7.49738 5.71112 6.95968 6.0868 6.56365L10.7796 1.61654C11.1541 1.22173 11.6615 1 12.1905 1H17.4866C18.5899 1 19.4844 1.94513 19.4844 3.11101V13H17.4866Z" fill="#202020"/>
<path d="M7.5 20C7.5 19.4477 7.94772 19 8.5 19V19C9.05228 19 9.5 19.4477 9.5 20V20C9.5 20.5523 9.05228 21 8.5 21V21C7.94772 21 7.5 20.5523 7.5 20V20Z" fill="#202020"/>
<path d="M7.5 20C7.5 19.4477 7.94772 19 8.5 19V19C9.05228 19 9.5 19.4477 9.5 20V20C9.5 20.5523 9.05228 21 8.5 21V21C7.94772 21 7.5 20.5523 7.5 20V20Z" fill="#202020"/>
@@ -13,10 +12,4 @@
<path d="M15.5 20C15.5 19.4477 15.9477 19 16.5 19V19C17.0523 19 17.5 19.4477 17.5 20V21C17.5 21.5523 17.0523 22 16.5 22V22C15.9477 22 15.5 21.5523 15.5 21V20Z" fill="#202020"/>
<path d="M15.5 15C15.5 14.4477 15.9477 14 16.5 14V14C17.0523 14 17.5 14.4477 17.5 15V16C17.5 16.5523 17.0523 17 16.5 17V17C15.9477 17 15.5 16.5523 15.5 16V15Z" fill="#202020"/>
<path d="M15.5 15C15.5 14.4477 15.9477 14 16.5 14V14C17.0523 14 17.5 14.4477 17.5 15V16C17.5 16.5523 17.0523 17 16.5 17V17C15.9477 17 15.5 16.5523 15.5 16V15Z" fill="#202020"/>
-</g>
-<defs>
-<clipPath id="clip0_2632_33815">
-<rect width="24" height="24" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/discard_document.svg b/alfa-client/libs/ui/src/lib/assets/discard_document.svg
index 001b6cb06b57a44ea10a6dbeb07c6795fac6782e..2cf7c16f46ae84c9321b44c4ace9acbdd01c1097 100644
--- a/alfa-client/libs/ui/src/lib/assets/discard_document.svg
+++ b/alfa-client/libs/ui/src/lib/assets/discard_document.svg
@@ -1,11 +1,4 @@
<svg width="25" height="24" viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2624_33488)">
<path d="M12.5 19.4L14.1 21L16.5 18.6286L18.9 21L20.5 19.4L18.1286 17L20.5 14.6L18.9 13L16.5 15.4L14.1 13L12.5 14.6L14.9 17L12.5 19.4Z" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.75 11V3.77384H11.7794L7.375 7.93078L7.375 18.408H10.5V20.1818H7.375C6.33947 20.1818 5.5 19.3876 5.5 18.408V7.93078C5.5 7.4596 5.69815 7.00779 6.05074 6.67501L10.4551 2.51807C10.8066 2.18631 11.2829 2 11.7794 2H16.75C17.7855 2 18.625 2.79417 18.625 3.77384V11H16.75Z" />
-</g>
-<defs>
-<clipPath id="clip0_2624_33488">
-<rect width="24" height="24" transform="translate(0.5)"/>
-</clipPath>
-</defs>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/done.svg b/alfa-client/libs/ui/src/lib/assets/done.svg
index ddd8f1e84bcb946e090e6d0820ed72d92408f404..6fd1e43b40aef4a7393b2f34aa401a59aec17ddc 100644
--- a/alfa-client/libs/ui/src/lib/assets/done.svg
+++ b/alfa-client/libs/ui/src/lib/assets/done.svg
@@ -1,8 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_2_1608" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="18" height="19">
-<rect y="0.000183105" width="18" height="18" fill="#D9D9D9"/>
-</mask>
-<g mask="url(#mask0_2_1608)">
<path d="M7.16245 13.5002L2.88745 9.2252L3.9562 8.15645L7.16245 11.3627L14.0437 4.48145L15.1125 5.5502L7.16245 13.5002Z" fill="#2D65BA"/>
-</g>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/request_deletion.svg b/alfa-client/libs/ui/src/lib/assets/request_deletion.svg
index 3f9a50ad7f2a849a7a4e88e109c06a114691a6b3..6a962628ed8c7cce784219544a6c033052cecd4b 100644
--- a/alfa-client/libs/ui/src/lib/assets/request_deletion.svg
+++ b/alfa-client/libs/ui/src/lib/assets/request_deletion.svg
@@ -1,11 +1,4 @@
<svg width="25" height="24" viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2632_33797)">
<path d="M11.5 8H13.5V12.15L15.1 10.6L16.5 12L12.5 16L8.5 12L9.9 10.6L11.5 12.15V8Z" />
<path d="M7.5 21C6.95 21 6.47917 20.8042 6.0875 20.4125C5.69583 20.0208 5.5 19.55 5.5 19V6H4.5V4H9.5V3H15.5V4H20.5V6H19.5V19C19.5 19.55 19.3042 20.0208 18.9125 20.4125C18.5208 20.8042 18.05 21 17.5 21H7.5ZM17.5 6H7.5V19H17.5V6Z" />
-</g>
-<defs>
-<clipPath id="clip0_2632_33797">
-<rect width="24" height="24" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg b/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg
index 684d308dbe55189828a54dcf5516ded36134da5e..dbeb50ca6be99a07ffbf8210a39954cb0f4d2a84 100644
--- a/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg
+++ b/alfa-client/libs/ui/src/lib/assets/resubmission_expired.svg
@@ -1,19 +1,7 @@
<svg width="25" height="24" viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2611_41024)">
-<g clip-path="url(#clip1_2611_41024)">
<path d="M21.491 10.122H14.711L17.451 7.30195C14.721 4.60195 10.301 4.50195 7.57097 7.20195C4.84097 9.91195 4.84097 14.282 7.57097 16.992C10.301 19.702 14.721 19.702 17.451 16.992C18.811 15.652 19.491 14.082 19.491 12.102H21.491C21.491 14.082 20.611 16.652 18.851 18.392C15.341 21.872 9.64097 21.872 6.13097 18.392C2.63097 14.922 2.60097 9.28195 6.11097 5.81195C9.62097 2.34195 15.251 2.34195 18.761 5.81195L21.491 3.00195V10.122Z" />
<rect x="2.21484" y="5.56445" width="5.95309" height="1.98598" transform="rotate(-45 2.21484 5.56445)" />
<rect x="4.34375" y="1" width="0.828641" height="3.29385" transform="rotate(45 4.34375 1)" />
<rect x="11.5" y="7" width="2" height="6" />
<circle cx="12.5" cy="16" r="1" />
-</g>
-</g>
-<defs>
-<clipPath id="clip0_2611_41024">
-<rect width="24" height="24" fill="white" transform="translate(0.5)"/>
-</clipPath>
-<clipPath id="clip1_2611_41024">
-<rect width="24" height="24" fill="white" transform="translate(0.5)"/>
-</clipPath>
-</defs>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/undo_request_deletion.svg b/alfa-client/libs/ui/src/lib/assets/undo_request_deletion.svg
index c1c6a4949cb6b6ab005f85e2a5a618a4cc86ef0e..7b123439db9e008f64c58643fa78e5086f00597d 100644
--- a/alfa-client/libs/ui/src/lib/assets/undo_request_deletion.svg
+++ b/alfa-client/libs/ui/src/lib/assets/undo_request_deletion.svg
@@ -1,10 +1,3 @@
<svg width="25" height="24" viewBox="0 0 25 24" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2632_33811)">
<path d="M11.5 16H13.5V11.85L15.1 13.4L16.5 12L12.5 8L8.5 12L9.9 13.4L11.5 11.85V16ZM7.5 21C6.95 21 6.47917 20.8042 6.0875 20.4125C5.69583 20.0208 5.5 19.55 5.5 19V6H4.5V4H9.5V3H15.5V4H20.5V6H19.5V19C19.5 19.55 19.3042 20.0208 18.9125 20.4125C18.5208 20.8042 18.05 21 17.5 21H7.5ZM17.5 6H7.5V19H17.5V6Z"/>
-</g>
-<defs>
-<clipPath id="clip0_2632_33811">
-<rect width="24" height="24" transform="translate(0.5)"/>
-</clipPath>
-</defs>
</svg>
diff --git a/alfa-client/libs/ui/src/lib/assets/vorgang_vorpruefen.svg b/alfa-client/libs/ui/src/lib/assets/vorgang_vorpruefen.svg
index c1cf840f609e20315379507fc42ed2a10c326a89..9a07d2fb623e21224814c66c6fc28015dfe73145 100644
--- a/alfa-client/libs/ui/src/lib/assets/vorgang_vorpruefen.svg
+++ b/alfa-client/libs/ui/src/lib/assets/vorgang_vorpruefen.svg
@@ -1,8 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_2_1599" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="25">
-<rect y="0.000183105" width="24" height="24"/>
-</mask>
-<g mask="url(#mask0_2_1599)">
<path d="M8.6 22.5002L6.7 19.3002L3.1 18.5002L3.45 14.8002L1 12.0002L3.45 9.20018L3.1 5.50018L6.7 4.70018L8.6 1.50018L12 2.95018L15.4 1.50018L17.3 4.70018L20.9 5.50018L20.55 9.20018L23 12.0002L20.55 14.8002L20.9 18.5002L17.3 19.3002L15.4 22.5002L12 21.0502L8.6 22.5002ZM9.45 19.9502L12 18.8502L14.6 19.9502L16 17.5502L18.75 16.9002L18.5 14.1002L20.35 12.0002L18.5 9.85018L18.75 7.05018L16 6.45018L14.55 4.05018L12 5.15018L9.4 4.05018L8 6.45018L5.25 7.05018L5.5 9.85018L3.65 12.0002L5.5 14.1002L5.25 16.9502L8 17.5502L9.45 19.9502ZM10.95 15.5502L16.6 9.90018L15.2 8.45018L10.95 12.7002L8.8 10.6002L7.4 12.0002L10.95 15.5502Z"/>
-</g>
</svg>
\ No newline at end of file
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
index 4d9a6cd7f6c56983ce65590fcae495e88c34e42d..dd35f14177f9f6b6de7b665da4c71f0ec6bb5581 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.html
@@ -32,9 +32,10 @@
(blur)="touch()"
[attr.data-test-id]="(label | convertForDataTest) + '-date-input'"
(dateInput)="inputEvent($event)"
+ (blur)="onBlur()"
/>
<mat-datepicker-toggle matSuffix [for]="picker">
- <mat-icon matDatepickerToggleIcon attr.aria-label="xxx">update</mat-icon>
+ <mat-icon matDatepickerToggleIcon>calendar_month</mat-icon>
</mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
index 0bfe30ef97c28aa38ac80510a09def0f312841c6..24020a5412e79d4e0c21e5c016d3aa6804d613d9 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
+++ b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.spec.ts
@@ -21,19 +21,22 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule } from '@angular/forms';
import { MatNativeDateModule } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatIconModule } from '@angular/material/icon';
import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ConvertForDataTestPipe } from '@alfa-client/tech-shared';
+import faker from '@faker-js/faker';
import { MockComponent } from 'ng-mocks';
import { ValidationErrorComponent } from '../../validation-error/validation-error.component';
import { DateEditorComponent } from './date-editor.component';
+import * as dateUtil from '../../../../../../tech-shared/src/lib/date.util';
+
describe('DateEditorComponent', () => {
let component: DateEditorComponent;
let fixture: ComponentFixture<DateEditorComponent>;
@@ -79,4 +82,48 @@ describe('DateEditorComponent', () => {
expect(element).toBeInstanceOf(HTMLElement);
});
});
+
+ describe('onBlur', () => {
+ it('should not call add2000Years if input value is not Date object', () => {
+ const inputValue: string = '12.12.2024';
+ component.fieldControl.setValue(inputValue);
+ const add2000Years = jest.spyOn(dateUtil, 'add2000Years');
+
+ component.onBlur();
+
+ expect(add2000Years).not.toHaveBeenCalled();
+ });
+
+ describe('if input value is Date object', () => {
+ const inputValue: Date = faker.date.recent();
+
+ beforeEach(() => {
+ component.fieldControl.setValue(inputValue);
+ });
+
+ it('should call add2000Years', () => {
+ const add2000Years = jest.spyOn(dateUtil, 'add2000Years');
+
+ component.onBlur();
+
+ expect(add2000Years).toHaveBeenCalledWith(inputValue);
+ });
+
+ it('should call fieldControl.patchValue', () => {
+ const patchValue = jest.spyOn(component.fieldControl, 'patchValue');
+
+ component.onBlur();
+
+ expect(patchValue).toHaveBeenCalled();
+ });
+
+ it('should call onChange', () => {
+ const onChange = jest.spyOn(component, 'onChange');
+
+ component.onBlur();
+
+ expect(onChange).toHaveBeenCalled();
+ });
+ });
+ });
});
diff --git a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
index d3288eabcb3db70e110084e9a8ed3e26f47dde5d..b93828d71bece9019d6ce554f0e93709114b4bc6 100644
--- a/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/editor/date-editor/date-editor.component.ts
@@ -21,8 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { add2000Years } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
import { MatDatepickerInputEvent } from '@angular/material/datepicker';
+import { isDate } from 'date-fns';
import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
@Component({
@@ -36,4 +38,15 @@ export class DateEditorComponent extends FormControlEditorAbstractComponent {
inputEvent(event: MatDatepickerInputEvent<Date>): void {
this.onChange(event.value);
}
+
+ onBlur(): void {
+ if (!isDate(this.fieldControl.value)) {
+ return;
+ }
+
+ const value: Date = add2000Years(this.fieldControl.value);
+
+ this.fieldControl.patchValue(value);
+ this.onChange(value);
+ }
}
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
index 78547141a5665a15799b97afc211cee0134f8d49..2a5c2244d1530041467669e723103a3f8925df02 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
@@ -25,7 +25,7 @@ import { Component, Input, SimpleChanges } from '@angular/core';
import {
ApiError,
createEmptyStateResource,
- hasError,
+ hasStateResourceError,
MessageCode,
StateResource,
} from '@alfa-client/tech-shared';
@@ -61,7 +61,7 @@ export class UserIconComponent {
if (this.userProfileStateResource.resource) {
return this.getUserTooltip();
}
- if (hasError(this.userProfileStateResource)) {
+ if (hasStateResourceError(this.userProfileStateResource)) {
return this.getErrorTooltip();
}
return userProfileMessage.UNASSIGNED;
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
index 4a93a23e00e7211c40a49c585acd73d78bba2ed7..1f150a1e04e1c8799556a595330e3a93afdb9514 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
@@ -26,7 +26,7 @@ import {
ApiError,
StateResource,
createEmptyStateResource,
- hasError,
+ hasStateResourceError,
isServiceUnavailableMessageCode,
} from '@alfa-client/tech-shared';
import { UserProfileResource } from '@alfa-client/user-profile-shared';
@@ -46,7 +46,7 @@ export class UserProfileInVorgangComponent {
readonly vorgangLinkRel = VorgangWithEingangLinkRel;
public isUserServiceAvailable(stateResource: StateResource<Resource>): boolean {
- if (hasError(stateResource) && isServiceUnavailableMessageCode(<ApiError>stateResource.error)) {
+ if (hasStateResourceError(stateResource) && isServiceUnavailableMessageCode(<ApiError>stateResource.error)) {
return false;
}
return true;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
index 9048ea218b5a838a57884121a7e6be9b35173dcc..161feeb6fa3e48c8280195b5f2bcf5b121030d3f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
@@ -1,4 +1,4 @@
-import { AktenzeichenEditDialogComponent } from '@alfa-client/vorgang-detail';
+import { AktenzeichenEditDialogComponent } from './aktenzeichen-edit-dialog.component';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { mock } from '@alfa-client/test-utils';
import {
@@ -32,7 +32,7 @@ import {
import {
COMMAND_ERROR_MESSAGES,
CommandErrorMessage,
- hasError,
+ hasCommandError,
isSuccessfulDone,
} from '@alfa-client/command-shared';
import { AktenzeichenEditDialogMessages } from './aktenzeichen-edit-dialog.message';
@@ -41,7 +41,7 @@ import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.fo
jest.mock('@alfa-client/tech-shared');
const isClipboardReadSupportedMock = isClipboardReadSupported as jest.Mock;
jest.mock('@alfa-client/command-shared');
-const hasErrorMock = hasError as jest.Mock;
+const hasErrorMock = hasCommandError as jest.Mock;
const isSuccessfulDoneMock = isSuccessfulDone as jest.Mock;
const hasContentMock = hasContent as jest.Mock;
const createEmptyStateResourceMock = createEmptyStateResource as jest.Mock;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
index 0ce392d5695903ef318c27c704c02b9c18eb8e16..d618bb16fbcb744d80cd6d8ae48ffd5523a2e2f5 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
@@ -1,7 +1,7 @@
import {
COMMAND_ERROR_MESSAGES,
CommandResource,
- hasError,
+ hasCommandError,
isSuccessfulDone,
} from '@alfa-client/command-shared';
import {
@@ -73,7 +73,7 @@ export class AktenzeichenEditDialogComponent implements OnInit {
}
onResponse(commandResource: CommandResource) {
- if (commandResource && hasError(commandResource)) {
+ if (commandResource && hasCommandError(commandResource)) {
this.showSnackbar(commandResource);
} else if (isSuccessfulDone(commandResource)) {
this.vorgangService.reloadCurrentVorgang();
@@ -82,7 +82,7 @@ export class AktenzeichenEditDialogComponent implements OnInit {
}
showSnackbar(commandResource: CommandResource): void {
- if (hasError(commandResource)) {
+ if (hasCommandError(commandResource)) {
this.snackBarService.showError(this.getErrorMessage(commandResource));
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index 897a93130bf9e8d21b120f86de04796e564b7300..be0c599a5b7e04df8b03cbe0c51568aed474e709 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -23,7 +23,7 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<ng-container *ngIf="!isVorgangInBearbeitung && vorgang | hasLink: linkRel.ABSCHLIESSEN">
+<ng-container *ngIf="vorgang | hasLink: linkRel.ABSCHLIESSEN">
<ozgcloud-stroked-button-with-spinner
*ngIf="!showAsIconButton"
data-test-id="abschliessen-button"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index ff72e924921e24b4de0a81d651dc2854ec06e266..4d98aa579e9927feab12c1474ebc7dfaddb8e926 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -134,18 +134,6 @@ describe('AbschliessenButtonComponent', () => {
expect(buttonElement).not.toBeInstanceOf(HTMLElement);
});
- it('should be hidden if in bearbeitung', () => {
- component.vorgang = {
- ...createVorgangWithEingangResource([VorgangWithEingangLinkRel.ABSCHLIESSEN]),
- status: VorgangStatus.IN_BEARBEITUNG,
- };
-
- fixture.detectChanges();
- const buttonElement = fixture.nativeElement.querySelector(abschliessenButton);
-
- expect(buttonElement).not.toBeInstanceOf(HTMLElement);
- });
-
it('should be visible', () => {
component.vorgang = createVorgangWithEingangResource([
VorgangWithEingangLinkRel.ABSCHLIESSEN,
@@ -173,17 +161,6 @@ describe('AbschliessenButtonComponent', () => {
expect(buttonElement).not.toBeInstanceOf(HTMLElement);
});
- it('should be hidden if in bearbeitung', () => {
- component.vorgang = {
- ...createVorgangWithEingangResource([VorgangWithEingangLinkRel.ABSCHLIESSEN]),
- status: VorgangStatus.IN_BEARBEITUNG,
- };
-
- fixture.detectChanges();
- const buttonElement = fixture.nativeElement.querySelector(abschliessenIconButton);
-
- expect(buttonElement).not.toBeInstanceOf(HTMLElement);
- });
it('should be visible', () => {
component.vorgang = createVorgangWithEingangResource([
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
index c8475e5aae551b7cfedeeea0d9a15e36c58219e6..15df48ad2b497eed92ec4dfd36278e18fd3e506f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.ts
@@ -55,8 +55,4 @@ export class AbschliessenButtonComponent implements OnInit {
public abschliessen(): void {
this.commandStateResource$ = this.vorgangCommandService.abschliessen(this.vorgang);
}
-
- get isVorgangInBearbeitung(): boolean {
- return this.vorgang.status === 'IN_BEARBEITUNG';
- }
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
index cacfe8689e1b09b653c2f2f82de5a0b856501d57..f93a84e663ec4a59ba867e0692996e2d35a4a54c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
@@ -32,7 +32,7 @@ import {
} from '../../../../../bescheid-shared/src/test/bescheid';
import { createDocumentResource } from '../../../../../bescheid-shared/src/test/document';
import { createBinaryFileResource } from '../../../../../binary-file-shared/test/binary-file';
-import { singleCold } from '../../../../../tech-shared/src/lib/resource/marbles';
+import { singleCold } from '../../../../../tech-shared/test/marbles';
import { createVorgangWithEingangResource } from '../../../../../vorgang-shared/test/vorgang';
import { BescheidenFormService } from './bescheiden.formservice';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
index f7d6ea59813fa20881d5cb9d019aac71f81e6fef..dc987af324371fbc73cab82d955fa0cb935e9443 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
@@ -14,7 +14,6 @@ import {
HttpError,
StateResource,
convertToBoolean,
- createEmptyStateResource,
formatForDatabase,
isNotEmpty,
isNotNil,
@@ -37,7 +36,6 @@ import {
Subscription,
combineLatest,
map,
- of,
startWith,
} from 'rxjs';
@@ -68,8 +66,6 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
].join('\n\n');
private readonly bescheidChanges$: BehaviorSubject<Bescheid>;
- private attachmentUpload$: BehaviorSubject<StateResource<BinaryFileResource>>;
- private bescheidFileUpload$: Observable<StateResource<BinaryFileResource>>;
private readonly fileDelete$: Subject<BinaryFileResource>;
private readonly showMissingBescheidDocumentError$: BehaviorSubject<boolean> =
new BehaviorSubject<boolean>(false);
@@ -80,7 +76,6 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
vorgangWithEingangResource: VorgangWithEingangResource;
private formControlSubscriptions: Subscription;
-
private formChangesSubscription: Subscription;
constructor(
@@ -96,10 +91,6 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
init(): void {
this.formControlSubscriptions = this.subscribeToSendBy();
- this.bescheidFileUpload$ = of(createEmptyStateResource<BinaryFileResource>());
- this.attachmentUpload$ = new BehaviorSubject<StateResource<BinaryFileResource>>(
- createEmptyStateResource(),
- );
this.initializeFormChanges();
}
@@ -219,22 +210,6 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
return this.vorgangWithEingangResource;
}
- public getAttachmentUpload(): Observable<StateResource<BinaryFileResource>> {
- return this.attachmentUpload$.asObservable();
- }
-
- public uploadAttachment(attachment: StateResource<BinaryFileResource>): void {
- this.attachmentUpload$.next(attachment);
- }
-
- public getBescheidFileUpload(): Observable<StateResource<BinaryFileResource>> {
- return this.bescheidFileUpload$;
- }
-
- public setBescheidFileUpload(bescheidFileUpload$: Observable<StateResource<BinaryFileResource>>) {
- this.bescheidFileUpload$ = bescheidFileUpload$;
- }
-
public deleteFile(binaryFileResource: BinaryFileResource): void {
this.fileDelete$.next(binaryFileResource);
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.html
deleted file mode 100644
index a918dc17e3598587c93a32aa26172bb1ab088d03..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ods-attachment-error [errorList]="errorList"></ods-attachment-error>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.spec.ts
deleted file mode 100644
index 19de71ccad63395970f15d60808ded974ee1b9bf..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ApiError, Issue } from '@alfa-client/tech-shared';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AttachmentErrorComponent } from '@ods/system';
-import { createApiError, createIssue } from 'libs/tech-shared/test/error';
-import { MockComponent } from 'ng-mocks';
-import { VorgangDetailBescheidenFormErrorComponent } from './vorgang-detail-bescheiden-form-error.component';
-
-describe('VorgangDetailBescheidenFormErrorComponent', () => {
- let component: VorgangDetailBescheidenFormErrorComponent;
- let fixture: ComponentFixture<VorgangDetailBescheidenFormErrorComponent>;
-
- const issue: Issue = {
- ...createIssue(),
- messageCode: 'validation_field_file_content_type_invalid',
- };
-
- const error: ApiError = createApiError([issue]);
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [VorgangDetailBescheidenFormErrorComponent],
- imports: [MockComponent(AttachmentErrorComponent)],
- }).compileComponents();
-
- fixture = TestBed.createComponent(VorgangDetailBescheidenFormErrorComponent);
- component = fixture.componentInstance;
- component.error = error;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- describe('set errorList', () => {
- it('should push VALIDATION_MESSAGES to errorList', () => {
- expect(component.errorList[0]).toBe('Erlaubte Dateiendungen: pdf, jpg, png, jpeg');
- });
- });
-});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.ts
deleted file mode 100644
index e37d488736e6cda3577126ce47752cb855895e9d..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ApiError, Issue, getMessageForIssue } from '@alfa-client/tech-shared';
-import { Component, Input } from '@angular/core';
-
-@Component({
- selector: 'alfa-vorgang-detail-bescheiden-form-error',
- templateUrl: './vorgang-detail-bescheiden-form-error.component.html',
- styles: [],
-})
-export class VorgangDetailBescheidenFormErrorComponent {
- @Input() set error(error: ApiError) {
- error.issues.forEach((issue: Issue) =>
- this.errorList.push(getMessageForIssue('Bescheid Dokument', issue)),
- );
- }
-
- public errorList: string[] = [];
-}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
index 58820ed3249496a0d88f11e04b65dbc98d377fb9..95e424d51d4542bce8bc97612cd8f632bca51b48 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.html
@@ -7,10 +7,6 @@
>
</alfa-binary-file2-container>
<ng-container *ngFor="let attachment of uploadedAttachments">
- <alfa-vorgang-detail-bescheiden-form-error
- *ngIf="attachment.error"
- [error]="attachment.error"
- ></alfa-vorgang-detail-bescheiden-form-error>
<alfa-binary-file2-container
*ngIf="!attachment.loading && attachment.resource"
[file]="attachment.resource"
@@ -19,11 +15,16 @@
[attr.data-test-id]="(attachment.resource.name | convertForDataTest) + '-file2-container'"
>
</alfa-binary-file2-container>
+ </ng-container>
+ <ng-container *ngIf="uploadInProgress$ | async as uploadFileInProgress">
<ods-attachment
- *ngIf="attachment.loading"
- documentName="Anhang wird hochgeladen"
- fileType=""
- [isLoading]="true"
+ data-test-id="attachment-upload-in-progress"
+ *ngIf="uploadFileInProgress.loading || uploadFileInProgress.error"
+ [loadingCaption]="uploadFileInProgress.fileName"
+ errorCaption="Fehler beim Hochladen"
+ [errorMessages]="uploadFileInProgress.error | convertApiErrorToErrorMessages"
+ description="Anhang wird hochgeladen"
+ [isLoading]="uploadFileInProgress.loading"
></ods-attachment>
</ng-container>
</ods-attachment-container>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
index 7daea8566a73228653dfd08bc7e94de1477071c2..c9b80fe49d0d2389e5d647eac7bceb37dd55f7b3 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.spec.ts
@@ -2,9 +2,9 @@ import { BescheidService } from '@alfa-client/bescheid-shared';
import { BinaryFile2ContainerComponent } from '@alfa-client/binary-file';
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import {
+ ConvertApiErrorToErrorMessagesPipe,
convertForDataTest,
ConvertForDataTestPipe,
- createEmptyStateResource,
createErrorStateResource,
createStateResource,
FileSizePipe,
@@ -21,6 +21,7 @@ import {
} from '@ods/system';
import { MockComponent, MockPipe } from 'ng-mocks';
import { BehaviorSubject, EMPTY, Observable, of, Subscription } from 'rxjs';
+import { createUploadFileInProgress } from '../../../../../../../bescheid-shared/src/test/bescheid';
import {
createBinaryFileResource,
createLoadedBinaryFileResource,
@@ -29,7 +30,6 @@ import {
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
import { createApiError } from '../../../../../../../tech-shared/test/error';
import { BescheidenFormService } from '../../bescheiden.formservice';
-import { VorgangDetailBescheidenFormErrorComponent } from '../vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component';
import { VorgangDetailBescheidenResultAttachmentsComponent } from './vorgang-detail-bescheiden-result-attachments.component';
describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
@@ -42,13 +42,12 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
beforeEach(async () => {
bescheidService = mock(BescheidService);
bescheidService.getAttachments.mockReturnValue(EMPTY);
+ bescheidService.getUploadedAttachment.mockReturnValue(EMPTY);
formService = mock(BescheidenFormService);
formService.getBescheidChanges.mockReturnValue(
new BehaviorSubject({ beschiedenAm: new Date(), bewilligt: false }),
);
- formService.getAttachmentUpload.mockReturnValue(of(createEmptyStateResource()));
- formService.getBescheidFileUpload.mockReturnValue(of(createEmptyStateResource()));
await TestBed.configureTestingModule({
declarations: [
@@ -56,9 +55,9 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
ConvertForDataTestPipe,
MatIcon,
MockPipe(FileSizePipe),
+ MockPipe(ConvertApiErrorToErrorMessagesPipe),
MockComponent(OzgcloudSvgIconComponent),
MockComponent(SpinnerComponent),
- MockComponent(VorgangDetailBescheidenFormErrorComponent),
MockComponent(AttachmentContainerComponent),
MockComponent(BinaryFile2ContainerComponent),
MockComponent(SpinnerIconComponent),
@@ -90,6 +89,7 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
const dataTestId = getDataTestIdOf(
`${convertForDataTest(attachment.resource.name)}-file2-container`,
);
+ const uploadInProgressDataTestId: string = getDataTestIdOf('attachment-upload-in-progress');
beforeEach(() => {
component.uploadedAttachments = [attachment];
@@ -117,6 +117,38 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
notExistsAsHtmlElement(fixture, dataTestId);
});
+
+ it('should render attachment in progress component when loading', () => {
+ component.uploadInProgress$ = of({ ...createUploadFileInProgress(), loading: true });
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, uploadInProgressDataTestId);
+ });
+
+ it('should render attachment in progress component on error', () => {
+ component.uploadInProgress$ = of({
+ ...createUploadFileInProgress(),
+ loading: false,
+ error: createApiError(),
+ });
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, uploadInProgressDataTestId);
+ });
+
+ it('should not render attachment in progress component when not loading and no error', () => {
+ component.uploadInProgress$ = of({
+ ...createUploadFileInProgress(),
+ loading: false,
+ error: null,
+ });
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, uploadInProgressDataTestId);
+ });
});
describe('ngOnInit', () => {
@@ -139,6 +171,12 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
expect(subscribeToAttachmentUpload).toHaveBeenCalled();
});
+
+ it('should get upload attachment in progress', () => {
+ component.ngOnInit();
+
+ expect(bescheidService.getUploadAttachmentInProgress).toHaveBeenCalled();
+ });
});
describe('ngOnDestroy', () => {
@@ -146,7 +184,7 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
const subscription = mock(Subscription);
const observable = mock(Observable);
observable.subscribe.mockReturnValue(subscription);
- formService.getAttachmentUpload.mockReturnValue(observable);
+ bescheidService.getUploadedAttachment.mockReturnValue(observable);
component.ngOnInit();
component.ngOnDestroy();
@@ -189,13 +227,7 @@ describe('VorgangDetailBescheidenResultAttachmentsComponent', () => {
beforeEach(() => {
attachment = createLoadedBinaryFileResource();
- formService.getAttachmentUpload.mockReturnValue(of(attachment));
- });
-
- it('should get attachment upload', () => {
- component.subscribeToAttachmentUpload();
-
- expect(formService.getAttachmentUpload).toHaveBeenCalled();
+ bescheidService.getUploadedAttachment.mockReturnValue(of(attachment));
});
it('should should set uploaded attachments', () => {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
index 4fd9ae0799a0e928378e59a3a152d4a5a3ff84f9..084a5361b9ec8460e5cc0f518aeacb535cb47cf9 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
@@ -1,16 +1,16 @@
-import { BescheidService } from '@alfa-client/bescheid-shared';
+import { BescheidService, UploadFileInProgress } from '@alfa-client/bescheid-shared';
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import {
StateResource,
containsLoading,
getSuccessfullyLoaded,
- hasError,
+ hasStateResourceError,
isLoaded,
isNotNil,
} from '@alfa-client/tech-shared';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { getUrl } from '@ngxp/rest';
-import { Subscription, first } from 'rxjs';
+import { Observable, Subscription, first } from 'rxjs';
import { BescheidenFormService } from '../../bescheiden.formservice';
@Component({
@@ -23,6 +23,7 @@ export class VorgangDetailBescheidenResultAttachmentsComponent implements OnDest
existingAttachments: BinaryFileResource[] = [];
uploadedAttachments: StateResource<BinaryFileResource>[] = [];
+ uploadInProgress$: Observable<UploadFileInProgress>;
private attachmentUploadSubscription: Subscription;
@@ -32,6 +33,7 @@ export class VorgangDetailBescheidenResultAttachmentsComponent implements OnDest
) {}
ngOnInit(): void {
+ this.uploadInProgress$ = this.bescheidService.getUploadAttachmentInProgress();
this.loadExistingAttachments();
this.subscribeToAttachmentUpload();
}
@@ -52,8 +54,8 @@ export class VorgangDetailBescheidenResultAttachmentsComponent implements OnDest
}
subscribeToAttachmentUpload() {
- this.attachmentUploadSubscription = this.formService
- .getAttachmentUpload()
+ this.attachmentUploadSubscription = this.bescheidService
+ .getUploadedAttachment()
.subscribe(
(stateResource: StateResource<BinaryFileResource>) =>
(this.uploadedAttachments = this.buildUploadedAttachments(stateResource)),
@@ -63,7 +65,7 @@ export class VorgangDetailBescheidenResultAttachmentsComponent implements OnDest
buildUploadedAttachments(
uploadStateResource: StateResource<BinaryFileResource>,
): StateResource<BinaryFileResource>[] {
- if (isLoaded(uploadStateResource) || hasError(uploadStateResource)) {
+ if (isLoaded(uploadStateResource) || hasStateResourceError(uploadStateResource)) {
return [...getSuccessfullyLoaded(this.uploadedAttachments), uploadStateResource];
} else if (uploadStateResource.loading && !containsLoading(this.uploadedAttachments)) {
return [...getSuccessfullyLoaded(this.uploadedAttachments), uploadStateResource];
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
index 5a92ba6a0e1a6c43d8b71b3043327904e0333b3a..2080ba5b2a7b977a0837a437c97ae3d1579ba396 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.html
@@ -8,7 +8,11 @@
<ods-attachment-container>
<ng-container *ngIf="bescheidDocumentFile.resource">
<alfa-binary-file2-container
- *ngIf="!bescheidDocumentFile.loading && !uploadBescheidDocumentInProgress.loading"
+ *ngIf="
+ !bescheidDocumentFile.loading &&
+ !uploadBescheidDocumentInProgress.loading &&
+ !createDocumentInProgess.loading
+ "
[file]="bescheidDocumentFile.resource"
[deletable]="deletable"
(startDelete)="deleteFile.emit()"
@@ -16,19 +20,23 @@
</alfa-binary-file2-container>
</ng-container>
<ods-attachment
- *ngIf="uploadBescheidDocumentInProgress.loading"
- documentName="Bescheiddokument wird hochgeladen"
- fileType=""
- [isLoading]="true"
+ *ngIf="uploadBescheidDocumentInProgress.loading || uploadBescheidDocumentInProgress.error"
+ errorCaption="Fehler beim Hochladen"
+ [loadingCaption]="uploadBescheidDocumentInProgress.fileName"
+ [attr.data-test-id]="
+ 'upload-bescheid-document-error-' + !!uploadBescheidDocumentInProgress.error
+ "
+ [isLoading]="uploadBescheidDocumentInProgress.loading"
+ [errorMessages]="uploadBescheidDocumentInProgress.error | convertApiErrorToErrorMessages"
+ description="Bescheiddokument wird hochgeladen"
+ ></ods-attachment>
+ <ods-attachment
+ *ngIf="createDocumentInProgess.loading || hasCreateDocumentError"
+ errorCaption="Fehler beim automatischen Erstellen"
+ loadingCaption="Bescheiddokument"
+ description="Bescheiddokument wird erstellt"
+ [isLoading]="createDocumentInProgess.loading"
+ [errorMessages]="createDocumentErrorMessages"
+ data-test-id="create-bescheid-document-attachment"
></ods-attachment>
- <!-- REPLACEME: UI/UX Componente für den Fehler anzeigen-->
- <ng-container *ngIf="createBescheidDocumentInProgress.error">
- <span data-test-id="create-bescheid-document-error">Fehler beim automatischen Erstellen.</span>
- </ng-container>
- <!-- -->
- <alfa-vorgang-detail-bescheiden-form-error
- *ngIf="uploadBescheidDocumentInProgress.error && !bescheidDocumentFile.loading"
- data-test-id="upload-bescheid-document-error"
- [error]="uploadBescheidDocumentInProgress.error"
- ></alfa-vorgang-detail-bescheiden-form-error>
</ods-attachment-container>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
index a241cfc7659d2d966194c71c117dc30c52f5d98e..15a99f1bea6f85d4287f1ca9d0a85fffc4144dbc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.spec.ts
@@ -1,24 +1,38 @@
import { BescheidLinkRel, BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
import { BinaryFile2ContainerComponent } from '@alfa-client/binary-file';
-import { createStateResource } from '@alfa-client/tech-shared';
-import { Mock, existsAsHtmlElement, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { CommandResource } from '@alfa-client/command-shared';
+import {
+ ConvertApiErrorToErrorMessagesPipe,
+ createEmptyStateResource,
+ createStateResource,
+ StateResource,
+} from '@alfa-client/tech-shared';
+import { existsAsHtmlElement, Mock, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { getUrl } from '@ngxp/rest';
-import { AttachmentContainerComponent } from '@ods/system';
+import { AttachmentComponent, AttachmentContainerComponent } from '@ods/system';
import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { createBinaryFileResource } from 'libs/binary-file-shared/test/binary-file';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createApiError } from 'libs/tech-shared/test/error';
-import { MockComponent } from 'ng-mocks';
-import { VorgangDetailBescheidenFormErrorComponent } from '../vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component';
+import { MockComponent, MockPipe } from 'ng-mocks';
+import {
+ createCommandErrorStateResource,
+ createCommandResource,
+ createCommandStateResource,
+} from '../../../../../../../command-shared/test/command';
import { VorgangDetailBescheidenResultDokumentComponent } from './vorgang-detail-bescheiden-result-dokument.component';
describe('VorgangDetailBescheidenResultDokumentComponent', () => {
let component: VorgangDetailBescheidenResultDokumentComponent;
let fixture: ComponentFixture<VorgangDetailBescheidenResultDokumentComponent>;
- const createBescheidDocumentError: string = getDataTestIdOf('create-bescheid-document-error');
- const uploadBescheidDocumentError: string = getDataTestIdOf('upload-bescheid-document-error');
+ const createBescheidDocumentAttachment: string = getDataTestIdOf(
+ 'create-bescheid-document-attachment',
+ );
+ const uploadBescheidDocumentError: string = getDataTestIdOf(
+ 'upload-bescheid-document-error-true',
+ );
const missingBescheidDocumentErrorMessage: string = getDataTestIdOf(
'missing-bescheid-document-error-message',
);
@@ -32,8 +46,9 @@ describe('VorgangDetailBescheidenResultDokumentComponent', () => {
declarations: [
VorgangDetailBescheidenResultDokumentComponent,
MockComponent(BinaryFile2ContainerComponent),
- MockComponent(VorgangDetailBescheidenFormErrorComponent),
+ MockComponent(AttachmentComponent),
MockComponent(AttachmentContainerComponent),
+ MockPipe(ConvertApiErrorToErrorMessagesPipe),
],
providers: [
{
@@ -69,6 +84,35 @@ describe('VorgangDetailBescheidenResultDokumentComponent', () => {
notExistsAsHtmlElement(fixture, missingBescheidDocumentErrorMessage);
});
+
+ describe('create bescheid document ods-attachment', () => {
+ it('should be shown if error exists', () => {
+ component.createBescheidDocumentInProgress = createCommandErrorStateResource();
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, createBescheidDocumentAttachment);
+ });
+
+ it('should be shown while loading', () => {
+ component.createBescheidDocumentInProgress = createStateResource(
+ createCommandResource(),
+ true,
+ );
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, createBescheidDocumentAttachment);
+ });
+
+ it('should be hidden on loaded without error', () => {
+ component.createBescheidDocumentInProgress = createCommandStateResource();
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, createBescheidDocumentAttachment);
+ });
+ });
});
describe('handle bescheid document', () => {
@@ -109,21 +153,61 @@ describe('VorgangDetailBescheidenResultDokumentComponent', () => {
});
});
- describe('create bescheid document error', () => {
- it('should be shown if error exists', () => {
- component.createBescheidDocumentInProgress = { loading: false, error: createApiError() };
+ describe('set create bescheid document in progress', () => {
+ beforeEach(() => {
+ component.handleCreateBescheidDocumentCommandError = jest.fn();
+ });
- fixture.detectChanges();
+ it('should set create document in progress', () => {
+ const commandStateResource: StateResource<CommandResource> = createEmptyStateResource();
+
+ component.createBescheidDocumentInProgress = commandStateResource;
- existsAsHtmlElement(fixture, createBescheidDocumentError);
+ expect(component.createDocumentInProgess).toBe(commandStateResource);
});
- it('should be hidden on non error', () => {
- component.createBescheidDocumentInProgress = { loading: false };
+ it('should handle command error', () => {
+ const commandStateResource: StateResource<CommandResource> = createEmptyStateResource();
- fixture.detectChanges();
+ component.createBescheidDocumentInProgress = commandStateResource;
+
+ expect(component.handleCreateBescheidDocumentCommandError).toHaveBeenCalledWith(
+ commandStateResource,
+ );
+ });
+ });
+
+ describe('handleCreateBescheidDocumentCommandError', () => {
+ it('should set has error', () => {
+ component.handleCreateBescheidDocumentCommandError(createCommandErrorStateResource());
+
+ expect(component.hasCreateDocumentError).toBeTruthy();
+ });
+
+ it('should not set has error', () => {
+ component.handleCreateBescheidDocumentCommandError(createCommandStateResource());
+
+ expect(component.hasCreateDocumentError).toBeFalsy();
+ });
+
+ it('should not set has error on empty state resource', () => {
+ component.handleCreateBescheidDocumentCommandError(createEmptyStateResource());
+
+ expect(component.hasCreateDocumentError).toBeFalsy();
+ });
+
+ it('should set error messages', () => {
+ component.handleCreateBescheidDocumentCommandError(createCommandErrorStateResource());
+
+ expect(component.createDocumentErrorMessages).toEqual([
+ VorgangDetailBescheidenResultDokumentComponent.CREATE_DOCUMENT_ERROR_MESSAGE,
+ ]);
+ });
+
+ it('should not set error messages', () => {
+ component.handleCreateBescheidDocumentCommandError(createCommandStateResource());
- notExistsAsHtmlElement(fixture, createBescheidDocumentError);
+ expect(component.createDocumentErrorMessages).toEqual([]);
});
});
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.ts
index f46d2cbd1d7aa2719a19b7f73ae55e1efb23945e..6e7c4eb3941d74b6d782d2ee6b51ee0d35a93a6f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component.ts
@@ -5,7 +5,8 @@ import {
UploadFileInProgress,
} from '@alfa-client/bescheid-shared';
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
-import { StateResource } from '@alfa-client/tech-shared';
+import { CommandResource, hasCommandError } from '@alfa-client/command-shared';
+import { createEmptyStateResource, isNotNil, StateResource } from '@alfa-client/tech-shared';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { getUrl, hasLink } from '@ngxp/rest';
@@ -14,17 +15,32 @@ import { getUrl, hasLink } from '@ngxp/rest';
templateUrl: './vorgang-detail-bescheiden-result-dokument.component.html',
})
export class VorgangDetailBescheidenResultDokumentComponent {
+ static readonly CREATE_DOCUMENT_ERROR_MESSAGE: string =
+ 'Bescheiddokument konnte nicht erzeugt werden.';
+
@Input() bescheidDocumentFile: StateResource<BinaryFileResource>;
@Input() uploadBescheidDocumentInProgress: UploadFileInProgress = { loading: false };
- @Input() createBescheidDocumentInProgress: UploadFileInProgress = { loading: false };
+
+ @Input() set createBescheidDocumentInProgress(
+ commandStateResource: StateResource<CommandResource>,
+ ) {
+ this.createDocumentInProgess = commandStateResource;
+ this.handleCreateBescheidDocumentCommandError(commandStateResource);
+ }
+
@Input() set bescheidDraftStateResource(bescheidStateResource: StateResource<BescheidResource>) {
this.handleBescheidDocument(bescheidStateResource.resource);
}
+
@Input() public deletable: boolean;
- @Input() public showMissingBescheidDocumentError: boolean;
+ @Input() public showMissingBescheidDocumentError: boolean;
@Output() deleteFile: EventEmitter<void> = new EventEmitter<void>();
+ createDocumentErrorMessages: string[] = [];
+ createDocumentInProgess: StateResource<CommandResource> = createEmptyStateResource();
+ hasCreateDocumentError: boolean = false;
+
constructor(private bescheidService: BescheidService) {}
handleBescheidDocument(bescheid: BescheidResource): void {
@@ -34,4 +50,18 @@ export class VorgangDetailBescheidenResultDokumentComponent {
);
}
}
+
+ handleCreateBescheidDocumentCommandError(
+ commandStateResource: StateResource<CommandResource>,
+ ): void {
+ this.hasCreateDocumentError =
+ isNotNil(commandStateResource.resource) && hasCommandError(commandStateResource.resource);
+ if (this.hasCreateDocumentError) {
+ this.createDocumentErrorMessages = [
+ VorgangDetailBescheidenResultDokumentComponent.CREATE_DOCUMENT_ERROR_MESSAGE,
+ ];
+ } else {
+ this.createDocumentErrorMessages = [];
+ }
+ }
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
index 080523dac6a3ee225bf761bd66db45f3da905db6..893c337ba18e0c86c6454628e475431305b092ba 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.spec.ts
@@ -17,9 +17,9 @@ import { OzgcloudSvgIconComponent } from 'libs/ui/src/lib/ui/ozgcloud-svgicon/oz
import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createDocumentResource } from '../../../../../../../bescheid-shared/src/test/document';
-import { singleColdCompleted } from '../../../../../../../tech-shared/src/lib/resource/marbles';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
import { createApiError } from '../../../../../../../tech-shared/test/error';
+import { singleColdCompleted } from '../../../../../../../tech-shared/test/marbles';
import { BescheidenFormService } from '../../bescheiden.formservice';
import { VorgangDetailBescheidenResultNachrichtComponent } from './vorgang-detail-bescheiden-result-nachricht.component';
@@ -128,5 +128,14 @@ describe('VorgangDetailBescheidenResultNachrichtComponent', () => {
expect(formService.patchNachricht).not.toHaveBeenCalled();
});
+
+ it.each([null, undefined])(
+ 'should not patch form if document resource is %s',
+ (resource: DocumentResource) => {
+ component.bescheidDocumentStateResource = createStateResource(resource);
+
+ expect(formService.patchNachricht).not.toHaveBeenCalled();
+ },
+ );
});
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.ts
index fffb51e8555034313271c3d39bff2830defe8119..9dd0fca6fb796f1d47f773d147fdd54954ae1756 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component.ts
@@ -1,5 +1,5 @@
import { BescheidService, DocumentResource } from '@alfa-client/bescheid-shared';
-import { StateResource } from '@alfa-client/tech-shared';
+import { StateResource, isNotNil } from '@alfa-client/tech-shared';
import { Component, Input, OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { Observable } from 'rxjs';
@@ -11,7 +11,7 @@ import { BescheidenFormService } from '../../bescheiden.formservice';
})
export class VorgangDetailBescheidenResultNachrichtComponent implements OnInit {
@Input() set bescheidDocumentStateResource(stateResource: StateResource<DocumentResource>) {
- if (!stateResource.loading && !stateResource.error) {
+ if (!stateResource.loading && !stateResource.error && isNotNil(stateResource.resource)) {
this.formService.patchNachricht(stateResource.resource);
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
index 3c25ac7106362d46c7ebfa79889a8e5aa9195a67..918867cb02f084f1d79f24aca4ac1e8cdfbd5283 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.spec.ts
@@ -21,7 +21,7 @@ import { createCommandResource } from 'libs/command-shared/test/command';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { BehaviorSubject, EMPTY, first, of } from 'rxjs';
-import { singleColdCompleted } from '../../../../../../tech-shared/src/lib/resource/marbles';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
import { BescheidenFormService } from '../bescheiden.formservice';
import { VorgangDetailBescheidenResultAttachmentsComponent } from './vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component';
import { VorgangDetailBescheidenResultDokumentComponent } from './vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.ts
index 20d0b09b29f4ddc0ff80fc310312c5efe4a1613a..29e7e18dfa836123bfbf1232551170fc20224012 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result.component.ts
@@ -13,10 +13,10 @@ import {
switchMapCommandSuccessfullyDone,
tapOnCommandSuccessfullyDone,
} from '@alfa-client/command-shared';
-import { StateResource, createEmptyStateResource, isLoaded } from '@alfa-client/tech-shared';
+import { createEmptyStateResource, isLoaded, StateResource } from '@alfa-client/tech-shared';
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { hasLink } from '@ngxp/rest';
-import { Observable, filter, map, of } from 'rxjs';
+import { filter, map, Observable, of } from 'rxjs';
import { BescheidenFormService } from '../bescheiden.formservice';
type sendBescheid = (
@@ -51,9 +51,9 @@ export class VorgangDetailBescheidenResultComponent implements OnInit {
loading: false,
});
- public createBescheidDocumentInProgress$: Observable<UploadFileInProgress> = of({
- loading: false,
- });
+ public createBescheidDocumentInProgress$: Observable<StateResource<CommandResource>> = of(
+ createEmptyStateResource<CommandResource>(),
+ );
public canSave$: Observable<boolean> = of(true);
public canSend$: Observable<boolean> = of(true);
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
index 58333a2dc251f41b4b20766e3c7882ce5c088416..57979ad9c46243854ab904c46570eac6f92b8a1c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.html
@@ -5,7 +5,7 @@
[uploadInProgress]="uploadInProgress$ | async"
(newFile)="uploadFile($event)"
[fileLinkList]="getFileLinkList()"
- label="Attachment hochladen"
+ label="Anhang hochladen"
>
</ods-file-upload-editor>
</div>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
index c6d4b9f293b55af444bb3a6b3da555bc5e382200..74c2aea0911f06523b5b632206a370f06cba0f15 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.spec.ts
@@ -1,16 +1,17 @@
-import { BescheidLinkRel, BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
import { BinaryFileAttachmentContainerComponent } from '@alfa-client/binary-file';
-import { BinaryFileResource, BinaryFileService } from '@alfa-client/binary-file-shared';
-import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
+import { BinaryFileResource } from '@alfa-client/binary-file-shared';
+import { StateResource, createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
import { FileUploadEditorComponent } from '@ods/component';
-import { cold } from 'jest-marbles';
import { MockComponent } from 'ng-mocks';
import { EMPTY, Observable, Subscription, of } from 'rxjs';
-import { createBescheidResource } from '../../../../../../../../../bescheid-shared/src/test/bescheid';
+import { createBescheidStateResource } from '../../../../../../../../../bescheid-shared/src/test/bescheid';
import { createBinaryFileResource } from '../../../../../../../../../binary-file-shared/test/binary-file';
+import { createFile } from '../../../../../../../../../tech-shared/test/file';
+import { singleColdCompleted } from '../../../../../../../../../tech-shared/test/marbles';
import { BescheidenFormService } from '../../../../bescheiden.formservice';
import { VorgangDetailBescheidenAttachmentHochladenComponent } from './vorgang-detail-bescheiden-attachment-hochladen.component';
@@ -20,15 +21,12 @@ describe('VorgangDetailBescheidenDokumentHochladenComponent', () => {
const selfLink: string = 'self';
let bescheidService: Mock<BescheidService>;
- let binaryFileService: Mock<BinaryFileService>;
let formService: BescheidenFormService;
beforeEach(async () => {
bescheidService = mock(BescheidService);
bescheidService.getAttachments.mockReturnValue(EMPTY);
- binaryFileService = mock(BinaryFileService);
-
formService = new BescheidenFormService(new UntypedFormBuilder(), useFromMock(bescheidService));
await TestBed.configureTestingModule({
@@ -47,10 +45,6 @@ describe('VorgangDetailBescheidenDokumentHochladenComponent', () => {
provide: BescheidService,
useValue: bescheidService,
},
- {
- provide: BinaryFileService,
- useValue: binaryFileService,
- },
],
}).compileComponents();
@@ -167,90 +161,42 @@ describe('VorgangDetailBescheidenDokumentHochladenComponent', () => {
});
describe('uploadFile', () => {
- const file: File = <any>{ name: 'TestDatei' };
- let uploadAndGetFile: jest.Mock;
+ const bescheidDraftStateResource: StateResource<BescheidResource> =
+ createBescheidStateResource();
+ const file: File = createFile();
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
+ createBinaryFileResource(),
+ );
beforeEach(() => {
- uploadAndGetFile = component.uploadAndGetFile = jest.fn();
+ bescheidService.uploadAttachment.mockReturnValue(of(binaryFileStateResource));
+ component.bescheidDraftStateResource = bescheidDraftStateResource;
});
- it('should uploadAndGetFile', () => {
- uploadAndGetFile.mockReturnValue(of(createEmptyStateResource()));
-
+ it('should upload attachment', () => {
component.uploadFile(file);
- expect(component.uploadAndGetFile).toHaveBeenCalledWith(file);
- });
-
- it('should start with loading empty state resource', () => {
- const loadingStateResource = createEmptyStateResource(true);
- const uploadStateResource = createStateResource(createBinaryFileResource());
- uploadAndGetFile.mockReturnValue(cold('-a', { a: uploadStateResource }));
-
- component.uploadFile(file);
+ component.uploadInProgress$.subscribe();
- expect(component.uploadInProgress$).toBeObservable(
- cold('ab', { a: loadingStateResource, b: uploadStateResource }),
+ expect(bescheidService.uploadAttachment).toHaveBeenCalledWith(
+ bescheidDraftStateResource.resource,
+ file,
);
});
- it('should call form service', () => {
- formService.uploadAttachment = jest.fn();
- uploadAndGetFile.mockReturnValue(of(createEmptyStateResource()));
-
+ it('should add to file list', () => {
component.uploadFile(file);
- component.uploadInProgress$.subscribe();
- expect(formService.uploadAttachment).toHaveBeenCalledWith(createEmptyStateResource());
- });
- });
-
- describe('uploadAndGetFile', () => {
- const file: File = <any>{ name: 'TestDatei' };
- let bescheidResource: BescheidResource;
- let uploadResource: BinaryFileResource;
-
- beforeEach(() => {
- bescheidResource = createBescheidResource();
- uploadResource = createBinaryFileResource();
- bescheidService.getBescheidDraft.mockReturnValue(of(createStateResource(bescheidResource)));
- binaryFileService.uploadFile.mockReturnValue(of(createStateResource(uploadResource)));
- });
-
- it('should get bescheid draft', () => {
- component.uploadAndGetFile(file);
-
- expect(bescheidService.getBescheidDraft).toHaveBeenCalled();
- });
-
- it('should upload file', (done) => {
- const binaryFileStateResource$ = component.uploadAndGetFile(file);
-
- binaryFileStateResource$.subscribe(() => {
- expect(binaryFileService.uploadFile).toHaveBeenCalledWith(
- bescheidResource,
- BescheidLinkRel.UPLOAD_ATTACHMENT,
- file,
- false,
- );
- done();
- });
- });
-
- it('should add file to file list', (done) => {
- const binaryFileStateResource$ = component.uploadAndGetFile(file);
+ component.uploadInProgress$.subscribe();
- binaryFileStateResource$.subscribe(() => {
- expect(component.fileList[0]).toEqual(uploadResource);
- done();
- });
+ expect(component.fileList).toEqual([binaryFileStateResource.resource]);
});
- it('should emit binary file state resource', () => {
- const binaryFileStateResource$ = component.uploadAndGetFile(file);
+ it('should emit', () => {
+ component.uploadFile(file);
- expect(binaryFileStateResource$).toBeObservable(
- cold('(a|)', { a: createStateResource(uploadResource) }),
+ expect(component.uploadInProgress$).toBeObservable(
+ singleColdCompleted(binaryFileStateResource),
);
});
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.ts
index 6632bbe6b17fd5739b97eb99b67f261f1a7bb672..e707f6c2dbcccc73815f858e8adf68726ba57d6a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-attachment-hochladen/vorgang-detail-bescheiden-attachment-hochladen.component.ts
@@ -1,16 +1,14 @@
-import { BescheidLinkRel, BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
-import { BinaryFileResource, BinaryFileService } from '@alfa-client/binary-file-shared';
+import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import {
StateResource,
createEmptyStateResource,
doOnValidStateResource,
- isLoaded,
isNotNil,
} from '@alfa-client/tech-shared';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { getUrl } from '@ngxp/rest';
-import { Observable, Subscription, filter, first, of, startWith, switchMap } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { Observable, Subscription, first, of, tap } from 'rxjs';
import { BescheidenFormService } from '../../../../bescheiden.formservice';
@Component({
@@ -19,6 +17,8 @@ import { BescheidenFormService } from '../../../../bescheiden.formservice';
styles: [],
})
export class VorgangDetailBescheidenAttachmentHochladenComponent implements OnInit, OnDestroy {
+ @Input() bescheidDraftStateResource: StateResource<BescheidResource>;
+
uploadInProgress$: Observable<StateResource<BinaryFileResource>>;
fileList: BinaryFileResource[] = [];
private deleteFileSubscription: Subscription;
@@ -28,7 +28,6 @@ export class VorgangDetailBescheidenAttachmentHochladenComponent implements OnIn
constructor(
public readonly formService: BescheidenFormService,
private readonly bescheidService: BescheidService,
- private readonly binaryFileService: BinaryFileService,
) {
this.uploadInProgress$ = of(createEmptyStateResource<BinaryFileResource>());
}
@@ -63,34 +62,16 @@ export class VorgangDetailBescheidenAttachmentHochladenComponent implements OnIn
return this.fileList.map((fileResource: BinaryFileResource) => getUrl(fileResource));
}
- public uploadFile(file: File) {
- this.uploadInProgress$ = this.uploadAndGetFile(file).pipe(
- tap((stateResource) => this.formService.uploadAttachment(stateResource)),
- startWith(createEmptyStateResource<BinaryFileResource>(true)),
- );
- }
-
- uploadAndGetFile(file: File): Observable<StateResource<BinaryFileResource>> {
- return this.bescheidService.getBescheidDraft().pipe(
- filter(isLoaded),
- first(),
- switchMap((bescheidStateResource: StateResource<BescheidResource>) =>
- this.binaryFileService
- .uploadFile(
- bescheidStateResource.resource,
- BescheidLinkRel.UPLOAD_ATTACHMENT,
- file,
- false,
- )
- .pipe(
- tap((stateResource: StateResource<BinaryFileResource>) =>
- doOnValidStateResource(
- stateResource,
- () => (this.fileList = [...this.fileList, stateResource.resource]),
- ),
- ),
+ public uploadFile(file: File): void {
+ this.uploadInProgress$ = this.bescheidService
+ .uploadAttachment(this.bescheidDraftStateResource.resource, file)
+ .pipe(
+ tap((stateResource: StateResource<BinaryFileResource>) =>
+ doOnValidStateResource(
+ stateResource,
+ () => (this.fileList = [...this.fileList, stateResource.resource]),
),
- ),
- );
+ ),
+ );
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
index ab3d869ebee84bf9053f79efff6b80f21f68a6ae..0a6689531ec1b15b38d0deac111ed92163911adc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.spec.ts
@@ -1,9 +1,14 @@
import { BescheidLinkRel, BescheidService } from '@alfa-client/bescheid-shared';
-import { HasLinkPipe, createStateResource } from '@alfa-client/tech-shared';
+import { CommandLinkRel } from '@alfa-client/command-shared';
+import {
+ createEmptyStateResource,
+ createStateResource,
+ HasLinkPipe,
+} from '@alfa-client/tech-shared';
import {
- Mock,
dispatchEventFromFixture,
existsAsHtmlElement,
+ Mock,
mock,
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
@@ -14,13 +19,14 @@ import {
ButtonCardComponent,
SpinnerIconComponent,
} from '@ods/system';
-import {
- createBescheidResource,
- createUploadFileInProgress,
-} from 'libs/bescheid-shared/src/test/bescheid';
+import { createBescheidResource } from 'libs/bescheid-shared/src/test/bescheid';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
+import {
+ createCommandErrorStateResource,
+ createCommandStateResource,
+} from '../../../../../../../../../command-shared/test/command';
import { BescheidenFormService } from '../../../../bescheiden.formservice';
import { VorgangDetailBescheidenBescheidAutomatischErstellenComponent } from './vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component';
@@ -101,7 +107,7 @@ describe('VorgangDetailBescheidenBescheidAutomatischErstellenComponent', () => {
it('should clear nachricht', () => {
bescheidService.createBescheidDocument.mockReturnValue(
- of({ ...createUploadFileInProgress(), loading: false, error: null }),
+ of(createCommandStateResource([CommandLinkRel.EFFECTED_RESOURCE])),
);
component.createBescheidDocument();
@@ -111,9 +117,7 @@ describe('VorgangDetailBescheidenBescheidAutomatischErstellenComponent', () => {
});
it('should not clear nachricht when loading', () => {
- bescheidService.createBescheidDocument.mockReturnValue(
- of({ ...createUploadFileInProgress(), error: null }),
- );
+ bescheidService.createBescheidDocument.mockReturnValue(of(createEmptyStateResource(true)));
component.createBescheidDocument();
@@ -122,9 +126,7 @@ describe('VorgangDetailBescheidenBescheidAutomatischErstellenComponent', () => {
});
it('should not clear nachricht when error', () => {
- bescheidService.createBescheidDocument.mockReturnValue(
- of({ ...createUploadFileInProgress(), loading: false }),
- );
+ bescheidService.createBescheidDocument.mockReturnValue(of(createCommandErrorStateResource()));
component.createBescheidDocument();
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.ts
index 22ea557b1d537f9bf93d27c173b8920307115e03..c8d7e21a4576391531efa2a1dce7b930e9450070 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen/vorgang-detail-bescheiden-bescheid-automatisch-erstellen.component.ts
@@ -1,12 +1,6 @@
-import {
- BescheidLinkRel,
- BescheidResource,
- BescheidService,
- hasUploadNoError,
- isUploadFinished,
- UploadFileInProgress,
-} from '@alfa-client/bescheid-shared';
-import { StateResource } from '@alfa-client/tech-shared';
+import { BescheidLinkRel, BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { CommandResource, isSuccessfulDone } from '@alfa-client/command-shared';
+import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
import { Observable, of, tap } from 'rxjs';
import { BescheidenFormService } from '../../../../bescheiden.formservice';
@@ -18,9 +12,9 @@ import { BescheidenFormService } from '../../../../bescheiden.formservice';
export class VorgangDetailBescheidenBescheidAutomatischErstellenComponent {
@Input() public bescheidDraftStateResource: StateResource<BescheidResource>;
- public createBescheidDocumentInProgress$: Observable<UploadFileInProgress> = of({
- loading: false,
- });
+ public createBescheidDocumentInProgress$: Observable<StateResource<CommandResource>> = of(
+ createEmptyStateResource<CommandResource>(),
+ );
public readonly bescheidLinkRel = BescheidLinkRel;
@@ -31,8 +25,8 @@ export class VorgangDetailBescheidenBescheidAutomatischErstellenComponent {
public createBescheidDocument(): void {
this.createBescheidDocumentInProgress$ = this.bescheidService.createBescheidDocument().pipe(
- tap((uploadFileInProgress: UploadFileInProgress) => {
- if (isUploadFinished(uploadFileInProgress) && hasUploadNoError(uploadFileInProgress)) {
+ tap((commandStateResource: StateResource<CommandResource>) => {
+ if (isSuccessfulDone(commandStateResource.resource)) {
this.formService.clearNachricht();
}
}),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.html
index 88e80fc07928ff69271f36e4832343d389cce584..e78ff6386bf1b7b908109c15e9d14b2e4c73fbea 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokument-hochladen/vorgang-detail-bescheiden-dokument-hochladen.component.html
@@ -9,6 +9,6 @@
>
<ods-bescheid-upload-icon icon></ods-bescheid-upload-icon>
<ods-spinner-icon spinner size="extra-large"></ods-spinner-icon>
- <div text class="text-center">Bescheid Dokument hochladen</div>
+ <div text class="text-center">Bescheiddokument hochladen</div>
</ods-single-file-upload-editor>
</div>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component.html
index 2c98dc3938883b3658342b7bf8194264c0e3bbbc..2cfc7ff99368dc650ab7807c53c4bc0414d00ea4 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-dokumente-hinzufuegen/vorgang-detail-bescheiden-dokumente-hinzufuegen.component.html
@@ -5,5 +5,7 @@
<alfa-vorgang-detail-bescheiden-dokument-hochladen
[bescheidDraftStateResource]="bescheidDraftStateResource$ | async"
></alfa-vorgang-detail-bescheiden-dokument-hochladen>
- <alfa-vorgang-detail-bescheiden-attachment-hochladen></alfa-vorgang-detail-bescheiden-attachment-hochladen>
+ <alfa-vorgang-detail-bescheiden-attachment-hochladen
+ [bescheidDraftStateResource]="bescheidDraftStateResource$ | async"
+ ></alfa-vorgang-detail-bescheiden-attachment-hochladen>
</div>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
index 5a2d05a8c865f4b021f187f37beaa2326b2059ee..6559c97674ad9b2fee5258fd64835cff365ff99f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
@@ -15,8 +15,8 @@ import {
createCommandResource,
createCommandStateResource,
} from '../../../../../../../command-shared/test/command';
-import { singleCold } from '../../../../../../../tech-shared/src/lib/resource/marbles';
import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
+import { singleCold } from '../../../../../../../tech-shared/test/marbles';
import { createVorgangWithEingangResource } from '../../../../../../../vorgang-shared/test/vorgang';
import { BescheidenFormService } from '../../bescheiden.formservice';
import { VorgangDetailBescheidenStepTitleComponent } from '../vorgang-detail-bescheiden-step-title/vorgang-detail-bescheiden-step-title.component';
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
index 8bb8b9b2cd8c20339979c950da3561851474eb93..a05c072bc6c488d8b4948180c7f7ebefb58de08a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
@@ -1,4 +1,4 @@
-import { HttpError, StateResource, hasError, isLoaded } from '@alfa-client/tech-shared';
+import { HttpError, StateResource, hasStateResourceError, isLoaded } from '@alfa-client/tech-shared';
import {
VorgangService,
VorgangWithEingangLinkRel,
@@ -61,6 +61,6 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit {
}
noError(stateResource: StateResource<Resource | HttpError>): boolean {
- return isLoaded(stateResource) && !hasError(stateResource);
+ return isLoaded(stateResource) && !hasStateResourceError(stateResource);
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component.html
index 8df4670c7d47d8cfc6b998a7d0a0d0b66a4ff803..55a9f67956faa09ff08e2e0849134c690a73059c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component.html
@@ -1,10 +1,10 @@
<ods-button
*ngIf="showButton$ | async"
- (click)="clickEmitter.emit($event)"
+ (clickEmitter)="clickEmitter.emit()"
variant="primary"
size="medium"
class="mt-8 flex"
- data-test-id="bescheid-weiter-button"
+ dataTestId="bescheid-weiter-button"
text="Weiter"
>
</ods-button>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
index 46dd5111642b4781159e42e073f20a13214807e2..c82b596f3669350ebd42f569cae44749fa9c92f8 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.spec.ts
@@ -1,4 +1,5 @@
import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { PostfachService } from '@alfa-client/postfach-shared';
import { Mock, dispatchEventFromFixture, mock, useFromMock } from '@alfa-client/test-utils';
import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
@@ -23,6 +24,7 @@ describe('VorgangDetailBescheidenComponent', () => {
let vorgangService: Mock<VorgangService>;
let formService: BescheidenFormService;
let dialogRef: Mock<DialogRef>;
+ let postfachService: Mock<PostfachService>;
let vorgangWithEingangResource: VorgangWithEingangResource;
let bescheidDraftResource: BescheidResource;
@@ -34,6 +36,7 @@ describe('VorgangDetailBescheidenComponent', () => {
vorgangService = mock(VorgangService);
formService = new BescheidenFormService(new UntypedFormBuilder(), useFromMock(bescheidService));
dialogRef = mock(DialogRef);
+ postfachService = mock(PostfachService);
vorgangWithEingangResource = createVorgangWithEingangResource();
bescheidDraftResource = createBescheidResource();
@@ -73,6 +76,10 @@ describe('VorgangDetailBescheidenComponent', () => {
provide: DIALOG_DATA,
useValue: { vorgangWithEingangResource, bescheidDraftResource },
},
+ {
+ provide: PostfachService,
+ useValue: postfachService,
+ },
],
imports: [ReactiveFormsModule],
}).compileComponents();
@@ -116,6 +123,12 @@ describe('VorgangDetailBescheidenComponent', () => {
expect(vorgangService.reloadCurrentVorgang).toHaveBeenCalled();
});
+
+ it('should reload postfach mail list', () => {
+ component.onClose();
+
+ expect(postfachService.setPostfachMailOnReload).toHaveBeenCalled();
+ });
});
describe('close dialog on bescheiden result', () => {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
index 9223a68d605e8575a1d48b764a6e839280c7152f..c3a880423edbb95b2b2153db66b3202ae9dd7bad 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component.ts
@@ -1,4 +1,5 @@
import { BescheidResource } from '@alfa-client/bescheid-shared';
+import { PostfachService } from '@alfa-client/postfach-shared';
import { VorgangService } from '@alfa-client/vorgang-shared';
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
import { Component, Inject, OnInit } from '@angular/core';
@@ -17,8 +18,9 @@ export class VorgangDetailBescheidenComponent implements OnInit {
constructor(
public dialogRef: DialogRef,
- public formService: BescheidenFormService,
- private vorgangService: VorgangService,
+ public readonly formService: BescheidenFormService,
+ private readonly vorgangService: VorgangService,
+ private readonly postfachService: PostfachService,
@Inject(DIALOG_DATA) private readonly dialogData: BescheidenDialogData,
) {
this.bescheidDraftResource = dialogData.bescheidDraftResource;
@@ -32,5 +34,6 @@ export class VorgangDetailBescheidenComponent implements OnInit {
public onClose(): void {
this.dialogRef.close();
this.vorgangService.reloadCurrentVorgang();
+ this.postfachService.setPostfachMailOnReload();
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 45f9decc4f7d4e8133605ba802b99dd72a4a665b..69241c6fd1be29d963aa274d18b2cbaa855d0543 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -50,7 +50,6 @@ import {
import {
AttachmentComponent,
AttachmentContainerComponent,
- AttachmentErrorComponent,
BescheidGenerateIconComponent,
BescheidStatusTextComponent,
BescheidUploadIconComponent,
@@ -87,7 +86,6 @@ import { VorgangDetailRepresentationListComponent } from './vorgang-detail-page/
import { VorgangDetailHeaderComponent } from './vorgang-detail-page/vorgang-detail-area/vorgang-detail-header/vorgang-detail-header.component';
import { VorgangDetailBackButtonContainerComponent } from './vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button-container.component';
import { VorgangDetailBackButtonComponent } from './vorgang-detail-page/vorgang-detail-back-button-container/vorgang-detail-back-button/vorgang-detail-back-button.component';
-import { VorgangDetailBescheidenFormErrorComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-form-error/vorgang-detail-bescheiden-form-error.component';
import { VorgangDetailBescheidenResultAttachmentsComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component';
import { VorgangDetailBescheidenResultDokumentComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-dokument/vorgang-detail-bescheiden-result-dokument.component';
import { VorgangDetailBescheidenResultNachrichtComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-nachricht/vorgang-detail-bescheiden-result-nachricht.component';
@@ -155,7 +153,6 @@ const routes: Routes = [
BescheidGenerateIconComponent,
AttachmentComponent,
AttachmentContainerComponent,
- AttachmentErrorComponent,
ButtonWithSpinnerComponent,
FileUploadEditorComponent,
SingleFileUploadEditorComponent,
@@ -213,7 +210,6 @@ const routes: Routes = [
VorgangDetailBescheidenAttachmentHochladenComponent,
VorgangDetailBescheidenResultDokumentComponent,
VorgangDetailBescheidenResultAttachmentsComponent,
- VorgangDetailBescheidenFormErrorComponent,
VorgangDetailBescheidenBescheidVersendenComponent,
VorgangDetailBescheidenResultNachrichtComponent,
],
diff --git a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
index a96d7ca4e7cd27b2936a41b5b91e9fcbfc1f853d..c9633abfedc9521786c49655796b3304e4a3972e 100644
--- a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
+++ b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
@@ -37,7 +37,7 @@ import {
createStateResource,
decodeUrlFromEmbedding,
doIfLoadingRequired,
- hasError,
+ hasStateResourceError,
isNotNull,
isNotUndefined,
replacePlaceholder,
@@ -327,7 +327,7 @@ export class WiedervorlageService implements OnDestroy {
this.submitInProgress$.next(createStateResource(commandStateResource.resource));
this.snackbarService.show(commandStateResource.resource, message);
this.setWiedervorlageListReload();
- } else if (hasError(commandStateResource)) {
+ } else if (hasStateResourceError(commandStateResource)) {
this.submitInProgress$.next(createStateResource(commandStateResource.resource));
}
}
diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml
index 961e14d6fa3f44e0a1382e4b26c924e1fe0fd2d2..a0ed2b50fa6eb31acfb21af7156aa2c0590a7cc9 100644
--- a/alfa-server/src/main/resources/application-local.yml
+++ b/alfa-server/src/main/resources/application-local.yml
@@ -12,6 +12,8 @@ grpc:
user-manager:
address: static://127.0.0.1:9000
negotiationType: PLAINTEXT
+ vorgang-manager:
+ negotiationType: PLAINTEXT
ozgcloud:
feature:
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index 37fafad40ea8fb37e5177621ffb398ff756ccb16..8e17178fea49083f2e1a5035d0b27d50c6670e50 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -57,7 +57,7 @@ grpc:
client:
vorgang-manager:
address: static://127.0.0.1:9090
- negotiationType: PLAINTEXT
+ negotiationType: TLS
user-manager:
address: static://127.0.0.1:9000
negotiationType: TLS
diff --git a/alfa-service/javac.20240524_095230.args b/alfa-service/javac.20240524_095230.args
new file mode 100644
index 0000000000000000000000000000000000000000..afb64b5f04472a1efb08d555a627210a5f51a84e
--- /dev/null
+++ b/alfa-service/javac.20240524_095230.args
@@ -0,0 +1 @@
+@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler16216354973819705899arguments
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessor.java
index 8a7a0c580ab7f9e4aa75e5cc9476dddbe0176e00..3a134ac79f67c11e6168fe0116bcebbbfe94b24f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessor.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessor.java
@@ -56,11 +56,11 @@ class BescheidHistorieProcessor implements HistorieProcessor {
}
List<Command> filterBescheidRelatedCommands(List<Command> commands) {
- var commandIdsToFilter = getBescheidRelatedCommandIdsToFilter(commands);
- return commands.stream().filter(command -> !commandIdsToFilter.contains(command.getId())).toList();
+ var excludeCommandIds = getExcludedBescheidRelatedCommandIds(commands);
+ return commands.stream().filter(command -> !excludeCommandIds.contains(command.getId())).toList();
}
- List<String> getBescheidRelatedCommandIdsToFilter(List<Command> commands) {
+ List<String> getExcludedBescheidRelatedCommandIds(List<Command> commands) {
var sendBescheidCommands = commands.stream().filter(this::isSendBescheidCommand).toList();
var sendBescheidCommandsRelationIds = sendBescheidCommands.stream().map(Command::getRelationId).toList();
var orphanedUpdateBescheidCommands = commands.stream().filter(IS_UPDATE_BESCHEID_COMMAND)
@@ -80,7 +80,7 @@ class BescheidHistorieProcessor implements HistorieProcessor {
if (isManualSent(getVorgangAttachedItem(sendBescheidCommand.getRelationId()).getItem())) {
return Stream.concat(Stream.of(sendBescheidCommand.getId()), filterLatestByCreatedAt(relatedUpdateBescheidCommands)).toList();
} else {
- return relatedUpdateBescheidCommands.stream().map(Command::getId).toList();
+ return filterLatestByCreatedAt(relatedUpdateBescheidCommands).toList();
}
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
index 18609a3e02a160c36a6bff251093faf42ac17c43..bf8932e3df1d5415b43aebb5e4be6df0c0f5cc2e 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
@@ -1,8 +1,6 @@
package de.ozgcloud.alfa.bescheid;
-import java.time.ZonedDateTime;
import java.util.List;
-import java.util.UUID;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -13,19 +11,18 @@ import com.google.protobuf.ProtocolStringList;
import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
-import de.ozgcloud.alfa.common.user.UserId;
+import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.bescheid.GrpcBescheid;
+import de.ozgcloud.bescheid.GrpcSentInfo;
-@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = FileIdMapper.class)
+@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = { FileIdMapper.class,
+ UserIdMapper.class })
interface BescheidMapper {
@Mapping(target = "attachments", source = "grpcBescheid.attachmentsList")
- @Mapping(target = "sentInfo", expression = "java(sentInfoDummyMapping())")
Bescheid fromGrpc(GrpcBescheid grpcBescheid, String vorgangId);
List<FileId> fromProtocolStringList(ProtocolStringList value);
- default SentInfo sentInfoDummyMapping() {
- return SentInfo.builder().sentBy(UserId.from(UUID.randomUUID().toString())).sentAt(ZonedDateTime.now()).build();
- }
+ SentInfo fromGrpcSentInfo(GrpcSentInfo grpcSentInfo);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessorTest.java
index 8e57e2cf77ad8ce2eacf789e1d113c6755b8401d..ac60d058d4b2b3a315ac2312cae6375a160275d6 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidHistorieProcessorTest.java
@@ -131,14 +131,14 @@ class BescheidHistorieProcessorTest {
@BeforeEach
void mock() {
- doReturn(Collections.singletonList(commandToFilter.getId())).when(processor).getBescheidRelatedCommandIdsToFilter(any());
+ doReturn(Collections.singletonList(commandToFilter.getId())).when(processor).getExcludedBescheidRelatedCommandIds(any());
}
@Test
void shouldGetBescheidRelatedCommandIdsToFilter() {
processor.filterBescheidRelatedCommands(commands);
- verify(processor).getBescheidRelatedCommandIdsToFilter(commands);
+ verify(processor).getExcludedBescheidRelatedCommandIds(commands);
}
@Test
@@ -177,14 +177,14 @@ class BescheidHistorieProcessorTest {
@Test
void shouldGetCommandIdsToFilter() {
- processor.getBescheidRelatedCommandIdsToFilter(commands);
+ processor.getExcludedBescheidRelatedCommandIds(commands);
verify(processor).getCommandIdsToFilter(sendBescheidCommand, commands);
}
@Test
void shouldReturnIdsToFilter() {
- var commandIds = processor.getBescheidRelatedCommandIdsToFilter(commands);
+ var commandIds = processor.getExcludedBescheidRelatedCommandIds(commands);
assertThat(commandIds).containsExactlyInAnyOrder(updateBescheidCommand.getId(), updateBescheidCommandOfBescheidNotSent.getId());
}
@@ -279,7 +279,7 @@ class BescheidHistorieProcessorTest {
void shouldReturnRelatedCommandIds() {
var ids = processor.getCommandIdsToFilter(sendBescheidCommand, relatedUpdateBescheidCommands);
- assertThat(ids).containsExactly(relatedUpdateBescheidCommand.getId(), relatedLatestUpdateBescheidCommand.getId());
+ assertThat(ids).containsExactly(relatedUpdateBescheidCommand.getId());
}
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
index e825c374cce0a8e55a656bdbf3656032a1f8526f..ddf307c06f9dc8460ab0d7f311b3c7f01b081bb2 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
@@ -4,6 +4,8 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
+import java.time.ZonedDateTime;
+
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
@@ -11,12 +13,16 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
+import de.ozgcloud.alfa.common.user.UserId;
+import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
class BescheidMapperTest {
@Mock
private FileIdMapper fileIdMapper;
+ @Mock
+ private UserIdMapper userIdMapper;
@InjectMocks
private final BescheidMapper mapper = Mappers.getMapper(BescheidMapper.class);
@@ -88,6 +94,30 @@ class BescheidMapperTest {
assertThat(bescheid.getStatus()).isEqualTo(BescheidTestFactory.STATUS);
}
+ @Nested
+ class TestMapSentInfo {
+ private final SentInfo expectedSentInfo = SentInfoTestFactory.createBuilder()
+ .sentAt(ZonedDateTime.parse(GrpcSentInfoTestFactory.SENT_AT))
+ .sentBy(UserId.from(GrpcSentInfoTestFactory.SENT_BY))
+ .build();
+
+ @Test
+ void shouldMapSentBy() {
+ when(userIdMapper.fromString(GrpcSentInfoTestFactory.SENT_BY)).thenCallRealMethod();
+
+ var bescheid = map();
+
+ assertThat(bescheid.getSentInfo().getSentBy()).isEqualTo(expectedSentInfo.getSentBy());
+ }
+
+ @Test
+ void shouldMapSentAt() {
+ var bescheid = map();
+
+ assertThat(bescheid.getSentInfo().getSentAt()).isEqualTo(expectedSentInfo.getSentAt());
+ }
+ }
+
private Bescheid map() {
return mapper.fromGrpc(GrpcBescheidTestFactory.create(), VorgangHeaderTestFactory.ID);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
index 4ee81e36e98a17bea65d0f9472ae31b693ac5f73..fe0b433c030563f152f66ea4f12d94a8c0c3964c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcBescheidTestFactory.java
@@ -3,6 +3,7 @@ package de.ozgcloud.alfa.bescheid;
import java.util.List;
import de.ozgcloud.bescheid.GrpcBescheid;
+import de.ozgcloud.bescheid.GrpcSentInfo;
import de.ozgcloud.common.datatype.StringBasedValue;
public class GrpcBescheidTestFactory {
@@ -14,6 +15,7 @@ public class GrpcBescheidTestFactory {
public static final List<String> ATTACHMENTS = BescheidTestFactory.ATTACHMENTS.stream().map(StringBasedValue::toString).toList();
public static final String NACHRICHT_TEXT = BescheidTestFactory.NACHRICHT_TEXT;
public static final String NACHRICHT_SUBJECT = BescheidTestFactory.NACHRICHT_SUBJECT;
+ public static final GrpcSentInfo SENT_INFO = GrpcSentInfoTestFactory.create();
public static GrpcBescheid create() {
return createBuilder().build();
@@ -29,6 +31,7 @@ public class GrpcBescheidTestFactory {
.addAllAttachments(ATTACHMENTS)
.setNachrichtText(NACHRICHT_TEXT)
.setNachrichtSubject(NACHRICHT_SUBJECT)
- .setSendBy(BescheidTestFactory.SEND_BY.toString());
+ .setSendBy(BescheidTestFactory.SEND_BY.toString())
+ .setSentInfo(SENT_INFO);
}
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf0dc48600671fa22a54fb1b33d9093632eb7cfb
--- /dev/null
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/GrpcSentInfoTestFactory.java
@@ -0,0 +1,22 @@
+package de.ozgcloud.alfa.bescheid;
+
+import java.time.ZonedDateTime;
+
+import de.ozgcloud.alfa.common.user.GrpcUserTestFactory;
+import de.ozgcloud.bescheid.GrpcSentInfo;
+
+public class GrpcSentInfoTestFactory {
+
+ public static final String SENT_AT = ZonedDateTime.now().toString();
+ public static final String SENT_BY = GrpcUserTestFactory.ID;
+
+ public static GrpcSentInfo create() {
+ return createBuilder().build();
+ }
+
+ public static GrpcSentInfo.Builder createBuilder() {
+ return GrpcSentInfo.newBuilder()
+ .setSentAt(SENT_AT)
+ .setSentBy(SENT_BY);
+ }
+}
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/bescheid/ExportBescheidService.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/bescheid/ExportBescheidService.java
index bdac750f71c68402fbec3be070fa3dccacad4b2e..1d66ad45f4a52597ed08fa0aa41aa6a93489e45c 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/bescheid/ExportBescheidService.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/bescheid/ExportBescheidService.java
@@ -40,9 +40,9 @@ public class ExportBescheidService {
}
void addBescheidExportData(BescheidExportInput input, BescheidExportData.BescheidExportDataBuilder builder) {
- builder.dokumentType(buildDokumentType(input));
- builder.file(getDocument(input.bescheid()));
- builder.files(input.files());
+ builder.dokumentType(buildDokumentType(input))
+ .file(getDocument(input.bescheid()))
+ .files(input.files());
}
OzgFile getDocument(Bescheid bescheid) {
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
index 5ca01628405e55797a2a0e0f7c3dbcad41adc181..9c4bfd7a1291e1a06ea16cc902d2ee60019f4a41 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/DokumentTypeBuilderTest.java
@@ -13,6 +13,8 @@ import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Spy;
+import com.thedeanda.lorem.LoremIpsum;
+
import de.ozgcloud.alfa.common.AnlageDokumentTypeBuilder;
import de.ozgcloud.alfa.common.AnlageDokumentTypeTestFactory;
import de.ozgcloud.alfa.common.DateConverter;
@@ -68,73 +70,73 @@ class DokumentTypeBuilderTest {
identifikationObjektTypeBuilderMockedStatic.close();
}
- @Nested
- class TestWithoutAnlage {
- @Test
- void shouldSetObjectId() {
- builder.build();
+ @Test
+ void shouldSetObjectId() {
+ builder.build();
- verify(identifikationObjektTypeBuilder).withObjectID(bescheid.getId());
- }
+ verify(identifikationObjektTypeBuilder).withObjectID(bescheid.getId());
+ }
- @Test
- void shouldBuildIdentifikationObjectType() {
- builder.build();
+ @Test
+ void shouldBuildIdentifikationObjectType() {
+ builder.build();
- verify(identifikationObjektTypeBuilder).build();
- }
+ verify(identifikationObjektTypeBuilder).build();
+ }
- @Test
- void shouldHaveIdentifikation() {
- var dokument = builder.build();
+ @Test
+ void shouldHaveIdentifikation() {
+ var dokument = builder.build();
- assertThat(dokument.getIdentifikation()).isEqualTo(identifikationObjektType);
- }
+ assertThat(dokument.getIdentifikation()).isEqualTo(identifikationObjektType);
+ }
- @Test
- void shouldHaveTyp() {
- var dokument = builder.build();
+ @Test
+ void shouldHaveTyp() {
+ var dokument = builder.build();
- assertThat(dokument.getTyp()).isEqualTo(TYP);
- }
+ assertThat(dokument.getTyp()).isEqualTo(TYP);
+ }
- @Test
- void shouldHaveBezugWithBetreff() {
- var subject = "Betreff";
- builder.withBescheid(BescheidTestFactory.createBuilder().nachrichtSubject(subject).build());
+ @Test
+ void shouldHaveBezugWithBetreff() {
+ var subject = LoremIpsum.getInstance().getWords(5);
+ builder.withBescheid(BescheidTestFactory.createBuilder().nachrichtSubject(subject).build());
- var dokument = builder.build();
+ var dokument = builder.build();
- assertThat(dokument.getBezug()).isEqualTo(subject);
- }
+ assertThat(dokument.getBezug()).isEqualTo(subject);
+ }
- @Test
- void shouldHaveEmptyBezug() {
- builder.withBescheid(BescheidTestFactory.createBuilder().nachrichtSubject(null).build());
+ @Test
+ void shouldHaveEmptyBezug() {
+ builder.withBescheid(BescheidTestFactory.createBuilder().nachrichtSubject(null).build());
- var dokument = builder.build();
+ var dokument = builder.build();
- assertThat(dokument.getBezug()).isEmpty();
- }
+ assertThat(dokument.getBezug()).isEmpty();
+ }
- @Test
- void shouldHaveMetadaten() {
- doReturn(metadatenType).when(builder).createAllgemeineMetadaten();
+ @Test
+ void shouldHaveMetadaten() {
+ doReturn(metadatenType).when(builder).createAllgemeineMetadaten();
- var dokument = builder.build();
+ var dokument = builder.build();
- assertThat(dokument.getAllgemeineMetadaten()).isEqualTo(metadatenType);
- }
+ assertThat(dokument.getAllgemeineMetadaten()).isEqualTo(metadatenType);
+ }
- @Test
- void shouldHaveHistorienProtokollInformation() {
- doReturn(historienProtokollInformation).when(builder).createHistorienProtokollInformation();
+ @Test
+ void shouldHaveHistorienProtokollInformation() {
+ doReturn(historienProtokollInformation).when(builder).createHistorienProtokollInformation();
- var dokument = builder.build();
+ var dokument = builder.build();
- assertThat(dokument.getHistorienProtokollInformation()).containsExactly(historienProtokollInformation);
- }
+ assertThat(dokument.getHistorienProtokollInformation()).containsExactly(historienProtokollInformation);
+ }
+ @Nested
+ class TestWithoutAnlage {
@Test
void shouldHaveNoAnlage() {
var dokument = builder.build();
@@ -187,9 +189,12 @@ class DokumentTypeBuilderTest {
@Nested
class TestCreateHistorienProtokollInformation {
+ private final static String GESPEICHERT = "Bescheid gespeichert";
+ private final static String GESENDET = "Bescheid an Antragsteller gesendet";
+
@Test
void shouldHaveMetadatumName() {
- var text = "Nachricht";
+ var text = LoremIpsum.getInstance().getHtmlParagraphs(1, 1);
builder.withBescheid(BescheidTestFactory.createBuilder().nachrichtText(text).build());
var protokollInfo = builder.createHistorienProtokollInformation();
@@ -226,7 +231,7 @@ class DokumentTypeBuilderTest {
var protokollInfo = builder.createHistorienProtokollInformation();
- assertThat(protokollInfo.getAktion()).isEqualTo("Bescheid gespeichert");
+ assertThat(protokollInfo.getAktion()).isEqualTo(GESPEICHERT);
}
@Test
@@ -235,7 +240,7 @@ class DokumentTypeBuilderTest {
var protokollInfo = builder.createHistorienProtokollInformation();
- assertThat(protokollInfo.getAktion()).isEqualTo("Bescheid an Antragsteller gesendet");
+ assertThat(protokollInfo.getAktion()).isEqualTo(GESENDET);
}
}
@@ -244,7 +249,7 @@ class DokumentTypeBuilderTest {
private MockedStatic<AnlageDokumentTypeBuilder> anlageDokumentTypeBuilderMockedStatic;
@Mock
private AnlageDokumentTypeBuilder anlageDokumentTypeBuilder;
- private AnlageDokumentType expectedAnlage = AnlageDokumentTypeTestFactory.create();
+ private final AnlageDokumentType expectedAnlage = AnlageDokumentTypeTestFactory.create();
private final OzgFile attachment = OzgFileTestFactory.create();
@BeforeEach
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
index 2e7e49d9c3f89f7df2aafdcdf9fee34077208bf5..126aab998d2b46b39b5b8e5c2340f6200fe2adee 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/ExportBescheidServiceTest.java
@@ -52,8 +52,8 @@ class ExportBescheidServiceTest {
private final VorgangWithEingang vorgang = VorgangWithEingangTestFactory.create();
private final Bescheid bescheid = BescheidTestFactory.create();
private final BescheidExportData exportData = BescheidExportDataTestFactory.create();
+ private final BescheidExportInput input = BescheidExportInputTestFactory.create();
- private BescheidExportInput input = BescheidExportInputTestFactory.create();
private MockedStatic<BescheidExportData> bescheidExportDataMockedStatic;
@Mock
private BescheidExportDataBuilder exportDataBuilder;
@@ -181,9 +181,9 @@ class ExportBescheidServiceTest {
@Nested
class TestGetDocument {
- private Bescheid bescheid = BescheidTestFactory.create();
- private Document document = DocumentTestFactory.create();
- private OzgFile ozgDocument = OzgFileTestFactory.create();
+ private final Bescheid bescheid = BescheidTestFactory.create();
+ private final Document document = DocumentTestFactory.create();
+ private final OzgFile ozgDocument = OzgFileTestFactory.create();
@BeforeEach
void setUpMock() {
@@ -255,6 +255,8 @@ class ExportBescheidServiceTest {
void setUpMocks() {
doReturn(dokumentType).when(service).buildDokumentType(exportInput);
doReturn(document).when(service).getDocument(exportInput.bescheid());
+ when(exportDataBuilder.dokumentType(dokumentType)).thenReturn(exportDataBuilder);
+ when(exportDataBuilder.file(document)).thenReturn(exportDataBuilder);
}
@Test
@@ -331,7 +333,7 @@ class ExportBescheidServiceTest {
void shouldCallBuilder() {
callService();
- dokumentTypeBuilderMockedStatic.verify(() -> DokumentTypeBuilder.builder());
+ dokumentTypeBuilderMockedStatic.verify(DokumentTypeBuilder::builder);
}
@Test
@@ -393,9 +395,9 @@ class ExportBescheidServiceTest {
@Nested
class TestGetFullName {
- private Bescheid bescheid = BescheidTestFactory.create();
- private UserProfile userProfile = UserProfileTestFactory.create();
- private String expectedFullName = UserProfileTestFactory.FULLNAME;
+ private final Bescheid bescheid = BescheidTestFactory.create();
+ private final UserProfile userProfile = UserProfileTestFactory.create();
+ private final String expectedFullName = UserProfileTestFactory.FULLNAME;
@BeforeEach
void mockUserService() {
diff --git a/pom.xml b/pom.xml
index aa707651cdc6c5f822f0dcb2ba123c0ce4e2aa2e..4be17f3b766715348c9d8a217b700df8b37e4b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <vorgang-manager.version>2.7.0</vorgang-manager.version>
+ <vorgang-manager.version>2.8.0-SNAPSHOT</vorgang-manager.version>
<nachrichten-manager.version>2.7.0</nachrichten-manager.version>
<ozgcloud-common-pdf.version>3.0.1</ozgcloud-common-pdf.version>
<user-manager.version>2.2.0</user-manager.version>
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 4a3d38c9b4ff9fc0e3183840d1554b666112e25c..cad88f7ba2e55da7b791497853c8ff633af6aaac 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
value: "/bindings"
- name: grpc_client_vorgang-manager_address
value: {{ include "app.grpc_client_vorgang_manager_address" . }}
+ - name: grpc_client_vorgang-manager_negotiationType
+ value: {{ (.Values.vorgangManager).grpcClientNegotiationType | default "TLS" }}
- name: grpc_client_user-manager_address
value: {{ include "app.grpc_client_user-manager_address" . }}
- name: grpc_client_user-manager_negotiationType
@@ -176,12 +178,6 @@ spec:
mountPath: "/bindings/ca-certificates/type"
subPath: type
readOnly: true
- {{- if not .Values.disableUserManagerGrpcTls }}
- - name: user-manager-tls-certificate
- mountPath: "/bindings/ca-certificates/user-manager-tls-ca.pem"
- subPath: ca.crt
- readOnly: true
- {{- end }}
- name: temp-dir
mountPath: "/tmp"
{{- if (.Values.sso).tlsCertName }}
@@ -190,15 +186,13 @@ spec:
subPath: tls.crt
readOnly: true
{{- end }}
+ - name: namespace-ca-cert
+ mountPath: "/bindings/namespace-certificate"
+ readOnly: true
volumes:
- name: bindings
configMap:
name: alfa-bindings-type
- {{- if not .Values.disableUserManagerGrpcTls }}
- - name: user-manager-tls-certificate
- secret:
- secretName: user-manager-tls-cert
- {{- end }}
- name: temp-dir
emptyDir: {}
{{- if (.Values.sso).tlsCertName }}
@@ -206,6 +200,17 @@ spec:
secret:
secretName: {{ .Values.sso.tlsCertName }}
{{- end }}
+ - name: namespace-ca-cert
+ projected:
+ sources:
+ - secret:
+ name: {{ include "app.namespace" . }}-ca-cert
+ optional: true
+ items:
+ - key: ca.crt
+ path: ca.crt
+ - configMap:
+ name: alfa-bindings-type
dnsConfig: {}
dnsPolicy: ClusterFirst
imagePullSecrets:
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index aca352c23e4dc350e919c0eb8d3bb45cd79ec40c..91c7626679c859414ff092714b8b21f69796c7df 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -38,9 +38,9 @@ set:
baseUrl: test.company.local
imagePullSecret: image-pull-secret
tests:
- - it: should have volumes
- set:
- usermanagerName: user-manager
+ - it: should have volume mounts
+ set:
+ usermanagerName: user-manager
asserts:
- contains:
path: spec.template.spec.containers[0].volumeMounts
@@ -49,13 +49,6 @@ tests:
mountPath: "/bindings/ca-certificates/type"
subPath: type
readOnly: true
- - contains:
- path: spec.template.spec.containers[0].volumeMounts
- content:
- name: user-manager-tls-certificate
- mountPath: "/bindings/ca-certificates/user-manager-tls-ca.pem"
- subPath: ca.crt
- readOnly: true
- contains:
path: spec.template.spec.containers[0].volumeMounts
content:
@@ -68,9 +61,15 @@ tests:
mountPath: "/bindings/ca-certificates/ssl-tls-ca.pem"
subPath: ca.crt
readOnly: true
- - it: should have volume mounts
- set:
- usermanagerName: user-manager
+ - contains:
+ path: spec.template.spec.containers[0].volumeMounts
+ content:
+ name: namespace-ca-cert
+ mountPath: "/bindings/namespace-certificate"
+ readOnly: true
+ - it: should have volumes
+ set:
+ usermanagerName: user-manager
asserts:
- contains:
path: spec.template.spec.volumes
@@ -78,12 +77,6 @@ tests:
name: bindings
configMap:
name: alfa-bindings-type
- - contains:
- path: spec.template.spec.volumes
- content:
- name: user-manager-tls-certificate
- secret:
- secretName: user-manager-tls-cert
- contains:
path: spec.template.spec.volumes
content:
@@ -93,6 +86,20 @@ tests:
path: spec.template.spec.volumes
content:
name: sso-tls-certificate
+ - contains:
+ path: spec.template.spec.volumes
+ content:
+ name: namespace-ca-cert
+ projected:
+ sources:
+ - secret:
+ items:
+ - key: ca.crt
+ path: ca.crt
+ name: sh-helm-test-ca-cert
+ optional: true
+ - configMap:
+ name: alfa-bindings-type
- it: should have sso tls cert mount
set:
usermanagerName: user-manager
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index f2b46cc3dcd95eac18f2a1286f97a83034992141..99d108c95f63fc674e22cf2cc369af4db57c0ae5 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -132,3 +132,21 @@ tests:
content:
name: grpc_client_user-manager_negotiationType
value: TLS
+
+ - it: should set vorgang-manager negotiationType plaintext
+ set:
+ vorgangManager.grpcClientNegotiationType: PLAINTEXT
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_vorgang-manager_negotiationType
+ value: PLAINTEXT
+
+ - it: should contain default vorgang-manager negotiationType tls
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: grpc_client_vorgang-manager_negotiationType
+ value: TLS