Merge branch 'master' into add_nvm_support

Jenkinsfile

 pipeline {
     agent {
         node {
-            label 'jenkins-build-agent'
+            label 'jenkins-build-agent-nodejs-16'
         }
     }
 
@@ -10,7 +10,7 @@ pipeline {
         RELEASE_REGEX = /\d+.\d+.\d+/
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
         BUNDESLAND = "by"
-        SSO_URL = "sso.dev.by.kop-sys.de"
+        SSO_URL = "sso.dev.by.kop-cloud.de"
         CLUSTER_BASE_URL = "dev.by.kop-cloud.de"
         FAILED_STAGE = ""
         IMAGE_TAG = ""
@@ -63,7 +63,7 @@ pipeline {
                     sh 'npm --version'
                     dir('goofy-client') {
                         sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
-                        sh 'echo "_auth=amVua2luczpQaihzX0ZNNFU5ZC8=" >> ~/.npmrc'
+                        sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczpQaihzX0ZNNFU5ZC8=" >> ~/.npmrc'
 
 						sh 'npm cache verify'
                         sh 'npm install --legacy-peer-deps'

README.md

 ## Versionen
-nodeJS: 14.15.1
-npm: 6.14.8
 
+* Frontend: siehe [Client README.md](./goofy-client/README.md)
 
 ## IDE Setup
 Window > Preferences > Maven > Automatically update Maven projects configuration

goofy-client/angular.json

@@ -294,7 +294,9 @@
 							"includePaths": [
 								"apps/goofy/src/styles/abstracts",
 								"apps/goofy/src/styles/material",
-								"libs/ui/src/lib/font"
+								"node_modules/@angular",
+								"node_modules/include-media",
+								"node_modules/typeface-roboto"
 							]
 						},
 						"vendorChunk": true,

goofy-client/apps/goofy-e2e/docker-compose.yml

@@ -33,7 +33,8 @@ services:
       - MONGODB_EXTRA_FLAGS=--profile=2
 
   ozg-pluto:
-    image: docker.ozg-sh.de/pluto:snapshot-latest
+    image: docker.ozg-sh.de/pluto:${PLUTO_DOCKER_IMAGE:-snapshot-latest}
+    platform: linux/amd64
     environment:
       - SPRING_DATA_MONGODB_HOST=ozg-mongodb
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
@@ -49,7 +50,8 @@ services:
       - ozg-elastic
 
   ozg-goofy:
-    image: docker.ozg-sh.de/goofy:snapshot-latest
+    image: docker.ozg-sh.de/goofy:${GOOFY_DOCKER_IMAGE:-snapshot-latest}
+    platform: linux/amd64
     environment:
       - GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090
       - SPRING_PROFILES_ACTIVE=remotekc, e2e
@@ -82,7 +84,8 @@ services:
         hard: 65536
 
   ozg-usermanager:
-    image: docker.ozg-sh.de/user-manager:snapshot-latest
+    image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
+    platform: linux/amd64
     environment:
       - QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.ozg-sh.de
       - QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.ozg-sh.de/realms/sh-e2e-dev

goofy-client/apps/goofy-e2e/src/plugins/index.js

@@ -94,7 +94,7 @@ module.exports = (on, config) => {
     const webpackOptions = webpackPreprocessor.defaultOptions.webpackOptions;
 
     webpackOptions.module.rules.unshift({
-        test: /[/\\]@angular[/\\].+\.m?js$/,
+        test: /[/\\](@angular|@ngxp)[/\\].+\.m?js$/,
         resolve: {
             fullySpecified: false,
         },

goofy-client/apps/goofy-e2e/src/support/postfach-util.ts

@@ -21,13 +21,14 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { encodeUrlForEmbedding } from '@goofy-client/tech-shared';
 import { PostfachE2E } from '../model/postfach-nachricht';
-import { buildUrl, encodeUrl } from './tech.util';
+import { buildUrl } from './tech.util';
 
 const postfachNachricht: PostfachE2E = require('../fixtures/postfach/postfach-nachricht-reply-item.json');
 
 export function createPostfachUriByVorgangId(id: string): string {
-	return `/vorgang/${encodeUrl(buildUrl(id, 'vorgangs'))}/postfach`;
+	return `/vorgang/${encodeUrlForEmbedding(buildUrl(id, 'vorgangs'))}/postfach`;
 }
 
 export function createPostfachNachricht() {

goofy-client/apps/goofy-e2e/src/support/tech.util.ts

@@ -60,10 +60,6 @@ export function generate12ByteId(): string {
 	return outString;
 }
 
-export function encodeUrl(vorgangUrl: string) {
-	return encodeURIComponent(btoa(vorgangUrl).replace('/', '_'));//TODO pruefen, ob das replace noch notwendig ist
-}
-
 export function buildUrl(id: string, pathPrefix: string) {
 	return `${getBaseUrl()}/api/${pathPrefix}/${id}`
 }

goofy-client/apps/goofy-e2e/src/support/vorgang-util.ts

@@ -21,10 +21,11 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { encodeUrlForEmbedding } from '@goofy-client/tech-shared';
 import { AccessPermissionE2E, AntragstellerE2E, ClientAttributeE2E, ClientAttributesE2E, EingangE2E, EingangHeaderE2E, VorgangE2E } from '../model/vorgang';
 import { VorgangAttachedItemClientE2E } from '../model/vorgang-attached-item';
 import { initSearchIndexData, initVorgangData } from './cypress-helper';
-import { buildUrl, encodeUrl } from './tech.util';
+import { buildUrl } from './tech.util';
 
 export const objectIds: string[] = require('../fixtures/util/object_id_collection.json');
 const vorgangFixture: VorgangE2E = require('../fixtures/vorgang/vorgang.json');
@@ -58,7 +59,7 @@ export const AntragstellerE2ETestData: AntragstellerE2E = EingangE2ETestData.ant
 export const EingangHeaderE2ETestData: EingangHeaderE2E = EingangE2ETestData.header;
 
 export function createVorgangUriById(id: string): string {
-	return `/vorgang/${encodeUrl(buildUrl(id, 'vorgangs'))}`;
+	return `/vorgang/${encodeUrlForEmbedding(buildUrl(id, 'vorgangs'))}`;
 }
 
 //Client Attribute

goofy-client/apps/goofy-e2e/src/support/wiedervorlage-util.ts

@@ -21,9 +21,10 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
+import { encodeUrlForEmbedding } from '@goofy-client/tech-shared';
 import { VorgangAttachedItemClientE2E, VorgangAttachedItemE2E, VorgangAttachedItemNameE2E } from '../model/vorgang-attached-item';
 import { WiedervorlageE2E } from '../model/wiedervorlage';
-import { buildUrl, encodeUrl } from './tech.util';
+import { buildUrl } from './tech.util';
 import { getUserSabineUuid } from './user-util';
 import { VORGANG_ATTACHED_ITEM_CLASS } from './vorgang-attached-item-util';
 
@@ -45,7 +46,7 @@ export function buildWiedervorlage(_id: string, uiIdentifier: string): Wiedervor
 }
 
 export function createWiedervorlageNeuUriByVorgangId(id: string): string {
-	return `/vorgang/${encodeUrl(buildUrl(id, 'vorgangs'))}/wiedervorlage/neu`;
+	return `/vorgang/${encodeUrlForEmbedding(buildUrl(id, 'vorgangs'))}/wiedervorlage/neu`;
 }
 
 const wiedervorlageItemFixture: WiedervorlageE2E = require('../fixtures/wiedervorlage/wiedervorlage.json');

goofy-client/apps/goofy/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/apps/goofy/src/app/app.component.scss

@@ -22,7 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 @import "breakpoints";
-@import "~include-media/dist/include-media";
+@import "include-media/dist/include-media";
 
 :host {
 	display: flex;

goofy-client/apps/goofy/src/styles/main.scss

@@ -22,29 +22,29 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 @use '@angular/material' as mat;
-@import 'font_material';
-@import "~typeface-roboto/index.css";
+@import 'libs/ui/src/lib/font/font_material';
+@import "typeface-roboto/index.css";
 
 @import "abstracts/variables";
 @import "base/setup";
 @import "layout/main";
 @import "material/tabs";
 @import "material/icons";
-@import "~libs/navigation/src/lib/navigation/navigation.theme";
-@import "~libs/navigation/src/lib/header-container/header/header.theme";
-@import "~libs/ui/src/lib/ui/expansion-panel/expansion-panel.theme";
-@import "~libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.theme";
-@import "~libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.theme";
-@import "~libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.theme";
-@import "~libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.theme";
-@import "~libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.theme";
-@import "~libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.theme";
-@import "~libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.theme";
-@import "~libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.theme";
-@import "~libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.theme";
-@import "~libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.theme";
-@import "~libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.theme";
-@import "~libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.theme";
+@import "libs/navigation/src/lib/navigation/navigation.theme";
+@import "libs/navigation/src/lib/header-container/header/header.theme";
+@import "libs/ui/src/lib/ui/expansion-panel/expansion-panel.theme";
+@import "libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.theme";
+@import "libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.theme";
+@import "libs/ui/src/lib/ui/fixed-dialog/fixed-dialog.theme";
+@import "libs/wiedervorlage/src/lib/wiedervorlage-page-container/wiedervorlage-page/breadcrumb/breadcrumb.theme";
+@import "libs/binary-file/src/lib/binary-file-container/binary-file/binary-file.theme";
+@import "libs/postfach/src/lib/postfach-mail-form/postfach-mail-form.theme";
+@import "libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search-container.theme";
+@import "libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-list-container/wiedervorlage-list-in-vorgang-list-container.theme";
+@import "libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.theme";
+@import "libs/user-profile/src/lib/user-profile-search-container/user-profile-search-container.theme";
+@import "libs/vorgang-shared-ui/src/lib/vorgang-nummer/vorgang-nummer.component.theme";
+@import "libs/ui/src/lib/icon/postfach-icon/postfach-icon.component.theme";
 
 @include mat.core();
 

goofy-client/libs/api-root-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/app-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/binary-file-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/binary-file/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/command-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/command-shared/src/lib/command.service.ts

@@ -106,7 +106,8 @@ export interface IntervallHandleWithTickObservable {
 
 export function startInterval(interval: number): IntervallHandleWithTickObservable {
 	const subj: Subject<any> = new Subject();
-	const handle = setInterval(() => subj.next('tick'), interval);
+	// Workaround: cast return value of setInterval() to number because since TS 4.8 it thinks it must be "Timer"
+	const handle = setInterval(() => subj.next('tick'), interval) as unknown as number;
 
 	return { handle, tickObservable: subj.asObservable() };
 }

goofy-client/libs/environment-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein

goofy-client/libs/forwarding-shared/jest.config.ts

+/* eslint-disable */
 /*
  * Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
  * Ministerpräsidenten des Landes Schleswig-Holstein