diff --git a/Jenkinsfile b/Jenkinsfile
index eb46e2e1adb1367ae3a76b5bd6edde1a5830f42b..d5f8b7d4af8bac8e299534f279784eb6c58cd6a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -78,11 +78,11 @@ pipeline {
}
}
}
-// post {
-// always{
-// junit testResults: 'alfa-client/test-report.xml', skipPublishingChecks: true
-// }
-// }
+ // post {
+ // always{
+ // junit testResults: 'alfa-client/test-report.xml', skipPublishingChecks: true
+ // }
+ // }
}
stage('Build and push client container') {
@@ -199,7 +199,7 @@ pipeline {
}
}
- stage('Test, build and deploy Helm Chart') {
+ stage('Test, build and deploy Alfa Helm Chart') {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
@@ -211,7 +211,27 @@ pipeline {
sh "helm package --version=${HELM_CHART_VERSION} ."
- deployHelmChart(HELM_CHART_VERSION)
+ deployHelmChart(HELM_CHART_VERSION, "alfa")
+ }
+ }
+ }
+ }
+
+ stage('Test, build and deploy Alfa-Client Helm Chart') {
+ steps {
+ script {
+ dir('alfa-client') {
+ FAILED_STAGE=env.STAGE_NAME
+ HELM_CHART_VERSION = generateHelmChartVersion()
+
+ sh "./run_helm_test.sh"
+
+ dir('src/main/helm') {
+
+ sh "helm package --version=${HELM_CHART_VERSION} ."
+
+ deployHelmChart(HELM_CHART_VERSION, "alfa-client")
+ }
}
}
}
@@ -299,13 +319,13 @@ pipeline {
}
}
-Void deployHelmChart(String helmChartVersion) {
+Void deployHelmChart(String helmChartVersion, String app ) {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
if (isReleaseBranch()) {
- result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
+ result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@'''+app+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true
}
else {
- result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
+ result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@'''+app+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true
}
if (result != '') {
@@ -405,6 +425,7 @@ String getElementAccessToken() {
Void setNewDevVersion() {
setNewGitopsVersion("dev")
+
}
Void setNewTestVersion() {
@@ -414,16 +435,20 @@ Void setNewTestVersion() {
Void setNewGitopsVersion(String environment) {
def envFile = "${environment}/application/values/alfa-values.yaml"
def commitMessage = "jenkins rollout ${environment} alfa version ${IMAGE_TAG}";
- setNewGitopsVersion(envFile, commitMessage);
+ setNewAlfaGitopsVersion(envFile, commitMessage);
+
+ envFile = "${environment}/application/values/alfa-client-values.yaml"
+ commitMessage = "jenkins rollout ${environment} alfa-client version ${IMAGE_TAG}";
+ setNewAlfaClientGitopsVersion(envFile, commitMessage);
}
Void setNewBarrierefreiheitVersion() {
def envFile = "dev/namespace/namespaces/by-barrierefreiheit-dev.yaml"
def commitMessage = "jenkins rollout ${IMAGE_TAG} for Barrierefreiheit Dev"
- setNewGitopsVersion(envFile, commitMessage);
+ setNewAlfaGitopsVersion(envFile, commitMessage);
}
-Void setNewGitopsVersion(String envFile, String commitMessage) {
+Void setNewAlfaGitopsVersion(String envFile, String commitMessage) {
dir("gitops") {
def envVersions = readYaml file: envFile
@@ -439,6 +464,22 @@ Void setNewGitopsVersion(String envFile, String commitMessage) {
}
}
+Void setNewAlfaClientGitopsVersion(String envFile, String commitMessage) {
+ dir("gitops") {
+ def envVersions = readYaml file: envFile
+
+ envVersions.alfa_client.image.tag = IMAGE_TAG
+ envVersions.alfa_client.helm.version = HELM_CHART_VERSION
+
+ writeYaml file: envFile, data: envVersions, overwrite: true
+
+ if (hasValuesFileChanged(envFile)) {
+ sh "git add ${envFile}"
+ sh "git commit -m '${commitMessage}'"
+ }
+ }
+}
+
String getCommitHash() {
return "-${env.GIT_COMMIT.take(7)}";
}
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/Jenkinsfile.e2e
similarity index 69%
rename from alfa-client/apps/alfa-e2e/Jenkinsfile
rename to alfa-client/Jenkinsfile.e2e
index 22dd8d42af4d5d81c7c163d876aa3ce3e0949d73..8d4455ba9f7a363efe2d0850d88b00473c1e27db 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/Jenkinsfile.e2e
@@ -23,7 +23,10 @@ pipeline {
FAILED_PARALLEL_STAGE = " "
EA_BEZEICHNER = generateBezeichner("e2e-ea")
MAIN_BEZEICHNER = generateBezeichner("e2e-main")
+ ADMIN_BEZEICHNER = generateBezeichner("e2e-admin")
SH_SUCCESS_STATUS_CODE = 0
+ KEYCLOAK_CLIENT_ADMIN_APP = "admin"
+ KEYCLOAK_CLIENT_ALFA_APP = "alfa"
}
options {
@@ -98,6 +101,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
+ initEnvAdminDefaultVersions()
initEnvAlfaDefaultVersions()
initEnvVorgangManagerDefaultVersions()
initEnvUserManagerDefaultVersions()
@@ -122,6 +126,12 @@ pipeline {
string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true),
string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, trim: true),
string(name: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true),
+ string(name: "AdministrationImageTag", defaultValue: env.ADMINISTRATION_IMAGE_TAG, trim: true),
+ string(name: "AdministrationHelmChartVersion", defaultValue: env.ADMINISTRATION_HELM_CHART_VERSION, trim: true),
+ string(name: "AdministrationHelmRepoUrl", defaultValue: env.ADMINISTRATION_HELM_REPO_URL, trim: true),
+ string(name: "AdminClientImageTag", defaultValue: env.ADMIN_CLIENT_IMAGE_TAG, trim: true),
+ string(name: "AdminClientHelmChartVersion", defaultValue: env.ADMIN_CLIENT_HELM_CHART_VERSION, trim: true),
+ string(name: "AdminClientHelmRepoUrl", defaultValue: env.ADMIN_CLIENT_HELM_REPO_URL, trim: true),
string(name: "VorgangManagerImageTag", defaultValue: env.VORGANG_MANAGER_IMAGE_TAG, trim: true),
string(name: "VorgangManagerHelmChartVersion", defaultValue: env.VORGANG_MANAGER_HELM_CHART_VERSION, trim: true),
string(name: "VorgangManagerHelmRepoUrl", defaultValue: env.VORGANG_MANAGER_HELM_REPO_URL, trim: true),
@@ -165,10 +175,9 @@ pipeline {
checkoutGitopsE2eBranch()
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
- generateMainNamespaceYaml()
- generateEaNamespaceYaml()
+ generateNamespaces()
pushGitopsRepo()
}
@@ -176,7 +185,7 @@ pipeline {
post {
failure {
script {
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -210,13 +219,14 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
- waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ waitForAdminRollout(env.ADMIN_BEZEICHNER)
+ waitForAlfaRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -235,14 +245,14 @@ pipeline {
}
}
-// stage('Run E2E-Tests') {
-// when {
-// expression { !SKIP_RUN }
-// }
-// failFast false
+ stage('Run E2E-Tests') {
+ when {
+ expression { !SKIP_RUN }
+ }
+ failFast false
-// parallel {
- stage('E2E-EA') {
+ parallel {
+ stage('E2E-Alfa-EA') {
when {
expression { !SKIP_RUN }
}
@@ -253,7 +263,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
- runTests(bezeichner, 'einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME)
+ runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
@@ -267,13 +277,13 @@ pipeline {
}
always {
script {
- publishE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
+ publishAlfaE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
}
}
}
}
- stage('E2E-Main') {
+ stage('E2E-Alfa-Main') {
when {
expression { !SKIP_RUN }
}
@@ -284,7 +294,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
- runTests(bezeichner, 'main-tests', mongoDbPort, env.STAGE_NAME)
+ runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
@@ -298,13 +308,43 @@ pipeline {
}
always {
script {
- publishE2ETestResult("main-tests", "Alfa E2E-Tests main")
+ publishAlfaE2ETestResult("main-tests", "Alfa E2E-Tests main")
}
}
}
}
-// }
-// }
+ stage('E2E-Admin-Main') {
+ when {
+ expression { !SKIP_RUN }
+ }
+ steps {
+ catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+ script {
+ String bezeichner = env.ADMIN_BEZEICHNER
+
+ Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
+
+ runTests(bezeichner, 'admin-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ADMIN_APP, mongoDbPort, env.STAGE_NAME)
+
+ stopForwardMongoDbPort(generateNamespace(bezeichner))
+ }
+ }
+ }
+ post {
+ failure {
+ script {
+ FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
+ }
+ }
+ always {
+ script {
+ publishAdminE2ETestResult()
+ }
+ }
+ }
+ }
+ }
+ }
stage('Delete E2E Namespaces') {
when {
@@ -314,7 +354,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -375,21 +415,6 @@ String getHelmChartVersion(Map applicationValues) {
return applicationValues.helm.version
}
-Void initEnvAlfaDefaultVersions() {
- if (isMasterBranch() || isReleaseBranch()) {
- values = getApplicationValues('alfa')
-
- env.ALFA_IMAGE_TAG = getImageTag(values)
- env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
- }
- else {
- env.ALFA_IMAGE_TAG = getFeatureBranchImageTag()
- env.ALFA_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
- }
-
- env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
-}
-
Boolean isMasterBranch() {
return env.BRANCH_NAME == 'master'
}
@@ -416,6 +441,33 @@ String getRootPomVersion() {
return rootPom.version
}
+Void initEnvAdminDefaultVersions() {
+ def values = getApplicationValues('administration')
+ env.ADMINISTRATION_IMAGE_TAG = getImageTag(values)
+ env.ADMINISTRATION_HELM_CHART_VERSION = getHelmChartVersion(values)
+ env.ADMINISTRATION_HELM_REPO_URL = getHelmRepoUrl()
+
+ values = getApplicationValues('admin-client')
+ env.ADMIN_CLIENT_IMAGE_TAG = getImageTag(values)
+ env.ADMIN_CLIENT_HELM_CHART_VERSION = getHelmChartVersion(values)
+ env.ADMIN_CLIENT_HELM_REPO_URL = getHelmRepoUrl()
+}
+
+Void initEnvAlfaDefaultVersions() {
+ if (isMasterBranch() || isReleaseBranch()) {
+ values = getApplicationValues('alfa')
+
+ env.ALFA_IMAGE_TAG = getImageTag(values)
+ env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
+ }
+ else {
+ env.ALFA_IMAGE_TAG = getFeatureBranchImageTag()
+ env.ALFA_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
+ }
+
+ env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
+}
+
Void initEnvVorgangManagerDefaultVersions() {
def values = getApplicationValues('vorgang-manager')
@@ -436,6 +488,12 @@ Void initEnvUserVersions(userVersions) {
env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag
env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion
env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl
+ env.ADMINISTRATION_IMAGE_TAG = userVersions.AdministrationImageTag
+ env.ADMINISTRATION_HELM_CHART_VERSION = userVersions.AdministrationHelmChartVersion
+ env.ADMINISTRATION_HELM_REPO_URL = userVersions.AdministrationHelmRepoUrl
+ env.ADMIN_CLIENT_IMAGE_TAG = userVersions.AdminClientImageTag
+ env.ADMIN_CLIENT_HELM_CHART_VERSION = userVersions.AdminClientHelmChartVersion
+ env.ADMIN_CLIENT_HELM_REPO_URL = userVersions.AdminClientHelmRepoUrl
env.VORGANG_MANAGER_IMAGE_TAG = userVersions.VorgangManagerImageTag
env.VORGANG_MANAGER_HELM_CHART_VERSION = userVersions.VorgangManagerHelmChartVersion
env.VORGANG_MANAGER_HELM_REPO_URL = userVersions.VorgangManagerHelmRepoUrl
@@ -467,15 +525,43 @@ Void checkoutGitopsE2eBranch() {
}
}
-Void generateEaNamespaceYaml() {
- generateNamespaceYaml(env.EA_BEZEICHNER, "by-ea-dev.yaml");
+Void generateNamespaces() {
+ def y1 = generateAdminNamespaceYaml()
+ def y2 = generateEaNamespaceYaml()
+ def y3 = generateMainNamespaceYaml()
+
+ dir("gitops") {
+ sh "git add ${y1} ${y2} ${y3}"
+ sh "git commit -m 'add e2e namespaces for testrun'"
+ }
+
+}
+
+Void generateAdminNamespaceYaml() {
+ def bezeichner = env.ADMIN_BEZEICHNER
+ def envValues
+ dir("alfa-client/apps/admin-e2e/") {
+ envValues = readYaml file: "src/fixtures/argocd/by-admin-dev.yaml";
+
+ envValues.ozgcloud.bezeichner = bezeichner
+ envValues.administration.put("image", ['tag': env.ADMINISTRATION_IMAGE_TAG])
+ envValues.administration.put("helm", ['version': env.ADMINISTRATION_HELM_CHART_VERSION, 'repoUrl': env.ADMINISTRATION_HELM_REPO_URL])
+
+ envValues.admin_client.put("image", ['tag': env.ADMIN_CLIENT_IMAGE_TAG])
+ envValues.admin_client.put("helm", ['version': env.ADMIN_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ADMIN_CLIENT_HELM_REPO_URL])
+ }
+ return writeYamlToGitOps(bezeichner, envValues);
+}
+
+String generateEaNamespaceYaml() {
+ return generateNamespaceYaml(env.EA_BEZEICHNER, "by-ea-dev.yaml");
}
-Void generateMainNamespaceYaml() {
- generateNamespaceYaml(env.MAIN_BEZEICHNER, "by-main-dev.yaml");
+String generateMainNamespaceYaml() {
+ return generateNamespaceYaml(env.MAIN_BEZEICHNER, "by-main-dev.yaml");
}
-Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix) {
+String generateNamespaceYaml(String bezeichner, String valuesPathSuffix) {
def envValues
dir('alfa-client/apps/alfa-e2e/') {
envValues = readYaml file: "src/fixtures/argocd/" + valuesPathSuffix;
@@ -490,18 +576,20 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix) {
envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
}
+ return writeYamlToGitOps(bezeichner, envValues);
+}
- writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
+String writeYamlToGitOps(String bezeichner, Object envValues){
+ def bezeichnerYaml = "dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
- sh "cat gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
+ writeYaml file: "gitops/${bezeichnerYaml}", data: envValues, overwrite: true
- dir("gitops") {
- sh "git add dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
- sh "git commit -m 'add e2e by-${bezeichner}-dev'"
- }
+ sh "cat gitops/${bezeichnerYaml}"
+
+ return bezeichnerYaml;
}
-Void deleteOzgCloudStack(ozgCloudBezeichner) {
+Void deleteNamespaces(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) {
if (hasNamespaceFile(bezeichner)) {
removeNamespaceFile(bezeichner)
@@ -535,13 +623,19 @@ Void waitForDeletion(String bezeichner) {
}
}
-Void waitForOzgCloudStackRollout(ozgCloudBezeichner) {
+Void waitForAlfaRollout(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) {
- waitForRollout(bezeichner)
+ waitForAlfaRollout(bezeichner)
}
}
-Void waitForRollout(String bezeichner) {
+Void waitForAdminRollout(String bezeichner) {
+ waitForAlfaRollout([bezeichner])
+ waitForHealthyApplication(bezeichner, 'administration')
+ waitForHealthyApplication(bezeichner, 'admin-client')
+}
+
+Void waitForAlfaRollout(String bezeichner) {
waitForHealthyApplication(bezeichner, 'application')
waitForHealthyApplication(bezeichner, 'vorgang-manager')
waitForHealthyApplication(bezeichner, 'user-manager')
@@ -579,32 +673,41 @@ Void waitForHealthyStatus(String bezeichner, String application) {
sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-dev-${application} -n argocd --timeout=900s"
}
-Void publishE2ETestResult(String reportFolder, String reportName) {
- publishHTML (
- target: [
- allowMissing: false,
- alwaysLinkToLastBuild: false,
- keepAll: true,
- reportDir: "alfa-client/apps/alfa-e2e/reports/${reportFolder}",
- reportFiles: 'report.html',
- reportName: reportName
- ]
- )
+Void publishAlfaE2ETestResult(String appVariant, String reportName) {
+ publishE2ETestResult("alfa-e2e", appVariant, reportName);
}
-String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) {
- def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
+Void publishAdminE2ETestResult() {
+ publishE2ETestResult("admin-e2e", "main-tests", "Admin E2E-Tests main");
+}
- try {
- dir('alfa-client'){
- sh "npm run cypress:version"
- sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}"
- }
- } catch (Exception e) {
- printNpmDebugLog()
+Void publishE2ETestResult(String appName, String appVariant, String reportName) {
+ def reportDir = "alfa-client/apps/"+appName+"/reports/"+appVariant;
- error("Fehler in Stage ${stageName}")
+ publishHTML (
+ target: [
+ allowMissing: false,
+ alwaysLinkToLastBuild: false,
+ keepAll: true,
+ reportDir: reportDir,
+ reportFiles: 'report.html',
+ reportName: reportName
+ ]
+ )
+}
+
+String runTests(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort, String stageName) {
+ def config = generateCypressConfig(bezeichner, appName, appVariant, keycloakClientName, dbPort)
+ try {
+ dir('alfa-client'){
+ sh "npm run cypress:version"
+ sh "apps/run-tests.sh ${appName} ${appVariant} ${config}"
}
+ } catch (Exception e) {
+ printNpmDebugLog()
+
+ error("Fehler in Stage ${stageName}")
+ }
}
Void printNpmDebugLog() {
@@ -635,39 +738,49 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) {
return branchName.take(cutBranchNamePosition)
}
-String generateCypressConfig(String bezeichner, String testFolder, Integer dbPort) {
- def namespace = generateNamespace(bezeichner)
- def configName = "cypress-ci-"+testFolder+".json"
+String generateCypressConfig(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort) {
+ def namespace = generateNamespace(bezeichner)
+ def configName = "cypress-ci-"+appVariant+".json"
- dir('alfa-client/apps/alfa-e2e/'){
- def config = readJSON file: 'cypress-ci.json'
+ dir("alfa-client/apps/${appName}/"){
+ def config = readJSON file: 'cypress-ci.json'
- def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
- def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
- def parsablePassword = makePasswordUrlConform(decodedPassword);
+ def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
+ def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
+ def parsablePassword = makePasswordUrlConform(decodedPassword);
- config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
- config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String
- config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
- config.env.keycloakRealm = namespace as String
- config.videosFolder = "./reports/${testFolder}/videos" as String
- config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
- config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
+ config.baseUrl = "https://${generateUrlBezeichner(bezeichner, appName)}.${env.CLUSTER_BASE_URL}" as String
+ config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String
+ config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
+ config.env.keycloakRealm = namespace as String
+ config.env.keycloakClient = keycloakClientName as String
+ config.videosFolder = "./reports/${appVariant}/videos" as String
+ config.screenshotsFolder = "./reports/${appVariant}/screenshots" as String
+ config.reporterOptions.reportDir = "./reports/${appVariant}/mochawesome-report" as String
- config.specPattern = "src/e2e/${testFolder}/**/*.cy.{js,jsx,ts,tsx}" as String
+ config.specPattern = "src/e2e/${appVariant}/**/*.cy.{js,jsx,ts,tsx}" as String
- config.env.put("search", getElasticsearchEnv(namespace))
- config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
- config.env.put("smocker", getSmockerEnv(namespace))
+ config.env.put("search", getElasticsearchEnv(namespace))
+ config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
+ config.env.put("smocker", getSmockerEnv(namespace))
- writeJSON file: configName, json: config
+ writeJSON file: configName, json: config
- sh "cat ${configName}"
- }
+ sh "cat ${configName}"
+ }
- return "cypress-ci-"+testFolder+".config.ts"
+ return "cypress-ci-"+appVariant+".config.ts"
}
+String generateUrlBezeichner(String bezeichner, String appName){
+ if(appName == 'admin-e2e'){
+ return "${bezeichner}-admin";
+ }
+ return bezeichner;
+}
+
+
+
String makePasswordUrlConform(String password) {
return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
}
@@ -792,7 +905,7 @@ String generateNamespace(String bezeichner) {
}
String decodeString(String encoded) {
- return sh (script: "echo -n ${encoded} | base64 --decode", returnStdout: true)
+ return sh (script: "echo -n ${encoded} | base64 --decode", returnStdout: true)
}
Map getElasticsearchSecret(String namespace) {
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile-static b/alfa-client/Jenkinsfile.e2e.static
similarity index 99%
rename from alfa-client/apps/alfa-e2e/Jenkinsfile-static
rename to alfa-client/Jenkinsfile.e2e.static
index 01673a51834ec605746262d077c006133faf0067..56b1c25a16d92dc4f13341bb10151ca853d4912d 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/alfa-client/Jenkinsfile.e2e.static
@@ -16,7 +16,7 @@ pipeline {
environment {
BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/job/E2E%20Tests/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
BUNDESLAND = 'by'
- ENVIRONMENT = 'dev'
+ ENVIRONMENT = 'dev'
SSO_URL = 'sso.dev.by.ozg-cloud.de'
CLUSTER_BASE_URL = 'dev.by.ozg-cloud.de'
FAILED_STAGE = ''
@@ -551,7 +551,7 @@ String generateNamespace(String bezeichner) {
}
String decodeString(String encoded) {
- return sh(script: "echo -n ${encoded} | base64 --decode", returnStdout: true)
+ return sh(script: "echo -n ${encoded} | base64 --decode", returnStdout: true)
}
Map getElasticsearchSecret(String namespace) {
diff --git a/alfa-client/apps/admin-e2e/README.md b/alfa-client/apps/admin-e2e/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..cc1f1c46a2e2c7c034d661d9595990bbd606b370
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/README.md
@@ -0,0 +1,9 @@
+## Allgemein
+
+Dieses Teilprojekt enthält die End-2-End Tests für die Admin-Anwendung.
+
+Der Aufbau ist analog der [E2E-Tests für Alfa](../alfa-e2e/README.md).
+
+Bei Ausführung mit Jenkins im Cluster wird das [Jenkinsfile.e2e](../../Jenkinsfile.e2e) verwendet.
+
+Bei lokaler Ausführung die hier abgelegte [docker-compose.yml](docker-compose.yml) verwenden.
diff --git a/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts b/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..debc5e3e19864e0afbd6b3376b24aec1be23d3c4
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts
@@ -0,0 +1,25 @@
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+import { defineConfig } from 'cypress';
+
+//Cypress config is generated by JenkinsFile
+const cypressConfig = require('./cypress-ci-main-tests.json');
+const cypressEvents = require('./src/support/cypress-tasks.ts');
+
+export default defineConfig({
+ e2e: {
+ ...nxE2EPreset(__dirname),
+ ...cypressConfig,
+ setupNodeEvents(on, config) {
+ return cypressEvents(on, config);
+ },
+ },
+ retries: {
+ experimentalStrategy: 'detect-flake-and-pass-on-threshold',
+ experimentalOptions: {
+ maxRetries: 2,
+ passesRequired: 1,
+ },
+ openMode: true,
+ runMode: true,
+ },
+});
diff --git a/alfa-client/apps/admin-e2e/cypress-ci.json b/alfa-client/apps/admin-e2e/cypress-ci.json
new file mode 100644
index 0000000000000000000000000000000000000000..ca9f95c11d0896e1559b198fe1521e9f5c95b423
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/cypress-ci.json
@@ -0,0 +1,22 @@
+{
+ "env": {
+ "database": "vorgang-manager-database",
+ "keycloakClient": "admin"
+ },
+ "fileServerFolder": ".",
+ "fixturesFolder": "./src/fixtures",
+ "modifyObstructiveCode": false,
+ "video": true,
+ "chromeWebSecurity": false,
+ "reporter": "../../node_modules/cypress-mochawesome-reporter",
+ "defaultCommandTimeout": 10000,
+ "supportFile": "./src/support/e2e.ts",
+ "testIsolation": false,
+ "reporterOptions": {
+ "html": false,
+ "json": true,
+ "quite": true,
+ "reportFilename": "report",
+ "overwrite": false
+ }
+}
diff --git a/alfa-client/apps/admin-e2e/cypress.config.json b/alfa-client/apps/admin-e2e/cypress.config.json
index 136d40d4f8a967df5e477627ba6c81b37d58080d..5909e20614abeabc8173d107cf7b3dd8fa35330e 100644
--- a/alfa-client/apps/admin-e2e/cypress.config.json
+++ b/alfa-client/apps/admin-e2e/cypress.config.json
@@ -3,7 +3,9 @@
"env": {
"keycloakRealm": "by-e2e-tests-local-dev",
"keycloakUrl": "https://sso.dev.by.ozg-cloud.de",
- "keycloakClient": "admin"
+ "keycloakClient": "admin",
+ "dbUrl": "mongodb://localhost:27017",
+ "database": "config-db"
},
"fileServerFolder": ".",
"fixturesFolder": "./src/fixtures",
@@ -19,8 +21,8 @@
"reporterOptions": {
"html": false,
"json": true,
- "reportDir": "./reports/mochawesome-report",
+ "reportDir": "./reports/main-tests/mochawesome-report",
"reportFilename": "report",
"overwrite": true
}
-}
\ No newline at end of file
+}
diff --git a/alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts
index 474b719fef02f95377505bb0d34c85df693b46ae..5a67a4226ff7d7d4eda4f7d57a69fdca18bd4d72 100644
--- a/alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/benutzer/benutzer.e2e.component.ts
@@ -1,8 +1,18 @@
+import 'cypress-real-events';
import { exist } from '../../support/cypress.util';
export class BenutzerE2EComponent {
- private readonly benutzerHinzufuegenButton: string = 'add-user-button';
- private readonly userEntry: string = 'user-entry-';
+ private readonly benutzerHinzufuegenButton: string = 'Add-user-button';
+ private readonly userEntry: string = 'User-entry-';
+ private readonly userVorname: string = 'Vorname-text-input';
+ private readonly userNachname: string = 'Nachname-text-input';
+ private readonly userBenutzername: string = 'Benutzername-text-input';
+ private readonly userMail: string = 'E-Mail-text-input';
+ private readonly addOEButton: string = 'Add-organisationseinheit-button';
+ private readonly adminCheckbox: string = 'Admin-checkbox-editor';
+ private readonly loeschenCheckbox: string = 'Loschen-checkbox-editor';
+ private readonly userCheckbox: string = 'User-checkbox-editor';
+ private readonly postCheckbox: string = 'Poststelle-checkbox-editor';
public getHinzufuegenButton(): Cypress.Chainable<Element> {
return cy.getTestElement(this.benutzerHinzufuegenButton);
@@ -22,4 +32,60 @@ export class BenutzerE2EComponent {
exist(cy.contains(phrase));
});
}
+
+ public getVornameInput(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.userVorname);
+ }
+
+ public getNachnameInput(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.userNachname);
+ }
+
+ public getBenutzernameInput(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.userBenutzername);
+ }
+
+ public getMailInput(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.userMail);
+ }
+
+ public getOEButton(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.addOEButton);
+ }
+
+ public addOrganisationseinheit(): void {
+ this.getOEButton().click();
+ }
+
+ public getAdminCheckbox(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.adminCheckbox);
+ }
+
+ public clickAdminCheckbox(): void {
+ this.getAdminCheckbox().click();
+ }
+
+ public getLoeschenCheckbox() {
+ return cy.getTestElement(this.loeschenCheckbox);
+ }
+
+ public clickLoeschenCheckbox(): void {
+ this.getLoeschenCheckbox().click();
+ }
+
+ public getUserCheckbox(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.userCheckbox);
+ }
+
+ public clickUserCheckbox(): void {
+ this.getUserCheckbox().click();
+ }
+
+ public getPostCheckbox(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.postCheckbox);
+ }
+
+ public clickPostCheckbox(): void {
+ this.getPostCheckbox().click();
+ }
}
diff --git a/alfa-client/apps/admin-e2e/src/components/buildinfo/buildinfo.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/buildinfo/buildinfo.e2e.component.ts
index 5bede900428396575e45c322fe1357c7ac9d3a3a..e6521431d3c69f85ff9dfc9aa060605a0f38e349 100644
--- a/alfa-client/apps/admin-e2e/src/components/buildinfo/buildinfo.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/buildinfo/buildinfo.e2e.component.ts
@@ -1,9 +1,9 @@
export class BuildInfoE2EComponent {
- private readonly locatorVersion: string = 'build-version';
+ private readonly locatorBuildInfo: string = 'build-info';
private readonly locatorBuildTime: string = 'build-time';
- public getVersion() {
- return cy.getTestElement(this.locatorVersion);
+ public getBuildInfo() {
+ return cy.getTestElement(this.locatorBuildInfo);
}
public getBuildTime() {
diff --git a/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten-signatur.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten-signatur.e2e.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..041bf093208cf29e77862ebab47324e04691eb14
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten-signatur.e2e.component.ts
@@ -0,0 +1,45 @@
+import { clearText, haveValue, typeText } from '../../support/cypress.util';
+
+export class OrganisationseinheitenSignaturE2EComponent {
+ private readonly organisationsEinheitName: string = 'organisations-form-container-headline';
+ private readonly signatureText: string = 'signature-textarea';
+ private readonly saveSignatureButton: string = 'save-button';
+
+ public getOrganisationsEinheitName(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.organisationsEinheitName);
+ }
+
+ public getSignatureText(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.signatureText);
+ }
+
+ public setSignature(signatur: string): void {
+ this.clearSignature();
+ typeText(this.getSignatureText(), signatur);
+ }
+
+ public clearSignature(): void {
+ clearText(this.getSignatureText());
+ }
+
+ public getSaveButton(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.saveSignatureButton);
+ }
+
+ public saveSignature(): void {
+ this.getSaveButton().click();
+ }
+
+ public hasSignature(compare: string): void {
+ haveValue(this.getSignatureText(), compare);
+ }
+
+ public hasScrollbar(): void {
+ this.getSignatureText().then((textarea) => {
+ const scrollHeight = textarea[0].scrollHeight;
+ const clientHeight = textarea[0].clientHeight;
+
+ expect(scrollHeight).to.be.greaterThan(clientHeight);
+ });
+ }
+}
diff --git a/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten.e2e.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f2c4e6ad137d219cc60a2055192098136270ec3f
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/components/organisationseinheiten/organisationseinheiten.e2e.component.ts
@@ -0,0 +1,54 @@
+import { containClass, exist, haveText, notContainClass } from '../../support/cypress.util';
+
+export class OrganisationsEinheitenE2EComponent {
+ private readonly organisationsEinheitenList: string = 'organisations-einheit-list';
+ private readonly organisationsEinheitenName: string = 'organisations-einheit-name';
+ private readonly organisationsEinheitenID: string = 'organisations-einheit-id';
+ private readonly errorColor: string = 'text-red-500';
+ private readonly errorIcon: string = 'organisations-einheit-sync-error';
+
+ private readonly errorText: string = 'Organisationseinheit wurde nicht in den PVOG-Daten gefunden.';
+
+ public getOrganisationsEinheitList(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.organisationsEinheitenList);
+ }
+
+ public getListItemByName(name: string): Cypress.Chainable<JQuery<HTMLElement>> {
+ return cy.getTestElement(this.organisationsEinheitenName).contains(name);
+ }
+
+ public openOrganisationsEinheit(name: string): void {
+ this.getListItemByName(name).click();
+ }
+
+ public organisationsEinheitContainsID(name: string, id: string): void {
+ this.getListItemByName(name)
+ .parents('a')
+ .within(() => {
+ haveText(cy.getTestElement(this.organisationsEinheitenID), id);
+ });
+ }
+
+ public elementIsShownAsError(name: string): void {
+ containClass(this.getListItemByName(name).closest('ods-list-item'), this.errorColor);
+ }
+
+ public getErrorIconInElement(name: string): Cypress.Chainable<JQuery<HTMLAnchorElement>> {
+ return this.getListItemByName(name)
+ .parents('a')
+ .within(() => {
+ exist(cy.getTestElement(this.errorIcon));
+ });
+ }
+
+ public getErrorTooltip(name: string): Cypress.Chainable<JQuery<HTMLElement>> {
+ return this.getErrorIconInElement(name)
+ .find('ods-exclamation-icon[mattooltip]')
+ .should('have.attr', 'mattooltip')
+ .and('include', this.errorText);
+ }
+
+ public elementShowsNoError(name: string): void {
+ notContainClass(this.getListItemByName(name).closest('ods-list-item'), this.errorColor);
+ }
+}
diff --git a/alfa-client/apps/admin-e2e/src/components/postfach/postfach.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/postfach/postfach.e2e.component.ts
index c0b20783ba77f5247d66f50e4c1b21cab2c4271e..e450fde45239755baeda4f07c060d48ce5d845a1 100644
--- a/alfa-client/apps/admin-e2e/src/components/postfach/postfach.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/postfach/postfach.e2e.component.ts
@@ -9,6 +9,7 @@ export class PostfachE2EComponent {
}
public setSignatur(signatur: string): void {
+ this.clearSignatur();
typeText(this.getSignaturText(), signatur);
}
diff --git a/alfa-client/apps/admin-e2e/src/e2e/app/buildinfo.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/app/buildinfo.cy.ts
deleted file mode 100644
index 9ba459c3402f408b6a1813da97d3a16d1df224a6..0000000000000000000000000000000000000000
--- a/alfa-client/apps/admin-e2e/src/e2e/app/buildinfo.cy.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { BuildInfoE2EComponent } from '../../components/buildinfo/buildinfo.e2e.component';
-import { HeaderE2EComponent } from '../../page-objects/header.po';
-import { MainPage } from '../../page-objects/main.po';
-import { exist } from '../../support/cypress.util';
-import { loginAsAriane } from '../../support/user-util';
-
-describe('Buildinfo', () => {
- const mainPage: MainPage = new MainPage();
- const header: HeaderE2EComponent = mainPage.getHeader();
- const buildInfo: BuildInfoE2EComponent = mainPage.getBuildInfo();
-
- it('should login as Ariane', () => {
- loginAsAriane();
- });
-
- describe('get buildinfo', () => {
- it('should show version', () => {
- exist(buildInfo.getVersion());
- header.getCurrentUserProfile().logout();
- });
- });
-});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/benutzer_rollen/benutzer_rollen.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/benutzer_rollen/benutzer_rollen.cy.ts
deleted file mode 100644
index 45b22031b07206ebfc1b7a5ce62c288c99f62e95..0000000000000000000000000000000000000000
--- a/alfa-client/apps/admin-e2e/src/e2e/benutzer_rollen/benutzer_rollen.cy.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { BenutzerE2EComponent } from '../../components/benutzer/benutzer.e2e.component';
-import { MainPage } from '../../page-objects/main.po';
-import { exist } from '../../support/cypress.util';
-import { loginAsAriane } from '../../support/user-util';
-
-const mainPage: MainPage = new MainPage();
-const benutzerPage: BenutzerE2EComponent = new BenutzerE2EComponent();
-const role1: string = 'VERWALTUNG_USER';
-const role2: string = 'VERWALTUNG_LOESCHEN';
-const role3: string = 'VERWALTUNG_POSTSTELLE';
-const orga1: string = 'Ordnungsamt';
-const orga2: string = 'Landesamt für Denkmalpflege';
-const orga3: string = 'Wirtschaftsförderung';
-const orga_none: string = 'keine zuständige Stelle zugewiesen';
-const mail1: string = 'peter.von.der.post@ozg-sh.de';
-
-describe('Benutzer und Rollen', () => {
- before(() => {
- loginAsAriane();
- });
-
- it('should open Benutzer tab and show Hinzufuegen button', () => {
- mainPage.clickBenutzerTab();
-
- exist(benutzerPage.getHinzufuegenButton());
- });
-
- it('should show users and attributes in table', () => {
- exist(benutzerPage.getUserEntry('ariane'));
- benutzerPage.stringExistsInUserEntry(role1, 'dorothea');
- benutzerPage.stringExistsInUserEntry(orga1, 'ludwig');
- benutzerPage.stringExistsInUserEntry(role1, 'zelda');
- benutzerPage.stringExistsInUserEntry(role2, 'zelda');
- benutzerPage.stringExistsInUserEntry(orga2, 'zelda');
- benutzerPage.stringExistsInUserEntry(orga3, 'zelda');
- benutzerPage.stringExistsInUserEntry(orga_none, 'adelheit');
- benutzerPage.stringExistsInUserEntry(mail1, 'peter');
- benutzerPage.stringExistsInUserEntry(role3, 'peter');
- });
-});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/app/0-login-logout.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
similarity index 68%
rename from alfa-client/apps/admin-e2e/src/e2e/app/0-login-logout.cy.ts
rename to alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
index fc19b08d96e0a250e5fa64f323c0e44095458ab1..cbee0dcfa84f4ca39bc865b67cebb499194b7920 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/app/0-login-logout.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
@@ -1,8 +1,8 @@
-import { HeaderE2EComponent } from '../../page-objects/header.po';
-import { MainPage } from '../../page-objects/main.po';
-import { reload } from '../../support/cypress-helper';
-import { exist } from '../../support/cypress.util';
-import { loginByUi } from '../../support/user-util';
+import { HeaderE2EComponent } from '../../../page-objects/header.po';
+import { MainPage } from '../../../page-objects/main.po';
+import { reload } from '../../../support/cypress-helper';
+import { exist } from '../../../support/cypress.util';
+import { loginByUi } from '../../../support/user-util';
describe('Login and Logout', () => {
const mainPage: MainPage = new MainPage();
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/buildinfo.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/buildinfo.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..aa93008afd7b2a61765af4cfc88fc712fe691dec
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/buildinfo.cy.ts
@@ -0,0 +1,22 @@
+import { BuildInfoE2EComponent } from '../../../components/buildinfo/buildinfo.e2e.component';
+import { HeaderE2EComponent } from '../../../page-objects/header.po';
+import { MainPage } from '../../../page-objects/main.po';
+import { exist } from '../../../support/cypress.util';
+import { loginAsAriane } from '../../../support/user-util';
+
+describe('Buildinfo', () => {
+ const mainPage: MainPage = new MainPage();
+ const header: HeaderE2EComponent = mainPage.getHeader();
+ const buildInfo: BuildInfoE2EComponent = mainPage.getBuildInfo();
+
+ it('should login as Ariane', () => {
+ loginAsAriane();
+ });
+
+ describe('get buildinfo', () => {
+ it('should show build info', () => {
+ exist(buildInfo.getBuildInfo());
+ header.getCurrentUserProfile().logout();
+ });
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer_rollen.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer_rollen.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3df2287d6b55969a56f58c66568347813b3e1f3f
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/benutzer_rollen/benutzer_rollen.cy.ts
@@ -0,0 +1,98 @@
+import { MainPage } from 'apps/admin-e2e/src/page-objects/main.po';
+import { BenutzerE2EComponent } from '../../../components/benutzer/benutzer.e2e.component';
+import { beChecked, beEnabled, exist, notBeChecked, notBeEnabled } from '../../../support/cypress.util';
+import { AlfaRollen, AlfaUsers, loginAsAriane } from '../../../support/user-util';
+
+const mainPage: MainPage = new MainPage();
+const benutzerPage: BenutzerE2EComponent = new BenutzerE2EComponent();
+const organistationsEinheitOrdnungsamt: string = 'Ordnungsamt';
+const organisationsEinheitDenkmalpflege: string = 'Denkmalpflege';
+const organisationsEinheitWirtschaftsfoerderung: string = 'Wirtschaftsförderung';
+const organisationsEinheitNone: string = 'keine zuständige Stelle zugewiesen';
+const emailAddress: string = 'peter.von.der.post@ozg-sh.de';
+
+describe('Benutzer und Rollen', () => {
+ before(() => {
+ loginAsAriane();
+ });
+
+ it('should open Benutzer tab and show Hinzufuegen button', () => {
+ mainPage.clickBenutzerTab();
+
+ exist(benutzerPage.getHinzufuegenButton());
+ });
+
+ it('should show users and attributes in table', () => {
+ exist(benutzerPage.getUserEntry('ariane'));
+ benutzerPage.stringExistsInUserEntry(AlfaRollen.USER, AlfaUsers.DOROTHEA);
+ benutzerPage.stringExistsInUserEntry(organistationsEinheitOrdnungsamt, AlfaUsers.LUDWIG);
+ benutzerPage.stringExistsInUserEntry(AlfaRollen.USER, AlfaUsers.ZELDA);
+ benutzerPage.stringExistsInUserEntry(AlfaRollen.LOESCHEN, AlfaUsers.LUDWIG);
+ benutzerPage.stringExistsInUserEntry(organisationsEinheitDenkmalpflege, AlfaUsers.ZELDA);
+ benutzerPage.stringExistsInUserEntry(organisationsEinheitWirtschaftsfoerderung, AlfaUsers.ZELDA);
+ benutzerPage.stringExistsInUserEntry(organisationsEinheitNone, AlfaUsers.RICHARD);
+ benutzerPage.stringExistsInUserEntry(emailAddress, AlfaUsers.PETER);
+ benutzerPage.stringExistsInUserEntry(AlfaRollen.POSTSTELLE, AlfaUsers.PETER);
+ });
+
+ it('should show single user screen on click', () => {
+ benutzerPage.addUser();
+
+ exist(benutzerPage.getVornameInput());
+ exist(benutzerPage.getNachnameInput());
+ exist(benutzerPage.getBenutzernameInput());
+ exist(benutzerPage.getMailInput());
+
+ notBeChecked(benutzerPage.getAdminCheckbox());
+ notBeChecked(benutzerPage.getLoeschenCheckbox());
+ notBeChecked(benutzerPage.getUserCheckbox());
+ notBeChecked(benutzerPage.getPostCheckbox());
+ });
+
+ it('should activate loeschen checkbox and deactivate the other two checkboxes', () => {
+ benutzerPage.clickLoeschenCheckbox();
+ beChecked(benutzerPage.getLoeschenCheckbox());
+ notBeEnabled(benutzerPage.getUserCheckbox());
+ notBeEnabled(benutzerPage.getPostCheckbox());
+
+ benutzerPage.clickLoeschenCheckbox();
+ notBeChecked(benutzerPage.getLoeschenCheckbox());
+ beEnabled(benutzerPage.getUserCheckbox());
+ beEnabled(benutzerPage.getPostCheckbox());
+ });
+
+ it('should additionally activate and deactivate admin checkbox', () => {
+ benutzerPage.clickLoeschenCheckbox();
+ benutzerPage.clickAdminCheckbox();
+ beChecked(benutzerPage.getLoeschenCheckbox());
+ beChecked(benutzerPage.getAdminCheckbox());
+
+ benutzerPage.clickAdminCheckbox();
+ notBeChecked(benutzerPage.getAdminCheckbox());
+ });
+
+ it('should activate user checkbox and deactivate the other two checkboxes', () => {
+ benutzerPage.clickLoeschenCheckbox();
+ benutzerPage.clickUserCheckbox();
+ beChecked(benutzerPage.getUserCheckbox());
+ notBeEnabled(benutzerPage.getLoeschenCheckbox());
+ notBeEnabled(benutzerPage.getPostCheckbox());
+
+ benutzerPage.clickUserCheckbox();
+ notBeChecked(benutzerPage.getUserCheckbox());
+ beEnabled(benutzerPage.getLoeschenCheckbox());
+ beEnabled(benutzerPage.getPostCheckbox());
+ });
+
+ it('should activate post checkbox and deactivate the other two checkboxes', () => {
+ benutzerPage.clickPostCheckbox();
+ beChecked(benutzerPage.getPostCheckbox());
+ notBeEnabled(benutzerPage.getLoeschenCheckbox());
+ notBeEnabled(benutzerPage.getUserCheckbox());
+
+ benutzerPage.clickPostCheckbox();
+ notBeChecked(benutzerPage.getPostCheckbox());
+ beEnabled(benutzerPage.getLoeschenCheckbox());
+ beEnabled(benutzerPage.getUserCheckbox());
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/postfach/postfach-signatur.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/postfach/postfach-signatur.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..93efa8d8ba0639d999fbcdaf9f2387426ed61291
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/postfach/postfach-signatur.cy.ts
@@ -0,0 +1,34 @@
+import { PostfachE2EComponent } from '../../../components/postfach/postfach.e2e.component';
+import { waitForSpinnerToDisappear } from '../../../page-objects/main.po';
+import { exist } from '../../../support/cypress.util';
+import { loginAsAriane } from '../../../support/user-util';
+
+describe('Signatur', () => {
+ const postfach: PostfachE2EComponent = new PostfachE2EComponent();
+
+ const signaturText: string = 'Signatur\nmit\n\n\n\nZeilenumbruch\n\n';
+
+ before(() => {
+ loginAsAriane();
+ });
+
+ it('should show Postfach page', () => {
+ waitForSpinnerToDisappear();
+ exist(postfach.getSignaturText());
+ });
+
+ it('should show signature input with scrollbar', () => {
+ postfach.setSignatur(signaturText);
+ postfach.saveSignatur();
+
+ postfach.signatureIs(signaturText);
+ postfach.scrollbarIsPresent();
+ });
+
+ it('should enter an save empty signature', () => {
+ postfach.clearSignatur();
+ postfach.saveSignatur();
+
+ postfach.signatureIs('');
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-laden.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-laden.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..024419213edd7e67280c2fc9893d6864fd2469df
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-laden.cy.ts
@@ -0,0 +1,52 @@
+import { OrganisationsEinheitenE2EComponent } from '../../components/organisationseinheiten/organisationseinheiten.e2e.component';
+import { MainPage, waitForSpinnerToDisappear } from '../../page-objects/main.po';
+import { exist } from '../../support/cypress.util';
+import { OrganisationsEinheitSyncResultE2E } from '../../support/organisationseinheit';
+import {
+ createBauamtOrganisationsEinheit,
+ createDenkmalpflegeOrganisationsEinheit,
+ createFundstelleOrganisationsEinheit,
+ initOrganisationsEinheiten,
+} from '../../support/organisationseinheit-util';
+import { loginAsAriane } from '../../support/user-util';
+
+describe('show Organisationsheiten', () => {
+ const mainPage: MainPage = new MainPage();
+ const organisationsEinheitenTab: OrganisationsEinheitenE2EComponent = new OrganisationsEinheitenE2EComponent();
+
+ before(() => {
+ loginAsAriane();
+ initOrganisationsEinheiten([
+ createBauamtOrganisationsEinheit(),
+ { ...createDenkmalpflegeOrganisationsEinheit(), syncResult: OrganisationsEinheitSyncResultE2E.NAME_MISMATCH },
+ { ...createFundstelleOrganisationsEinheit(), syncResult: OrganisationsEinheitSyncResultE2E.NOT_FOUND_IN_PVOG },
+ ]);
+ });
+
+ it('should show table of Organisationseinheiten', () => {
+ waitForSpinnerToDisappear();
+ mainPage.openOrganisationsEinheiten();
+
+ exist(organisationsEinheitenTab.getOrganisationsEinheitList());
+ });
+
+ it('should show identical data in Keycloak and PVOG without error', () => {
+ organisationsEinheitenTab.getListItemByName('Bauamt');
+ organisationsEinheitenTab.organisationsEinheitContainsID('Bauamt', '248240886');
+ organisationsEinheitenTab.elementShowsNoError('Bauamt');
+ });
+
+ it('should show data not found in PVOG in red color and with error icon and tooltip message', () => {
+ const organisationsEinheitName: string = 'Fundstelle';
+
+ organisationsEinheitenTab.organisationsEinheitContainsID(organisationsEinheitName, '10363455');
+ organisationsEinheitenTab.elementIsShownAsError(organisationsEinheitName);
+ organisationsEinheitenTab.getErrorIconInElement(organisationsEinheitName);
+ organisationsEinheitenTab.getErrorTooltip(organisationsEinheitName);
+ });
+
+ it('should get name for OE from PVOG, if mismatch with Keycloak, but without error', () => {
+ organisationsEinheitenTab.organisationsEinheitContainsID('Landesamt für Denkmalpflege', '9093371');
+ organisationsEinheitenTab.elementShowsNoError('Landesamt für Denkmalpflege');
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-signaturen.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-signaturen.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cd484bd20a56578cd03f599cbe2757c000b471ed
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/e2e/organisationseinheiten/organisationseinheiten-signaturen.cy.ts
@@ -0,0 +1,40 @@
+import { OrganisationseinheitenSignaturE2EComponent } from '../../components/organisationseinheiten/organisationseinheiten-signatur.e2e.component';
+import { OrganisationsEinheitenE2EComponent } from '../../components/organisationseinheiten/organisationseinheiten.e2e.component';
+import { MainPage, waitForSpinnerToDisappear } from '../../page-objects/main.po';
+import { haveText } from '../../support/cypress.util';
+import { loginAsAriane } from '../../support/user-util';
+
+describe('Signatur', () => {
+ const mainPage: MainPage = new MainPage();
+ const signaturePage: OrganisationseinheitenSignaturE2EComponent = new OrganisationseinheitenSignaturE2EComponent();
+ const organisationsEinheitenTab: OrganisationsEinheitenE2EComponent = new OrganisationsEinheitenE2EComponent();
+
+ const signatureText: string = 'Signatur\nmit\n\n\n\nZeilenumbruch\n\n';
+
+ before(() => {
+ loginAsAriane();
+ });
+
+ it('should open signature page for Bauamt on click', () => {
+ waitForSpinnerToDisappear();
+ mainPage.openOrganisationsEinheiten();
+ organisationsEinheitenTab.openOrganisationsEinheit('Bauamt');
+
+ haveText(signaturePage.getOrganisationsEinheitName(), 'Bauamt');
+ });
+
+ it('should show signature input with scrollbar', () => {
+ signaturePage.setSignature(signatureText);
+ signaturePage.saveSignature();
+
+ signaturePage.hasSignature(signatureText);
+ signaturePage.hasScrollbar();
+ });
+
+ it.skip('should enter and save empty signature', () => {
+ signaturePage.clearSignature();
+ signaturePage.saveSignature();
+
+ signaturePage.hasSignature('');
+ });
+});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/postfach/signatur.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/postfach/signatur.cy.ts
deleted file mode 100644
index 1a9d07d9cd02a699d33ad6f24e3df8fb94d24d89..0000000000000000000000000000000000000000
--- a/alfa-client/apps/admin-e2e/src/e2e/postfach/signatur.cy.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { PostfachE2EComponent } from '../../components/postfach/postfach.e2e.component';
-import { HeaderE2EComponent } from '../../page-objects/header.po';
-import { MainPage, waitForSpinnerToDisappear } from '../../page-objects/main.po';
-import { exist } from '../../support/cypress.util';
-import { loginAsAriane } from '../../support/user-util';
-
-describe('Signatur', () => {
- const mainPage: MainPage = new MainPage();
- const header: HeaderE2EComponent = mainPage.getHeader();
- const postfachTab: PostfachE2EComponent = new PostfachE2EComponent();
-
- const signaturText: string = 'Signatur\nmit\n\n\n\nZeilenumbruch\n\n';
-
- before(() => {
- loginAsAriane();
- });
-
- it('should clear current signature0', () => {
- waitForSpinnerToDisappear();
- exist(postfachTab.getSignaturText());
-
- postfachTab.clearSignatur();
- postfachTab.signatureIs('');
-
- postfachTab.saveSignatur();
- });
-
- it('should show Signatur input', () => {
- postfachTab.setSignatur(signaturText);
- postfachTab.saveSignatur();
-
- postfachTab.signatureIs(signaturText);
- postfachTab.scrollbarIsPresent();
- });
-});
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f307b1c0c8ff3aaf6d33b000ec7500a4e55ae065
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
@@ -0,0 +1,37 @@
+ozgcloud:
+ bezeichner: admine2emain
+ environment: dev
+e2eTest: true
+project:
+ destinations:
+ - namespace: "*"
+ server: https://kubernetes.default.svc
+
+administration:
+ enabled: true
+
+admin_client:
+ enabled: true
+ ingress:
+ use_staging_cert: true
+
+alfa:
+ env:
+ overrideSpringProfiles: "oc,e2e,dev"
+ ingress:
+ use_staging_cert: true
+
+vorgang_manager:
+ env:
+ overrideSpringProfiles: "oc,e2e,dev"
+
+user_manager:
+ ozgcloud:
+ usersync:
+ onstart: false
+ period: disabled
+ ingress:
+ use_staging_cert: true
+
+smocker:
+ enabled: false
\ No newline at end of file
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/bauamt.json b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/bauamt.json
new file mode 100644
index 0000000000000000000000000000000000000000..6a598ee189c3f6319de061ea7c5945abe568afec
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/bauamt.json
@@ -0,0 +1,8 @@
+{
+ "_id": {
+ "$oid": "602566a807bb665df9a86101"
+ },
+ "name": "Bauamt",
+ "organisationsEinheitId": "248240886",
+ "syncResult": "OK"
+}
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/denkmalpflege.json b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/denkmalpflege.json
new file mode 100644
index 0000000000000000000000000000000000000000..b4043a822ffc01a60d8332584a99b37b6eade7cc
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/denkmalpflege.json
@@ -0,0 +1,8 @@
+{
+ "_id": {
+ "$oid": "602566a807bb665df9a86100"
+ },
+ "name": "Landesamt für Denkmalpflege",
+ "organisationsEinheitId": "9093371",
+ "syncResult": "OK"
+}
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/fundstelle.json b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/fundstelle.json
new file mode 100644
index 0000000000000000000000000000000000000000..dfe93cb8fb0571e572b54285c3f764520e0f0501
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/fixtures/organisationseinheit/fundstelle.json
@@ -0,0 +1,8 @@
+{
+ "_id": {
+ "$oid": "602566a807bb665df9a86102"
+ },
+ "name": "Fundstelle",
+ "organisationsEinheitId": "10363455",
+ "syncResult": "OK"
+}
diff --git a/alfa-client/apps/admin-e2e/src/model/util.ts b/alfa-client/apps/admin-e2e/src/model/util.ts
new file mode 100644
index 0000000000000000000000000000000000000000..db337f7b99563e7bca14e7bc556249e0c86262b7
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/model/util.ts
@@ -0,0 +1,3 @@
+export class ObjectIdE2E {
+ $oid: string;
+}
diff --git a/alfa-client/apps/admin-e2e/src/page-objects/main.po.ts b/alfa-client/apps/admin-e2e/src/page-objects/main.po.ts
index 14c867e8b121a71674c1ef602bf52b8a5234ed31..90dde9a2818eb8e3d0ea43e55aa80c768262adbb 100644
--- a/alfa-client/apps/admin-e2e/src/page-objects/main.po.ts
+++ b/alfa-client/apps/admin-e2e/src/page-objects/main.po.ts
@@ -4,8 +4,9 @@ import { HeaderE2EComponent } from './header.po';
export class MainPage {
private readonly buildInfo: BuildInfoE2EComponent = new BuildInfoE2EComponent();
private readonly header: HeaderE2EComponent = new HeaderE2EComponent();
- private readonly benutzerTab: string = 'nav-item-Benutzer__Rollen';
- private readonly postfachTab: string = 'nav-item-Postfach';
+ private readonly benutzerTab: string = 'caption-Benutzer__Rollen';
+ private readonly postfachTab: string = 'caption-Postfach';
+ private readonly organisationsEinheitenTab: string = 'caption-Organisationseinheiten';
public getBuildInfo(): BuildInfoE2EComponent {
return this.buildInfo;
@@ -22,6 +23,14 @@ export class MainPage {
public clickBenutzerTab(): void {
this.getBenutzerTab().click();
}
+
+ public getOrganisationsEinheitenMenu(): Cypress.Chainable<Element> {
+ return cy.getTestElement(this.organisationsEinheitenTab);
+ }
+
+ public openOrganisationsEinheiten(): void {
+ this.getOrganisationsEinheitenMenu().click();
+ }
}
export function waitForSpinnerToDisappear(): boolean {
diff --git a/alfa-client/apps/admin-e2e/src/support/cypress-helper.ts b/alfa-client/apps/admin-e2e/src/support/cypress-helper.ts
index e9e5e65b43ffeba7ed077751880a2d4f8a634d1f..e288336c7d16d3fd66b645772cc1571c49b44de1 100644
--- a/alfa-client/apps/admin-e2e/src/support/cypress-helper.ts
+++ b/alfa-client/apps/admin-e2e/src/support/cypress-helper.ts
@@ -1,4 +1,14 @@
import { Interception, RouteHandler, RouteMatcher } from 'cypress/types/net-stubbing';
+import { OrganisationsEinheitE2E } from './organisationseinheit';
+
+enum CypressTasks {
+ DROP_COLLECTIONS = 'dropCollections',
+ INIT_ORGANISATIONS_EINHEIT_DATA = 'initOrganisationsEinheitData',
+}
+
+enum MongoCollections {
+ ORGANISATIONS_EINHEIT = 'organisationsEinheit',
+}
const DOWNLOAD_FOLDER: string = 'cypress/downloads';
@@ -14,11 +24,7 @@ export function intercept(method: string, url: string): Cypress.Chainable<null>
return cy.intercept(method, url);
}
-export function interceptWithResponse(
- method,
- url: RouteMatcher,
- response: RouteHandler,
-): Cypress.Chainable<null> {
+export function interceptWithResponse(method, url: RouteMatcher, response: RouteHandler): Cypress.Chainable<null> {
return cy.intercept(method, url, response);
}
@@ -45,6 +51,7 @@ export function wait(ms: number, reason = ''): void {
console.log(`Had to wait ${ms}ms because of: ${reason}`);
}
}
+
//
export function reload(): void {
@@ -68,3 +75,12 @@ export function getBaseUrl(): string {
export function getCypressEnv(value: string) {
return Cypress.env(value);
}
+
+export function initOrganisationsEinheitenData(data: OrganisationsEinheitE2E[]): void {
+ cy.task(CypressTasks.DROP_COLLECTIONS, [MongoCollections.ORGANISATIONS_EINHEIT]);
+ cy.task(CypressTasks.INIT_ORGANISATIONS_EINHEIT_DATA, { collection: MongoCollections.ORGANISATIONS_EINHEIT, data });
+}
+
+export function dropCollections() {
+ cy.task(CypressTasks.DROP_COLLECTIONS, [MongoCollections.ORGANISATIONS_EINHEIT]);
+}
diff --git a/alfa-client/apps/admin-e2e/src/support/cypress-tasks.ts b/alfa-client/apps/admin-e2e/src/support/cypress-tasks.ts
index 136431484e48612c068e8f2c5981bb6adc02f1e2..3d4769f1095fa7cf54b1fe0992618b7458f9b173 100644
--- a/alfa-client/apps/admin-e2e/src/support/cypress-tasks.ts
+++ b/alfa-client/apps/admin-e2e/src/support/cypress-tasks.ts
@@ -1,4 +1,5 @@
-import { MongoClient } from 'mongodb';
+import { Db, MongoClient, ObjectId } from 'mongodb';
+
const fs = require('fs');
module.exports = (on: any, config: any) => {
@@ -52,8 +53,12 @@ module.exports = (on: any, config: any) => {
dropCollectionsFromDatabase(config, collections);
return 0;
},
+ initOrganisationsEinheitData({ collection, data }) {
+ console.log('initOrganisationsEinheitData');
+ insertIntoDatabase(config, collection, parseOrganisationsEinheitData(data));
+ return 0;
+ },
});
-
return config;
// Ende - Workaround für Angular 13 und Cypress mit Webpack 4
};
@@ -89,3 +94,58 @@ function dropCollections(databaseUrl, databaseName, collections) {
}
});
}
+
+function insertIntoDatabase(config, collection, data) {
+ insert(getDatabaseUrl(config), getDatabase(config), collection, data);
+}
+
+function insert(databaseUrl, databaseName, collection, data) {
+ MongoClient.connect(databaseUrl, (error, connection) => {
+ console.log(`connect to ${databaseName} database with ${databaseUrl}`);
+ if (!error) {
+ console.log('success');
+ const db: Db = connection.db(databaseName);
+
+ db.collection(collection).drop(() => {
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
+ });
+ } else {
+ console.error('Error: ', error);
+ }
+ });
+}
+
+function handleCreateCollection(db, connection, collection, data, error) {
+ if (error) {
+ console.error(`Fehler beim Erstellen der Collection "${collection}": `, error);
+ } else {
+ console.log(`Collection ${collection} erfolgreich erstellt`);
+ insertManyToDatabase(db, connection, collection, data);
+ }
+}
+
+function insertManyToDatabase(db, connection, collection, data) {
+ db.collection(collection).insertMany(data, (error) => handleInsertMany(connection, error));
+}
+
+function handleInsertMany(connection, error) {
+ if (error) {
+ console.error('Fehler beim Einlesen der Daten: ', error);
+ } else {
+ console.log('Die Daten wurden erfolgreich eingelesen.');
+ }
+ connection.close();
+}
+
+function parseOrganisationsEinheit(organisationsEinheit) {
+ organisationsEinheit._id = createObjectId(organisationsEinheit);
+}
+
+function createObjectId(field) {
+ return new ObjectId(field._id.$oid);
+}
+
+function parseOrganisationsEinheitData(data) {
+ data.forEach((organisationsEinheit) => parseOrganisationsEinheit(organisationsEinheit));
+ return data;
+}
diff --git a/alfa-client/apps/admin-e2e/src/support/cypress.util.ts b/alfa-client/apps/admin-e2e/src/support/cypress.util.ts
index 9b68b3206ff29d0c3eab2ea3c9f292b4d776030d..8eb3e6c0db0ea806a58eb30239dae08e51f382f4 100644
--- a/alfa-client/apps/admin-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/admin-e2e/src/support/cypress.util.ts
@@ -2,104 +2,104 @@ import { wait } from './cypress-helper';
//TODO Naming der Methoden geradeziehen
-export function containClass(element: any, cssClass: string): void {
+export function containClass(element: Cypress.Chainable<Element>, cssClass: string): void {
element.should('have.class', cssClass);
}
-export function notContainClass(element: any, cssClass: string): void {
+export function notContainClass(element: Cypress.Chainable<Element>, cssClass: string): void {
element.should('not.have.class', cssClass);
}
-export function exist(element: any): void {
+export function exist(element: Cypress.Chainable<Element>): void {
element.should('exist');
}
-export function notExist(element: any): void {
+export function notExist(element: Cypress.Chainable<Element>): void {
element.should('not.exist');
}
-export function haveText(element: any, text: string): void {
+export function haveText(element: Cypress.Chainable<Element>, text: string): void {
element
.invoke('text')
.then((elementText) => elementText.trim())
.should('equal', text);
}
-export function haveValue(element: any, value: string): void {
+export function haveValue(element: Cypress.Chainable<Element>, value: string): void {
element.should('have.value', value);
}
-export function haveFocus(element: any): void {
+export function haveFocus(element: Cypress.Chainable<Element>): void {
element.should('have.focus');
}
-export function mouseEnter(element: any): void {
+export function mouseEnter(element: Cypress.Chainable<Element>): void {
element.trigger('mouseenter');
}
-export function mouseOver(element: any): void {
+export function mouseOver(element: Cypress.Chainable<Element>): void {
element.trigger('mouseover');
}
-export function contains(element: any, containing: string): void {
+export function contains(element: Cypress.Chainable<Element>, containing: string): void {
element.should('exist').contains(containing);
}
-export function notContains(element: any, containing: string): void {
+export function notContains(element: Cypress.Chainable<Element>, containing: string): void {
element.contains(containing).should('not.exist');
}
-export function haveLength(element: any, length: number): void {
+export function haveLength(element: Cypress.Chainable<Element>, length: number): void {
element.should('have.length', length);
}
-export function beChecked(element: any): void {
+export function beChecked(element: Cypress.Chainable<Element>): void {
element.should('be.checked');
}
-export function notBeChecked(element: any): void {
+export function notBeChecked(element: Cypress.Chainable<Element>): void {
element.should('not.be.checked');
}
+export function beEnabled(element: Cypress.Chainable<Element>): void {
+ element.should('be.enabled');
+}
+
+export function notBeEnabled(element: Cypress.Chainable<Element>): void {
+ element.should('not.be.enabled');
+}
+
//TODO: "first()" rausnehmen -> im html eine entprechende data-test-id ansprechen?! | trennen in "get" und "verify"
-export function shouldFirstContains(element: any, containing: string) {
+export function shouldFirstContains(element: Cypress.Chainable<Element>, containing: string) {
element.first().should('exist').contains(containing);
}
-export function shouldHaveAttributeBeGreaterThan(
- element: any,
- attributeName: string,
- value: number,
-) {
+export function shouldHaveAttributeBeGreaterThan(element: Cypress.Chainable<Element>, attributeName: string, value: number) {
element.first().should('exist').invoke(attributeName).should('be.gt', value);
}
-export function shouldHaveAttributeBeLowerThan(element: any, attributeName: string, value: number) {
+export function shouldHaveAttributeBeLowerThan(element: Cypress.Chainable<Element>, attributeName: string, value: number) {
element.first().should('exist').invoke(attributeName).should('be.gt', value);
}
//
-export function shouldHaveAttribute(element: any, name: string, value: string) {
+export function shouldHaveAttribute(element: Cypress.Chainable<Element>, name: string, value: string) {
element.should('have.attr', name, value);
}
-export function visible(element: any) {
+export function visible(element: Cypress.Chainable<Element>) {
element.should('be.visible');
}
-export function notBeVisible(element: any) {
+export function notBeVisible(element: Cypress.Chainable<Element>) {
element.should('not.be.visible');
}
-export function enter(element: any): void {
+export function enter(element: Cypress.Chainable<Element>): void {
element.clear().type(CypressKeyboardActions.ENTER);
}
-export function enterWith(
- element: Cypress.Chainable<JQuery<HTMLElement>>,
- value: string,
- delayBeforeEnter: number = 200,
-): void {
+export function enterWith(element: Cypress.Chainable<JQuery<HTMLElement>>, value: string, delayBeforeEnter: number = 200): void {
element.clear().type(value);
wait(delayBeforeEnter);
element.type(CypressKeyboardActions.ENTER);
@@ -109,10 +109,14 @@ export function typeText(element: Cypress.Chainable<JQuery<HTMLElement>>, value:
element.type(value);
}
-export function backspaceOn(element: any): void {
+export function backspaceOn(element: Cypress.Chainable<Element>): void {
element.type(CypressKeyboardActions.BACKSPACE);
}
+export function clearText(element: Cypress.Chainable<Element>): void {
+ element.type('{selectAll}{del}');
+}
+
enum CypressKeyboardActions {
ENTER = '{enter}',
BACKSPACE = '{backspace}',
diff --git a/alfa-client/apps/admin-e2e/src/support/organisationseinheit-util.ts b/alfa-client/apps/admin-e2e/src/support/organisationseinheit-util.ts
new file mode 100644
index 0000000000000000000000000000000000000000..35e8ed50f915b1a8c58961f05c0c6e951831ca43
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/support/organisationseinheit-util.ts
@@ -0,0 +1,26 @@
+import { initOrganisationsEinheitenData } from './cypress-helper';
+import { OrganisationsEinheitE2E } from './organisationseinheit';
+
+const denkmalpflegeOrganisationseinheitFixture = require('../fixtures/organisationseinheit/denkmalpflege.json');
+const bauamtOrganisationseinheitFixture = require('../fixtures/organisationseinheit/bauamt.json');
+const fundstelleOrganisationseinheitFixture = require('../fixtures/organisationseinheit/fundstelle.json');
+
+export function initOrganisationsEinheit(organisationsEinheiten: OrganisationsEinheitE2E): void {
+ initOrganisationsEinheitenData([organisationsEinheiten]);
+}
+
+export function initOrganisationsEinheiten(organisationsEinheiten: OrganisationsEinheitE2E[]): void {
+ initOrganisationsEinheitenData(organisationsEinheiten);
+}
+
+export function createBauamtOrganisationsEinheit(): OrganisationsEinheitE2E {
+ return bauamtOrganisationseinheitFixture;
+}
+
+export function createFundstelleOrganisationsEinheit(): OrganisationsEinheitE2E {
+ return fundstelleOrganisationseinheitFixture;
+}
+
+export function createDenkmalpflegeOrganisationsEinheit(): OrganisationsEinheitE2E {
+ return denkmalpflegeOrganisationseinheitFixture;
+}
diff --git a/alfa-client/apps/admin-e2e/src/support/organisationseinheit.ts b/alfa-client/apps/admin-e2e/src/support/organisationseinheit.ts
new file mode 100644
index 0000000000000000000000000000000000000000..2a2850ca1ec05e4c53c0014df5fa689d98f6d1c1
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/support/organisationseinheit.ts
@@ -0,0 +1,21 @@
+import { ObjectIdE2E } from '../model/util';
+
+export class OrganisationsEinheitE2E {
+ _id: ObjectIdE2E;
+ name: string;
+ organisationsEinheitId: string;
+ syncResult: OrganisationsEinheitSyncResultE2E;
+ settings: OrganisationsEinheitSettingsE2E;
+}
+
+export enum OrganisationsEinheitSyncResultE2E {
+ OK = 'OK',
+ NOT_FOUND_IN_PVOG = 'NOT_FOUND_IN_PVOG',
+ NAME_MISMATCH = 'NAME_MISMATCH',
+ ORGANISATIONSEINHEIT_ID_NOT_UNIQUE = 'ORGANISATIONSEINHEIT_ID_NOT_UNIQUE',
+ DELETED = 'DELETED',
+}
+
+export class OrganisationsEinheitSettingsE2E {
+ signatur: string;
+}
diff --git a/alfa-client/apps/admin-e2e/src/support/user-util.ts b/alfa-client/apps/admin-e2e/src/support/user-util.ts
index e8b54e6500b91758a66ebee2f02fd09e4b75aa54..1e4709eb69c5d2022f6f2659b3e1a383b4dbaf8e 100644
--- a/alfa-client/apps/admin-e2e/src/support/user-util.ts
+++ b/alfa-client/apps/admin-e2e/src/support/user-util.ts
@@ -42,3 +42,17 @@ export function logout(): void {
const header: HeaderE2EComponent = mainPage.getHeader();
header.getCurrentUserProfile().logout();
}
+
+export enum AlfaRollen {
+ USER = 'VERWALTUNG_USER',
+ LOESCHEN = 'VERWALTUNG_LOESCHEN',
+ POSTSTELLE = 'VERWALTUNG_POSTSTELLE',
+}
+
+export enum AlfaUsers {
+ DOROTHEA = 'dorothea',
+ LUDWIG = 'ludwig',
+ PETER = 'peter',
+ RICHARD = 'richard',
+ ZELDA = 'zelda',
+}
diff --git a/alfa-client/apps/admin/project.json b/alfa-client/apps/admin/project.json
index e113da51b11ba0f7afa5d2a0e194ba9aea7a1e82..a823b06f67d3c4bea4fa758699ea1583d1a00c68 100644
--- a/alfa-client/apps/admin/project.json
+++ b/alfa-client/apps/admin/project.json
@@ -8,24 +8,22 @@
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
- "outputs": [
- "{options.outputPath}"
- ],
+ "outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/apps/admin",
"index": "apps/admin/src/index.html",
"main": "apps/admin/src/main.ts",
- "polyfills": [
- "zone.js"
- ],
+ "polyfills": ["zone.js"],
"tsConfig": "apps/admin/tsconfig.app.json",
"assets": [
- "apps/admin/src/favicon.ico",
- "apps/admin/src/assets"
- ],
- "styles": [
- "apps/admin/src/styles.scss"
+ "apps/admin/src/assets",
+ {
+ "input": "apps/admin/src/favicon",
+ "glob": "**/*",
+ "output": ""
+ }
],
+ "styles": ["apps/admin/src/styles.scss"],
"scripts": [],
"stylePreprocessorOptions": {
"includePaths": [
@@ -87,15 +85,11 @@
},
"lint": {
"executor": "@nx/eslint:lint",
- "outputs": [
- "{options.outputFile}"
- ]
+ "outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
- "outputs": [
- "{workspaceRoot}/coverage/{projectRoot}"
- ],
+ "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/admin/jest.config.ts"
}
@@ -108,22 +102,16 @@
},
"container": {
"executor": "@nx-tools/nx-container:build",
- "dependsOn": [
- "build"
- ],
+ "dependsOn": ["build"],
"options": {
"engine": "docker",
"push": false,
"metadata": {
- "images": [
- "docker.ozg-sh.de/admin-client"
- ],
+ "images": ["docker.ozg-sh.de/admin-client"],
"load": true,
- "tags": [
- "build-latest"
- ]
+ "tags": ["build-latest"]
}
}
}
}
-}
\ No newline at end of file
+}
diff --git a/alfa-client/apps/admin/src/app/app.component.html b/alfa-client/apps/admin/src/app/app.component.html
index f2b6f351107b9ad56a829832c750d7b9f6956033..9e3f549e41e574184c74dbba19273cf2693c4385 100644
--- a/alfa-client/apps/admin/src/app/app.component.html
+++ b/alfa-client/apps/admin/src/app/app.component.html
@@ -1,6 +1,6 @@
<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
<header
- class="flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2"
+ class="z-50 flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2"
data-test-id="admin-header"
>
<a
@@ -37,6 +37,8 @@
<unavailable-page></unavailable-page>
</ng-template>
</main>
+ <section class="w-5">
+ <alfa-build-info *ngIf="apiRoot" [apiRoot]="apiRoot" data-test-id="build-info" />
+ </section>
</div>
- <footer data-test-id="build-version">Version: {{ apiRoot.version }}</footer>
</ng-container>
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 fbf5f0baf5ba16a4c33e3140833521efb6e7a367..547e09233158c2f9343e0550a9345ff97ac3dab5 100644
--- a/alfa-client/apps/admin/src/app/app.component.spec.ts
+++ b/alfa-client/apps/admin/src/app/app.component.spec.ts
@@ -1,9 +1,6 @@
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
-import {
- HasLinkPipe,
- createEmptyStateResource,
- createStateResource,
-} from '@alfa-client/tech-shared';
+import { BuildInfoComponent } from '@alfa-client/common';
+import { HasLinkPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
import {
Mock,
dispatchEventFromFixture,
@@ -13,7 +10,7 @@ import {
notExistsAsHtmlElement,
} from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Router, RouterOutlet } from '@angular/router';
+import { ActivatedRoute, Router, RouterOutlet } from '@angular/router';
import {
AdminLogoIconComponent,
MailboxIconComponent,
@@ -36,7 +33,7 @@ describe('AppComponent', () => {
let fixture: ComponentFixture<AppComponent>;
const adminHeaderSelector: string = getDataTestIdOf('admin-header');
- const buildVersionSelector: string = getDataTestIdOf('build-version');
+ const buildInfoSelector: string = getDataTestIdOf('build-info');
const userProfileButtonSelector: string = getDataTestIdOf('user-profile-button');
const navigationSelector: string = getDataTestIdOf('navigation');
const logoLink: string = getDataTestIdOf('logo-link');
@@ -48,6 +45,18 @@ describe('AppComponent', () => {
};
const router: Mock<Router> = mock(Router);
+ const route: Mock<ActivatedRoute> = {
+ ...mock(ActivatedRoute),
+ snapshot: {
+ queryParams: {
+ iss: 'some-iss',
+ state: 'some-state',
+ session_state: 'some-session-state',
+ code: 'some-code',
+ },
+ } as any,
+ };
+
const apiRootService: Mock<ApiRootService> = mock(ApiRootService);
beforeEach(async () => {
@@ -62,6 +71,7 @@ describe('AppComponent', () => {
MockComponent(UnavailablePageComponent),
MockComponent(NavbarComponent),
MockComponent(NavItemComponent),
+ MockComponent(BuildInfoComponent),
HasLinkPipe,
MockDirective(RouterOutlet),
],
@@ -78,6 +88,10 @@ describe('AppComponent', () => {
provide: Router,
useValue: router,
},
+ {
+ provide: ActivatedRoute,
+ useValue: route,
+ },
],
}).compileComponents();
});
@@ -87,26 +101,28 @@ describe('AppComponent', () => {
component = fixture.componentInstance;
});
- it(`should have as title 'admin'`, () => {
- const appTitle: string = fixture.componentInstance.title;
+ describe('component', () => {
+ it(`should have as title 'admin'`, () => {
+ const appTitle: string = fixture.componentInstance.title;
- expect(appTitle).toEqual('admin');
- });
+ expect(appTitle).toEqual('admin');
+ });
- describe('ngOnInit', () => {
- it('should call authService login', () => {
- component.ngOnInit();
+ describe('ngOnInit', () => {
+ it('should call authService login', () => {
+ component.ngOnInit();
- expect(authenticationService.login).toHaveBeenCalled();
- });
+ expect(authenticationService.login).toHaveBeenCalled();
+ });
- it('should call doAfterLoggedIn', async () => {
- component.doAfterLoggedIn = jest.fn();
+ it('should call doAfterLoggedIn', async () => {
+ component.doAfterLoggedIn = jest.fn();
- component.ngOnInit();
- await fixture.whenStable();
+ component.ngOnInit();
+ await fixture.whenStable();
- expect(component.doAfterLoggedIn).toHaveBeenCalled();
+ expect(component.doAfterLoggedIn).toHaveBeenCalled();
+ });
});
describe('do after logged in', () => {
@@ -116,104 +132,109 @@ describe('AppComponent', () => {
expect(apiRootService.getApiRoot).toHaveBeenCalled();
});
- it('should navigate to default route', () => {
+ it('should call forwardWithoutAuthenticationParams', () => {
+ component.forwardWithoutAuthenticationParams = jest.fn();
+
component.doAfterLoggedIn();
- expect(router.navigate).toHaveBeenCalledWith(['/']);
+ expect(component.forwardWithoutAuthenticationParams).toHaveBeenCalled();
});
});
- });
- it('show not show header if apiRoot is not loaded', () => {
- component.apiRootStateResource$ = of(createEmptyStateResource<ApiRootResource>());
+ describe('forward without authentication params', () => {
+ it('should navigate to same route without authentication params', () => {
+ component.forwardWithoutAuthenticationParams();
- notExistsAsHtmlElement(fixture, adminHeaderSelector);
+ expect(router.navigate).toHaveBeenCalledWith([], { queryParams: {} });
+ });
+ });
});
- describe('user profile button', () => {
- beforeEach(() => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
+ describe('template', () => {
+ it('show not show header if apiRoot is not loaded', () => {
+ component.apiRootStateResource$ = of(createEmptyStateResource<ApiRootResource>());
+
+ notExistsAsHtmlElement(fixture, adminHeaderSelector);
});
- it('should show if apiRoot exists', () => {
- fixture.detectChanges();
+ describe('user profile button', () => {
+ beforeEach(() => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
+ });
+
+ it('should show if apiRoot exists', () => {
+ fixture.detectChanges();
- existsAsHtmlElement(fixture, userProfileButtonSelector);
+ existsAsHtmlElement(fixture, userProfileButtonSelector);
+ });
});
- });
- describe('administration logo', () => {
- const apiResource: ApiRootResource = createApiRootResource();
+ describe('administration logo', () => {
+ const apiResource: ApiRootResource = createApiRootResource();
- beforeEach(() => {
- component.apiRootStateResource$ = of(createStateResource(apiResource));
- fixture.detectChanges();
- });
+ beforeEach(() => {
+ component.apiRootStateResource$ = of(createStateResource(apiResource));
+ fixture.detectChanges();
+ });
- it('should navigate to start page on click', () => {
- dispatchEventFromFixture(fixture, logoLink, 'click');
+ it('should navigate to start page on click', () => {
+ dispatchEventFromFixture(fixture, logoLink, 'click');
- expect(router.navigate).toHaveBeenCalledWith(['/']);
+ expect(router.navigate).toHaveBeenCalledWith([], { queryParams: {} });
+ });
});
- });
- describe('navigation', () => {
- beforeEach(() => {});
- it('should show links if configuration link exists', () => {
- component.apiRootStateResource$ = of(
- createStateResource(createApiRootResource([ApiRootLinkRel.CONFIGURATION])),
- );
- fixture.detectChanges();
+ describe('navigation', () => {
+ it('should show links if configuration link exists', () => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource([ApiRootLinkRel.CONFIGURATION])));
+ fixture.detectChanges();
- const navbarElement: HTMLElement = getElementFromFixture(fixture, navigationSelector);
+ const navbarElement: HTMLElement = getElementFromFixture(fixture, navigationSelector);
- expect(navbarElement.children.length).toBeGreaterThan(0);
- });
+ expect(navbarElement.children.length).toBeGreaterThan(0);
+ });
- it('should not not show links if configuration resource not available', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource([])));
- fixture.detectChanges();
+ it('should not not show links if configuration resource not available', () => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource([])));
+ fixture.detectChanges();
- const navbarElement: HTMLElement = getElementFromFixture(fixture, navigationSelector);
+ const navbarElement: HTMLElement = getElementFromFixture(fixture, navigationSelector);
- expect(navbarElement.children.length).toBe(0);
+ expect(navbarElement.children.length).toBe(0);
+ });
});
- });
- describe('build version', () => {
- const apiResource: ApiRootResource = createApiRootResource();
-
- beforeEach(() => {
- component.apiRootStateResource$ = of(createStateResource(apiResource));
- });
+ describe('build version', () => {
+ it('should not be rendered if api root not loaded', () => {
+ notExistsAsHtmlElement(fixture, buildInfoSelector);
+ });
- it('should show after apiRoot loaded', () => {
- fixture.detectChanges();
+ it('should show after apiRoot loaded', () => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
+ fixture.detectChanges();
- const buildVersionElement = getElementFromFixture(fixture, buildVersionSelector);
- expect(buildVersionElement.textContent.trim()).toEqual(`Version: ${apiResource.version}`);
+ existsAsHtmlElement(fixture, buildInfoSelector);
+ });
});
- });
- describe('router outlet', () => {
- beforeEach(() => {});
+ describe('router outlet', () => {
+ beforeEach(() => {});
- it('should exist if configuration resource available', () => {
- component.apiRootStateResource$ = of(
- createStateResource(createApiRootResource([ApiRootLinkRel.CONFIGURATION])),
- );
+ it('should exist if configuration resource available', () => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource([ApiRootLinkRel.CONFIGURATION])));
- fixture.detectChanges();
+ fixture.detectChanges();
- existsAsHtmlElement(fixture, routerOutletSelector);
- });
+ existsAsHtmlElement(fixture, routerOutletSelector);
+ });
- it('should not exist if configuration resource not available', () => {
- component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
+ it('should not exist if configuration resource not available', () => {
+ component.apiRootStateResource$ = of(createStateResource(createApiRootResource()));
- fixture.detectChanges();
+ fixture.detectChanges();
- notExistsAsHtmlElement(fixture, routerOutletSelector);
+ notExistsAsHtmlElement(fixture, routerOutletSelector);
+ });
});
});
});
diff --git a/alfa-client/apps/admin/src/app/app.component.ts b/alfa-client/apps/admin/src/app/app.component.ts
index bccefbebc1e14ca084e18329ba7f604e28434731..e1d4c6d2a424c489756ec2966dde744126e360fa 100644
--- a/alfa-client/apps/admin/src/app/app.component.ts
+++ b/alfa-client/apps/admin/src/app/app.component.ts
@@ -1,7 +1,7 @@
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { StateResource } from '@alfa-client/tech-shared';
import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Params, Router } from '@angular/router';
import { AuthenticationService } from 'libs/authentication/src/lib/authentication.service';
import { Observable } from 'rxjs';
@@ -19,6 +19,7 @@ export class AppComponent implements OnInit {
public authenticationService: AuthenticationService,
private apiRootService: ApiRootService,
private router: Router,
+ private route: ActivatedRoute,
) {}
ngOnInit(): void {
@@ -27,7 +28,17 @@ export class AppComponent implements OnInit {
doAfterLoggedIn(): void {
this.apiRootStateResource$ = this.apiRootService.getApiRoot();
- this.router.navigate(['/']);
+ this.forwardWithoutAuthenticationParams();
+ }
+
+ forwardWithoutAuthenticationParams() {
+ const queryParams = this.getQueryParamsWithoutAuthentication();
+ this.router.navigate([], { queryParams });
+ }
+
+ private getQueryParamsWithoutAuthentication(): Params {
+ const { iss, state, session_state, code, ...queryParams } = this.route.snapshot.queryParams;
+ return queryParams;
}
protected readonly ApiRootLinkRel = ApiRootLinkRel;
diff --git a/alfa-client/apps/admin/src/app/app.module.ts b/alfa-client/apps/admin/src/app/app.module.ts
index 01643aecf53c02179b296544043e2dd10f3fca65..2b32d7c65df119f3c0b6469b6d7fa3d8cd43d259 100644
--- a/alfa-client/apps/admin/src/app/app.module.ts
+++ b/alfa-client/apps/admin/src/app/app.module.ts
@@ -1,9 +1,11 @@
import { AdminSettingsModule } from '@admin-client/admin-settings';
import { ApiRootModule } from '@alfa-client/api-root-shared';
+import { BuildInfoComponent } from '@alfa-client/common';
import { EnvironmentModule } from '@alfa-client/environment-shared';
import { TechSharedModule } from '@alfa-client/tech-shared';
-import { CommonModule } from '@angular/common';
+import { CommonModule, registerLocaleData } from '@angular/common';
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import localeDe from '@angular/common/locales/de';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
@@ -32,10 +34,13 @@ import { OrganisationsEinheitFormPageComponent } from '../pages/organisationsein
import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
import { UnavailablePageComponent } from '../pages/unavailable/unavailable-page/unavailable-page.component';
+import { UserAddPageComponent } from '../pages/users-roles/user-add-page/user-add-page.component';
import { UserRolesPageComponent } from '../pages/users-roles/user-roles-page/user-roles-page.component';
import { AppComponent } from './app.component';
import { appRoutes } from './app.routes';
+registerLocaleData(localeDe);
+
@NgModule({
declarations: [
AppComponent,
@@ -45,6 +50,7 @@ import { appRoutes } from './app.routes';
OrganisationsEinheitFormPageComponent,
UserProfileButtonContainerComponent,
UnavailablePageComponent,
+ UserAddPageComponent,
],
imports: [
CommonModule,
@@ -75,6 +81,7 @@ import { appRoutes } from './app.routes';
},
}),
TechSharedModule,
+ BuildInfoComponent,
],
providers: [
{
diff --git a/alfa-client/apps/admin/src/app/app.routes.ts b/alfa-client/apps/admin/src/app/app.routes.ts
index 4225458cdaeb73330edbafa34f76c46209ebfc27..6f9acc7ca367f1914ae7d4ff21e72c5004316463 100644
--- a/alfa-client/apps/admin/src/app/app.routes.ts
+++ b/alfa-client/apps/admin/src/app/app.routes.ts
@@ -1,32 +1,39 @@
import { Route } from '@angular/router';
+import { ROUTES } from 'libs/admin/shared';
import { OrganisationsEinheitFormPageComponent } from '../pages/organisationseinheit/organisationseinheit-form-page/organisationseinheit-form-page.component';
import { OrganisationsEinheitPageComponent } from '../pages/organisationseinheit/organisationseinheit-page/organisationseinheit-page.component';
import { PostfachPageComponent } from '../pages/postfach/postfach-page/postfach-page.component';
+import { UserAddPageComponent } from '../pages/users-roles/user-add-page/user-add-page.component';
import { UserRolesPageComponent } from '../pages/users-roles/user-roles-page/user-roles-page.component';
export const appRoutes: Route[] = [
{
path: '',
- redirectTo: 'postfach',
+ redirectTo: ROUTES.POSTFACH,
pathMatch: 'full',
},
{
- path: 'postfach',
+ path: ROUTES.POSTFACH,
component: PostfachPageComponent,
title: 'Admin | Postfach',
},
{
- path: 'benutzer_und_rollen',
+ path: ROUTES.BENUTZER_UND_ROLLEN,
component: UserRolesPageComponent,
title: 'Admin | Benutzer & Rollen',
},
{
- path: 'organisationseinheiten',
+ path: ROUTES.BENUTZER_UND_ROLLEN_NEU,
+ component: UserAddPageComponent,
+ title: 'Admin | Benutzer anlegen',
+ },
+ {
+ path: ROUTES.ORGANISATIONSEINHEITEN,
component: OrganisationsEinheitPageComponent,
title: 'Admin | Organisationseinheiten',
},
{
- path: 'organisationseinheiten/:organisationsEinheitUrl',
+ path: `${ROUTES.ORGANISATIONSEINHEITEN}/:organisationsEinheitUrl`,
component: OrganisationsEinheitFormPageComponent,
title: 'Admin | Organisationseinheit',
},
diff --git a/alfa-client/apps/admin/src/favicon.ico b/alfa-client/apps/admin/src/favicon.ico
deleted file mode 100644
index 317ebcb2336e0833a22dddf0ab287849f26fda57..0000000000000000000000000000000000000000
Binary files a/alfa-client/apps/admin/src/favicon.ico and /dev/null differ
diff --git a/alfa-client/apps/admin/src/favicon/apple-touch-icon.png b/alfa-client/apps/admin/src/favicon/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e03d655a5aa8d259aacdf45f1fcf28a09251be
Binary files /dev/null and b/alfa-client/apps/admin/src/favicon/apple-touch-icon.png differ
diff --git a/alfa-client/apps/admin/src/favicon/favicon.svg b/alfa-client/apps/admin/src/favicon/favicon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f610ada33f00495a5ce2e6e6f8f1936de57dec4c
--- /dev/null
+++ b/alfa-client/apps/admin/src/favicon/favicon.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 250.45 291.68">
+ <defs>
+ <style>
+ .cls-1 {
+ clip-path: url(#clippath-4);
+ }
+
+ .cls-2 {
+ fill: none;
+ }
+
+ .cls-3 {
+ clip-path: url(#clippath-1);
+ }
+
+ .cls-4 {
+ clip-path: url(#clippath-5);
+ }
+
+ .cls-5 {
+ clip-path: url(#clippath-3);
+ }
+
+ .cls-6 {
+ fill: url(#Unbenannter_Verlauf_11);
+ }
+
+ .cls-7 {
+ clip-path: url(#clippath-2);
+ }
+
+ .cls-8 {
+ clip-path: url(#clippath);
+ }
+
+ .cls-9 {
+ fill: #003064;
+ }
+ </style>
+ <linearGradient id="Unbenannter_Verlauf_11" data-name="Unbenannter Verlauf 11" x1="149.23" y1="174.09" x2="250.45" y2="174.09" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#003064"/>
+ <stop offset="1" stop-color="#d4004b"/>
+ </linearGradient>
+ <clipPath id="clippath">
+ <path class="cls-2" d="M182.48,248.08c0,21.25-17.11,38.59-38.15,38.59s-36.9-15.93-38.04-36.14c0-31.09-21.39-57.24-50.08-64.28,12.79-4.17,22.94-14.36,27.02-27.3,6.96,29.06,32.78,50.65,63.36,50.65,20.1,1.15,35.88,18.03,35.88,38.48Z"/>
+ </clipPath>
+ <clipPath id="clippath-1">
+ <rect class="cls-2" x="51.21" y="153.95" width="136.27" height="137.73"/>
+ </clipPath>
+ <clipPath id="clippath-2">
+ <rect class="cls-2" x="51.21" y="153.95" width="136.27" height="137.73"/>
+ </clipPath>
+ <clipPath id="clippath-3">
+ <path class="cls-2" d="M182.48,43.59c0,20.45-15.75,37.33-35.73,38.48-35.43,0-64.42,28.83-65.33,64.51-.04.61-.04,1.19-.04,1.8-1.1,19.72-17.03,35.26-36.56,36.1h-.15c-.49.04-1.02.04-1.51.04-2.08,0-4.12-.15-6.13-.54-.61-.11-1.21-.23-1.82-.34-1.78-.34-3.48-.84-5.15-1.45-2.12-.8-4.13-1.76-6.06-2.91-.61-.34-1.17-.69-1.7-1.07-.15-.08-.3-.19-.45-.31-.76-.5-1.48-1.03-2.16-1.57-.11-.08-.23-.15-.34-.31-.87-.69-1.7-1.42-2.5-2.18-.49-.5-.98-1-1.48-1.53-1.67-1.72-3.1-3.6-4.35-5.63-.3-.5-.61-1.03-.91-1.53-.91-1.53-1.7-3.18-2.35-4.86-.68-1.68-1.25-3.45-1.67-5.25-.15-.61-.3-1.19-.38-1.8-.11-.61-.23-1.23-.3-1.84-.19-1.23-.3-2.49-.38-3.75-.04-.57-.04-1.15-.04-1.72,0-.8.04-1.57.08-2.34.08-1.11.19-2.22.34-3.33.11-.88.27-1.76.45-2.64.04-.08.04-.15.08-.19.15-.88.38-1.76.64-2.6.15-.54.34-1.11.53-1.65.19-.57.42-1.19.64-1.76.38-.96.8-1.91,1.25-2.83.34-.73.72-1.42,1.1-2.07.64-1.15,1.36-2.26,2.12-3.33.61-.88,1.25-1.72,1.93-2.53.04-.04.08-.08.11-.11.42-.5.83-.96,1.29-1.42.34-.38.68-.73,1.02-1.07.53-.54,1.06-1.03,1.63-1.49.49-.46.98-.88,1.51-1.26,1.21-1,2.5-1.88,3.82-2.68.83-.5,1.67-.96,2.54-1.38.49-.31,1.02-.54,1.55-.77.38-.19.76-.34,1.17-.5.38-.19.79-.34,1.21-.46,3.33-1.26,6.89-2.03,10.6-2.22h.49c1.14,0,2.27-.04,3.37-.11h.11c34.37-2.07,61.69-30.9,61.69-65.89,1.13-20.33,17.83-36.3,38.04-36.3s38.15,17.34,38.15,38.59Z"/>
+ </clipPath>
+ <clipPath id="clippath-4">
+ <rect class="cls-2" y="0" width="187.48" height="189.53"/>
+ </clipPath>
+ <clipPath id="clippath-5">
+ <rect class="cls-2" y="0" width="187.48" height="189.53"/>
+ </clipPath>
+ </defs>
+ <g>
+ <path class="cls-9" d="M207.42,137.73h-67.63c-8.36,0-15.14-6.86-15.14-15.31s6.78-15.31,15.14-15.31h67.63c8.36,0,15.14,6.86,15.14,15.31s-6.78,15.31-15.14,15.31Z"/>
+ <path class="cls-6" d="M235.31,189.41h-70.94c-8.36,0-15.14-6.86-15.14-15.31s6.78-15.31,15.14-15.31h70.94c8.36,0,15.14,6.86,15.14,15.31s-6.78,15.31-15.14,15.31Z"/>
+ </g>
+ <g class="cls-8">
+ <g class="cls-3">
+ <g class="cls-7">
+ <image width="285" height="288" transform="translate(50.88 153.49) scale(.48)" xlink:href="data:image/png;base64,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"/>
+ </g>
+ </g>
+ </g>
+ <g class="cls-5">
+ <g class="cls-1">
+ <g class="cls-4">
+ <image width="391" height="396" transform="translate(0 -.11) scale(.48)" xlink:href="data:image/png;base64,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"/>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/alfa-client/apps/admin/src/favicon/logo192.png b/alfa-client/apps/admin/src/favicon/logo192.png
new file mode 100644
index 0000000000000000000000000000000000000000..058c5bb8a8fc79b10adea359c97563030c09bc91
Binary files /dev/null and b/alfa-client/apps/admin/src/favicon/logo192.png differ
diff --git a/alfa-client/apps/admin/src/favicon/logo512.png b/alfa-client/apps/admin/src/favicon/logo512.png
new file mode 100644
index 0000000000000000000000000000000000000000..86e8c57ac21fd004a424962e4d46bf13bfcfcdef
Binary files /dev/null and b/alfa-client/apps/admin/src/favicon/logo512.png differ
diff --git a/alfa-client/apps/admin/src/favicon/manifest.json b/alfa-client/apps/admin/src/favicon/manifest.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab5afa131edbb266f434c9ce991db50fc685633b
--- /dev/null
+++ b/alfa-client/apps/admin/src/favicon/manifest.json
@@ -0,0 +1,24 @@
+{
+ "name": "Alfa Administration",
+ "short_name": "Administration Client",
+ "icons": [
+ {
+ "src": "favicon.svg",
+ "sizes": "64x64 32x32 24x24 16x16",
+ "type": "image/x-icon"
+ },
+ {
+ "src": "logo192.png",
+ "type": "image/png",
+ "sizes": "192x192"
+ },
+ {
+ "src": "logo512.png",
+ "type": "image/png",
+ "sizes": "512x512"
+ }
+ ],
+ "theme_color": "#ffffff",
+ "background_color": "#ffffff",
+ "display": "standalone"
+}
diff --git a/alfa-client/apps/admin/src/index.html b/alfa-client/apps/admin/src/index.html
index e9b77e77d1493dd0f7e67f051941b5c48fff1b33..667d6ae9fdd9724394c4018d6c6526ee13e177c1 100644
--- a/alfa-client/apps/admin/src/index.html
+++ b/alfa-client/apps/admin/src/index.html
@@ -5,11 +5,11 @@
<title>admin</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="icon" type="image/x-icon" href="favicon.ico" />
+ <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
+ <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+ <link rel="manifest" href="/manifest.json" />
</head>
- <body
- class="flex max-h-full min-h-full overflow-hidden bg-white text-black dark:bg-slate-900 dark:text-slate-100"
- >
+ <body class="flex max-h-full min-h-full overflow-hidden bg-white text-black dark:bg-slate-900 dark:text-slate-100">
<app-root class="flex w-full flex-col"></app-root>
</body>
</html>
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..dad58a8662dd19eb059273474e2df1474305d3b4
--- /dev/null
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.html
@@ -0,0 +1 @@
+<admin-user-add-form />
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..eecaa8e5c0c24be917a8b968d2af926dbf1ff56f
--- /dev/null
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.spec.ts
@@ -0,0 +1,23 @@
+import { UserAddFormComponent } from '@admin-client/admin-settings';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { UserAddPageComponent } from './user-add-page.component';
+
+describe('UserAddPageComponent', () => {
+ let component: UserAddPageComponent;
+ let fixture: ComponentFixture<UserAddPageComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [UserAddPageComponent, MockComponent(UserAddFormComponent)],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(UserAddPageComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f3bcc1eaf5f74df921a17932bea865ce96a61907
--- /dev/null
+++ b/alfa-client/apps/admin/src/pages/users-roles/user-add-page/user-add-page.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'user-add-page',
+ templateUrl: './user-add-page.component.html',
+})
+export class UserAddPageComponent {}
diff --git a/alfa-client/apps/admin/src/styles.scss b/alfa-client/apps/admin/src/styles.scss
index 4e5a7a5c68a63422c4523a58efe6f664c0a6e13e..f3ad3e7e325ea8827c9128b64e18eeb5ec083c9b 100644
--- a/alfa-client/apps/admin/src/styles.scss
+++ b/alfa-client/apps/admin/src/styles.scss
@@ -7,12 +7,17 @@
@import 'libs/design-system/src/lib/tailwind-preset/root.css';
@import 'libs/ui/src/lib/font/font_material';
@import 'variables';
+@import 'typeface-roboto/index.css';
@include mat.all-component-typographies();
@include mat.core();
@include mat.all-component-themes($alfaTheme);
+body {
+ font-family: Roboto, 'Helvetica Neue', sans-serif;
+}
+
body.dark {
@include mat.all-component-colors($alfaDarkTheme);
}
diff --git a/alfa-client/apps/alfa-e2e/README.md b/alfa-client/apps/alfa-e2e/README.md
index e54e685002d7a1d2eddf7ddbcf68214f741a5f0f..e8fd2fba20457053b9a043e3cdbadfa696692c5e 100644
--- a/alfa-client/apps/alfa-e2e/README.md
+++ b/alfa-client/apps/alfa-e2e/README.md
@@ -1,14 +1,39 @@
-# E2E
-
## Allgemein
-Die E2E Tests werden in parallen Jenkins Stages in seperaten Namespaces durchgeführt.
-`einheitlicher-ansprechpartener` -> 'EA'-Umgebung
-`main-tests` -> 'Dev'-Umgebung
--> es dürfen nur die der Umgebung entsprechenden User für die Tests genutzt werden.
-(siehe dokumentation/Anwender/Standardbenutzer.md)
+Dieses Teilprojekt bündelt:
+* Die End-2-End Tests für die Alfa-Anwendung
+* Das Setup für verschiedene Konfigurationsvarianten
+
+Die Konfigurationsvarianten sind:
+* Ausführungsart und Umgebung
+ * lokal
+ * Im Cluster (dynamisch deployed)
+ * Im Cluster (statisch)
+* Fachlich unterschiedliche Testgruppen
+ * `einheitlicher-ansprechpartner` -> 'EA'-Umgebung
+ * `main-tests` -> 'Dev'-Umgebung
+
+Dabei benötigen die Testgruppen (sogenannte "App-Varianten", siehe Verzeichnis [src/e2e](src/e2e)) jeweils eine eigene Umgebung in der gewählten Ausführungsart.
+
+## Lokale Ausführung
+Siehe [Entwicklungsdokumentation](https://git.ozg-sh.de/ozgcloud-doc/dokumentation/src/branch/master/Entwicklungsumgebung#e2e-tests).
+
+## Jenkins/Cluster Ausführung
+Die E2E Tests werden in parallelen Jenkins Stages in separaten Namespaces durchgeführt.
-## Gegen ein bestehenden Namespace testen
+Es dürfen nur die der Umgebung entsprechenden User für die Tests genutzt werden (siehe [Standardbenutzer](https://git.ozg-sh.de/ozgcloud-doc/dokumentation/src/branch/master/Anwender/Standardbenutzer.md)).
+
+Es gibt 2 Jenkinsfiles:
+* E2E ("main") - Das derzeit benutzte Hauptprofil. Namespaces werden hier neu aufgebaut.
+* Static - Profil, wenn eine bestehender Namespace (ggf. in ganz bestimmter Konfiguration) getestet werden soll.
+
+### Dynamisch deployed
+* siehe: [Jenkinsfile.e2e](../../Jenkinsfile.e2e)
+* Im Verzeichnis 'src/fixtures/argocd' liegen die Kubernetes Templates (ArgoCD-Namespace-Helm-Charts)
+* Neue Umgebungen werden im Repo [gitops im Branch "e2e"](https://git.ozg-sh.de/ozgcloud-devops/gitops/src/branch/e2e) eingetragen.
+
+### Gegen ein bestehenden Namespace testen
+Siehe: [Jenkinsfile.e2e](../../Jenkinsfile.e2e.static)
Beispiel Namespace: sh-mastere2emain-dev
@@ -20,10 +45,11 @@ Beispiel Namespace: sh-mastere2emain-dev
4. Cypress mit entsprechender config starten: `npm run cypress:open -- --config-file cypress-master-main.json`
-## docker-compose
+## Dev Hinweise
### -march Architektur
In die `.env` Datei eintragen:
-
- USER_MANAGER_DOCKER_IMAGE=march-snapshot-latest
\ No newline at end of file
+```
+USER_MANAGER_DOCKER_IMAGE=march-snapshot-latest
+```
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/cypress.config.json b/alfa-client/apps/alfa-e2e/cypress.config.json
index 3a604c010deb694376105420fb38252bc1029efe..4368e301cc77905eaf8ef585f7893173713dccad 100644
--- a/alfa-client/apps/alfa-e2e/cypress.config.json
+++ b/alfa-client/apps/alfa-e2e/cypress.config.json
@@ -28,13 +28,13 @@
"chromeWebSecurity": false,
"reporter": "../../node_modules/cypress-mochawesome-reporter",
"defaultCommandTimeout": 10000,
- "specPattern": "src/e2e/**/*.cy.{js,jsx,ts,tsx}",
+ "specPattern": ["src/e2e/init-users.cy.ts", "src/e2e/**/*.cy.{js,jsx,ts,tsx}"],
"supportFile": "src/support/e2e.ts",
"testIsolation": false,
"reporterOptions": {
"html": false,
"json": true,
- "reportDir": "./reports/mochawesome-report",
+ "reportDir": "./reports/main-tests/mochawesome-report",
"reportFilename": "report",
"overwrite": true
}
diff --git a/alfa-client/apps/alfa-e2e/run-tests.sh b/alfa-client/apps/alfa-e2e/run-tests.sh
deleted file mode 100755
index 6b7f5098a285a5417326b611f500c686fcd1f08f..0000000000000000000000000000000000000000
--- a/alfa-client/apps/alfa-e2e/run-tests.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-export NO_COLOR=1
-
-REPORT_FOLDER=$1
-CONFIG_FILE="${2:-cypress.config.ts}"
-
-echo "Run E2E for $REPORT_FOLDER with configuration apps/alfa-e2e/$CONFIG_FILE..."
-
-rm -rf apps/alfa-e2e/reports/${REPORT_FOLDER}
-
-npx cypress run --project apps/alfa-e2e --spec apps/alfa-e2e/src/e2e/${REPORT_FOLDER} --config-file $CONFIG_FILE
-
-TEST_RESULT=$?
-
-if [ -d "apps/alfa-e2e/reports/${REPORT_FOLDER}/mochawesome-report/.jsons" ]; then
- mv apps/alfa-e2e/reports/${REPORT_FOLDER}/mochawesome-report/.jsons apps/alfa-e2e/reports/${REPORT_FOLDER}/mochawesome-report/jsons
- npx mochawesome-merge apps/alfa-e2e/reports/${REPORT_FOLDER}/mochawesome-report/**/*.json > apps/alfa-e2e/reports/${REPORT_FOLDER}/report.json
- # Workaround: mochawesome's "screenshotsFolder" value is not added in the generated HTML file. Add "screenshots" to image paths.
- sed --in-place --regexp-extended 's/"([^"]*\.png)/"screenshots\1/' apps/alfa-e2e/reports/${REPORT_FOLDER}/report.json
- npx marge apps/alfa-e2e/reports/${REPORT_FOLDER}/report.json -f report -o apps/alfa-e2e/reports/${REPORT_FOLDER}
-else
- echo "ERROR: Reports do not exist at apps/alfa-e2e/reports/${REPORT_FOLDER}/mochawesome-report/.jsons"
-fi
-
-exit $TEST_RESULT
\ No newline at end of file
diff --git a/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts b/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
index caa4da170044134fd7d8439b78e4870fcb43a678..faaeee09f8b06e25d4ae46129171db67f8f73576 100644
--- a/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
@@ -46,7 +46,7 @@ export class CurrentUserProfileE2EComponent {
return cy.getTestElement(this.locatorUserIconButton);
}
- private getLogoutButton() {
+ public getLogoutButton() {
return cy.getTestElement(this.locatorLogoutButton);
}
}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.cy.ts
index 15b06ef2419bd6df855f8a76a59e8878e543a2ae..08d7553417d836b36ea7b90b4770ebbe5ac7a27f 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.cy.ts
@@ -23,27 +23,13 @@
*/
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { loginAsEmil } from 'apps/alfa-e2e/src/support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initVorgaenge,
- objectIds,
-} from 'apps/alfa-e2e/src/support/vorgang-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from 'apps/alfa-e2e/src/support/vorgang-util';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
-import {
- MainPage,
- waitForSpinnerToDisappear,
- waitforSpinnerToAppear,
-} from '../../../page-objects/main.po';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
+import { MainPage, waitForSpinnerToDisappear, waitforSpinnerToAppear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections } from '../../../support/cypress-helper';
+import { dropCollections, wait } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
describe('Vorgang abschliessen', () => {
@@ -52,8 +38,7 @@ describe('Vorgang abschliessen', () => {
const snackBar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangAbschliessen: VorgangE2E = {
...createVorgang(),
@@ -88,10 +73,7 @@ describe('Vorgang abschliessen', () => {
describe('by button', () => {
it('should have status Beschieden', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangAbschliessen.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]);
});
it('should show snackBar', () => {
@@ -108,10 +90,7 @@ describe('Vorgang abschliessen', () => {
});
it('should have status Abgeschlossen', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN]);
});
it('back to vorgang list', () => {
@@ -142,10 +121,7 @@ describe('Vorgang abschliessen', () => {
describe('by icon-button', () => {
it('should have status Beschieden', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangAbschliessenRevoke.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessenRevoke.status]);
});
it('should show snackBar', () => {
@@ -157,6 +133,7 @@ describe('Vorgang abschliessen', () => {
it('should close snackbar on revoke', () => {
snackBar.getRevokeButton().click();
+ wait(500);
waitForSpinnerToDisappear();
notExist(snackBar.getMessage());
@@ -165,10 +142,7 @@ describe('Vorgang abschliessen', () => {
it('should show status Beschieden after progressbar dissapear', () => {
notExist(vorgangPage.getProgressBar());
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
});
it('back to vorgang list', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b3e205a4319a4986586efbc7d47687041866d2c7
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts
@@ -0,0 +1,55 @@
+import { registerLocaleData } from '@angular/common';
+import localeDe from '@angular/common/locales/de';
+import localeDeExtra from '@angular/common/locales/extra/de';
+import { HeaderE2EComponent } from '../../page-objects/header.po';
+import { MainPage, waitForSpinnerToDisappear } from '../../page-objects/main.po';
+import { login, writeUserIdsIntoFile } from '../../support/cypress-helper';
+import { exist } from '../../support/cypress.util';
+import { areUsersSynced, DatabaseUser } from '../../support/user-util';
+
+registerLocaleData(localeDe, 'de', localeDeExtra);
+
+describe('Init users', () => {
+ const mainPage: MainPage = new MainPage();
+ const header: HeaderE2EComponent = mainPage.getHeader();
+
+ it('should login sabine', () => {
+ syncUser(DatabaseUser.SABINE);
+ });
+
+ it('should login dorothea', () => {
+ syncUser(DatabaseUser.DOROTHEA);
+ });
+ it('should login peter', () => {
+ syncUser(DatabaseUser.PETER);
+ });
+ xit('should login emil', () => {
+ // disabled until password change
+ syncUser(DatabaseUser.EMIL);
+ });
+ it('should login adelheit', () => {
+ syncUser(DatabaseUser.ADELHEIT);
+ });
+ it('should login ludwig', () => {
+ syncUser(DatabaseUser.LUDWIG);
+ });
+ it('should login richard', () => {
+ syncUser(DatabaseUser.RICHARD);
+ });
+
+ it('should write user ids to file', () => {
+ if (!areUsersSynced()) {
+ writeUserIdsIntoFile();
+ }
+ });
+
+ function syncUser(user: DatabaseUser) {
+ if (!areUsersSynced()) {
+ login(user);
+ waitForSpinnerToDisappear();
+ exist(header.getLogo());
+ header.getCurrentUserProfile().getUserIconButton().click();
+ header.getCurrentUserProfile().getLogoutButton().click();
+ }
+ }
+});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/navigation/navigation.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/navigation/navigation.cy.ts
index 496c3213996ea51b4d00c1982ba0067ebbad34a9..2e07f38a4bd641af2bc4f306bdc371274bbad5a5 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/navigation/navigation.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/navigation/navigation.cy.ts
@@ -37,13 +37,7 @@ import {
initUsermanagerUsers,
loginAsSabine,
} from 'apps/alfa-e2e/src/support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initSearchIndex,
- initVorgaenge,
- objectIds,
-} from 'apps/alfa-e2e/src/support/vorgang-util';
+import { buildVorgang, createVorgang, initSearchIndex, initVorgaenge, objectIds } from 'apps/alfa-e2e/src/support/vorgang-util';
describe('Navigation', () => {
const mainPage: MainPage = new MainPage();
@@ -187,6 +181,6 @@ describe('Navigation', () => {
});
function doSearch(searchString: string): void {
- enterWith(vorgangSearch.getInput(), searchString);
+ enterWith(vorgangSearch.getInput(), searchString, 500);
}
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
index c1c79e720ee8b57d483e70b000906259be6e79ed..fbcd2ba7850d363047117b9158bdbdec3e501e94 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-assign-unassign.cy.ts
@@ -26,20 +26,11 @@ import { VorgangListItemE2EComponent } from '../../../components/vorgang/vorgang
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
import { UserE2E } from '../../../model/user';
import { VorgangE2E } from '../../../model/vorgang';
-import {
- MainPage,
- waitForSpinnerToDisappear,
- waitforSpinnerToAppear,
-} from '../../../page-objects/main.po';
+import { MainPage, waitForSpinnerToDisappear, waitforSpinnerToAppear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections, wait } from '../../../support/cypress-helper';
-import { enter, exist, haveText, notExist } from '../../../support/cypress.util';
-import {
- getUserDorothea,
- getUserSabine,
- initUsermanagerUsers,
- loginAsSabine,
-} from '../../../support/user-util';
+import { enterWith, exist, haveText, notExist } from '../../../support/cypress.util';
+import { getUserDorothea, getUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang } from '../../../support/vorgang-util';
describe('User Profile im ausgewählten Vorgang', () => {
@@ -47,9 +38,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
const vorgangPage: VorgangPage = new VorgangPage();
- const userProfileContainer: UserProfileE2EComponent = vorgangPage
- .getVorgangDetailHeader()
- .getUserContainer();
+ const userProfileContainer: UserProfileE2EComponent = vorgangPage.getVorgangDetailHeader().getUserContainer();
const vorgang: VorgangE2E = createVorgang();
@@ -98,15 +87,16 @@ describe('User Profile im ausgewählten Vorgang', () => {
describe('fill formular', () => {
it('should show error on enter wrong input', () => {
- userProfileContainer.getSearchContainer().getInput().clear().type('Clark Kent');
- enter(userProfileContainer.getSearchContainer().getInput());
+ enterWith(userProfileContainer.getSearchContainer().getInput(), 'Clark Kent');
+ cy.wait(1000);
exist(userProfileContainer.getSearchContainer().getError());
exist(userProfileContainer.getIconContainer().getUnassignedIcon());
});
it('should show error on enter empty field', () => {
- enter(userProfileContainer.getSearchContainer().getInput());
+ enterWith(userProfileContainer.getSearchContainer().getInput(), 'Clark Kent', 500);
+ cy.wait(1000);
exist(userProfileContainer.getSearchContainer().getError());
exist(userProfileContainer.getIconContainer().getUnassignedIcon());
@@ -138,11 +128,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
exist(vorgangList.getListItem(vorgang.name).getUserProfile().getRoot());
haveText(
- vorgangList
- .getListItem(vorgang.name)
- .getUserProfile()
- .getIconContainer()
- .getAssignedIcon(),
+ vorgangList.getListItem(vorgang.name).getUserProfile().getIconContainer().getAssignedIcon(),
userSabine.initials,
);
});
@@ -168,10 +154,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
it('should hide formular', () => {
userProfileContainer.getSearchContainer().getInput().clear().type(userDorothea.name);
exist(userProfileContainer.getSearchContainer().getSearchOption(userDorothea.dataTestId));
- userProfileContainer
- .getSearchContainer()
- .getSearchOption(userDorothea.dataTestId)
- .click();
+ userProfileContainer.getSearchContainer().getSearchOption(userDorothea.dataTestId).click();
waitforSpinnerToAppear();
waitForSpinnerToDisappear();
@@ -184,10 +167,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
// WORKAROUND Hier muss aufs Verarbeiten im Backend gewartet werden - oder: wait(500)
wait(500);
exist(userProfileContainer.getIconContainer().getAssignedIcon());
- haveText(
- userProfileContainer.getIconContainer().getAssignedIcon(),
- userDorothea.initials,
- );
+ haveText(userProfileContainer.getIconContainer().getAssignedIcon(), userDorothea.initials);
});
});
});
@@ -201,11 +181,7 @@ describe('User Profile im ausgewählten Vorgang', () => {
exist(vorgangList.getListItem(vorgang.name).getUserProfile().getRoot());
haveText(
- vorgangList
- .getListItem(vorgang.name)
- .getUserProfile()
- .getIconContainer()
- .getAssignedIcon(),
+ vorgangList.getListItem(vorgang.name).getUserProfile().getIconContainer().getAssignedIcon(),
userDorothea.initials,
);
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-settings/user-settings.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-settings/user-settings.cy.ts
index 2ba36a2468e8cf3c13653885f476e7d047da1d59..6062ca41eca131651c1b23683ea91ca7632dde54 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-settings/user-settings.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-settings/user-settings.cy.ts
@@ -80,78 +80,78 @@ describe('User Settings', () => {
});
describe('click on neuer Vorgang toggle', () => {
- it('should have initial unchecked toggle', () => {
+ it('should have initial checked toggle', () => {
isNotChecked(userSettings.getEmailBenachrichtigungForNewVorgang().getToggle());
});
it('should switch toggle status', () => {
userSettings.getEmailBenachrichtigungForNewVorgang().getToggle().click();
- isChecked(userSettings.getEmailBenachrichtigungForNewVorgang().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForNewVorgang().getToggle());
});
it('should be loaded after page reload', () => {
reload();
userSettings.getRoot().click();
- isChecked(userSettings.getEmailBenachrichtigungForNewVorgang().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForNewVorgang().getToggle());
});
});
describe('click on neue nachricht antragsteller toggle', () => {
- it('should have initial unchecked toggle', () => {
- isNotChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
+ it('should have initial checked toggle', () => {
+ isChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
});
it('should switch toggle status', () => {
userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle().click();
- isChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
});
it('should be loaded after page reload', () => {
reload();
userSettings.getRoot().click();
- isChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForPostfachNachrichtFromAntragsteller().getToggle());
});
});
describe('click on vorgang mir zugewiesen toggle', () => {
- it('should have initial unchecked toggle', () => {
- isNotChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
+ it('should have initial checked toggle', () => {
+ isChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
});
it('should switch toggle status', () => {
userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle().click();
- isChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
});
it('should be loaded after page reload', () => {
reload();
userSettings.getRoot().click();
- isChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForVorgangAssignedToUser().getToggle());
});
});
describe('click on faellige wiedervorlage toggle', () => {
- it('should have initial unchecked toggle', () => {
- isNotChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
+ it('should have initial checked toggle', () => {
+ isChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
});
it('should switch toggle status', () => {
userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle().click();
- isChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
});
it('should be loaded after page reload', () => {
reload();
userSettings.getRoot().click();
- isChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
+ isNotChecked(userSettings.getEmailBenachrichtigungForWiedervorlageDueToday().getToggle());
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
index 7c24cf66f97dd2c37b98288fbe9bc481c5172aa9..2d3f3b5003c1f2a79e9a0d089eae7a56486c6c45 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
@@ -24,15 +24,10 @@
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections } from '../../../support/cypress-helper';
+import { dropCollections, wait } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
@@ -43,8 +38,7 @@ describe('Vorgang abschliessen', () => {
const snackBar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangAbschliessen: VorgangE2E = {
...buildVorgang(objectIds[0], 'DoAbschliessen'),
@@ -78,10 +72,7 @@ describe('Vorgang abschliessen', () => {
describe('by button', () => {
it('should have status Beschieden', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangAbschliessen.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]);
});
it('should show snackBar message', () => {
@@ -99,10 +90,7 @@ describe('Vorgang abschliessen', () => {
});
it('should have status Abgeschlossen', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN]);
});
it('back to vorgang list', () => {
@@ -131,10 +119,7 @@ describe('Vorgang abschliessen', () => {
describe('by icon-button', () => {
it('should have status Beschieden', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangAbschliessenRevoke.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessenRevoke.status]);
});
it('should show snackBar message', () => {
@@ -147,6 +132,7 @@ describe('Vorgang abschliessen', () => {
it('should close snackbar on revoke', () => {
snackBar.getRevokeButton().click();
+ wait(500);
waitForSpinnerToDisappear();
notExist(snackBar.getMessage());
@@ -155,10 +141,7 @@ describe('Vorgang abschliessen', () => {
it('should show status Beschieden', () => {
notExist(vorgangPage.getProgressBar());
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN]);
});
it('back to vorgang list', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-aktenzeichen-anlegen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-aktenzeichen-anlegen.cy.ts
index ffe5e2a8433e232d4859ac4af79d778d16e69193..7d14cdb7bd568826d12bf6ba6edd6d1a45a8be7d 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-aktenzeichen-anlegen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-aktenzeichen-anlegen.cy.ts
@@ -22,12 +22,7 @@ import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections } from '../../../support/cypress-helper';
import { contains, enterWith, exist, notExist } from '../../../support/cypress.util';
import { getUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
-import {
- buildVorgang,
- initSearchIndex,
- initVorgaenge,
- objectIds,
-} from '../../../support/vorgang-util';
+import { buildVorgang, initSearchIndex, initVorgaenge, objectIds } from '../../../support/vorgang-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -46,8 +41,7 @@ describe('Aktenzeichen anlegen', () => {
const vorgangPage: VorgangPage = new VorgangPage();
const vorgangHeader: VorgangDetailHeaderE2EComponent = vorgangPage.getVorgangDetailHeader();
- const aktenzeichenEditor: VorgangAktenzeichenEditE2EComponent =
- vorgangPage.getAktenzeichenEditor();
+ const aktenzeichenEditor: VorgangAktenzeichenEditE2EComponent = vorgangPage.getAktenzeichenEditor();
const header: HeaderE2EComponent = mainPage.getHeader();
const vorgangSearch: VorgangSearchE2EComponent = header.getVorgangSearch();
const bescheidWizard: VorgangBescheidWizardE2EComponent = vorgangPage.getBescheidWizard();
@@ -77,14 +71,10 @@ describe('Aktenzeichen anlegen', () => {
aktenzeichen: searchAZ,
};
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
- const vorgangDatenFormular: VorgangFormularDatenE2EComponent =
- vorgangPage.getFormularDatenContainer();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
+ const vorgangDatenFormular: VorgangFormularDatenE2EComponent = vorgangPage.getFormularDatenContainer();
- const vorgangShowInSearch: VorgangListItemE2EComponent = vorgangList.getListItem(
- aktenzeichenVorgangSearch.name,
- );
+ const vorgangShowInSearch: VorgangListItemE2EComponent = vorgangList.getListItem(aktenzeichenVorgangSearch.name);
before(() => {
initVorgaenge([
@@ -305,9 +295,7 @@ describe('Aktenzeichen anlegen', () => {
describe('search for Aktenzeichen', () => {
it('should find Vorgang with existing Aktenzeichen', () => {
vorgangList.getListItem(aktenzeichenVorgangSearch.name).getRoot().click();
- enterWith(vorgangSearch.getInput(), searchAZ);
- //currently the first search only works if you manually send an Enter after a short delay
- cy.wait(1000);
+ enterWith(vorgangSearch.getInput(), searchAZ, 500);
vorgangSearch.getInput().type('{enter}');
exist(vorgangShowInSearch.getRoot());
@@ -317,7 +305,7 @@ describe('Aktenzeichen anlegen', () => {
vorgangList.getListItem(aktenzeichenVorgangSearch.name).getRoot().click();
vorgangHeader.getAktenzeichenEditButton().click();
setNewAktenzeichen(newAZ);
- enterWith(vorgangSearch.getInput(), searchAZ);
+ enterWith(vorgangSearch.getInput(), searchAZ, 500);
notExist(vorgangShowInSearch.getRoot());
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-bescheiden.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-bescheiden.cy.ts
index f735f511037959dd6360ac62d7f3ee2c6fe26887..cb1f62b6ce24d3dd7d81772e70649ea35d359299 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-bescheiden.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-bescheiden.cy.ts
@@ -25,23 +25,13 @@ import { VorgangBescheidWizardE2EComponent } from 'apps/alfa-e2e/src/components/
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initVorgaenge,
- objectIds,
-} from '../../../support/vorgang-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
describe('Vorgang bescheiden', () => {
const mainPage: MainPage = new MainPage();
@@ -49,8 +39,7 @@ describe('Vorgang bescheiden', () => {
const snackBar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangBescheiden: VorgangE2E = {
...createVorgang(),
@@ -87,10 +76,7 @@ describe('Vorgang bescheiden', () => {
describe('by button', () => {
it('should have status In Bearbeitung', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangBescheiden.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangBescheiden.status]);
});
it('should show snackBar message', () => {
@@ -113,10 +99,7 @@ describe('Vorgang bescheiden', () => {
});
it('should have status Abgeschlossen', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN]);
});
it('back to vorgang list', () => {
@@ -147,10 +130,7 @@ describe('Vorgang bescheiden', () => {
describe('by icon-button', () => {
it('should have status In Bearbeitung', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangBescheidenRevoke.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangBescheidenRevoke.status]);
});
it('should show snackBar message', () => {
@@ -175,11 +155,9 @@ describe('Vorgang bescheiden', () => {
it('should show status In Bearbeitung', () => {
notExist(vorgangPage.getProgressBar());
+ waitForSpinnerToDisappear();
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
});
it('back to vorgang list', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
index 08eb091172c0888911b99f3f0d82e77e5bb4c627..9763fe29a9ad2ac3a6f44b718c2424fd235f10bb 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
@@ -27,23 +27,13 @@ import localeDeExtra from '@angular/common/locales/extra/de';
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initVorgaenge,
- objectIds,
-} from '../../../support/vorgang-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -53,8 +43,7 @@ describe('Vorgang Verwerfen', () => {
const snackbar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangVerwerfen: VorgangE2E = { ...createVorgang(), name: 'DoVerwerfen' };
const vorgangVerwerfenRevoke: VorgangE2E = { ...buildVorgang(objectIds[0], 'DoRevokeVerwerfen') };
@@ -82,10 +71,7 @@ describe('Vorgang Verwerfen', () => {
describe('by button', () => {
it('should have status Neu', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangVerwerfen.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangVerwerfen.status]);
});
it('should show snackBar', () => {
@@ -103,10 +89,7 @@ describe('Vorgang Verwerfen', () => {
});
it('should have status Verworfen', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN]);
});
it('should have button zurückholen', () => {
@@ -122,10 +105,7 @@ describe('Vorgang Verwerfen', () => {
});
it('should have status Verworfen', () => {
- haveText(
- vorgangList.getListItem(vorgangVerwerfen.name).getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN],
- );
+ haveText(vorgangList.getListItem(vorgangVerwerfen.name).getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN]);
});
});
});
@@ -140,10 +120,7 @@ describe('Vorgang Verwerfen', () => {
describe('by icon-button', () => {
it('should have status Neu', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangVerwerfenRevoke.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangVerwerfenRevoke.status]);
});
it('should show snackBar', () => {
@@ -163,11 +140,9 @@ describe('Vorgang Verwerfen', () => {
it('should show status Neu', () => {
notExist(vorgangPage.getProgressBar());
+ waitForSpinnerToDisappear();
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.NEU],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.NEU]);
});
it('should not have button zurückholen', () => {
@@ -183,10 +158,7 @@ describe('Vorgang Verwerfen', () => {
});
it('should have status Neu', () => {
- haveText(
- vorgangList.getListItem(vorgangVerwerfenRevoke.name).getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.NEU],
- );
+ haveText(vorgangList.getListItem(vorgangVerwerfenRevoke.name).getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.NEU]);
});
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
index 656e52ca66f34a7cb7c684a7e301551872f6781d..d2645d5b111baa0cb19196e58f8ea48627ffc7a2 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
@@ -24,23 +24,13 @@
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections, wait } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initVorgaenge,
- objectIds,
-} from '../../../support/vorgang-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
describe('Vorgang wiedereroeffnen', () => {
const mainPage: MainPage = new MainPage();
@@ -48,8 +38,7 @@ describe('Vorgang wiedereroeffnen', () => {
const snackbar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangBeschiedenWiedereroeffnen: VorgangE2E = {
...createVorgang(),
@@ -119,10 +108,7 @@ describe('Vorgang wiedereroeffnen', () => {
});
it('should have status In Bearbeitung', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
});
it('back to vorgang list', () => {
@@ -177,10 +163,7 @@ describe('Vorgang wiedereroeffnen', () => {
it('should show status Beschieden', () => {
wait(500);
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN]);
});
it('back to vorgang list', () => {
@@ -232,10 +215,7 @@ describe('Vorgang wiedereroeffnen', () => {
});
it('should have status In Bearbeitung', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
});
it('back to vorgang list', () => {
@@ -280,6 +260,7 @@ describe('Vorgang wiedereroeffnen', () => {
it('should close snackbar on revoke', () => {
snackbar.getRevokeButton().click();
+ wait(500);
waitForSpinnerToDisappear();
notExist(snackbar.getMessage());
@@ -288,10 +269,7 @@ describe('Vorgang wiedereroeffnen', () => {
it('should show status Abgeschlossen', () => {
notExist(vorgangPage.getProgressBar());
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN]);
});
it('back to vorgang list', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-zurueckholen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-zurueckholen.cy.ts
index 4c9784b5deb9e801dce14ff83721694e60e0f942..fb1ae0fe417a893d97d051a30816d9f7494a1311 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-zurueckholen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-zurueckholen.cy.ts
@@ -27,23 +27,13 @@ import localeDeExtra from '@angular/common/locales/extra/de';
import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
import { SnackBarE2EComponent } from '../../../components/ui/snackbar.e2e.component';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
-import {
- VorgangE2E,
- VorgangMessagesE2E,
- VorgangStatusE2E,
- vorgangStatusLabelE2E,
-} from '../../../model/vorgang';
+import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
-import {
- buildVorgang,
- createVorgang,
- initVorgaenge,
- objectIds,
-} from '../../../support/vorgang-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -53,8 +43,7 @@ describe('Vorgang Zurueckholen', () => {
const snackBar: SnackBarE2EComponent = mainPage.getSnackBar();
const vorgangPage: VorgangPage = new VorgangPage();
- const vorgangFormularButtons: VorgangFormularButtonsE2EComponent =
- vorgangPage.getFormularButtons();
+ const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons();
const vorgangZurueckholen: VorgangE2E = {
...createVorgang(),
@@ -89,10 +78,7 @@ describe('Vorgang Zurueckholen', () => {
describe('by button', () => {
it('should have status Verworfen', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangZurueckholen.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangZurueckholen.status]);
});
it('should show snackBar message', () => {
@@ -110,10 +96,7 @@ describe('Vorgang Zurueckholen', () => {
});
it('should have status Neu', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.NEU],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.NEU]);
});
it('should have button annehmen und verwerfen', () => {
@@ -128,10 +111,7 @@ describe('Vorgang Zurueckholen', () => {
});
it('should have status Neu', () => {
- haveText(
- vorgangList.getListItem(vorgangZurueckholen.name).getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.NEU],
- );
+ haveText(vorgangList.getListItem(vorgangZurueckholen.name).getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.NEU]);
});
});
});
@@ -146,10 +126,7 @@ describe('Vorgang Zurueckholen', () => {
describe('by icon-button', () => {
it('should have status Neu', () => {
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[vorgangZurueckholenRevoke.status],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangZurueckholenRevoke.status]);
});
it('should show snackBar', () => {
@@ -169,11 +146,9 @@ describe('Vorgang Zurueckholen', () => {
it('should show status Abgeschlossen', () => {
notExist(vorgangPage.getProgressBar());
+ waitForSpinnerToDisappear();
- haveText(
- vorgangPage.getVorgangDetailHeader().getStatus(),
- vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN],
- );
+ haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN]);
});
it('should have button zurueckholen', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
index 58e0660e0f37cba42cc6ab8ed1b0c824d5e3902d..d045ee9c6f58b1df37fc04f1260c0b75178a4bb1 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -7,6 +7,14 @@ project:
- namespace: '*'
server: https://kubernetes.default.svc
+administration:
+ enabled: true
+
+admin_client:
+ enabled: true
+ ingress:
+ use_staging_cert: true
+
alfa:
env:
overrideSpringProfiles: 'oc,ea,e2e,dev'
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index ed32236cd2d0a9b3c211c4c54b7a726e212cf500..1bcb0012c4aa771b977d6834c8d9825b20cb4f11 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -6,11 +6,10 @@ project:
destinations:
- namespace: "*"
server: https://kubernetes.default.svc
+
alfa:
env:
overrideSpringProfiles: "oc,e2e,dev"
- customList:
- ozgcloud_feature_bescheid-wizard: "true"
ingress:
use_staging_cert: true
ozgcloud:
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/user-ids.json
@@ -0,0 +1 @@
+{}
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
index 814e061ad715953b45342a9fde9a3dab6f7b17c3..7e02474fe5f97aaa5a7f7161d6476fc04462c046 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
@@ -10,7 +10,7 @@
"firstName": "Ariane",
"fullName": "Ariane Admin",
"lastName": "Admin",
- "email": "ariane-admin@ozg-sh.de",
+ "email": "ariane-admin@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["ADMIN_ADMIN", "VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
index 8c8a317b75a24343340390cc1e8bd722e3948d93..2c87f7fdacacfdbde9da6c1283556a12e73add3e 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
@@ -10,7 +10,7 @@
"firstName": "Dorothea",
"fullName": "Dorothea Doe",
"lastName": "Doe",
- "email": "dorothea.doe@ozg-sh.de",
+ "email": "dorothea.doe@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9030229", "10363455", "248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
index 2919f1b73675781d3f0b6b508a689f8587553216..f84b1f7bd73abde3e5a0eafe096e7e989f7f0f6f 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
@@ -10,7 +10,7 @@
"firstName": "Emil",
"fullName": "Emil Ansprechpartner",
"lastName": "Ansprechpartner",
- "email": "emil.ansprechpartner@ozg-sh.de",
+ "email": "emil.ansprechpartner@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["EINHEITLICHER_ANSPRECHPARTNER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
index 9bc95422fb2c6d99c6ea408d684e73b13fde1e08..6c0d961bd99a0f997153343106a8ca82b473d82c 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
@@ -10,7 +10,7 @@
"firstName": "Peter",
"fullName": "Peter von der Post",
"lastName": "von der Post",
- "email": "peter.von.der.post@ozg-sh.de",
+ "email": "peter.von.der.post@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["VERWALTUNG_POSTSTELLE"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
index afc4c87496649073054973b8e9944a7740fe4d49..f6be06faa2fb4f03c6e7981399201d000f263dc9 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
@@ -10,7 +10,7 @@
"firstName": "Sabine",
"fullName": "Sabine Sach",
"lastName": "Sach",
- "email": "sabine.sach@ozg-sh.de",
+ "email": "sabine.sach@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
index 013cd251b1f3d1e20c6b775c61c1f0a11471b50f..466f127e1c848d66409fc46da37b0482933d4eba 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
@@ -10,7 +10,7 @@
"firstName": "Zelda",
"fullName": "Zelda Zusammen",
"lastName": "Zusammen",
- "email": "zelda-z@ozg-sh.de",
+ "email": "zelda-z@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9797773", "9093371"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
index aa30f90a3e2aba7dfd964af16093943324b68d14..9787ef0dd9b5e64b2d7b739d6edf255cdf63a58b 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
@@ -42,6 +42,7 @@ enum CypressTasks {
DELETE_FOLDER = 'deleteFolder',
UNZIP_FILE = 'unzipDownloadFile',
GET_DOWNLOAD_FILES = 'getDownloadFiles',
+ WRITE_USER_IDS_TO_FILE = 'writeUserIdsToFile',
}
enum MongoCollections {
@@ -146,6 +147,10 @@ export function getDownloadFiles(): Cypress.Chainable<Array<string>> {
return cy.task(CypressTasks.GET_DOWNLOAD_FILES, DOWNLOAD_FOLDER);
}
+export function writeUserIdsIntoFile() {
+ return cy.task(CypressTasks.WRITE_USER_IDS_TO_FILE, { collection: MongoCollections.USER });
+}
+
export function scrollToWindowBottom(): void {
cy.window().scrollTo('bottom');
}
@@ -154,11 +159,7 @@ export function intercept(method: string, url: string): Cypress.Chainable<null>
return cy.intercept(method, url);
}
-export function interceptWithResponse(
- method,
- url: RouteMatcher,
- response: RouteHandler,
-): Cypress.Chainable<null> {
+export function interceptWithResponse(method, url: RouteMatcher, response: RouteHandler): Cypress.Chainable<null> {
return cy.intercept(method, url, response);
}
@@ -185,6 +186,7 @@ export function wait(ms: number, reason = ''): void {
console.log(`Had to wait ${ms}ms because of: ${reason}`);
}
}
+
//
export function reload(): void {
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
index 827b7b3d31d21f7c991796b5256302ae28354466..cb2d876ca6b1caea67aa0dc913431cba44872609 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
@@ -1,5 +1,6 @@
import { readdir, remove } from 'fs-extra';
-import { Db, Long, MongoClient, ObjectId } from 'mongodb';
+import { Db, Document, Long, MongoClient, ObjectId, WithId } from 'mongodb';
+
const fs = require('fs');
const decompress = require('decompress');
@@ -65,6 +66,14 @@ module.exports = (on: any, config: any) => {
unzipFile(folderName, fileName);
return 0;
},
+ writeUserIdsToFile({ collection }) {
+ writeUserIds(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection).then(
+ (userIds: { [username: string]: string }) => {
+ fs.writeFileSync('src/fixtures/usermanager/user-ids.json', JSON.stringify(userIds));
+ },
+ );
+ return 0;
+ },
});
on('after:spec', (spec: Cypress.Spec, results: CypressCommandLine.RunResult) => {
@@ -212,9 +221,7 @@ function createDate(field) {
}
function parseVorgangAttachedItemData(vorgangAttachedItems) {
- vorgangAttachedItems.forEach((vorgangAttachedItem) =>
- parseVorgangAttachedItem(vorgangAttachedItem),
- );
+ vorgangAttachedItems.forEach((vorgangAttachedItem) => parseVorgangAttachedItem(vorgangAttachedItem));
return vorgangAttachedItems;
}
@@ -247,7 +254,21 @@ function insertIntoDatabase(config, collection, data) {
}
function insertIntoUserManagerDatabase(config, collection, data) {
- insert(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+ insertWithoutDrop(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+}
+
+function insertWithoutDrop(databaseUrl, databaseName, collection, data) {
+ MongoClient.connect(databaseUrl, (error, connection) => {
+ console.log(`connect to ${databaseName} database with ${databaseUrl}`);
+ if (!error) {
+ console.log('success');
+ const db: Db = connection.db(databaseName);
+
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
+ } else {
+ console.error('Error: ', error);
+ }
+ });
}
function insert(databaseUrl, databaseName, collection, data) {
@@ -258,9 +279,7 @@ function insert(databaseUrl, databaseName, collection, data) {
const db: Db = connection.db(databaseName);
db.collection(collection).drop(() => {
- db.createCollection(collection, (error) =>
- handleCreateCollection(db, connection, collection, data, error),
- );
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
});
} else {
console.error('Error: ', error);
@@ -362,3 +381,19 @@ function unzipFile(folderName: string, fileName: string): void {
decompress(folderName + '/' + fileName, folderName);
return null;
}
+
+async function writeUserIds(databaseUrl, databaseName, collection) {
+ return MongoClient.connect(databaseUrl).then((client: MongoClient) => {
+ const db: Db = client.db(databaseName);
+ const userIds: { [username: string]: string } = {};
+ return db
+ .collection(collection)
+ .find()
+ .map((doc: WithId<Document>) => [doc['username'], doc._id.toString()])
+ .toArray()
+ .then((docData: [string, string][]) => {
+ docData.forEach((data) => Object.assign(userIds, { [data[0]]: data[1] }));
+ return userIds;
+ });
+ });
+}
diff --git a/alfa-client/apps/alfa-e2e/src/support/user-util.ts b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
index 34d06a712b3944f70b621d4507ca2dfc3b6ca004..4abfd9ad6eaed01c439575dec62211867312bcf6 100644
--- a/alfa-client/apps/alfa-e2e/src/support/user-util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
@@ -21,9 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { isNotEmpty } from '@alfa-client/tech-shared';
+import { isEmpty } from 'lodash-es';
import { UserE2E } from '../model/user';
import { UsermanagerUserE2E } from '../model/usermanager';
-import { initUsermanagerData, login } from './cypress-helper';
+import { login } from './cypress-helper';
const sabineFixture: UserE2E = require('../fixtures/user-main/user_sabine.json');
const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json');
@@ -36,16 +38,33 @@ const userManagerEmilFixture: UsermanagerUserE2E = require('../fixtures/usermana
const userManagerDorotheaFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_dorothea.json');
const userManagerZeldaFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_zelda.json');
const userManagerArianeFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_ariane.json');
+const userIds: { [username: string]: string } = require('../fixtures/usermanager/user-ids.json');
+
+type Username = 'sabine' | 'peter' | 'emil' | 'adelheit' | 'ludwig' | 'richard' | 'zonk' | 'dorothea';
+
+export function getUserId(username: Username) {
+ if (isEmpty(userIds)) {
+ throw new Error('user ids from fixtures/usermanager/user-ids.json empty');
+ }
+ if (isEmpty(userIds[username])) {
+ throw new Error(`username ${username} not found in fixtures/usermanager/user-ids.json`);
+ }
+ return userIds[username];
+}
+
+export function areUsersSynced(): boolean {
+ return isNotEmpty(userIds);
+}
export function initUsermanagerUsers() {
- initUsermanagerData([
- getUserManagerUserSabine(),
- getUserManagerUserPeter(),
- getUserManagerUserEmil(),
- getUserManagerUserDorothea(),
- getUserManagerUserZelda(),
- getUserManagerUserAriane(),
- ]);
+ // initUsermanagerData([
+ // getUserManagerUserSabine(),
+ // getUserManagerUserPeter(),
+ // getUserManagerUserEmil(),
+ // getUserManagerUserDorothea(),
+ // getUserManagerUserZelda(),
+ // getUserManagerUserAriane(),
+ // ]);
}
export function getUserSabine(): UserE2E {
@@ -89,20 +108,21 @@ export function getUserManagerUserAriane(): UsermanagerUserE2E {
}
export function getUserSabineId(): string {
- return getUserManagerUserSabine()._id.$oid;
+ return getUserId('sabine');
}
export function getUserDorotheaId(): string {
- return getUserManagerUserDorothea()._id.$oid;
+ return getUserId('dorothea');
}
-enum DatabaseUser {
+export enum DatabaseUser {
EMIL = 'user-ea/user_emil.json',
ADELHEIT = 'user-main/user_adelheit.json',
LUDWIG = 'user-main/user_ludwig.json',
PETER = 'user-main/user_peter.json',
RICHARD = 'user-main/user_richard.json',
SABINE = 'user-main/user_sabine.json',
+ DOROTHEA = 'user-main/user_dorothea.json',
ZELDA = 'user-main/user_zelda.json',
ZONK = 'user-main/user_zonk.json',
ARIANE = 'user-main/user_ariane.json',
diff --git a/alfa-client/apps/alfa/src/app/app.component.html b/alfa-client/apps/alfa/src/app/app.component.html
index 089e9de91f369cb64da483eb2a4316543084ae53..b10af37299a6874ab18519ed496e0366d18cb0bc 100644
--- a/alfa-client/apps/alfa/src/app/app.component.html
+++ b/alfa-client/apps/alfa/src/app/app.component.html
@@ -31,11 +31,7 @@
<div class="mat-app-background relative grow"><router-outlet></router-outlet></div>
<section class="mat-app-background right-nav">
- <alfa-build-info
- *ngIf="apiRoot.resource"
- [apiRoot]="apiRoot.resource"
- data-test-id="build-info"
- ></alfa-build-info>
+ <alfa-build-info *ngIf="apiRoot.resource" [apiRoot]="apiRoot.resource" data-test-id="build-info"></alfa-build-info>
</section>
</div>
</ozgcloud-spinner>
diff --git a/alfa-client/apps/alfa/src/app/app.component.spec.ts b/alfa-client/apps/alfa/src/app/app.component.spec.ts
index 0ca6382a2e0987cdbc277b9d388a891049849563..8824da3647969782aab53105663e18e44105a01a 100644
--- a/alfa-client/apps/alfa/src/app/app.component.spec.ts
+++ b/alfa-client/apps/alfa/src/app/app.component.spec.ts
@@ -22,6 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { ApiRootFacade } from '@alfa-client/api-root-shared';
+import { BuildInfoComponent } from '@alfa-client/common';
import { ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
import { NavigationService } from '@alfa-client/navigation-shared';
import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
@@ -30,20 +31,18 @@ import { IconService, SpinnerComponent } from '@alfa-client/ui';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Params } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { AuthConfig, OAuthEvent, OAuthService } from 'angular-oauth2-oidc';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
-import { BuildInfoComponent } from 'libs/navigation/src/lib/build-info/build-info.component';
import { HeaderContainerComponent } from 'libs/navigation/src/lib/header-container/header-container.component';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { setWindowLocationUrl } from 'libs/tech-shared/test/window';
+import * as VorgangNavigationUtil from 'libs/vorgang-shared/src/lib/vorgang-navigation.util';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { AppComponent } from './app.component';
-import { Params } from '@angular/router';
-import * as VorgangNavigationUtil from 'libs/vorgang-shared/src/lib/vorgang-navigation.util';
-
registerLocaleData(localeDe);
describe('AppComponent', () => {
diff --git a/alfa-client/apps/alfa/src/app/app.module.ts b/alfa-client/apps/alfa/src/app/app.module.ts
index f7138d442ac5f3c8ff30f3864c4f2943bd5a4c9e..8e35a1cb4ea3831bccdbb142b68d8844cb53582d 100644
--- a/alfa-client/apps/alfa/src/app/app.module.ts
+++ b/alfa-client/apps/alfa/src/app/app.module.ts
@@ -23,6 +23,7 @@
*/
import { ApiRootModule } from '@alfa-client/api-root-shared';
import { AppSharedModule } from '@alfa-client/app-shared';
+import { BuildInfoComponent } from '@alfa-client/common';
import { EnvironmentModule } from '@alfa-client/environment-shared';
import { HintSharedModule } from '@alfa-client/hint-shared';
import { NavigationModule } from '@alfa-client/navigation';
@@ -75,6 +76,7 @@ const routes: Routes = [
}),
ApiRootModule,
NavigationModule,
+ BuildInfoComponent,
AppSharedModule,
StoreModule.forRoot(
{},
diff --git a/alfa-client/apps/run-tests.sh b/alfa-client/apps/run-tests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..eadee4428cd9620ad5c66da8d44a0459f1e42c58
--- /dev/null
+++ b/alfa-client/apps/run-tests.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+export NO_COLOR=1
+
+if [ $# -eq 0 ]; then
+ >&2 echo "This script is for Jenkins Execution of E2E-Tests"
+ >&2 echo "Example: ./run-tests.sh admin-e2e main-tests cypress.config.ts"
+ exit 1
+fi
+APP_NAME="${1:-alfa-e2e}"
+APP_VARIATION="${2:-main-tests}"
+CONFIG_FILE="${3:-cypress.config.ts}"
+
+if [ -z $APP_NAME ]; then echo "App Folder not set" && exit 1; fi
+if [ -z $APP_VARIATION ]; then echo "Variation Name not set" && exit 1; fi
+if [ -z $CONFIG_FILE ]; then echo "Config File not set" && exit 1; fi
+
+SCRIPT_DIR="$(dirname "$0")"
+BASE_PATH=${SCRIPT_DIR}/${APP_NAME}
+SPEC_GROUP=${BASE_PATH}/src/e2e/${APP_VARIATION}
+COMMAND="npx cypress run --project ${BASE_PATH} --spec ${SPEC_GROUP} --config-file ${CONFIG_FILE}"
+REPORT_PATH=${BASE_PATH}/reports/${APP_VARIATION}
+
+echo "Run E2E for ${APP_NAME} with command: '$COMMAND'"
+
+rm -rf ${REPORT_PATH}
+
+eval $COMMAND
+TEST_RESULT=$?
+
+if [ -d "${REPORT_PATH}" ]; then
+ MOCHA_REPORT_PATH=${REPORT_PATH}/mochawesome-report/
+ MOCHA_REPORT_JSONS=${MOCHA_REPORT_PATH}.jsons
+ MOCHA_REPORT_FILE=${MOCHA_REPORT_PATH}report.json
+
+ mv ${MOCHA_REPORT_JSONS} ${MOCHA_REPORT_PATH}/jsons
+ npx mochawesome-merge ${MOCHA_REPORT_PATH}**/*.json > ${MOCHA_REPORT_FILE}
+ # Workaround: mochawesome's "screenshotsFolder" value is not added in the generated HTML file. Add "screenshots" to image paths.
+ sed --in-place --regexp-extended 's/"([^"]*\.png)/"screenshots\1/' ${MOCHA_REPORT_FILE}
+ npx marge ${MOCHA_REPORT_FILE} -f report -o ${REPORT_PATH}
+else
+ echo "ERROR: Reports do not exist at ${REPORT_PATH}"
+fi
+
+exit $TEST_RESULT
\ No newline at end of file
diff --git a/alfa-client/libs/admin/settings/src/index.ts b/alfa-client/libs/admin/settings/src/index.ts
index a13f84185d2480694cbb145fb300e553cc668381..b1a8f83f9738553500db49b8058e577390482e95 100644
--- a/alfa-client/libs/admin/settings/src/index.ts
+++ b/alfa-client/libs/admin/settings/src/index.ts
@@ -3,5 +3,5 @@ export * from './lib/organisationseinheit/organisations-einheit.model';
export * from './lib/organisationseinheit/organisationseinheit-container/organisationseinheit-container.component';
export * from './lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form-container.component';
export * from './lib/postfach/postfach-container/postfach-container.component';
-export * from './lib/shared/navigation-item/navigation-item.component';
+export * from './lib/users-roles/user-add-form/user-add-form.component';
export * from './lib/users-roles/users-roles.component';
diff --git a/alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts b/alfa-client/libs/admin/settings/src/lib/admin-settings.module.ts
index ad13c6426adbf09d39909c175b215c4e79f6c932..4e3f5c7bfe4c0a78873f7b92e3a6271a1668675f 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
@@ -8,7 +8,12 @@ import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import KcAdminClient from '@keycloak/keycloak-admin-client';
-import { ButtonWithSpinnerComponent, TextareaEditorComponent } from '@ods/component';
+import {
+ ButtonWithSpinnerComponent,
+ CheckboxEditorComponent,
+ TextareaEditorComponent,
+ TextEditorComponent,
+} from '@ods/component';
import {
ExclamationIconComponent,
ListComponent,
@@ -39,14 +44,8 @@ import { PostfachFormComponent } from './postfach/postfach-container/postfach-fo
import { PostfachSignaturComponent } from './postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component';
import { createPostfachResourceService, PostfachResourceService } from './postfach/postfach-resource.service';
import { PostfachService } from './postfach/postfach.service';
-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';
import { ToUserNamePipe } from './user/to-user-name.pipe';
+import { UserAddFormComponent } from './users-roles/user-add-form/user-add-form.component';
import { UsersRolesComponent } from './users-roles/users-roles.component';
@NgModule({
@@ -54,19 +53,13 @@ import { UsersRolesComponent } from './users-roles/users-roles.component';
PostfachContainerComponent,
PostfachFormComponent,
PostfachSignaturComponent,
- NavigationItemComponent,
- TextFieldComponent,
OrganisationsEinheitContainerComponent,
OrganisationsEinheitListComponent,
OrganisationsEinheitFormContainerComponent,
OrganisationsEinheitFormComponent,
OrganisationsEinheitSignaturComponent,
- PrimaryButtonComponent,
- SecondaryButtonComponent,
- MoreMenuComponent,
- MoreItemButtonComponent,
- SpinnerComponent,
UsersRolesComponent,
+ UserAddFormComponent,
],
imports: [
CommonModule,
@@ -74,6 +67,7 @@ import { UsersRolesComponent } from './users-roles/users-roles.component';
RouterModule,
ReactiveFormsModule,
TextInputComponent,
+ CheckboxEditorComponent,
ButtonWithSpinnerComponent,
TextareaEditorComponent,
MailboxIconComponent,
@@ -84,13 +78,14 @@ import { UsersRolesComponent } from './users-roles/users-roles.component';
ExclamationIconComponent,
UiModule,
NavigationSharedModule,
+ TextEditorComponent,
],
exports: [
PostfachContainerComponent,
OrganisationsEinheitContainerComponent,
OrganisationsEinheitFormContainerComponent,
- NavigationItemComponent,
UsersRolesComponent,
+ UserAddFormComponent,
],
providers: [
ConfigurationService,
diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html
index 4d7bb88c347ce810280f41d2202077cccf4e9062..53a9c8fba9f1bbbc2b17d8c4a78a004330b4b18a 100644
--- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html
+++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-list/organisationseinheit-list.component.html
@@ -20,7 +20,7 @@
<dl class="flex-1 basis-1/12">
<dt class="sr-only">Synchronisationsergebnis</dt>
- <dd class="mt-1">
+ <dd class="mt-1" data-test-id="organisations-einheit-sync-error">
<ods-exclamation-icon
*ngIf="organisationsEinheitResource.syncResult === AdminOrganisationsEinheitSyncResult.NOT_FOUND_IN_PVOG"
matTooltip="Organisationseinheit wurde nicht in den PVOG-Daten gefunden."
diff --git a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
index ad4f7bd11d40c6444ba2fdbbc169cd0b81aff0f4..86d331e417dd25431571427af73a542672943420 100644
--- a/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/organisationseinheit/organisationseinheit-form-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts
@@ -9,7 +9,6 @@ import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
import { createInvalidParam, createProblemDetail } from '../../../../../../../tech-shared/test/error';
import { createAdminOrganisationsEinheitResource } from '../../../../../test/organisations-einheit/organisations-einheit';
-import { TextFieldComponent } from '../../../shared/text-field/text-field.component';
import { OrganisationsEinheitService } from '../../organisationseinheit.service';
import { OrganisationsEinheitFormComponent } from './organisationseinheit-form.component';
import { OrganisationsEinheitSignaturComponent } from './organisationseinheit-signatur/organisationseinheit-signatur.component';
@@ -31,7 +30,6 @@ describe('OrganisationsEinheitFormComponent', () => {
await TestBed.configureTestingModule({
declarations: [
OrganisationsEinheitFormComponent,
- MockComponent(TextFieldComponent),
MockComponent(OrganisationsEinheitSignaturComponent),
MockComponent(ButtonWithSpinnerComponent),
],
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 8c8096d7df647918130510a8ac0fad54499064f7..119bf30d3ed7cac949543b020412c62a50e079f5 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
@@ -9,7 +9,6 @@ import { singleCold } from 'libs/tech-shared/test/marbles';
import { MockComponent } from 'ng-mocks';
import { EMPTY } from 'rxjs';
import { createPostfachResource } from '../../../../../test/postfach/postfach';
-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';
@@ -28,12 +27,7 @@ describe('PostfachFormComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [
- PostfachFormComponent,
- MockComponent(TextFieldComponent),
- MockComponent(PostfachSignaturComponent),
- MockComponent(ButtonWithSpinnerComponent),
- ],
+ declarations: [PostfachFormComponent, MockComponent(PostfachSignaturComponent), MockComponent(ButtonWithSpinnerComponent)],
imports: [ReactiveFormsModule, FormsModule],
providers: [
{
diff --git a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.spec.ts
index 7ac55113ec028463983d6e823f2e7842fbf9e53a..9d8db826b2b839234c1a12ce65caa10e2480e2bb 100644
--- a/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/postfach/postfach-container/postfach-form/postfach-signatur/postfach-signatur.component.spec.ts
@@ -1,6 +1,6 @@
-import { getElementFromFixture, mock, useFromMock } from '@alfa-client/test-utils';
+import { getElementFromFixture, mock, Mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
import { TextareaEditorComponent } from '@ods/component';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { MockComponent } from 'ng-mocks';
@@ -13,14 +13,13 @@ describe('PostfachSignaturComponent', () => {
let component: PostfachSignaturComponent;
let fixture: ComponentFixture<PostfachSignaturComponent>;
- const formService: PostfachFormService = new PostfachFormService(
- new FormBuilder(),
- useFromMock(mock(PostfachService)),
- );
-
+ let formService: Mock<PostfachFormService>;
+ let postfachService: Mock<PostfachService>;
const signaturTextarea = getDataTestIdOf('signatur-text');
beforeEach(async () => {
+ formService = mock(PostfachFormService);
+ postfachService = mock(PostfachService);
await TestBed.configureTestingModule({
imports: [ReactiveFormsModule],
declarations: [PostfachFormComponent, MockComponent(TextareaEditorComponent)],
@@ -29,9 +28,14 @@ describe('PostfachSignaturComponent', () => {
provide: PostfachFormService,
useValue: formService,
},
+ {
+ provide: PostfachService,
+ useValue: postfachService,
+ },
],
}).compileComponents();
fixture = TestBed.createComponent(PostfachSignaturComponent);
+ TestBed.inject(PostfachService);
component = fixture.componentInstance;
fixture.detectChanges();
});
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 bbc93c26a6744ea5ae695e9c4400bdeccfdb1f72..07b58e65ee3cc1b822146f3f5d671dd7192a81d2 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,6 +1,7 @@
import { createStateResource, StateResource } from '@alfa-client/tech-shared';
-import { mock, Mock, useFromMock } from '@alfa-client/test-utils';
-import { FormBuilder } from '@angular/forms';
+import { mock, Mock } from '@alfa-client/test-utils';
+import { TestBed } from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
import { of } from 'rxjs';
import { createPostfach, createPostfachResource } from '../../../../../test/postfach/postfach';
import { Postfach, PostfachResource } from '../../postfach.model';
@@ -10,22 +11,27 @@ import { PostfachFormService } from './postfach.formservice';
describe('PostfachFormService', () => {
let formService: PostfachFormService;
let postfachService: Mock<PostfachService>;
- const formBuilder: FormBuilder = new FormBuilder();
beforeEach(() => {
postfachService = mock(PostfachService);
- formService = new PostfachFormService(formBuilder, useFromMock(postfachService));
+
+ TestBed.configureTestingModule({
+ providers: [PostfachFormService, UntypedFormBuilder, { provide: PostfachService, useValue: postfachService }],
+ });
+
+ formService = TestBed.inject(PostfachFormService);
+ TestBed.inject(PostfachService);
});
it('should create', () => {
expect(formService).toBeTruthy();
});
+
describe('submit', () => {
const postfach: Postfach = createPostfach();
beforeEach(() => {
- const stateResource: StateResource<PostfachResource> =
- createStateResource(createPostfachResource());
+ const stateResource: StateResource<PostfachResource> = createStateResource(createPostfachResource());
postfachService.save.mockReturnValue(of(stateResource));
postfachService.get.mockReturnValue(of(stateResource));
formService.form.setValue({
@@ -69,8 +75,7 @@ describe('PostfachFormService', () => {
});
it('should call save with absender if any present', () => {
- formValueWithAbsender[PostfachFormService.ASBSENDER_GROUP][PostfachFormService.NAME_FIELD] =
- 'something';
+ formValueWithAbsender[PostfachFormService.ASBSENDER_GROUP][PostfachFormService.NAME_FIELD] = 'something';
formService.form.setValue(formValueWithAbsender);
formService.submit();
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 dd9bcc7a3732f8562aa596faa52b1b4b70407f26..63b83ffccaea662ec02004ff479f0f7a688b47db 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
@@ -1,6 +1,6 @@
import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
-import { Injectable } from '@angular/core';
-import { FormControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { inject, Injectable } from '@angular/core';
+import { FormControl, UntypedFormGroup } from '@angular/forms';
import { isNil } from 'lodash-es';
import { Observable } from 'rxjs';
import { Postfach, PostfachResource } from '../../postfach.model';
@@ -8,6 +8,8 @@ import { PostfachService } from '../../postfach.service';
@Injectable()
export class PostfachFormService extends AbstractFormService {
+ private postfachService: PostfachService = inject(PostfachService);
+
public static readonly ASBSENDER_GROUP: string = 'absender';
public static readonly NAME_FIELD: string = 'name';
public static readonly ANSCHRIFT_FIELD: string = 'anschrift';
@@ -17,13 +19,6 @@ export class PostfachFormService extends AbstractFormService {
public static readonly SIGNATUR_FIELD: string = 'signatur';
- constructor(
- formBuilder: UntypedFormBuilder,
- private postfachService: PostfachService,
- ) {
- super(formBuilder);
- }
-
protected initForm(): UntypedFormGroup {
return this.formBuilder.group({
[PostfachFormService.ASBSENDER_GROUP]: this.formBuilder.group({
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.html b/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.html
deleted file mode 100644
index 26ff86713579d5505c52823e6dacb3e429b627cf..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<button
- (click)="clickEmitter.emit($event)"
- [disabled]="disabled"
- class="w-full bg-white px-3 py-2 text-sm font-semibold shadow-sm hover:bg-gray-50 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ozgblue-500 active:bg-ozgblue-200"
->
- {{ label }}
-</button>
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
deleted file mode 100644
index 8d9b522ce93961b555b8c26e0621734e33af7237..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { dispatchEventFromFixture, getElementFromFixture } from '@alfa-client/test-utils';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MoreItemButtonComponent } from './more-item-button.component';
-
-describe('MoreItemButtonComponent', () => {
- let component: MoreItemButtonComponent;
- let fixture: ComponentFixture<MoreItemButtonComponent>;
-
- const buttonSelector: string = 'button';
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [MoreItemButtonComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(MoreItemButtonComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- it('should show label', () => {
- const text: string = 'test-text';
- component.label = text;
-
- fixture.detectChanges();
-
- const buttonElement: HTMLButtonElement = getElementFromFixture(fixture, buttonSelector);
- expect(buttonElement.textContent.trim()).toEqual(text);
- });
-
- it.each([false, true])('should use disabled "%s"', (disabled) => {
- component.disabled = disabled;
-
- fixture.detectChanges();
-
- const buttonElement: HTMLButtonElement = getElementFromFixture(fixture, buttonSelector);
- expect(buttonElement.disabled).toBe(disabled);
- });
-
- it('should emit clickEmitter', () => {
- component.clickEmitter.emit = jest.fn();
-
- dispatchEventFromFixture(fixture, buttonSelector, 'click');
-
- expect(component.clickEmitter.emit).toHaveBeenCalled();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.ts
deleted file mode 100644
index 843abd3d47661e76d184df6109f9c253095499ad..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-item-button/more-item-button.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-@Component({
- selector: 'admin-more-item-button',
- templateUrl: './more-item-button.component.html',
- styles: [],
-})
-export class MoreItemButtonComponent {
- @Output()
- clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
-
- @Input()
- disabled: boolean;
-
- @Input()
- label: string;
-}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.html b/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.html
deleted file mode 100644
index 08b802175695977a9b8c23d127932f4873b03ec2..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="group relative inline-block text-[0px]">
- <button class="active:bg-ozgblue-`00 rounded-full bg-gray-50 text-base hover:bg-ozgblue-200">
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="h-6 w-6 stroke-ozgblue-700"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M12 6.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 12.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 18.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5Z"
- />
- </svg>
- </button>
- <div
- class="absolute z-20 hidden flex-col items-stretch text-base drop-shadow-lg group-focus-within:flex"
- >
- <ng-content select="[more-menu-item]" />
- </div>
-</div>
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.spec.ts
deleted file mode 100644
index fd081be8ddb9eb66b376e68d7bdc2cba9139d8f2..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MoreMenuComponent } from './more-menu.component';
-
-describe('MoreMenuComponent', () => {
- let component: MoreMenuComponent;
- let fixture: ComponentFixture<MoreMenuComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [MoreMenuComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(MoreMenuComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.ts
deleted file mode 100644
index 897af6c72e72bf7bfe679079e24fbdb4b46a2304..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/more-menu/more-menu.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'admin-more-menu',
- templateUrl: './more-menu.component.html',
- styles: [],
-})
-export class MoreMenuComponent {}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.html b/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.html
deleted file mode 100644
index 60776b3e9972546299317c813e0fd34c7b5d7be8..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<a
- [routerLink]="link"
- routerLinkActive="active-link"
- data-test-id="anchor"
- class="mb-1 flex items-center gap-4 rounded-full p-3 font-semibold hover:bg-ozgblue-200 active:bg-ozgblue-200/75"
->
- <img [src]="imageSrc" [alt]="name" class="w-6" [attr.data-test-id]="'image-' + name" />
- <span [attr.data-test-id]="'navigation-label-' + name | convertForDataTest">{{ name }}</span>
-</a>
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.scss b/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.scss
deleted file mode 100644
index 9214426c081848ac1a46efac41e715a120eeff02..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.active-link:not(:hover):not(:active) {
- @apply bg-ozgblue-100;
-}
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
deleted file mode 100644
index 21822ae354e1a6a11629a652220a62edc5d100a0..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.spec.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-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 { RouterTestingModule } from '@angular/router/testing';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
-import { NavigationItemComponent } from './navigation-item.component';
-
-describe('NavigationItemComponent', () => {
- let component: NavigationItemComponent;
- let fixture: ComponentFixture<NavigationItemComponent>;
-
- const anchorLink = getDataTestIdOf('anchor');
- const navigationLabelName = 'test';
- const image = getDataTestIdOf('image-' + navigationLabelName);
- const label = getDataTestIdOf('navigation-label-' + navigationLabelName);
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [NavigationItemComponent, ConvertForDataTestPipe],
- imports: [ReactiveFormsModule, RouterTestingModule],
- }).compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(NavigationItemComponent);
- component = fixture.componentInstance;
- component.name = 'test';
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- it('should use imageSrc input', () => {
- const imageSrc = 'imagesrc';
- component.imageSrc = imageSrc;
-
- fixture.detectChanges();
-
- const imageElement: HTMLImageElement = getElementFromFixture(fixture, image);
- expect(imageElement.getAttribute('src')).toBe(imageSrc);
- });
-
- it('should use router link', () => {
- const link = '/testroute';
- component.link = link;
-
- fixture.detectChanges();
-
- const anchorElement: HTMLAnchorElement = getElementFromFixture(fixture, anchorLink);
- expect(anchorElement.getAttribute('ng-reflect-router-link')).toBe(link);
- });
-
- describe('image name', () => {
- it('should be used for alt', () => {
- const imageElement = getElementFromFixture(fixture, image);
- expect(imageElement.alt).toBe(navigationLabelName);
- });
-
- it('should be used for navigation-label', () => {
- const labelElement = getElementFromFixture(fixture, label);
- expect(labelElement.textContent).toBe(navigationLabelName);
- });
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.ts
deleted file mode 100644
index a7adc2cb8268e576cf6cd38b74e832b6f0de0797..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/navigation-item/navigation-item.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, Input } from '@angular/core';
-
-@Component({
- selector: 'admin-navigation-item',
- templateUrl: './navigation-item.component.html',
- styleUrls: ['./navigation-item.component.scss'],
-})
-export class NavigationItemComponent {
- @Input()
- link: string;
- @Input()
- imageSrc: string;
- @Input()
- name = 'Navigations-Link';
-}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.html b/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.html
deleted file mode 100644
index d5e7731728de024e1aeba9f9dbfaa4c86728fe0d..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<button
- (click)="clickEmitter.emit($event)"
- [disabled]="submitInProgress"
- type="button"
- class="me-2 inline-flex items-center rounded-lg bg-ozgblue-700 px-5 py-2.5 text-center text-sm font-medium text-white hover:bg-ozgblue-800 focus:ring-4 focus:ring-ozgblue-300 active:bg-ozgblue-600/90 disabled:bg-ozgblue-600/50 dark:bg-ozgblue-600 dark:hover:bg-ozgblue-700 dark:focus:ring-ozgblue-800"
->
- <svg
- *ngIf="submitInProgress"
- aria-hidden="true"
- role="status"
- class="me-3 inline h-4 w-4 animate-spin text-white"
- viewBox="0 0 100 101"
- fill="none"
- xmlns="http://www.w3.org/2000/svg"
- >
- <path
- d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
- fill="#E5E7EB"
- />
- <path
- d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
- fill="currentColor"
- />
- </svg>
- {{ label }}
-</button>
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.spec.ts
deleted file mode 100644
index a48b945b7fabdc55f6c58b44c4cce238c11315de..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PrimaryButtonComponent } from './primary-button.component';
-
-describe('PrimaryButtonComponent', () => {
- let component: PrimaryButtonComponent;
- let fixture: ComponentFixture<PrimaryButtonComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [PrimaryButtonComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(PrimaryButtonComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.ts
deleted file mode 100644
index 365dd569dae6f5a1cf82c94eab2215c70249b815..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/primary-button/primary-button.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-@Component({
- selector: 'admin-primary-button',
- templateUrl: './primary-button.component.html',
-})
-export class PrimaryButtonComponent {
- @Output()
- clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
-
- @Input()
- submitInProgress: boolean;
-
- @Input()
- label: string;
-}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.html b/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.html
deleted file mode 100644
index 9129a6ce150aad72c0d6dbf2ee7c8ce7f0b36195..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<button
- (click)="clickEmitter.emit($event)"
- [disabled]="disabled"
- class="rounded border border-ozgblue-500 bg-transparent px-4 py-2 font-semibold text-ozgblue-700 hover:border-transparent hover:bg-ozgblue-500 hover:text-white active:bg-ozgblue-500/70"
->
- {{ label }}
-</button>
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.spec.ts
deleted file mode 100644
index c50d78977381f148ddf59e6fa27020a88d74e43c..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SecondaryButtonComponent } from './secondary-button.component';
-
-describe('SecondaryButtonComponent', () => {
- let component: SecondaryButtonComponent;
- let fixture: ComponentFixture<SecondaryButtonComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [SecondaryButtonComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SecondaryButtonComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.ts
deleted file mode 100644
index 99bcd42bee927b79e8dda0cf39cfae5ac17d43f7..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/secondary-button/secondary-button.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-@Component({
- selector: 'admin-secondary-button',
- templateUrl: './secondary-button.component.html',
-})
-export class SecondaryButtonComponent {
- @Output()
- clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
-
- @Input()
- disabled: boolean;
-
- @Input()
- label: string;
-}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.html b/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.html
deleted file mode 100644
index 44ef993322a3dd799dfd5b807a11a8ed8d08fc3c..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div
- class="text-surface inline-block h-8 w-8 animate-spin rounded-full border-4 border-solid border-ozgblue-500 border-e-transparent align-[-0.125em] motion-reduce:animate-[spin_1.5s_linear_infinite] dark:text-white"
- role="status"
-></div>
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.spec.ts
deleted file mode 100644
index 8c8fd9ebc126388ce720aaadbbfd46d6d29bcd84..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SpinnerComponent } from './spinner.component';
-
-describe('SpinnerComponent', () => {
- let component: SpinnerComponent;
- let fixture: ComponentFixture<SpinnerComponent>;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [SpinnerComponent],
- }).compileComponents();
-
- fixture = TestBed.createComponent(SpinnerComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.ts b/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.ts
deleted file mode 100644
index ea1d1c44e703219a43d5a7ee25c4919e14ec8749..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/spinner/spinner.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'admin-spinner',
- templateUrl: './spinner.component.html',
- styles: [],
-})
-export class SpinnerComponent {}
diff --git a/alfa-client/libs/admin/settings/src/lib/shared/text-field/text-field.component.html b/alfa-client/libs/admin/settings/src/lib/shared/text-field/text-field.component.html
deleted file mode 100644
index 303f8720da7e44c2cdcc5618f70a64d366e4c64e..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/text-field/text-field.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="flex flex-col">
- <label class="grid grid-cols-2 items-center">
- <span
- [attr.data-test-id]="'text-field-span-' + label | convertForDataTest"
- [ngClass]="control?.invalid ? ['text-red-500', 'font-bold'] : []"
- >{{ label }}</span
- >
- <input
- class="m-[2px] p-[2px] outline outline-2 outline-gray-100 focus:outline-0 focus:outline-gray-500"
- [attr.data-test-id]="'text-field-input-' + label | convertForDataTest"
- type="text"
- [formControl]="fieldControl"
- />
- </label>
- <div
- *ngIf="invalidParams.length > 0"
- [attr.data-test-id]="'text-field-errors-' + label | convertForDataTest"
- >
- <span class="mb-3 italic text-red-500" *ngFor="let invalidParam of invalidParams">{{
- getErrorMessage(invalidParam)
- }}</span>
- </div>
-</div>
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
deleted file mode 100644
index 9096bedd3ab98897a3adc9474b291c7703144572..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/text-field/text-field.component.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { ConvertForDataTestPipe, InvalidParam } from '@alfa-client/tech-shared';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ReactiveFormsModule } from '@angular/forms';
-import { createInvalidParam, createProblemDetail } from 'libs/tech-shared/test/error';
-import { TextFieldComponent } from './text-field.component';
-
-import * as TechValidationUtil from 'libs/tech-shared/src/lib/validation/tech.validation.util';
-
-describe('TextFieldComponent', () => {
- let component: TextFieldComponent;
- let fixture: ComponentFixture<TextFieldComponent>;
-
- const label = 'custom';
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [TextFieldComponent, ConvertForDataTestPipe],
- imports: [ReactiveFormsModule],
- }).compileComponents();
-
- fixture = TestBed.createComponent(TextFieldComponent);
- component = fixture.componentInstance;
- component.label = label;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- describe('getErrorMessage', () => {
- it('should call getMessageForInvalidParam()', () => {
- const getMessageForInvalidParam: jest.SpyInstance<string, [string, InvalidParam]> =
- jest.spyOn(TechValidationUtil, 'getMessageForInvalidParam');
- const invalidParam: InvalidParam = createInvalidParam();
-
- component.getErrorMessage(invalidParam);
-
- expect(getMessageForInvalidParam).toHaveBeenCalledWith(label, invalidParam);
- });
- });
-
- describe('show error messages', () => {
- it('should not call getErrorMessage() if no error', () => {
- component.getErrorMessage = jest.fn();
- component.fieldControl.setErrors({});
-
- fixture.detectChanges();
-
- expect(component.getErrorMessage).not.toHaveBeenCalled();
- });
-
- it('should call getErrorMessage() if error', () => {
- component.getErrorMessage = jest.fn();
-
- component.fieldControl.setErrors({
- ...createProblemDetail(),
- invalidParams: [{ ...createInvalidParam(), name: 'settingBody.absender.name' }],
- });
-
- fixture.detectChanges();
-
- expect(component.getErrorMessage).toHaveBeenCalled();
- });
- });
-});
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
deleted file mode 100644
index 00037394425175ac3fcca9fe68b1ba286e3c6315..0000000000000000000000000000000000000000
--- a/alfa-client/libs/admin/settings/src/lib/shared/text-field/text-field.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { getMessageForInvalidParam, InvalidParam } from '@alfa-client/tech-shared';
-import { Component, Input } from '@angular/core';
-import { FormControlEditorAbstractComponent } from '@ods/component';
-
-@Component({
- selector: 'text-field',
- templateUrl: './text-field.component.html',
-})
-export class TextFieldComponent extends FormControlEditorAbstractComponent {
- @Input()
- label: string;
-
- public getErrorMessage(invalidParam: InvalidParam): string {
- return getMessageForInvalidParam(this.label, invalidParam);
- }
-}
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.html b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..1536bc42050127ed1f837d7a36de32b1ef513025
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.html
@@ -0,0 +1,28 @@
+<div class="max-w-[960px]" [formGroup]="formService.form">
+ <h1 class="heading-1 mb-4">Benutzer anlegen</h1>
+ <div class="mb-4 grid gap-4 xl:grid-cols-2">
+ <ods-text-editor [formControlName]="UserAddFormService.VORNAME" label="Vorname" required="true" />
+ <ods-text-editor [formControlName]="UserAddFormService.NACHNAME" label="Nachname" required="true" />
+ <ods-text-editor [formControlName]="UserAddFormService.BENUTZERNAME" label="Benutzername" required="true" />
+ <ods-text-editor [formControlName]="UserAddFormService.EMAIL" label="E-Mail" required="true" />
+ </div>
+
+ <h3 class="text-md mb-4 block font-medium text-text">Organisationseinheiten</h3>
+ <ods-button-with-spinner text="Organisationseinheit hinzufügen" variant="outline" dataTestId="Add-organisationseinheit-button" />
+
+ <h2 class="heading-2 mt-4">Rollen für OZG-Cloud</h2>
+ <div [formGroupName]="UserAddFormService.ROLLEN_GROUP" class="mb-8 flex gap-56">
+ <div [formGroupName]="UserAddFormService.ADMINISTRATION_GROUP" class="flex flex-col gap-2">
+ <h3 class="text-md block font-medium text-text">Administration</h3>
+ <ods-checkbox-editor [formControlName]="UserAddFormService.ADMIN" label="Admin" inputId="admin" />
+ </div>
+ <div [formGroupName]="UserAddFormService.ALFA_GROUP" class="flex flex-col gap-2">
+ <h3 class="text-md block font-medium text-text">Alfa</h3>
+ <ods-checkbox-editor [formControlName]="UserAddFormService.LOESCHEN" label="Löschen" inputId="delete" />
+ <ods-checkbox-editor [formControlName]="UserAddFormService.USER" label="User" inputId="user" />
+ <ods-checkbox-editor [formControlName]="UserAddFormService.POSTSTELLE" label="Poststelle" inputId="post_office" />
+ </div>
+ </div>
+
+ <ods-button-with-spinner text="Speichern" dataTestId="save-button" />
+</div>
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..079e9ce8630f1e18fe93ba2d48d55997e9c6d378
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { CommonModule } from '@angular/common';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { ButtonWithSpinnerComponent, CheckboxEditorComponent, TextEditorComponent } from '@ods/component';
+import { UserAddFormComponent } from './user-add-form.component';
+
+describe('UserAddFormComponent', () => {
+ let component: UserAddFormComponent;
+ let fixture: ComponentFixture<UserAddFormComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [UserAddFormComponent],
+ imports: [CommonModule, ButtonWithSpinnerComponent, ReactiveFormsModule, TextEditorComponent, CheckboxEditorComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(UserAddFormComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ee7830b3127a701025620bc208c559b2c05eb6d4
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.component.ts
@@ -0,0 +1,13 @@
+import { Component, inject } from '@angular/core';
+import { UserAddFormService } from './user-add-form.service';
+
+@Component({
+ selector: 'admin-user-add-form',
+ providers: [UserAddFormService],
+ templateUrl: './user-add-form.component.html',
+})
+export class UserAddFormComponent {
+ formService = inject(UserAddFormService);
+
+ protected readonly UserAddFormService = UserAddFormService;
+}
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.service.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f497893d00505e06c0170387a582f9d27fa35745
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-form.service.ts
@@ -0,0 +1,91 @@
+import { AbstractFormService, EMPTY_STRING, StateResource } from '@alfa-client/tech-shared';
+import { Injectable } from '@angular/core';
+import { AbstractControl, FormControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Resource } from '@ngxp/rest';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class UserAddFormService extends AbstractFormService {
+ public static readonly VORNAME: string = 'vorname';
+ public static readonly NACHNAME: string = 'nachname';
+ public static readonly BENUTZERNAME: string = 'benutzername';
+ public static readonly EMAIL: string = 'e-mail';
+
+ public static readonly ROLLEN_GROUP: string = 'rollen';
+ public static readonly ADMINISTRATION_GROUP: string = 'administration';
+ public static readonly ADMIN: string = 'admin';
+ public static readonly ALFA_GROUP: string = 'alfa';
+ public static readonly LOESCHEN: string = 'loeschen';
+ public static readonly USER: string = 'user';
+ public static readonly POSTSTELLE: string = 'poststelle';
+
+ public static readonly USER_ADD_PREFIX: string = 'userAdd';
+
+ constructor(public formBuilder: UntypedFormBuilder) {
+ super(formBuilder);
+ this.initAlfaGroupLogic();
+ }
+
+ protected initForm(): UntypedFormGroup {
+ return this.formBuilder.group({
+ [UserAddFormService.VORNAME]: new FormControl(EMPTY_STRING),
+ [UserAddFormService.NACHNAME]: new FormControl(EMPTY_STRING),
+ [UserAddFormService.BENUTZERNAME]: new FormControl(EMPTY_STRING),
+ [UserAddFormService.EMAIL]: new FormControl(EMPTY_STRING),
+ [UserAddFormService.ROLLEN_GROUP]: this.formBuilder.group({
+ [UserAddFormService.ADMINISTRATION_GROUP]: this.formBuilder.group({
+ [UserAddFormService.ADMIN]: new FormControl(false),
+ }),
+ [UserAddFormService.ALFA_GROUP]: this.formBuilder.group({
+ [UserAddFormService.LOESCHEN]: new FormControl(false),
+ [UserAddFormService.USER]: new FormControl(false),
+ [UserAddFormService.POSTSTELLE]: new FormControl(false),
+ }),
+ }),
+ });
+ }
+
+ protected initAlfaGroupLogic(): void {
+ const alfaGroup: UntypedFormGroup = this.getAlfaGroup();
+ alfaGroup.valueChanges.subscribe(() => {
+ this.handleAlfaGroupChange(alfaGroup);
+ });
+ }
+
+ private getAlfaGroup(): UntypedFormGroup {
+ return <UntypedFormGroup>this.form.get(UserAddFormService.ROLLEN_GROUP).get(UserAddFormService.ALFA_GROUP);
+ }
+
+ handleAlfaGroupChange(group: UntypedFormGroup): void {
+ const anyChecked: boolean = this.isAnyChecked(group);
+ if (anyChecked) {
+ this.disableUncheckedCheckboxes(group);
+ } else {
+ this.enableAllCheckboxes(group);
+ }
+ }
+
+ isAnyChecked(group: UntypedFormGroup): boolean {
+ return Object.keys(group.controls).some((key) => group.controls[key].value);
+ }
+
+ disableUncheckedCheckboxes(alfaGroup: UntypedFormGroup): void {
+ for (const control of Object.values<AbstractControl>(alfaGroup.controls)) {
+ if (control.value === false) control.disable({ emitEvent: false });
+ }
+ }
+
+ enableAllCheckboxes(group: UntypedFormGroup): void {
+ for (const control of Object.values<AbstractControl>(group.controls)) {
+ control.enable({ emitEvent: false });
+ }
+ }
+
+ protected doSubmit(): Observable<StateResource<Resource>> {
+ throw new Error('Method not implemented.');
+ }
+
+ protected getPathPrefix(): string {
+ return UserAddFormService.USER_ADD_PREFIX;
+ }
+}
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-formservice.spec.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-formservice.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..82048540fdf5cfbaa2da64004a03673670168f92
--- /dev/null
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/user-add-form/user-add-formservice.spec.ts
@@ -0,0 +1,112 @@
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { AbstractControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { UserAddFormService } from './user-add-form.service';
+import SpyInstance = jest.SpyInstance;
+
+describe('UserAddFormService', () => {
+ let formService: UserAddFormService;
+ let alfaGroup: UntypedFormGroup;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [UserAddFormService, UntypedFormBuilder],
+ });
+
+ formService = TestBed.inject(UserAddFormService);
+ alfaGroup = <UntypedFormGroup>formService.form.get(UserAddFormService.ROLLEN_GROUP).get(UserAddFormService.ALFA_GROUP);
+ });
+
+ it('should create', () => {
+ expect(formService).toBeTruthy();
+ });
+
+ describe('initAlfaGroupLogic', () => {
+ it('should call handleAlfaGroupChange when value of form element changes', fakeAsync(() => {
+ const handleAlfaGroupChangeSpy: SpyInstance = jest.spyOn(formService as any, 'handleAlfaGroupChange');
+
+ alfaGroup.get(UserAddFormService.LOESCHEN).setValue(true);
+
+ tick();
+
+ expect(handleAlfaGroupChangeSpy).toHaveBeenCalled();
+ }));
+ });
+
+ describe('handleAlfaGroupChange', () => {
+ it('should call disableUncheckedCheckboxes if any checkbox is checked', () => {
+ jest.spyOn(formService as any, 'isAnyChecked').mockReturnValue(true);
+ const disableUncheckedCheckboxesSpy: SpyInstance = jest.spyOn(formService as any, 'disableUncheckedCheckboxes');
+
+ formService.handleAlfaGroupChange(alfaGroup);
+
+ expect(disableUncheckedCheckboxesSpy).toHaveBeenCalled();
+ });
+
+ it('should call enableAllCheckboxes if not any checkbox is checked', () => {
+ jest.spyOn(formService as any, 'isAnyChecked').mockReturnValue(false);
+ const enableAllCheckboxesSpy: SpyInstance = jest.spyOn(formService as any, 'enableAllCheckboxes');
+
+ formService.handleAlfaGroupChange(alfaGroup);
+
+ expect(enableAllCheckboxesSpy).toHaveBeenCalled();
+ });
+ });
+
+ describe('isAnyChecked', () => {
+ it('should return false if no checkbox is checked', () => {
+ const result = formService.isAnyChecked(alfaGroup);
+
+ expect(result).toBe(false);
+ });
+
+ it('should return true if any checkbox is checked', () => {
+ alfaGroup.get(UserAddFormService.LOESCHEN).setValue(true);
+
+ const result = formService.isAnyChecked(alfaGroup);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe('disableUncheckedCheckboxes', () => {
+ it('if control value is false then control should be disabled', () => {
+ const control: AbstractControl = alfaGroup.get(UserAddFormService.LOESCHEN);
+ control.setValue(false);
+
+ formService.disableUncheckedCheckboxes(alfaGroup);
+
+ expect(control.disabled).toBe(true);
+ });
+
+ it('if control value is true then control should NOT be disabled', () => {
+ const control: AbstractControl = alfaGroup.get(UserAddFormService.LOESCHEN);
+ control.setValue(true);
+
+ formService.disableUncheckedCheckboxes(alfaGroup);
+
+ expect(control.disabled).toBe(false);
+ });
+ });
+
+ describe('updateCheckboxStates', () => {
+ it('if control value is false then control should be disabled', () => {
+ const control: AbstractControl = alfaGroup.get(UserAddFormService.LOESCHEN);
+ control.setValue(false);
+
+ formService.disableUncheckedCheckboxes(alfaGroup);
+
+ expect(control.disabled).toBe(true);
+ });
+ });
+
+ describe('enableAllCheckboxes', () => {
+ it('if control value is true then control should be enabled', () => {
+ const control: AbstractControl = alfaGroup.get(UserAddFormService.LOESCHEN);
+ const enableSpy = jest.spyOn(control, 'enable');
+
+ formService.enableAllCheckboxes(alfaGroup);
+
+ expect(enableSpy).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.html b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.html
index 09160afabe086d514782957cb31784a715e747f1..b9d08648462df8ef917ab8c201bd0f8948e68165 100644
--- a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.html
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.html
@@ -1,7 +1,12 @@
<h1 class="heading-1">Benutzer & Rollen</h1>
-<ods-button-with-spinner text="Benutzer hinzufügen" class="py-8" dataTestId="add-user-button" />
+<ods-button-with-spinner
+ text="Benutzer hinzufügen"
+ class="py-8"
+ dataTestId="Add-user-button"
+ (clickEmitter)="navigateToAddUser()"
+/>
<ods-list *ngIf="users$ | async as users">
- <ods-list-item *ngFor="let user of users.resource" [path]="user.username">
+ <ods-list-item *ngFor="let user of users.resource" [path]="user.username" [attr.data-test-id]="'User-entry-' + user.username">
<div class="flex-1 basis-1/2">
<div class="mb-2 flex flex-wrap items-center gap-3">
<h3 class="text-md font-semibold">{{ user | toUserName }}</h3>
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.spec.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.spec.ts
index 49182ee84673fa793f0cbe0ee14eb694ab6f2319..d7c6ca07647f7f99249ee4bf6bf1c0eb33634f58 100644
--- a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.spec.ts
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.spec.ts
@@ -1,8 +1,12 @@
+import { createStateResource } from '@alfa-client/tech-shared';
import { Mock, mock } from '@alfa-client/test-utils';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { MailboxIconComponent, PersonIconComponent } from '@ods/system';
import { MockComponent, MockPipe } from 'ng-mocks';
+import { ROUTES } from '../../../../shared';
+import { createUser } from '../../../test/user/user';
import { ToUserNamePipe } from '../user/to-user-name.pipe';
import { UserService } from './user.service';
import { UsersRolesComponent } from './users-roles.component';
@@ -10,6 +14,7 @@ import { UsersRolesComponent } from './users-roles.component';
describe('UsersRolesComponent', () => {
let component: UsersRolesComponent;
let fixture: ComponentFixture<UsersRolesComponent>;
+ let router: Router;
const userService: Mock<UserService> = {
...mock(UserService),
@@ -28,11 +33,37 @@ describe('UsersRolesComponent', () => {
],
}).compileComponents();
+ TestBed.inject(UserService);
+ router = TestBed.inject(Router);
+
fixture = TestBed.createComponent(UsersRolesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
+ describe('component', () => {
+ describe('ngOnInit', () => {
+ it('should get users from userService', () => {
+ const userState = createStateResource([createUser()]);
+ userService.get.mockReturnValueOnce(userState);
+
+ component.ngOnInit();
+
+ expect(component.users$).toBe(userState);
+ });
+ });
+
+ describe('navigateToAddUser', () => {
+ it('should navigate to add user', () => {
+ const routerSpy = jest.spyOn(router as any, 'navigate');
+
+ component.navigateToAddUser();
+
+ expect(routerSpy).toHaveBeenCalledWith([ROUTES.BENUTZER_UND_ROLLEN_NEU]);
+ });
+ });
+ });
+
describe('template', () => {
it('should create', () => {
expect(component).toBeTruthy();
diff --git a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.ts b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.ts
index 46003c627d6c355241eba06d875e49d4d7df0f2b..b9fead2dca191c13c751519b63ba94c4c794b466 100644
--- a/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.ts
+++ b/alfa-client/libs/admin/settings/src/lib/users-roles/users-roles.component.ts
@@ -1,6 +1,8 @@
import { StateResource } from '@alfa-client/tech-shared';
-import { Component } from '@angular/core';
+import { Component, inject, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
import { Observable } from 'rxjs';
+import { ROUTES } from '../../../../shared/libs/routes';
import { User } from '../user/user.model';
import { UserService } from './user.service';
@@ -8,11 +10,18 @@ import { UserService } from './user.service';
selector: 'admin-users-roles',
templateUrl: './users-roles.component.html',
})
-export class UsersRolesComponent {
+export class UsersRolesComponent implements OnInit {
+ private router = inject(Router);
+ private userService = inject(UserService);
+
public users$: Observable<StateResource<User[]>>;
public readonly GROUPS_TO_DISPLAY = 3;
- constructor(private userService: UserService) {
+ ngOnInit() {
this.users$ = this.userService.get();
}
+
+ navigateToAddUser(): void {
+ this.router.navigate([ROUTES.BENUTZER_UND_ROLLEN_NEU]);
+ }
}
diff --git a/alfa-client/libs/admin/shared/index.ts b/alfa-client/libs/admin/shared/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e41b2f175f471052508f2cab70d1f33dae2a2d27
--- /dev/null
+++ b/alfa-client/libs/admin/shared/index.ts
@@ -0,0 +1 @@
+export * from './libs/routes';
diff --git a/alfa-client/libs/admin/shared/libs/routes.ts b/alfa-client/libs/admin/shared/libs/routes.ts
new file mode 100644
index 0000000000000000000000000000000000000000..631028e873a7a4815b9bdefe0b7331b6fbca099c
--- /dev/null
+++ b/alfa-client/libs/admin/shared/libs/routes.ts
@@ -0,0 +1,6 @@
+export const ROUTES = {
+ POSTFACH: 'postfach',
+ BENUTZER_UND_ROLLEN: 'benutzer_und_rollen',
+ BENUTZER_UND_ROLLEN_NEU: 'benutzer_und_rollen/neu',
+ ORGANISATIONSEINHEITEN: 'organisationseinheiten',
+};
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.model.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.model.ts
index 9e7f485b57dde472449b84617e056c6590b56c67..0b7283732bb6d3096ed251d2281503016f739b93 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.model.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.model.ts
@@ -5,6 +5,7 @@ export enum BescheidStatus {
DRAFT = 'DRAFT',
SENT = 'SENT',
}
+
export interface Bescheid {
status: BescheidStatus;
beschiedenAm: string;
@@ -30,3 +31,13 @@ export interface UploadFileInProgress {
fileName?: string;
error?: HttpError;
}
+
+export enum BescheidWizardStep {
+ AntragBescheiden = 1,
+ DokumenteHochladen = 2,
+ BescheidVersenden = 3,
+}
+
+export interface BescheidWizardDialogResult {
+ reloadVorgang: boolean;
+}
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 4eb95c74da90efb1b6c868d02960da27fe81d28c..e36a84e4df075733f10c4bfce67483f094ca0daa 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
@@ -1,14 +1,5 @@
-import {
- BinaryFileListResource,
- BinaryFileResource,
- BinaryFileService,
-} from '@alfa-client/binary-file-shared';
-import {
- CommandOrder,
- CommandResource,
- CommandService,
- CreateCommandProps,
-} from '@alfa-client/command-shared';
+import { BinaryFileListResource, BinaryFileResource, BinaryFileService } from '@alfa-client/binary-file-shared';
+import { CommandOrder, CommandResource, CommandService, CreateCommandProps } from '@alfa-client/command-shared';
import {
ApiError,
EMPTY_ARRAY,
@@ -34,10 +25,7 @@ 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, of } from 'rxjs';
-import {
- createBinaryFileListResource,
- createBinaryFileResource,
-} from '../../../binary-file-shared/test/binary-file';
+import { createBinaryFileListResource, createBinaryFileResource } from '../../../binary-file-shared/test/binary-file';
import {
createCommandErrorResource,
createCommandResource,
@@ -62,12 +50,14 @@ import {
BescheidListResource,
BescheidResource,
BescheidStatus,
+ BescheidWizardStep,
UploadFileInProgress,
} from './bescheid.model';
import { BescheidService } from './bescheid.service';
import { DocumentLinkRel } from './document.linkrel';
import { DocumentResource } from './document.model';
+import { PostfachService } from '@alfa-client/postfach-shared';
import * as DateUtil from '../../../tech-shared/src/lib/date.util';
import * as BescheidUtil from './bescheid.util';
@@ -80,20 +70,21 @@ describe('BescheidService', () => {
let commandService: Mock<CommandService>;
let vorgangCommandService: Mock<VorgangCommandService>;
let binaryFileService: Mock<BinaryFileService>;
+ let postfachService: Mock<PostfachService>;
- const vorgangWithEingangStateResource: StateResource<VorgangWithEingangResource> =
- createStateResource(createVorgangWithEingangResource());
+ const vorgangWithEingangStateResource: StateResource<VorgangWithEingangResource> = createStateResource(
+ createVorgangWithEingangResource(),
+ );
beforeEach(() => {
facade = mock(BescheidFacade);
resourceRepository = mock(ResourceRepository);
commandService = mock(CommandService);
vorgangCommandService = mock(VorgangCommandService);
-
vorgangService = mock(VorgangService);
vorgangService.getVorgangWithEingang.mockReturnValue(of(vorgangWithEingangStateResource));
-
binaryFileService = mock(BinaryFileService);
+ postfachService = mock(PostfachService);
service = new BescheidService(
useFromMock(facade),
@@ -102,6 +93,7 @@ describe('BescheidService', () => {
useFromMock(vorgangCommandService),
useFromMock(binaryFileService),
useFromMock(resourceRepository),
+ useFromMock(postfachService),
);
});
@@ -109,10 +101,25 @@ describe('BescheidService', () => {
expect(service).toBeTruthy();
});
+ describe('getActiveStep', () => {
+ it('should emit initial value', () => {
+ const activeStep$: Observable<number> = service.getActiveStep();
+
+ expect(activeStep$).toBeObservable(singleCold(BescheidWizardStep.AntragBescheiden));
+ });
+ });
+
+ describe('setActiveStep', () => {
+ it('should emit changed active step', () => {
+ service.setActiveStep(BescheidWizardStep.DokumenteHochladen);
+
+ expect(service.activeStep$).toBeObservable(singleCold(BescheidWizardStep.DokumenteHochladen));
+ });
+ });
+
describe('get bescheid draft', () => {
const bescheidDraft: BescheidResource = createBescheidResource();
- const bescheidDraftStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidDraft);
+ const bescheidDraftStateResource: StateResource<BescheidResource> = createStateResource(bescheidDraft);
it('should call resource service', () => {
service.bescheidResourceService.get = jest.fn();
@@ -123,12 +130,9 @@ describe('BescheidService', () => {
});
it('should return value', () => {
- service.bescheidResourceService.get = jest
- .fn()
- .mockReturnValue(singleCold(bescheidDraftStateResource));
+ service.bescheidResourceService.get = jest.fn().mockReturnValue(singleCold(bescheidDraftStateResource));
- const bescheidStateResource$: Observable<StateResource<BescheidResource>> =
- service.getBescheidDraft();
+ const bescheidStateResource$: Observable<StateResource<BescheidResource>> = service.getBescheidDraft();
expect(bescheidStateResource$).toBeObservable(singleCold(bescheidDraftStateResource));
});
@@ -172,21 +176,17 @@ describe('BescheidService', () => {
describe('bescheidErstellungUeberspringen', () => {
describe('Bescheid Draft exists', () => {
- const vorgangWithEingangResource: VorgangWithEingangResource =
- createVorgangWithEingangResource();
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
const bescheidResource: BescheidResource = createBescheidResource();
- const bescheidStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidResource);
+ const bescheidStateResource: StateResource<BescheidResource> = createStateResource(bescheidResource);
const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
service.existsBescheidDraft = jest.fn().mockReturnValue(true);
service.getBescheidDraft = jest.fn().mockReturnValue(of(bescheidStateResource));
- service.bescheidLoeschenUndErstellungUeberspringen = jest
- .fn()
- .mockReturnValue(of(commandStateResource));
+ service.bescheidLoeschenUndErstellungUeberspringen = jest.fn().mockReturnValue(of(commandStateResource));
});
it('should get bescheid draft', (done) => {
@@ -221,8 +221,7 @@ describe('BescheidService', () => {
});
describe('Bescheid Draft not exists', () => {
- const vorgangWithEingangResource: VorgangWithEingangResource =
- createVorgangWithEingangResource();
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
@@ -254,9 +253,7 @@ describe('BescheidService', () => {
let bescheidStateResource: StateResource<BescheidResource>;
beforeEach(() => {
- vorgangStateResource = createStateResource(
- createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]),
- );
+ vorgangStateResource = createStateResource(createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]));
bescheidStateResource = createBescheidStateResource();
vorgangService.getVorgangWithEingang.mockReturnValue(of(vorgangStateResource));
service.getBescheidDraft = jest.fn().mockReturnValue(of(bescheidStateResource));
@@ -269,35 +266,27 @@ describe('BescheidService', () => {
});
it('should emit state resources', () => {
- const bescheid$: Observable<StateResource<BescheidResource>> =
- service.getBescheidDraftIfExists();
+ const bescheid$: Observable<StateResource<BescheidResource>> = service.getBescheidDraftIfExists();
- expect(bescheid$).toBeObservable(
- cold('(ab|)', { a: createEmptyStateResource(), b: bescheidStateResource }),
- );
+ expect(bescheid$).toBeObservable(cold('(ab|)', { a: createEmptyStateResource(), b: bescheidStateResource }));
});
});
describe('bescheidLoeschenUndErstellungUeberspringen', () => {
- const vorgangWithEingangResource: VorgangWithEingangResource =
- createVorgangWithEingangResource();
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
const bescheidResource: BescheidResource = createBescheidResource();
- const vorgangAbschliessenCommandStateResource: StateResource<CommandResource> =
- createCommandStateResource();
+ const vorgangAbschliessenCommandStateResource: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
- service.vorgangAbschliesen = jest
- .fn()
- .mockReturnValue(of(vorgangAbschliessenCommandStateResource));
+ service.vorgangAbschliesen = jest.fn().mockReturnValue(of(vorgangAbschliessenCommandStateResource));
service.deleteBescheid = jest.fn().mockReturnValue(of(createCommandStateResource));
});
it('should Bescheiderstellung überspringen', (done) => {
- const command$: Observable<StateResource<CommandResource>> =
- service.bescheidLoeschenUndErstellungUeberspringen(
- vorgangWithEingangResource,
- bescheidResource,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.bescheidLoeschenUndErstellungUeberspringen(
+ vorgangWithEingangResource,
+ bescheidResource,
+ );
command$.subscribe(() => {
expect(service.vorgangAbschliesen).toHaveBeenCalledWith(vorgangWithEingangResource);
@@ -306,15 +295,12 @@ describe('BescheidService', () => {
});
it('should Bescheid löschen', (done) => {
- service.vorgangAbschliesen = jest
- .fn()
- .mockReturnValue(of(createCommandStateResource([CommandLinkRel.EFFECTED_RESOURCE])));
-
- const command$: Observable<StateResource<CommandResource>> =
- service.bescheidLoeschenUndErstellungUeberspringen(
- vorgangWithEingangResource,
- bescheidResource,
- );
+ service.vorgangAbschliesen = jest.fn().mockReturnValue(of(createCommandStateResource([CommandLinkRel.EFFECTED_RESOURCE])));
+
+ const command$: Observable<StateResource<CommandResource>> = service.bescheidLoeschenUndErstellungUeberspringen(
+ vorgangWithEingangResource,
+ bescheidResource,
+ );
command$.subscribe(() => {
expect(service.deleteBescheid).toHaveBeenCalledWith(bescheidResource);
@@ -325,11 +311,10 @@ describe('BescheidService', () => {
it('should not Bescheid löschen', (done) => {
service.vorgangAbschliesen = jest.fn().mockReturnValue(of(createCommandStateResource()));
- const command$: Observable<StateResource<CommandResource>> =
- service.bescheidLoeschenUndErstellungUeberspringen(
- vorgangWithEingangResource,
- bescheidResource,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.bescheidLoeschenUndErstellungUeberspringen(
+ vorgangWithEingangResource,
+ bescheidResource,
+ );
command$.subscribe(() => {
expect(service.deleteBescheid).not.toHaveBeenCalledWith(bescheidResource);
@@ -338,19 +323,17 @@ describe('BescheidService', () => {
});
it('should emit vorgang abschliessen command', () => {
- const command$: Observable<StateResource<CommandResource>> =
- service.bescheidLoeschenUndErstellungUeberspringen(
- vorgangWithEingangResource,
- bescheidResource,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.bescheidLoeschenUndErstellungUeberspringen(
+ vorgangWithEingangResource,
+ bescheidResource,
+ );
expect(command$).toBeObservable(cold('(a|)', { a: vorgangAbschliessenCommandStateResource }));
});
});
describe('vorgang abschliessen', () => {
- const vorgangWithEingangResource: VorgangWithEingangResource =
- createVorgangWithEingangResource();
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
beforeEach(() => {
@@ -358,9 +341,7 @@ describe('BescheidService', () => {
});
it('should call vorgang command service', (done) => {
- const command$: Observable<StateResource<CommandResource>> = service.vorgangAbschliesen(
- vorgangWithEingangResource,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.vorgangAbschliesen(vorgangWithEingangResource);
command$.subscribe(() => {
expect(vorgangCommandService.abschliessen).toHaveBeenCalledWith(vorgangWithEingangResource);
@@ -369,9 +350,7 @@ describe('BescheidService', () => {
});
it('should return command', () => {
- const command$: Observable<StateResource<CommandResource>> = service.vorgangAbschliesen(
- vorgangWithEingangResource,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.vorgangAbschliesen(vorgangWithEingangResource);
expect(command$).toBeObservable(cold('(a|)', { a: commandStateResource }));
});
@@ -399,8 +378,7 @@ describe('BescheidService', () => {
const commandStateResource: StateResource<CommandResource> = createEmptyStateResource();
commandService.createCommandByProps.mockReturnValue(commandStateResource);
- const createdCommand: Observable<StateResource<CommandResource>> =
- service.deleteBescheid(bescheidResource);
+ const createdCommand: Observable<StateResource<CommandResource>> = service.deleteBescheid(bescheidResource);
expect(createdCommand).toEqual(commandStateResource);
});
@@ -408,11 +386,8 @@ describe('BescheidService', () => {
describe('update bescheid', () => {
const bescheid: Bescheid = createBescheid();
- const commandResource: CommandResource = createCommandResource([
- CommandLinkRel.EFFECTED_RESOURCE,
- ]);
- const commandStateResource: StateResource<CommandResource> =
- createStateResource(commandResource);
+ const commandResource: CommandResource = createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]);
+ const commandStateResource: StateResource<CommandResource> = createStateResource(commandResource);
const createCommandProps: CreateCommandProps = createCreateCommandProps();
let buildUpdateBescheidCommandPropsSpy: jest.SpyInstance;
@@ -428,10 +403,7 @@ describe('BescheidService', () => {
it('should build update bescheid command props', () => {
service.updateBescheid(bescheid);
- expect(buildUpdateBescheidCommandPropsSpy).toHaveBeenCalledWith(
- service.getResource(),
- bescheid,
- );
+ expect(buildUpdateBescheidCommandPropsSpy).toHaveBeenCalledWith(service.getResource(), bescheid);
});
it('should create command', () => {
@@ -441,21 +413,18 @@ describe('BescheidService', () => {
});
it('should return command', () => {
- const updateBescheid$: Observable<StateResource<CommandResource>> =
- service.updateBescheid(bescheid);
+ const updateBescheid$: Observable<StateResource<CommandResource>> = service.updateBescheid(bescheid);
expect(updateBescheid$).toBeObservable(cold('(a|)', { a: commandStateResource }));
});
it('should set resource by uri', (done) => {
- service
- .updateBescheid(bescheid)
- .subscribe((commandStateResource: StateResource<CommandResource>) => {
- expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
- getUrl(commandStateResource.resource, CommandLinkRel.EFFECTED_RESOURCE),
- );
- done();
- });
+ service.updateBescheid(bescheid).subscribe((commandStateResource: StateResource<CommandResource>) => {
+ expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
+ getUrl(commandStateResource.resource, CommandLinkRel.EFFECTED_RESOURCE),
+ );
+ done();
+ });
});
it('should clear create bescheid document in progress', (done) => {
@@ -495,9 +464,7 @@ describe('BescheidService', () => {
let buildSendBescheidCommandPropsSpy: jest.SpyInstance;
beforeEach(() => {
- service.bescheidResourceService.get = jest
- .fn()
- .mockReturnValue(of(createStateResource(bescheidResource)));
+ service.bescheidResourceService.get = jest.fn().mockReturnValue(of(createStateResource(bescheidResource)));
buildSendBescheidCommandPropsSpy = jest
.spyOn(BescheidUtil, 'buildSendBescheidCommandProps')
.mockReturnValue(createCommandProps);
@@ -525,10 +492,7 @@ describe('BescheidService', () => {
});
it('should return command', () => {
- const command$: Observable<StateResource<CommandResource>> = service.sendBescheid(
- bescheidResource,
- linkRel,
- );
+ const command$: Observable<StateResource<CommandResource>> = service.sendBescheid(bescheidResource, linkRel);
expect(command$).toBeObservable(cold('(a|)', { a: commandStateResource }));
});
@@ -545,15 +509,11 @@ describe('BescheidService', () => {
it('should call sendBescheid', () => {
service.sendBescheidManually(bescheidResource);
- expect(service.sendBescheid).toHaveBeenCalledWith(
- bescheidResource,
- BescheidLinkRel.BESCHEIDEN,
- );
+ expect(service.sendBescheid).toHaveBeenCalledWith(bescheidResource, BescheidLinkRel.BESCHEIDEN);
});
it('should return command', () => {
- const command$: Observable<StateResource<CommandResource>> =
- service.sendBescheidManually(bescheidResource);
+ const command$: Observable<StateResource<CommandResource>> = service.sendBescheidManually(bescheidResource);
expect(command$).toBeObservable(singleColdCompleted(sendBescheidCommand));
});
@@ -570,15 +530,11 @@ describe('BescheidService', () => {
it('should call sendBescheid', () => {
service.sendBescheidToAntragsteller(bescheidResource);
- expect(service.sendBescheid).toHaveBeenCalledWith(
- bescheidResource,
- BescheidLinkRel.BESCHEIDEN_UND_SENDEN,
- );
+ expect(service.sendBescheid).toHaveBeenCalledWith(bescheidResource, BescheidLinkRel.BESCHEIDEN_UND_SENDEN);
});
it('should return command', () => {
- const command$: Observable<StateResource<CommandResource>> =
- service.sendBescheidToAntragsteller(bescheidResource);
+ const command$: Observable<StateResource<CommandResource>> = service.sendBescheidToAntragsteller(bescheidResource);
expect(command$).toBeObservable(singleColdCompleted(sendBescheidCommand));
});
@@ -619,9 +575,7 @@ describe('BescheidService', () => {
beforeEach(() => {
bescheidResource = createBescheidResource([BescheidLinkRel.ATTACHMENTS]);
- service.getBescheidDraft = jest
- .fn()
- .mockReturnValue(of(createStateResource(bescheidResource)));
+ service.getBescheidDraft = jest.fn().mockReturnValue(of(createStateResource(bescheidResource)));
binaryFileResource = createBinaryFileResource();
@@ -631,10 +585,7 @@ describe('BescheidService', () => {
it('should get files', (done) => {
service.getAttachments().subscribe(() => {
- expect(binaryFileService.getFiles).toHaveBeenCalledWith(
- bescheidResource,
- BescheidLinkRel.ATTACHMENTS,
- );
+ expect(binaryFileService.getFiles).toHaveBeenCalledWith(bescheidResource, BescheidLinkRel.ATTACHMENTS);
done();
});
});
@@ -664,8 +615,7 @@ describe('BescheidService', () => {
describe('get bescheid document file', () => {
it('should return value', (done) => {
const binaryFile: BinaryFileResource = createBinaryFileResource();
- const binaryFileStateResource: StateResource<BinaryFileResource> =
- createStateResource(binaryFile);
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(binaryFile);
service.bescheidDocumentFile$.next(binaryFileStateResource);
service.getBescheidDocumentFile().subscribe((result: StateResource<BinaryFileResource>) => {
@@ -706,13 +656,11 @@ describe('BescheidService', () => {
});
it('should return bescheid document file', (done) => {
- service
- .uploadBescheidDocument(bescheid, file)
- .subscribe((uploadFileInProgress: UploadFileInProgress) => {
- expect(uploadFileInProgress.fileName).toBe(file.name);
- expect(uploadFileInProgress.loading).toBeTruthy();
- done();
- });
+ service.uploadBescheidDocument(bescheid, file).subscribe((uploadFileInProgress: UploadFileInProgress) => {
+ expect(uploadFileInProgress.fileName).toBe(file.name);
+ expect(uploadFileInProgress.loading).toBeTruthy();
+ done();
+ });
});
});
@@ -720,9 +668,7 @@ describe('BescheidService', () => {
const bescheid: BescheidResource = createBescheidResource();
const file: File = createFile();
- const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
- createBinaryFileResource(),
- );
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(createBinaryFileResource());
beforeEach(() => {
binaryFileService.uploadFile.mockReturnValue(of(binaryFileStateResource));
@@ -731,12 +677,7 @@ describe('BescheidService', () => {
it('should call binary file service', () => {
service.doUploadBescheidDocument(bescheid, file);
- expect(binaryFileService.uploadFile).toHaveBeenCalledWith(
- bescheid,
- BescheidLinkRel.UPLOAD_BESCHEID_FILE,
- file,
- false,
- );
+ expect(binaryFileService.uploadFile).toHaveBeenCalledWith(bescheid, BescheidLinkRel.UPLOAD_BESCHEID_FILE, file, false);
});
it('should call handle upload becheid document response', () => {
@@ -744,10 +685,7 @@ describe('BescheidService', () => {
service.doUploadBescheidDocument(bescheid, file);
- expect(service.handleUploadBescheidDocumentResponse).toHaveBeenCalledWith(
- bescheid,
- binaryFileStateResource,
- );
+ expect(service.handleUploadBescheidDocumentResponse).toHaveBeenCalledWith(bescheid, binaryFileStateResource);
});
});
@@ -756,10 +694,8 @@ describe('BescheidService', () => {
const binaryFile: BinaryFileResource = createBinaryFileResource();
const apiError: ApiError = createApiError();
- const binaryFileErrorStateResource: StateResource<BinaryFileResource> =
- createErrorStateResource(apiError);
- const binaryFileStateResource: StateResource<BinaryFileResource> =
- createStateResource(binaryFile);
+ const binaryFileErrorStateResource: StateResource<BinaryFileResource> = createErrorStateResource(apiError);
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(binaryFile);
it('should call create bescheid document from file on success', () => {
service.createBescheidDocumentFromFile = jest.fn();
@@ -813,10 +749,7 @@ describe('BescheidService', () => {
it('should build create command document from file props', () => {
service.createBescheidDocumentFromFile(bescheid, binaryFile);
- expect(buildCreateBescheidDocumentFromFilePropsSpy).toHaveBeenCalledWith(
- bescheid,
- binaryFile,
- );
+ expect(buildCreateBescheidDocumentFromFilePropsSpy).toHaveBeenCalledWith(bescheid, binaryFile);
});
it('should call handle create bescheid document from file response', () => {
@@ -824,10 +757,7 @@ describe('BescheidService', () => {
service.createBescheidDocumentFromFile(bescheid, binaryFile);
- expect(service.handleCreateBescheidDocumentFromFileResponse).toHaveBeenCalledWith(
- commandStateResource,
- binaryFile,
- );
+ expect(service.handleCreateBescheidDocumentFromFileResponse).toHaveBeenCalledWith(commandStateResource, binaryFile);
});
});
@@ -849,8 +779,7 @@ describe('BescheidService', () => {
describe('on error', () => {
it('should set upload bescheid in progress error', () => {
const httpError: HttpError = createApiError();
- const errorStateResource: StateResource<CommandResource> =
- createErrorStateResource(httpError);
+ const errorStateResource: StateResource<CommandResource> = createErrorStateResource(httpError);
service.handleCreateBescheidDocumentFromFileResponse(errorStateResource, binaryFile);
@@ -859,8 +788,7 @@ describe('BescheidService', () => {
it('should set upload bescheid in progress loading false', () => {
const httpError: HttpError = createApiError();
- const errorStateResource: StateResource<CommandResource> =
- createErrorStateResource(httpError);
+ const errorStateResource: StateResource<CommandResource> = createErrorStateResource(httpError);
service.handleCreateBescheidDocumentFromFileResponse(errorStateResource, binaryFile);
@@ -878,9 +806,7 @@ describe('BescheidService', () => {
it('should set document uri', () => {
service.handleCreateBescheidDocumentFromFileResponse(commandStateResource, binaryFile);
- expect(service.bescheidDocumentUri$.value).toEqual(
- getUrl(command, CommandLinkRel.EFFECTED_RESOURCE),
- );
+ expect(service.bescheidDocumentUri$.value).toEqual(getUrl(command, CommandLinkRel.EFFECTED_RESOURCE));
});
});
});
@@ -921,42 +847,39 @@ describe('BescheidService', () => {
it('should emit empty state resource document file', () => {
service.init();
- expect(service.getBescheidDocumentFile()).toBeObservable(
- singleCold(createEmptyStateResource()),
- );
+ expect(service.getBescheidDocumentFile()).toBeObservable(singleCold(createEmptyStateResource()));
});
it('should emit empty state resource uploaded attachment', () => {
service.init();
- expect(service.getUploadedAttachment()).toBeObservable(
- singleCold(createEmptyStateResource()),
- );
+ expect(service.getUploadedAttachment()).toBeObservable(singleCold(createEmptyStateResource()));
});
it('should emit empty upload in progress for upload bescheid document in progress', () => {
service.init();
- expect(service.getUploadBescheidDocumentInProgress()).toBeObservable(
- singleCold({ loading: false }),
- );
+ expect(service.getUploadBescheidDocumentInProgress()).toBeObservable(singleCold({ loading: false }));
});
it('should emit empty upload in progress for upload attachmentdocument in progress', () => {
service.init();
- expect(service.getUploadAttachmentInProgress()).toBeObservable(
- singleCold({ loading: false }),
- );
+ expect(service.getUploadAttachmentInProgress()).toBeObservable(singleCold({ loading: false }));
+ });
+
+ it('should init active step', () => {
+ service.setActiveStep(2);
+
+ service.init();
+
+ expect(service.activeStep$).toBeObservable(singleCold(1));
});
});
describe('create bescheid document', () => {
- const commandResource: CommandResource = createCommandResource([
- CommandLinkRel.EFFECTED_RESOURCE,
- ]);
- const commandStateResource: StateResource<CommandResource> =
- createStateResource(commandResource);
+ const commandResource: CommandResource = createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]);
+ const commandStateResource: StateResource<CommandResource> = createStateResource(commandResource);
const bescheidResource: BescheidResource = createBescheidResource();
const createCommandProps: CreateCommandProps = createCreateCommandProps();
@@ -1008,9 +931,7 @@ describe('BescheidService', () => {
service.createBescheidDocument();
tick();
- expect(service.loadBescheidDocumentByUri).toHaveBeenCalledWith(
- getUrl(commandResource, CommandLinkRel.EFFECTED_RESOURCE),
- );
+ expect(service.loadBescheidDocumentByUri).toHaveBeenCalledWith(getUrl(commandResource, CommandLinkRel.EFFECTED_RESOURCE));
}));
it('should update bescheid document Url', fakeAsync(() => {
@@ -1019,16 +940,12 @@ describe('BescheidService', () => {
service.createBescheidDocument();
tick();
- expect(service.bescheidDocumentUri$.value).toBe(
- getUrl(commandResource, CommandLinkRel.EFFECTED_RESOURCE),
- );
+ expect(service.bescheidDocumentUri$.value).toBe(getUrl(commandResource, CommandLinkRel.EFFECTED_RESOURCE));
}));
});
describe('on error', () => {
- const commandErrorStateResource: StateResource<CommandResource> = createStateResource(
- createCommandErrorResource(),
- );
+ const commandErrorStateResource: StateResource<CommandResource> = createStateResource(createCommandErrorResource());
it('should emit command state resource', () => {
commandService.createCommandByProps.mockReturnValue(of(commandErrorStateResource));
@@ -1071,8 +988,7 @@ describe('BescheidService', () => {
describe('get bescheid document command', () => {
const commandResource: CommandResource = createCommandResource();
- const commandStateResource: StateResource<CommandResource> =
- createStateResource(commandResource);
+ const commandStateResource: StateResource<CommandResource> = createStateResource(commandResource);
beforeEach(() => {
commandService.getCommandByOrder.mockReturnValue(of(commandStateResource));
@@ -1080,9 +996,7 @@ describe('BescheidService', () => {
it('should call command service', (done) => {
service.getBescheidDocumentCommand().subscribe(() => {
- expect(commandService.getCommandByOrder).toHaveBeenCalledWith(
- CommandOrder.CREATE_BESCHEID_DOCUMENT,
- );
+ expect(commandService.getCommandByOrder).toHaveBeenCalledWith(CommandOrder.CREATE_BESCHEID_DOCUMENT);
done();
});
});
@@ -1175,9 +1089,7 @@ describe('BescheidService', () => {
describe('load bescheid document file', () => {
const document: DocumentResource = createDocumentResource([DocumentLinkRel.FILE]);
- const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
- createBinaryFileResource(),
- );
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(createBinaryFileResource());
beforeEach(() => {
binaryFileService.getFile.mockReturnValue(of(binaryFileStateResource));
@@ -1186,9 +1098,7 @@ describe('BescheidService', () => {
it('should call bianry file service', () => {
service.loadBescheidDocumentFile(document);
- expect(binaryFileService.getFile).toHaveBeenCalledWith(
- getUrl(document, DocumentLinkRel.FILE),
- );
+ expect(binaryFileService.getFile).toHaveBeenCalledWith(getUrl(document, DocumentLinkRel.FILE));
});
it('should set bescheidDocument file', () => {
@@ -1217,11 +1127,8 @@ describe('BescheidService', () => {
it('should return value', () => {
const bescheidList: BescheidListResource = createBescheidListResource();
- const bescheidListStateResource: StateResource<BescheidListResource> =
- createStateResource(bescheidList);
- service.bescheidListResourceService.getList = jest
- .fn()
- .mockReturnValue(singleCold(bescheidListStateResource));
+ const bescheidListStateResource: StateResource<BescheidListResource> = createStateResource(bescheidList);
+ service.bescheidListResourceService.getList = jest.fn().mockReturnValue(singleCold(bescheidListStateResource));
const command$: Observable<StateResource<BescheidListResource>> = service.getBescheidList();
@@ -1244,8 +1151,7 @@ describe('BescheidService', () => {
});
it('should return value', () => {
- const documentStateResource$: Observable<StateResource<DocumentResource>> =
- service.loadBescheidDocument(resourceUri);
+ const documentStateResource$: Observable<StateResource<DocumentResource>> = service.loadBescheidDocument(resourceUri);
expect(documentStateResource$).toBeObservable(
cold('(ab|)', { a: createEmptyStateResource(true), b: createStateResource(document) }),
@@ -1255,13 +1161,10 @@ describe('BescheidService', () => {
describe('get resource', () => {
const bescheidResource: BescheidResource = createBescheidResource();
- const bescheidStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidResource);
+ const bescheidStateResource: StateResource<BescheidResource> = createStateResource(bescheidResource);
it('should call bescheid resource service select resource', () => {
- service.bescheidResourceService.selectResource = jest
- .fn()
- .mockReturnValue(of(bescheidStateResource));
+ service.bescheidResourceService.selectResource = jest.fn().mockReturnValue(of(bescheidStateResource));
service.getResource();
@@ -1269,9 +1172,7 @@ describe('BescheidService', () => {
});
it('should return value', () => {
- service.bescheidResourceService.selectResource = jest
- .fn()
- .mockReturnValue(of(bescheidStateResource));
+ service.bescheidResourceService.selectResource = jest.fn().mockReturnValue(of(bescheidStateResource));
const bescheidDraft: BescheidResource = service.getResource();
@@ -1281,8 +1182,7 @@ describe('BescheidService', () => {
describe('getEmpfaenger', () => {
it('should return Empfänger', () => {
- const vorgangWithEingangResource: VorgangWithEingangResource =
- createVorgangWithEingangResource();
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
const vorgangWithEingangStateResource: StateResource<VorgangWithEingangResource> =
createStateResource(vorgangWithEingangResource);
vorgangService.getVorgangWithEingang.mockReturnValue(of(vorgangWithEingangStateResource));
@@ -1306,12 +1206,8 @@ describe('BescheidService', () => {
beforeEach(() => {
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
- sortByGermanDateStrSpy = jest
- .spyOn(DateUtil, 'sortByGermanDateStr')
- .mockReturnValue(bescheide);
- getItemsSpy = service.bescheidListResourceService.getItems = jest
- .fn()
- .mockReturnValue(of(bescheide));
+ sortByGermanDateStrSpy = jest.spyOn(DateUtil, 'sortByGermanDateStr').mockReturnValue(bescheide);
+ getItemsSpy = service.bescheidListResourceService.getItems = jest.fn().mockReturnValue(of(bescheide));
});
it('should get items', () => {
@@ -1350,9 +1246,7 @@ describe('BescheidService', () => {
beforeEach(() => {
service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
- getItemsSpy = service.bescheidListResourceService.getItems = jest
- .fn()
- .mockReturnValue(of(bescheide));
+ getItemsSpy = service.bescheidListResourceService.getItems = jest.fn().mockReturnValue(of(bescheide));
});
it('should get items', () => {
@@ -1389,9 +1283,7 @@ describe('BescheidService', () => {
status: BescheidStatus.SENT,
};
- const filteredBescheide: BescheidResource[] = service.filterBySentStatus([
- bescheidWithSentStatus,
- ]);
+ const filteredBescheide: BescheidResource[] = service.filterBySentStatus([bescheidWithSentStatus]);
expect(filteredBescheide.length).toBe(1);
});
@@ -1402,9 +1294,7 @@ describe('BescheidService', () => {
status: BescheidStatus.DRAFT,
};
- const filteredBescheide: BescheidResource[] = service.filterBySentStatus([
- bescheidWithDraftStatus,
- ]);
+ const filteredBescheide: BescheidResource[] = service.filterBySentStatus([bescheidWithDraftStatus]);
expect(filteredBescheide.length).toBe(0);
});
@@ -1427,13 +1317,9 @@ describe('BescheidService', () => {
});
describe('uploadAttachment', () => {
- const bescheidResource: BescheidResource = createBescheidResource([
- BescheidLinkRel.UPLOAD_ATTACHMENT,
- ]);
+ const bescheidResource: BescheidResource = createBescheidResource([BescheidLinkRel.UPLOAD_ATTACHMENT]);
const file: File = createFile();
- const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
- createBinaryFileResource(),
- );
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(createBinaryFileResource());
beforeEach(() => {
binaryFileService.uploadFile.mockReturnValue(of(binaryFileStateResource));
@@ -1450,12 +1336,7 @@ describe('BescheidService', () => {
it('should upload file', (done) => {
service.uploadAttachment(bescheidResource, file).subscribe(() => {
- expect(binaryFileService.uploadFile).toBeCalledWith(
- bescheidResource,
- BescheidLinkRel.UPLOAD_ATTACHMENT,
- file,
- false,
- );
+ expect(binaryFileService.uploadFile).toBeCalledWith(bescheidResource, BescheidLinkRel.UPLOAD_ATTACHMENT, file, false);
done();
});
});
@@ -1468,16 +1349,13 @@ describe('BescheidService', () => {
});
it('should emit uploaded binary file', () => {
- expect(service.uploadAttachment(bescheidResource, file)).toBeObservable(
- singleColdCompleted(binaryFileStateResource),
- );
+ expect(service.uploadAttachment(bescheidResource, file)).toBeObservable(singleColdCompleted(binaryFileStateResource));
});
});
describe('handleAttachmentUpload', () => {
describe('on error', () => {
- const binaryFileStateResource: StateResource<BinaryFileResource> =
- createErrorStateResource(createApiError());
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createErrorStateResource(createApiError());
it('should emit upload in progress', () => {
service.handleAttachmentUpload(binaryFileStateResource);
@@ -1498,9 +1376,7 @@ describe('BescheidService', () => {
});
describe('on success', () => {
- const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(
- createBinaryFileResource(),
- );
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(createBinaryFileResource());
it('should emit upload in progress', () => {
service.handleAttachmentUpload(binaryFileStateResource);
@@ -1529,4 +1405,26 @@ describe('BescheidService', () => {
expect(service.uploadAttachmentInProgress$.value).toEqual(createEmptyStateResource());
});
});
+
+ describe('exit', () => {
+ it('should refresh bescheid list', () => {
+ service.bescheidListResourceService.refresh = jest.fn();
+
+ service.exit();
+
+ expect(service.bescheidListResourceService.refresh).toHaveBeenCalled();
+ });
+
+ it('should reload current vorgang', () => {
+ service.exit();
+
+ expect(vorgangService.reloadCurrentVorgang).toHaveBeenCalled();
+ });
+
+ it('should reload postfach list', () => {
+ service.exit();
+
+ expect(postfachService.setPostfachMailOnReload).toHaveBeenCalled();
+ });
+ });
});
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 277891fe474da829e8b3c8adacdcbf233fee73ee..8c76ba58973ec05b98571d86ee1e26da368c5db7 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
@@ -1,8 +1,4 @@
-import {
- BinaryFileListLinkRel,
- BinaryFileResource,
- BinaryFileService,
-} from '@alfa-client/binary-file-shared';
+import { BinaryFileListLinkRel, BinaryFileResource, BinaryFileService } from '@alfa-client/binary-file-shared';
import {
CommandOrder,
CommandResource,
@@ -12,20 +8,21 @@ import {
notHasCommandError,
tapOnCommandSuccessfullyDone,
} from '@alfa-client/command-shared';
+import { PostfachService } from '@alfa-client/postfach-shared';
import {
+ EMPTY_ARRAY,
+ HttpError,
+ ResourceListService,
+ StateResource,
createEmptyStateResource,
createStateResource,
- EMPTY_ARRAY,
filterIsLoadedOrHasError,
getEmbeddedResources,
hasStateResourceError,
- HttpError,
isLoaded,
isNotEmpty,
isNotNil,
- ResourceListService,
sortByGermanDateStr,
- StateResource,
} from '@alfa-client/tech-shared';
import {
VorgangCommandService,
@@ -35,23 +32,9 @@ import {
} from '@alfa-client/vorgang-shared';
import { getEmpfaenger } from '@alfa-client/vorgang-shared-ui';
import { Injectable } from '@angular/core';
-import { getUrl, hasLink, ResourceUri } from '@ngxp/rest';
-import {
- BehaviorSubject,
- filter,
- first,
- map,
- Observable,
- startWith,
- Subscription,
- switchMap,
- take,
- tap,
-} from 'rxjs';
-import {
- ListResourceServiceConfig,
- ResourceServiceConfig,
-} from '../../../tech-shared/src/lib/resource/resource.model';
+import { ResourceUri, getUrl, hasLink } from '@ngxp/rest';
+import { BehaviorSubject, Observable, Subscription, filter, first, map, startWith, switchMap, take, tap } from 'rxjs';
+import { ListResourceServiceConfig, ResourceServiceConfig } from '../../../tech-shared/src/lib/resource/resource.model';
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';
@@ -61,6 +44,7 @@ import {
BescheidListResource,
BescheidResource,
BescheidStatus,
+ BescheidWizardStep,
UploadFileInProgress,
} from './bescheid.model';
import {
@@ -76,38 +60,38 @@ import { DocumentResource } from './document.model';
@Injectable({ providedIn: 'root' })
export class BescheidService {
+ readonly activeStep$: BehaviorSubject<BescheidWizardStep> = new BehaviorSubject(BescheidWizardStep.AntragBescheiden);
+
bescheidResourceService: ResourceService<VorgangWithEingangResource, BescheidResource>;
- bescheidListResourceService: ResourceListService<
- VorgangWithEingangResource,
- BescheidListResource,
- BescheidResource
- >;
+ bescheidListResourceService: ResourceListService<VorgangWithEingangResource, BescheidListResource, BescheidResource>;
- readonly bescheidDocumentFile$: BehaviorSubject<StateResource<BinaryFileResource>> =
- new BehaviorSubject<StateResource<BinaryFileResource>>(createEmptyStateResource());
+ readonly bescheidDocumentFile$: BehaviorSubject<StateResource<BinaryFileResource>> = new BehaviorSubject<
+ StateResource<BinaryFileResource>
+ >(createEmptyStateResource());
- readonly bescheidDocumentUri$: BehaviorSubject<ResourceUri> = new BehaviorSubject<ResourceUri>(
- null,
- );
+ readonly bescheidDocumentUri$: BehaviorSubject<ResourceUri> = new BehaviorSubject<ResourceUri>(null);
- readonly bescheidDocument$: BehaviorSubject<StateResource<DocumentResource>> =
- new BehaviorSubject<StateResource<DocumentResource>>(createEmptyStateResource());
+ readonly bescheidDocument$: BehaviorSubject<StateResource<DocumentResource>> = new BehaviorSubject<
+ StateResource<DocumentResource>
+ >(createEmptyStateResource());
- readonly bescheidList$: BehaviorSubject<StateResource<BescheidListResource>> =
- new BehaviorSubject(createEmptyStateResource<BescheidListResource>());
+ readonly bescheidList$: BehaviorSubject<StateResource<BescheidListResource>> = new BehaviorSubject(
+ createEmptyStateResource<BescheidListResource>(),
+ );
- readonly createBescheidDocumentInProgress$: BehaviorSubject<StateResource<CommandResource>> =
- new BehaviorSubject<StateResource<CommandResource>>(createEmptyStateResource());
+ readonly createBescheidDocumentInProgress$: BehaviorSubject<StateResource<CommandResource>> = new BehaviorSubject<
+ StateResource<CommandResource>
+ >(createEmptyStateResource());
- readonly uploadBescheidDocumentInProgress$: BehaviorSubject<UploadFileInProgress> =
- new BehaviorSubject<UploadFileInProgress>({ loading: false });
+ readonly uploadBescheidDocumentInProgress$: BehaviorSubject<UploadFileInProgress> = new BehaviorSubject<UploadFileInProgress>({
+ loading: false,
+ });
- readonly uploadAttachmentInProgress$: BehaviorSubject<UploadFileInProgress> = new BehaviorSubject(
- { loading: false },
- );
+ readonly uploadAttachmentInProgress$: BehaviorSubject<UploadFileInProgress> = new BehaviorSubject({ loading: false });
- readonly uploadedAttachment$: BehaviorSubject<StateResource<BinaryFileResource>> =
- new BehaviorSubject(createEmptyStateResource());
+ readonly uploadedAttachment$: BehaviorSubject<StateResource<BinaryFileResource>> = new BehaviorSubject(
+ createEmptyStateResource(),
+ );
loadBescheidDocumentSubscription: Subscription;
@@ -118,16 +102,22 @@ export class BescheidService {
private readonly vorgangCommandService: VorgangCommandService,
private readonly binaryFileService: BinaryFileService,
private readonly repository: ResourceRepository,
+ private readonly postfachService: PostfachService,
) {
this.bescheidResourceService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(),
repository,
this.commandService,
);
- this.bescheidListResourceService = new ResourceListService(
- this.buildBescheidListServiceConfig(),
- repository,
- );
+ this.bescheidListResourceService = new ResourceListService(this.buildBescheidListServiceConfig(), repository);
+ }
+
+ public getActiveStep(): Observable<BescheidWizardStep> {
+ return this.activeStep$.asObservable();
+ }
+
+ public setActiveStep(step: BescheidWizardStep): void {
+ this.activeStep$.next(step);
}
buildBescheidDraftServiceConfig(): ResourceServiceConfig<VorgangWithEingangResource> {
@@ -158,6 +148,7 @@ export class BescheidService {
this.uploadBescheidDocumentInProgress$.next({ loading: false });
this.clearUploadAttachment();
this.uploadAttachmentInProgress$.next({ loading: false });
+ this.activeStep$.next(BescheidWizardStep.AntragBescheiden);
}
public getBescheidDraft(): Observable<StateResource<BescheidResource>> {
@@ -190,10 +181,7 @@ export class BescheidService {
filter(isLoaded),
first(),
switchMap((bescheidStateResource: StateResource<BescheidResource>) =>
- this.bescheidLoeschenUndErstellungUeberspringen(
- vorgangWithEingangResource,
- bescheidStateResource.resource,
- ),
+ this.bescheidLoeschenUndErstellungUeberspringen(vorgangWithEingangResource, bescheidStateResource.resource),
),
);
}
@@ -202,8 +190,7 @@ export class BescheidService {
return this.vorgangService.getVorgangWithEingang().pipe(
filter(
(stateResource: StateResource<VorgangWithEingangResource>) =>
- isLoaded(stateResource) &&
- hasLink(stateResource.resource, VorgangWithEingangLinkRel.BESCHEID_DRAFT),
+ isLoaded(stateResource) && hasLink(stateResource.resource, VorgangWithEingangLinkRel.BESCHEID_DRAFT),
),
switchMap(() => this.getBescheidDraft()),
startWith(createEmptyStateResource<BescheidResource>()),
@@ -219,9 +206,7 @@ export class BescheidService {
);
}
- vorgangAbschliesen(
- vorgangWithEingangResource: VorgangWithEingangResource,
- ): Observable<StateResource<CommandResource>> {
+ vorgangAbschliesen(vorgangWithEingangResource: VorgangWithEingangResource): Observable<StateResource<CommandResource>> {
return this.vorgangCommandService.abschliessen(vorgangWithEingangResource);
}
@@ -240,39 +225,25 @@ export class BescheidService {
this.uploadedAttachment$.next(createEmptyStateResource());
}
- public sendBescheidToAntragsteller(
- bescheidResource: BescheidResource,
- ): Observable<StateResource<CommandResource>> {
+ public sendBescheidToAntragsteller(bescheidResource: BescheidResource): Observable<StateResource<CommandResource>> {
return this.sendBescheid(bescheidResource, BescheidLinkRel.BESCHEIDEN_UND_SENDEN);
}
- public sendBescheidManually(
- bescheidResource: BescheidResource,
- ): Observable<StateResource<CommandResource>> {
+ public sendBescheidManually(bescheidResource: BescheidResource): Observable<StateResource<CommandResource>> {
return this.sendBescheid(bescheidResource, BescheidLinkRel.BESCHEIDEN);
}
- sendBescheid(
- bescheidResource: BescheidResource,
- linkRel: string,
- ): Observable<StateResource<CommandResource>> {
+ sendBescheid(bescheidResource: BescheidResource, linkRel: string): Observable<StateResource<CommandResource>> {
return this.bescheidResourceService.get().pipe(
filterIsLoadedOrHasError(),
switchMap((stateResource: StateResource<BescheidResource>) =>
- this.commandService.createCommandByProps(
- buildSendBescheidCommandProps(stateResource.resource, linkRel),
- ),
+ this.commandService.createCommandByProps(buildSendBescheidCommandProps(stateResource.resource, linkRel)),
),
);
}
- doUpdateBescheid(
- bescheidResource: BescheidResource,
- bescheid: Bescheid,
- ): Observable<StateResource<CommandResource>> {
- return this.commandService.createCommandByProps(
- buildUpdateBescheidCommandProps(bescheidResource, bescheid),
- );
+ doUpdateBescheid(bescheidResource: BescheidResource, bescheid: Bescheid): Observable<StateResource<CommandResource>> {
+ return this.commandService.createCommandByProps(buildUpdateBescheidCommandProps(bescheidResource, bescheid));
}
private updateBescheidDraft(command: CommandResource): void {
@@ -284,13 +255,9 @@ export class BescheidService {
filter(isLoaded),
map((stateResource: StateResource<BescheidResource>) => stateResource.resource),
filter((resource: BescheidResource) => hasLink(resource, BescheidLinkRel.ATTACHMENTS)),
- switchMap((resource: BescheidResource) =>
- this.binaryFileService.getFiles(resource, BescheidLinkRel.ATTACHMENTS),
- ),
+ switchMap((resource: BescheidResource) => this.binaryFileService.getFiles(resource, BescheidLinkRel.ATTACHMENTS)),
filter(isLoaded),
- map((stateResource) =>
- getEmbeddedResources<BinaryFileResource>(stateResource, BinaryFileListLinkRel.FILE_LIST),
- ),
+ map((stateResource) => getEmbeddedResources<BinaryFileResource>(stateResource, BinaryFileListLinkRel.FILE_LIST)),
);
}
@@ -330,10 +297,7 @@ export class BescheidService {
this.bescheidDocumentFile$.next({ ...this.bescheidDocumentFile$.value, loading: true });
}
- public uploadBescheidDocument(
- bescheid: BescheidResource,
- file: File,
- ): Observable<UploadFileInProgress> {
+ public uploadBescheidDocument(bescheid: BescheidResource, file: File): Observable<UploadFileInProgress> {
this.clearCreateBescheidDocumentInProgress();
this.initUploadBescheidDocumentInProgress(file.name);
this.doUploadBescheidDocument(bescheid, file);
@@ -429,14 +393,10 @@ export class BescheidService {
}
doCreateBescheidDocument(): Observable<StateResource<CommandResource>> {
- return this.commandService.createCommandByProps(
- buildCreateBescheidDocumentCommandProps(this.getResource()),
- );
+ return this.commandService.createCommandByProps(buildCreateBescheidDocumentCommandProps(this.getResource()));
}
- private handleCreateBescheidDocumentResponse(
- commandStateResource: StateResource<CommandResource>,
- ): void {
+ private handleCreateBescheidDocumentResponse(commandStateResource: StateResource<CommandResource>): void {
this.createBescheidDocumentInProgress$.next(commandStateResource);
if (notHasCommandError(commandStateResource.resource)) {
const documentUri: ResourceUri = getEffectedResourceUrl(commandStateResource.resource);
@@ -498,9 +458,7 @@ export class BescheidService {
this.vorgangService.reloadCurrentVorgang();
}
- public loadBescheidDocument(
- resourceUri: ResourceUri,
- ): Observable<StateResource<DocumentResource>> {
+ public loadBescheidDocument(resourceUri: ResourceUri): Observable<StateResource<DocumentResource>> {
return this.repository.getResource<DocumentResource>(resourceUri).pipe(
map((documentResource: DocumentResource) => createStateResource(documentResource)),
startWith(createEmptyStateResource<DocumentResource>(true)),
@@ -524,10 +482,7 @@ export class BescheidService {
}
private sortByBeschiedenAm(bescheide: BescheidResource[]): BescheidResource[] {
- return sortByGermanDateStr<BescheidResource>(
- bescheide,
- (bescheid: BescheidResource) => bescheid.beschiedenAm,
- );
+ return sortByGermanDateStr<BescheidResource>(bescheide, (bescheid: BescheidResource) => bescheid.beschiedenAm);
}
public existBescheid(): Observable<boolean> {
@@ -553,17 +508,12 @@ export class BescheidService {
this.bescheidListResourceService.refresh();
}
- public uploadAttachment(
- bescheidResource: BescheidResource,
- file: File,
- ): Observable<StateResource<BinaryFileResource>> {
+ 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),
- ),
+ tap((binaryFileStateResource: StateResource<BinaryFileResource>) => this.handleAttachmentUpload(binaryFileStateResource)),
);
}
@@ -593,4 +543,10 @@ export class BescheidService {
public clearAttachmentUpload(): void {
this.uploadAttachmentInProgress$.next(createEmptyStateResource());
}
+
+ public exit(): void {
+ this.bescheidListResourceService.refresh();
+ this.vorgangService.reloadCurrentVorgang();
+ this.postfachService.setPostfachMailOnReload();
+ }
}
diff --git a/alfa-client/libs/bescheid/src/index.ts b/alfa-client/libs/bescheid/src/index.ts
index 9f2c0268f34d8c2099f74dbb30ffae0bed8a8a21..d64bde358e1b807d3996ff5a31c233b0e80fb188 100644
--- a/alfa-client/libs/bescheid/src/index.ts
+++ b/alfa-client/libs/bescheid/src/index.ts
@@ -1,2 +1,3 @@
+export * from './lib/bescheid-wizard-container/bescheid-wizard-container.component';
export * from './lib/bescheid.module';
export * from './lib/beschieden-date-in-vorgang-container/beschieden-date-in-vorgang-container.component';
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-in-vorgang-container/bescheid-in-vorgang/bescheid-in-vorgang.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-in-vorgang-container/bescheid-in-vorgang/bescheid-in-vorgang.component.spec.ts
index b03163c947ea3ea59ea070eeb8ff9b651da1cd3c..2a5450489d1b8592cb1912e1a11390efe976db78 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-in-vorgang-container/bescheid-in-vorgang/bescheid-in-vorgang.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-in-vorgang-container/bescheid-in-vorgang/bescheid-in-vorgang.component.spec.ts
@@ -1,11 +1,8 @@
import { BescheidResource } from '@alfa-client/bescheid-shared';
-import {
- BinaryFile2ContainerComponent,
- BinaryFileContainerComponent,
-} from '@alfa-client/binary-file';
+import { BinaryFile2ContainerComponent, BinaryFileContainerComponent } from '@alfa-client/binary-file';
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import { StateResource, createStateResource } from '@alfa-client/tech-shared';
-import { getElementFromFixture } from '@alfa-client/test-utils';
+import { existsAsHtmlElement, notExistsAsHtmlElement } from '@alfa-client/test-utils';
import { ExpansionPanelComponent, SpinnerComponent } from '@alfa-client/ui';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
@@ -26,16 +23,12 @@ describe('BescheidInVorgangComponent', () => {
let fixture: ComponentFixture<BescheidInVorgangComponent>;
const bescheidResource: BescheidResource = createBescheidResource();
- const bescheidStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidResource);
+ const bescheidStateResource: StateResource<BescheidResource> = createStateResource(bescheidResource);
const binaryFile: BinaryFileResource = createBinaryFileResource();
- const binaryFileStateResource: StateResource<BinaryFileResource> =
- createStateResource(binaryFile);
+ const binaryFileStateResource: StateResource<BinaryFileResource> = createStateResource(binaryFile);
- const bescheidDocumentBinaryFileContainer = getDataTestIdOf(
- 'bescheid-document-in-vorgang-binary-file',
- );
+ const bescheidDocumentBinaryFileContainer: string = getDataTestIdOf('bescheid-document-in-vorgang-binary-file');
beforeEach(async () => {
await TestBed.configureTestingModule({
@@ -64,20 +57,18 @@ describe('BescheidInVorgangComponent', () => {
describe('render', () => {
it('should show bescheid document file', () => {
component.bescheidDocumentFile = createStateResource(createBinaryFileResource());
- fixture.detectChanges();
- const element = getElementFromFixture(fixture, bescheidDocumentBinaryFileContainer);
+ fixture.detectChanges();
- expect(element).toBeInstanceOf(HTMLElement);
+ existsAsHtmlElement(fixture, bescheidDocumentBinaryFileContainer);
});
it('should NOT show bescheid document file if resource null', () => {
component.bescheidDocumentFile = { ...createStateResource(null), loaded: true };
- fixture.detectChanges();
- const element = getElementFromFixture(fixture, bescheidDocumentBinaryFileContainer);
+ fixture.detectChanges();
- expect(element).not.toBeInstanceOf(HTMLElement);
+ notExistsAsHtmlElement(fixture, bescheidDocumentBinaryFileContainer);
});
it('should NOT show bescheid document file if resource loading', () => {
@@ -85,11 +76,10 @@ describe('BescheidInVorgangComponent', () => {
...createStateResource(createBinaryFileResource()),
loaded: false,
};
- fixture.detectChanges();
- const element = getElementFromFixture(fixture, bescheidDocumentBinaryFileContainer);
+ fixture.detectChanges();
- expect(element).not.toBeInstanceOf(HTMLElement);
+ notExistsAsHtmlElement(fixture, bescheidDocumentBinaryFileContainer);
});
});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.ts
index d8607e426d22e858d48673a678a3f593a2c32824..3ebd9ece73f85fe24a2817f27cef4df6acfd31b9 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-list-in-vorgang-container/bescheid-list-in-vorgang/bescheid-list-in-vorgang.component.ts
@@ -1,9 +1,4 @@
-import {
- BescheidLinkRel,
- BescheidListLinkRel,
- BescheidListResource,
- BescheidStatus,
-} from '@alfa-client/bescheid-shared';
+import { BescheidLinkRel, BescheidListLinkRel, BescheidListResource, BescheidStatus } from '@alfa-client/bescheid-shared';
import { Component, Input } from '@angular/core';
@Component({
@@ -12,7 +7,7 @@ import { Component, Input } from '@angular/core';
styles: [],
})
export class BescheidListInVorgangComponent {
- @Input() bescheidList: BescheidListResource;
+ @Input() public bescheidList: BescheidListResource;
public readonly bescheidListLinkRel = BescheidListLinkRel;
public readonly bescheidLinkRel = BescheidLinkRel;
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..47feee904d3ac5176801d46f6ef374184cb5cfcb
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.html
@@ -0,0 +1,30 @@
+<div class="relative z-10 duration-500 ease-in-out" aria-label="Bescheid Dialog" role="dialog" aria-modal="true">
+ <div class="fixed inset-0 z-10 w-screen overflow-y-auto">
+ <div class="flex h-full items-center justify-center p-8">
+ <div
+ class="relative h-full w-full max-w-7xl transform overflow-hidden rounded-lg bg-background-200 px-6 py-10 text-left shadow-xl transition-all"
+ >
+ <ng-container *ngIf="bescheidDraftStateResource$ | async as bescheidStateResource">
+ <ods-button
+ variant="icon"
+ size="fit"
+ class="absolute right-0 top-0 text-text"
+ (clickEmitter)="cancelWizard(bescheidStateResource.resource)"
+ data-test-id="close-bescheid"
+ >
+ <ods-close-icon icon />
+ </ods-button>
+ <alfa-bescheid-wizard
+ [vorgangWithEingangResource]="vorgangWithEingangResource"
+ [activeStep]="bescheidService.getActiveStep() | async"
+ [bescheidStateResource]="bescheidStateResource"
+ [submitStateResource]="submitStateResource$ | async"
+ (weiterClickEmitter)="onWeiter($event)"
+ (vorgangAbgeschlossen)="onVorgangAbgeschlossen()"
+ data-test-id="bescheid-wizard"
+ ></alfa-bescheid-wizard>
+ </ng-container>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e09cca2f663a659a867467375030620b111cb82b
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.spec.ts
@@ -0,0 +1,557 @@
+import { BescheidResource, BescheidService, BescheidWizardDialogResult, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { CommandOrder, CommandResource } from '@alfa-client/command-shared';
+import {
+ ESCAPE_KEY,
+ StateResource,
+ createEmptyStateResource,
+ createErrorStateResource,
+ createStateResource,
+} from '@alfa-client/tech-shared';
+import {
+ DialogRefMock,
+ Mock,
+ createDialogRefMock,
+ existsAsHtmlElement,
+ getElementFromFixtureByType,
+ mock,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
+import { OzgcloudDialogService } from '@alfa-client/ui';
+import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ButtonComponent, CloseIconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
+import { EMPTY, of } from 'rxjs';
+import { createBescheidResource, createBescheidStateResource } from '../../../../bescheid-shared/src/test/bescheid';
+import {
+ createCommandErrorResource,
+ createCommandResource,
+ createSuccessfullyDoneCommandResource,
+ createSuccessfullyDoneCommandStateResource,
+} from '../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../tech-shared/test/data-test';
+import { createApiError } from '../../../../tech-shared/test/error';
+import { singleColdCompleted } from '../../../../tech-shared/test/marbles';
+import { createKeydownKeyboardEvent } from '../../../../test-utils/src/lib/keyboard';
+import { createVorgangWithEingangResource } from '../../../../vorgang-shared/test/vorgang';
+import { BescheidWizardContainerComponent } from './bescheid-wizard-container.component';
+import { BescheidWizardComponent } from './bescheid-wizard/bescheid-wizard.component';
+import {
+ BescheidWizardCancelDialogContainerComponent,
+ CancelWizardDialogData,
+ CancelWizardDialogResult,
+} from './bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component';
+import { BescheidFormService } from './bescheid.formservice';
+
+describe('BescheidWizardContainerComponent', () => {
+ let component: BescheidWizardContainerComponent;
+ let fixture: ComponentFixture<BescheidWizardContainerComponent>;
+
+ const bescheidWizard: string = getDataTestIdOf('bescheid-wizard');
+ const closeButton: string = getDataTestIdOf('close-bescheid');
+
+ let bescheidService: Mock<BescheidService>;
+ let ozgcloudDialogService: Mock<OzgcloudDialogService>;
+ let formService: Mock<BescheidFormService>;
+ let wizardDialogRef: DialogRefMock<BescheidWizardDialogResult>;
+
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
+
+ beforeEach(() => {
+ bescheidService = mock(BescheidService);
+ ozgcloudDialogService = mock(OzgcloudDialogService);
+ formService = mock(BescheidFormService);
+ wizardDialogRef = createDialogRefMock();
+ });
+
+ beforeEach(async () => {
+ TestBed.overrideComponent(BescheidWizardContainerComponent, {
+ set: {
+ providers: [
+ {
+ provide: BescheidFormService,
+ useValue: formService,
+ },
+ ],
+ },
+ });
+
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardContainerComponent,
+ MockComponent(BescheidWizardComponent),
+ MockComponent(BescheidWizardCancelDialogContainerComponent),
+ MockComponent(ButtonComponent),
+ MockComponent(CloseIconComponent),
+ ],
+ providers: [
+ {
+ provide: DIALOG_DATA,
+ useValue: { vorgangWithEingangResource },
+ },
+ {
+ provide: BescheidService,
+ useValue: bescheidService,
+ },
+ {
+ provide: OzgcloudDialogService,
+ useValue: ozgcloudDialogService,
+ },
+ {
+ provide: DialogRef,
+ useValue: wizardDialogRef,
+ },
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardContainerComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('component', () => {
+ describe('constructor', () => {
+ it('should set vorgang with eingang resource from dialog data', () => {
+ expect(component.vorgangWithEingangResource).toBe(vorgangWithEingangResource);
+ });
+ });
+
+ describe('ngOnInit', () => {
+ it('should init service', () => {
+ component.ngOnInit();
+
+ expect(bescheidService.init).toHaveBeenCalled();
+ });
+
+ it('should set vorgang with eingang on form service', () => {
+ formService.setVorgangWithEingangResource = jest.fn();
+
+ component.ngOnInit();
+
+ expect(formService.setVorgangWithEingangResource).toHaveBeenCalledWith(vorgangWithEingangResource);
+ });
+
+ it('should subscribe to bescheid resource', () => {
+ component.subscribeToBescheidResourceIfExists = jest.fn();
+
+ component.ngOnInit();
+
+ expect(component.subscribeToBescheidResourceIfExists).toHaveBeenCalled();
+ });
+
+ it('should subscribe escape key handler', () => {
+ component.handleEscapeKey = jest.fn();
+
+ component.ngOnInit();
+
+ expect(component.handleEscapeKey).toHaveBeenCalled();
+ });
+ });
+
+ describe('subscribeToBescheidResourceIfExists', () => {
+ const bescheidDraftStateResource: StateResource<BescheidResource> = createBescheidStateResource();
+
+ beforeEach(() => {
+ bescheidService.getBescheidDraft.mockReturnValue(of(bescheidDraftStateResource));
+ });
+
+ describe('when bescheid draft link exist', () => {
+ beforeEach(() => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]);
+ });
+
+ it('should get bescheid draft', () => {
+ component.subscribeToBescheidResourceIfExists();
+
+ expect(bescheidService.getBescheidDraft).toHaveBeenCalled();
+ });
+
+ it('should emit bescheid draft state resource', () => {
+ component.subscribeToBescheidResourceIfExists();
+
+ expect(component.bescheidDraftStateResource$).toBeObservable(singleColdCompleted(bescheidDraftStateResource));
+ });
+ });
+
+ describe('when bescheid draft link NOT exists', () => {
+ beforeEach(() => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+ });
+
+ it('should not get bescheid draft', () => {
+ component.subscribeToBescheidResourceIfExists();
+
+ expect(bescheidService.getBescheidDraft).not.toHaveBeenCalled();
+ });
+
+ it('should emit empty bescheid draft state resource', () => {
+ component.subscribeToBescheidResourceIfExists();
+
+ expect(component.bescheidDraftStateResource$).toBeObservable(
+ singleColdCompleted(createEmptyStateResource<BescheidResource>()),
+ );
+ });
+
+ it('should not patch form values', () => {
+ formService.patchValues = jest.fn();
+
+ component.subscribeToBescheidResourceIfExists();
+
+ expect(formService.patchValues).not.toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('onWeiter', () => {
+ beforeEach(() => {
+ formService.submit = jest.fn().mockReturnValue(of(createSuccessfullyDoneCommandStateResource()));
+ component.isBescheidSuccessfullyCreated = jest.fn().mockReturnValue(true);
+ bescheidService.getBescheidDraft.mockReturnValue(of(createBescheidStateResource()));
+ });
+
+ it('should submit form', () => {
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ expect(formService.submit).toHaveBeenCalled();
+ });
+
+ it('should increment step on created bescheid', () => {
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should increment step on updated bescheid', () => {
+ component.isBescheidSuccessfullyCreated = jest.fn().mockReturnValue(false);
+
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should not increment step on command resource error', () => {
+ component.isBescheidSuccessfullyCreated = jest.fn().mockReturnValue(false);
+ formService.submit = jest.fn().mockReturnValue(of(createErrorStateResource(createApiError())));
+
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).not.toHaveBeenCalled();
+ });
+
+ it('should not increment step on command resource loading', () => {
+ component.isBescheidSuccessfullyCreated = jest.fn().mockReturnValue(false);
+ formService.submit = jest.fn().mockReturnValue(of(createStateResource(createCommandResource(), true)));
+
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).not.toHaveBeenCalled();
+ });
+
+ it('should not increment step on bescheid resource error', () => {
+ bescheidService.getBescheidDraft.mockReturnValue(of(createErrorStateResource(createApiError())));
+
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).not.toHaveBeenCalled();
+ });
+
+ it('should not increment step on bescheid loading', () => {
+ bescheidService.getBescheidDraft.mockReturnValue(of(createStateResource(null, true)));
+
+ component.onWeiter(BescheidWizardStep.DokumenteHochladen);
+
+ component.submitStateResource$.subscribe();
+ expect(bescheidService.setActiveStep).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('isBescheidSuccessfullyCreated', () => {
+ it('should return true', () => {
+ const createBescheidCommandResource: CommandResource = {
+ ...createSuccessfullyDoneCommandResource(),
+ order: CommandOrder.CREATE_BESCHEID,
+ };
+ const isBescheidSuccessfullyCreated: boolean = component.isBescheidSuccessfullyCreated(createBescheidCommandResource);
+
+ expect(isBescheidSuccessfullyCreated).toBeTruthy();
+ });
+
+ it('should return false on different order', () => {
+ const createBescheidCommandResource: CommandResource = {
+ ...createSuccessfullyDoneCommandResource(),
+ order: CommandOrder.UPDATE_BESCHEID,
+ };
+ const isBescheidSuccessfullyCreated: boolean = component.isBescheidSuccessfullyCreated(createBescheidCommandResource);
+
+ expect(isBescheidSuccessfullyCreated).toBeFalsy();
+ });
+
+ it('should return false on error command', () => {
+ const createBescheidCommandResource: CommandResource = createCommandErrorResource();
+ const isBescheidSuccessfullyCreated: boolean = component.isBescheidSuccessfullyCreated(createBescheidCommandResource);
+
+ expect(isBescheidSuccessfullyCreated).toBeFalsy();
+ });
+ });
+
+ describe('cancelWizard', () => {
+ beforeEach(() => {
+ component.openCancelDialog = jest.fn();
+ component.subscribeToCancelDialogClosed = jest.fn();
+ });
+
+ it('should open cancel dialog', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+
+ component.cancelWizard(bescheidResource);
+
+ expect(component.openCancelDialog).toHaveBeenCalledWith(bescheidResource);
+ });
+
+ it('should NOT open cancel dialog', () => {
+ component.cancelDialogRef = createDialogRefMock() as any;
+ const bescheidResource: BescheidResource = createBescheidResource();
+
+ component.cancelWizard(bescheidResource);
+
+ expect(component.openCancelDialog).not.toHaveBeenCalled();
+ });
+
+ it('should handle dialog close', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+
+ component.cancelWizard(bescheidResource);
+
+ expect(component.subscribeToCancelDialogClosed).toHaveBeenCalled();
+ });
+
+ it('should NOT handle dialog close', () => {
+ component.cancelDialogRef = createDialogRefMock() as any;
+ const bescheidResource: BescheidResource = createBescheidResource();
+
+ component.cancelWizard(bescheidResource);
+
+ expect(component.subscribeToCancelDialogClosed).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('openCancelDialog', () => {
+ it('should show close dialog', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+ ozgcloudDialogService.openInCallingComponentContext.mockReturnValue({
+ closed: EMPTY,
+ });
+
+ component.openCancelDialog(bescheidResource);
+
+ expect(ozgcloudDialogService.openInCallingComponentContext).toHaveBeenCalledWith(
+ BescheidWizardCancelDialogContainerComponent,
+ component.viewContainerRef,
+ {
+ bescheidResource,
+ } as CancelWizardDialogData,
+ );
+ });
+
+ it('should set cancelDialogRef', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+ ozgcloudDialogService.openInCallingComponentContext.mockReturnValue({
+ closed: EMPTY,
+ });
+
+ component.openCancelDialog(bescheidResource);
+
+ expect(component.cancelDialogRef).toBeDefined();
+ });
+ });
+
+ describe('subscribeToCancelDialogClosed', () => {
+ let cancelDialogResult: CancelWizardDialogResult;
+
+ beforeEach(() => {
+ cancelDialogResult = { closeWizard: true };
+ component.cancelDialogRef = { ...createDialogRefMock(), closed: of(cancelDialogResult) } as any;
+ component.handleCancelDialogClosed = jest.fn();
+ });
+
+ it('should handle cancel dialog closed', () => {
+ component.subscribeToCancelDialogClosed();
+
+ expect(component.handleCancelDialogClosed).toHaveBeenCalledWith(cancelDialogResult);
+ });
+ });
+
+ describe('handleCancelDialogClosed', () => {
+ it('should unset cancelDialogRef', () => {
+ component.cancelDialogRef = useFromMock(mock(DialogRef<CancelWizardDialogResult>));
+
+ component.handleCancelDialogClosed({ closeWizard: true });
+
+ expect(component.cancelDialogRef).toBeNull();
+ });
+
+ it('should close wizard', () => {
+ component.handleCancelDialogClosed({ closeWizard: true });
+
+ expect(wizardDialogRef.close).toHaveBeenCalledWith({ reloadVorgang: true });
+ });
+
+ it('should NOT close wizard', () => {
+ component.handleCancelDialogClosed({ closeWizard: false });
+
+ expect(wizardDialogRef.close).not.toHaveBeenCalled();
+ });
+
+ it('should NOT close wizard on empty result', () => {
+ component.handleCancelDialogClosed(null);
+
+ expect(wizardDialogRef.close).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('handleEscapeKey', () => {
+ beforeEach(() => {
+ component.cancelWizard = jest.fn();
+ });
+
+ it('should close wizard if bescheid resource loaded', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+ component.bescheidDraftStateResource$ = of(createStateResource(bescheidResource));
+ wizardDialogRef.keydownEvents = of(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ component.handleEscapeKey();
+
+ expect(component.cancelWizard).toHaveBeenCalledWith(bescheidResource);
+ });
+
+ it('should close wizard if bescheid resource not exists', () => {
+ component.bescheidDraftStateResource$ = of(createEmptyStateResource<BescheidResource>());
+ wizardDialogRef.keydownEvents = of(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ component.handleEscapeKey();
+
+ expect(component.cancelWizard).toHaveBeenCalledWith(null);
+ });
+
+ it('should not close if no escape key pressed', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+ component.bescheidDraftStateResource$ = of(createStateResource(bescheidResource));
+ wizardDialogRef.keydownEvents = of(createKeydownKeyboardEvent('a'));
+
+ component.handleEscapeKey();
+
+ expect(component.cancelWizard).not.toHaveBeenCalled();
+ });
+
+ it('should not close if bescheid resource loading', () => {
+ const bescheidResource: BescheidResource = createBescheidResource();
+ component.bescheidDraftStateResource$ = of(createStateResource(bescheidResource, true));
+ wizardDialogRef.keydownEvents = of(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ component.handleEscapeKey();
+
+ expect(component.cancelWizard).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('onVorgangAbgeschlossen', () => {
+ it('should close wizard', () => {
+ component.onVorgangAbgeschlossen();
+
+ expect(wizardDialogRef.close).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('template', () => {
+ describe('alfa-bescheid-wizard', () => {
+ function getElementComponent(): BescheidWizardComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardComponent);
+ }
+
+ describe('input', () => {
+ it('should set vorgangWithEingangResource', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().vorgangWithEingangResource).toBe(component.vorgangWithEingangResource);
+ });
+
+ it('should set activeStep', () => {
+ bescheidService.getActiveStep.mockReturnValue(of(2));
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().activeStep).toBe(2);
+ });
+
+ it('should set bescheidStateResource', () => {
+ const bescheidStateResource: StateResource<BescheidResource> = createBescheidStateResource();
+ component.bescheidDraftStateResource$ = of(bescheidStateResource);
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().bescheidStateResource).toBe(bescheidStateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should call onWeiter', () => {
+ component.onWeiter = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'weiterClickEmitter',
+ elementSelector: bescheidWizard,
+ });
+
+ expect(component.onWeiter).toHaveBeenCalled();
+ });
+
+ it('should call onVorgangAbgeschlossen', () => {
+ component.onVorgangAbgeschlossen = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'vorgangAbgeschlossen',
+ elementSelector: bescheidWizard,
+ });
+
+ expect(component.onVorgangAbgeschlossen).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('ods-button close', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, closeButton);
+ });
+
+ describe('output', () => {
+ it('should call cancelWizard', () => {
+ component.cancelWizard = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'clickEmitter',
+ elementSelector: closeButton,
+ });
+
+ expect(component.cancelWizard).toHaveBeenCalled();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e9ed187540a5921430c404a9a7a3d3020e0e70bd
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.ts
@@ -0,0 +1,138 @@
+import { BescheidResource, BescheidService, BescheidWizardDialogResult, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { CommandOrder, CommandResource, isSuccessfulDone } from '@alfa-client/command-shared';
+import {
+ StateResource,
+ createEmptyStateResource,
+ hasStateResourceError,
+ isEscapeKey,
+ isLoaded,
+ isNotLoading,
+ isNotNil,
+} from '@alfa-client/tech-shared';
+import { OzgcloudDialogService } from '@alfa-client/ui';
+import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { Component, Inject, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
+import { Resource, hasLink } from '@ngxp/rest';
+import { Observable, Subscription, filter, first, of, switchMap, tap } from 'rxjs';
+import {
+ BescheidWizardCancelDialogContainerComponent,
+ CancelWizardDialogData,
+ CancelWizardDialogResult,
+} from './bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component';
+import { BescheidFormService } from './bescheid.formservice';
+
+export interface BescheidWizardDialogData {
+ vorgangWithEingangResource: VorgangWithEingangResource;
+}
+
+@Component({
+ selector: 'alfa-bescheid-wizard-container',
+ templateUrl: './bescheid-wizard-container.component.html',
+ providers: [BescheidFormService],
+})
+export class BescheidWizardContainerComponent implements OnInit, OnDestroy {
+ public bescheidDraftStateResource$: Observable<StateResource<BescheidResource>> =
+ of(createEmptyStateResource<BescheidResource>());
+ public submitStateResource$: Observable<StateResource<Resource>> = of(createEmptyStateResource<Resource>());
+
+ cancelDialogRef: DialogRef<CancelWizardDialogResult>;
+ vorgangWithEingangResource: VorgangWithEingangResource;
+ keydownEventsSubscription: Subscription;
+
+ constructor(
+ @Inject(DIALOG_DATA) private readonly dialogData: BescheidWizardDialogData,
+ private readonly dialogRef: DialogRef<BescheidWizardDialogResult>,
+ readonly viewContainerRef: ViewContainerRef,
+ public readonly formService: BescheidFormService,
+ readonly bescheidService: BescheidService,
+ private readonly ozgcloudDialogService: OzgcloudDialogService,
+ ) {
+ this.vorgangWithEingangResource = dialogData.vorgangWithEingangResource;
+ }
+
+ ngOnInit(): void {
+ this.bescheidService.init();
+ this.formService.setVorgangWithEingangResource(this.vorgangWithEingangResource);
+ this.subscribeToBescheidResourceIfExists();
+ this.handleEscapeKey();
+ }
+
+ ngOnDestroy(): void {
+ this.keydownEventsSubscription.unsubscribe();
+ }
+
+ subscribeToBescheidResourceIfExists(): void {
+ if (hasLink(this.vorgangWithEingangResource, VorgangWithEingangLinkRel.BESCHEID_DRAFT)) {
+ this.bescheidDraftStateResource$ = this.bescheidService.getBescheidDraft();
+ }
+ }
+
+ handleEscapeKey(): void {
+ this.keydownEventsSubscription = this.dialogRef.keydownEvents
+ .pipe(
+ filter(isEscapeKey),
+ switchMap(() => this.bescheidDraftStateResource$),
+ filter(isNotLoading),
+ )
+ .subscribe((bescheidStateResource: StateResource<BescheidResource>) => {
+ this.cancelWizard(bescheidStateResource.resource);
+ });
+ }
+
+ public onWeiter(nextStep: BescheidWizardStep): void {
+ this.submitStateResource$ = this.formService.submit().pipe(
+ switchMap((commandStateResource: StateResource<CommandResource>) => {
+ if (this.isBescheidSuccessfullyCreated(commandStateResource.resource)) {
+ this.bescheidDraftStateResource$ = this.bescheidService.getBescheidDraft();
+ return this.bescheidDraftStateResource$;
+ }
+ return of(commandStateResource);
+ }),
+ tap((stateResource: StateResource<Resource>) => {
+ if (isLoaded(stateResource) && !hasStateResourceError(stateResource)) {
+ this.bescheidService.setActiveStep(nextStep);
+ }
+ }),
+ );
+ }
+
+ isBescheidSuccessfullyCreated(commandResource: CommandResource): boolean {
+ return isSuccessfulDone(commandResource) && commandResource.order === CommandOrder.CREATE_BESCHEID;
+ }
+
+ public cancelWizard(bescheidResource: BescheidResource): void {
+ if (isNotNil(this.cancelDialogRef)) return;
+ this.openCancelDialog(bescheidResource);
+ this.subscribeToCancelDialogClosed();
+ }
+
+ openCancelDialog(bescheidResource: BescheidResource) {
+ const dialogData: CancelWizardDialogData = {
+ bescheidResource,
+ };
+
+ this.cancelDialogRef = this.ozgcloudDialogService.openInCallingComponentContext(
+ BescheidWizardCancelDialogContainerComponent,
+ this.viewContainerRef,
+ dialogData,
+ );
+ }
+
+ subscribeToCancelDialogClosed() {
+ this.cancelDialogRef.closed
+ .pipe(first())
+ .subscribe((result: CancelWizardDialogResult) => this.handleCancelDialogClosed(result));
+ }
+
+ handleCancelDialogClosed(closeResult: CancelWizardDialogResult): void {
+ this.cancelDialogRef = null;
+ if (isNotNil(closeResult) && closeResult.closeWizard) {
+ this.dialogRef.close({ reloadVorgang: true });
+ }
+ }
+
+ public onVorgangAbgeschlossen(): void {
+ this.dialogRef.close();
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..9e9a62b72411f5926b2753c20eb2126957b0c626
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.html
@@ -0,0 +1,7 @@
+<button
+ (click)="onClick()"
+ data-test-id="bescheid-ueberspringen"
+ class="mt-6 select-none text-left text-primary hover:underline"
+>
+ Bescheiderstellung überspringen<br />und abschließen
+</button>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3e627c499b0e4c4718fa60bdae4d29fe0641ec48
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.spec.ts
@@ -0,0 +1,130 @@
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ existsAsHtmlElement,
+ mock,
+ Mock,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
+import { OzgcloudDialogService } from '@alfa-client/ui';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { createSuccessfullyDoneCommandStateResource } from '../../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import {
+ createDialogResult,
+ OzgcloudDialogCommandResult,
+} from '../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
+import { createVorgangWithEingangResource } from '../../../../../../vorgang-shared/test/vorgang';
+import {
+ AbschliessenDialogData,
+ BescheidWizardAbschliessenDialogContainerComponent,
+} from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component';
+import { BescheidWizardAbschliessenButtonComponent } from './bescheid-wizard-abschliessen-button.component';
+
+describe('BescheidWizardAbschliessenButtonComponent', () => {
+ let component: BescheidWizardAbschliessenButtonComponent;
+ let fixture: ComponentFixture<BescheidWizardAbschliessenButtonComponent>;
+
+ const abschliessenButton: string = getDataTestIdOf('bescheid-ueberspringen');
+
+ let ozgcloudDialogService: Mock<OzgcloudDialogService>;
+
+ beforeEach(() => {
+ ozgcloudDialogService = mock(OzgcloudDialogService);
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardAbschliessenButtonComponent],
+ providers: [
+ {
+ provide: OzgcloudDialogService,
+ useValue: ozgcloudDialogService,
+ },
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardAbschliessenButtonComponent);
+ component = fixture.componentInstance;
+ component.vorgangAbgeschlossen = useFromMock(mock(EventEmitter<void>));
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('component', () => {
+ describe('onClick', () => {
+ beforeEach(() => {
+ component.handleDialogClosed = jest.fn();
+ });
+
+ it('should open dialog', () => {
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
+ component.vorgangWithEingangResource = vorgangWithEingangResource;
+
+ component.onClick();
+
+ expect(ozgcloudDialogService.openInCallingComponentContext).toHaveBeenCalledWith(
+ BescheidWizardAbschliessenDialogContainerComponent,
+ component.viewContainerRef,
+ { vorgangWithEingangResource } as AbschliessenDialogData,
+ );
+ });
+
+ it('should handle dialog closed', () => {
+ const dialogRef: DialogRefMock<OzgcloudDialogCommandResult> = createDialogRefMock();
+ ozgcloudDialogService.openInCallingComponentContext.mockReturnValue(dialogRef);
+
+ component.onClick();
+
+ expect(component.handleDialogClosed).toHaveBeenCalledWith(dialogRef);
+ });
+ });
+ });
+
+ describe('handleDialogClosed', () => {
+ let dialogRef: DialogRefMock<OzgcloudDialogCommandResult>;
+
+ beforeEach(() => {
+ dialogRef = createDialogRefMock();
+ });
+
+ it('should NOT emit vorgang abgeschlossen', () => {
+ dialogRef.closed = of(undefined);
+
+ component.handleDialogClosed(dialogRef as never);
+
+ expect(component.vorgangAbgeschlossen.emit).not.toHaveBeenCalled();
+ });
+
+ it('should emit vorgang abgeschlossen', () => {
+ dialogRef.closed = of(createDialogResult(createSuccessfullyDoneCommandStateResource()));
+
+ component.handleDialogClosed(dialogRef as never);
+
+ expect(component.vorgangAbgeschlossen.emit).toHaveBeenCalled();
+ });
+ });
+
+ describe('template', () => {
+ it('should have button', () => {
+ existsAsHtmlElement(fixture, abschliessenButton);
+ });
+
+ describe('output', () => {
+ it('should call onClick', () => {
+ component.onClick = jest.fn();
+
+ triggerEvent({ fixture, name: 'click', elementSelector: abschliessenButton });
+
+ expect(component.onClick).toHaveBeenCalled();
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f5e04e99d2b1342e528148b124f613a044906965
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component.ts
@@ -0,0 +1,49 @@
+import { OzgcloudDialogService } from '@alfa-client/ui';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { DialogRef } from '@angular/cdk/dialog';
+import { Component, EventEmitter, Input, Output, ViewContainerRef } from '@angular/core';
+import { filter } from 'rxjs';
+import {
+ OzgcloudDialogCommandResult,
+ isDialogSuccessfullyCompleted,
+} from '../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
+import {
+ AbschliessenDialogData,
+ BescheidWizardAbschliessenDialogContainerComponent,
+} from '../abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-abschliessen-button',
+ templateUrl: './bescheid-wizard-abschliessen-button.component.html',
+})
+export class BescheidWizardAbschliessenButtonComponent {
+ @Input() vorgangWithEingangResource: VorgangWithEingangResource;
+
+ @Output() vorgangAbgeschlossen: EventEmitter<void> = new EventEmitter<void>();
+
+ constructor(
+ private readonly ozgclouDialogService: OzgcloudDialogService,
+ readonly viewContainerRef: ViewContainerRef,
+ ) {}
+
+ public onClick(): void {
+ const dialogData: AbschliessenDialogData = {
+ vorgangWithEingangResource: this.vorgangWithEingangResource,
+ };
+
+ const dialogRef: DialogRef<OzgcloudDialogCommandResult> =
+ this.ozgclouDialogService.openInCallingComponentContext(
+ BescheidWizardAbschliessenDialogContainerComponent,
+ this.viewContainerRef,
+ dialogData,
+ );
+
+ this.handleDialogClosed(dialogRef);
+ }
+
+ handleDialogClosed(dialogRef: DialogRef<OzgcloudDialogCommandResult>): void {
+ dialogRef.closed
+ .pipe(filter(isDialogSuccessfullyCompleted))
+ .subscribe(() => this.vorgangAbgeschlossen.emit());
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..2bdd79f315eb2a6473cd8212ecc895638d9544d4
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.html
@@ -0,0 +1,40 @@
+<div class="relative m-6 max-w-2xl rounded-lg bg-modalBg p-6 shadow-xl" data-test-id="bescheid-ueberspringen-dialog">
+ <button
+ class="absolute right-4 top-4 flex size-12 items-center justify-center rounded-full hover:bg-background-100"
+ (click)="onClose()"
+ data-test-id="close-bescheid-button"
+ >
+ <mat-icon>close</mat-icon>
+ </button>
+
+ <div class="flex flex-col gap-6">
+ <div>
+ <h4 class="text-lg font-medium text-primary">Bescheiderstellung überspringen</h4>
+ </div>
+ <div class="grow">
+ <p class="text-base">
+ Soll die Bescheiderstellung übersprungen und der Vorgang direkt in den Status Abgeschlossen gesetzt werden?
+ </p>
+ </div>
+ <div class="flex gap-4">
+ <ozgcloud-stroked-button-with-spinner
+ (click)="onConfirm()"
+ data-test-id="ueberspringen-abschliessen-button"
+ text="Überspringen und abschließen"
+ type="submit"
+ icon="check"
+ [stateResource]="abschliessen$ | async"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ <ozgcloud-stroked-button-with-spinner
+ (click)="onClose()"
+ data-test-id="ueberspringen-abbrechen-button"
+ text="Abbrechen"
+ color=""
+ icon="clear"
+ type="submit"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ </div>
+ </div>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fa2987b0468830953c4d0a7d86c9d66f3e57e27e
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.spec.ts
@@ -0,0 +1,173 @@
+import { BescheidService } from '@alfa-client/bescheid-shared';
+import { CommandResource } from '@alfa-client/command-shared';
+import { StateResource } from '@alfa-client/tech-shared';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ getElementComponentFromFixtureByCss,
+ mock,
+ Mock,
+ triggerEvent,
+} from '@alfa-client/test-utils';
+import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIcon } from '@angular/material/icon';
+import { MockComponent } from 'ng-mocks';
+import { of } from 'rxjs';
+import { createSuccessfullyDoneCommandStateResource } from '../../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
+import { createDialogResult } from '../../../../../../ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
+import { createVorgangWithEingangResource } from '../../../../../../vorgang-shared/test/vorgang';
+import {
+ AbschliessenDialogData,
+ BescheidWizardAbschliessenDialogContainerComponent,
+} from './bescheid-wizard-abschliessen-dialog-container.component';
+
+describe('BescheidWizardAbschliessenDialogContainerComponent', () => {
+ let component: BescheidWizardAbschliessenDialogContainerComponent;
+ let fixture: ComponentFixture<BescheidWizardAbschliessenDialogContainerComponent>;
+
+ const closeBescheidButton: string = getDataTestIdOf('close-bescheid-button');
+ const confirmButtonDataTestId: string = getDataTestIdOf('ueberspringen-abschliessen-button');
+ const cancelButtonDataTestId: string = getDataTestIdOf('ueberspringen-abbrechen-button');
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
+ const dialogData: AbschliessenDialogData = { vorgangWithEingangResource };
+
+ let dialogRef: DialogRefMock;
+ let bescheidService: Mock<BescheidService>;
+
+ beforeEach(() => {
+ bescheidService = mock(BescheidService);
+ dialogRef = createDialogRefMock();
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardAbschliessenDialogContainerComponent,
+ MockComponent(MatIcon),
+ MockComponent(OzgcloudStrokedButtonWithSpinnerComponent),
+ ],
+ providers: [
+ {
+ provide: DIALOG_DATA,
+ useValue: dialogData,
+ },
+ {
+ provide: DialogRef,
+ useValue: dialogRef,
+ },
+ {
+ provide: BescheidService,
+ useValue: bescheidService,
+ },
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardAbschliessenDialogContainerComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('component', () => {
+ describe('onClose', () => {
+ it('should close dialog', () => {
+ component.onClose();
+
+ expect(dialogRef.close).toHaveBeenCalled();
+ });
+ });
+
+ describe('onConfirm', () => {
+ it('should call bescheid service', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ bescheidService.bescheidErstellungUeberspringen.mockReturnValue(of(commandStateResource));
+
+ component.onConfirm();
+
+ expect(bescheidService.bescheidErstellungUeberspringen).toHaveBeenCalledWith(vorgangWithEingangResource);
+ });
+
+ it('should set abschliessen$', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ bescheidService.bescheidErstellungUeberspringen.mockReturnValue(of(commandStateResource));
+
+ component.onConfirm();
+
+ expect(component.abschliessen$).toBeObservable(singleColdCompleted(commandStateResource));
+ });
+
+ it('should close dialog', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ bescheidService.bescheidErstellungUeberspringen.mockReturnValue(of(commandStateResource));
+
+ component.onConfirm();
+ component.abschliessen$.subscribe();
+
+ expect(dialogRef.close).toHaveBeenCalledWith(createDialogResult(commandStateResource));
+ });
+ });
+ });
+
+ describe('template', () => {
+ describe('button close', () => {
+ describe('output', () => {
+ it('should call onClose', () => {
+ component.onClose = jest.fn();
+
+ triggerEvent({ fixture, name: 'click', elementSelector: closeBescheidButton });
+
+ expect(component.onClose).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('ozgcloud-stroked-button-with-spinner Überspringen und abschließen', () => {
+ function getElementComponent(): OzgcloudStrokedButtonWithSpinnerComponent {
+ return getElementComponentFromFixtureByCss(fixture, confirmButtonDataTestId);
+ }
+
+ describe('input', () => {
+ it('should set stateResource', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ component.abschliessen$ = of(commandStateResource);
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().stateResource).toBe(commandStateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should call onConfirm', () => {
+ component.onConfirm = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'click',
+ elementSelector: confirmButtonDataTestId,
+ });
+
+ expect(component.onConfirm).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('ozgcloud-stroked-button-with-spinner Abbrechen', () => {
+ it('should call onClose', () => {
+ component.onClose = jest.fn();
+
+ triggerEvent({ fixture, name: 'click', elementSelector: cancelButtonDataTestId });
+
+ expect(component.onClose).toHaveBeenCalled();
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4a6fa9de521ad52203dd2cbd2bc86a2365146908
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component.ts
@@ -0,0 +1,40 @@
+import { BescheidService } from '@alfa-client/bescheid-shared';
+import { CommandResource, tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
+import { StateResource } from '@alfa-client/tech-shared';
+import { createDialogResult } from '@alfa-client/ui';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { Component, Inject } from '@angular/core';
+import { Observable } from 'rxjs';
+
+export interface AbschliessenDialogData {
+ vorgangWithEingangResource: VorgangWithEingangResource;
+}
+
+@Component({
+ selector: 'alfa-bescheid-wizard-abschliessen-dialog-container',
+ templateUrl: './bescheid-wizard-abschliessen-dialog-container.component.html',
+})
+export class BescheidWizardAbschliessenDialogContainerComponent {
+ public abschliessen$: Observable<StateResource<CommandResource>>;
+
+ constructor(
+ @Inject(DIALOG_DATA) private readonly dialogData: AbschliessenDialogData,
+ private readonly dialogRef: DialogRef,
+ private readonly bescheidService: BescheidService,
+ ) {}
+
+ public onClose(): void {
+ this.dialogRef.close();
+ }
+
+ public onConfirm(): void {
+ this.abschliessen$ = this.bescheidService
+ .bescheidErstellungUeberspringen(this.dialogData.vorgangWithEingangResource)
+ .pipe(
+ tapOnCommandSuccessfullyDone((commandStateResource: StateResource<CommandResource>) =>
+ this.dialogRef.close(createDialogResult(commandStateResource)),
+ ),
+ );
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..3e3e0d9f2ddf27f8d7dec24face746611c03064f
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.html
@@ -0,0 +1,26 @@
+<div class="mt-2 grid h-full grid-cols-[min-content_1fr_1fr] gap-7">
+ <alfa-bescheid-wizard-stepper
+ [activeStep]="bescheidWizardStep.AntragBescheiden"
+ data-test-id="wizard-stepper"
+ ></alfa-bescheid-wizard-stepper>
+ <div>
+ <alfa-bescheid-wizard-step-title label="Antrag bescheiden" data-test-id="wizard-step-title"></alfa-bescheid-wizard-step-title>
+ <alfa-bescheid-wizard-antrag-bescheiden-form
+ [vorgangWithEingangResource]="vorgangWithEingangResource"
+ [bescheidResource]="bescheidResource"
+ [submitStateResource]="submitStateResource"
+ (weiterClickEmitter)="weiterClickEmitter.emit(bescheidWizardStep.DokumenteHochladen)"
+ data-test-id="antrag-bescheiden-form"
+ ></alfa-bescheid-wizard-antrag-bescheiden-form>
+ <alfa-bescheid-wizard-abschliessen-button
+ [vorgangWithEingangResource]="vorgangWithEingangResource"
+ (vorgangAbgeschlossen)="vorgangAbgeschlossen.emit()"
+ data-test-id="wizard-abschliessen-button"
+ ></alfa-bescheid-wizard-abschliessen-button>
+ </div>
+ <alfa-bescheid-wizard-summary data-test-id="wizard-summary">
+ <alfa-bescheid-wizard-antrag-bescheiden-summary
+ data-test-id="antrag-bescheiden-summary"
+ ></alfa-bescheid-wizard-antrag-bescheiden-summary>
+ </alfa-bescheid-wizard-summary>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..76204aa7e07e108f2b6221be33170b8a754b7c5c
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.spec.ts
@@ -0,0 +1,184 @@
+import { BescheidService, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { Mock, existsAsHtmlElement, getElementFromFixtureByType, mock, triggerEvent, useFromMock } from '@alfa-client/test-utils';
+import { EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { createBescheidResource } from '../../../../../../bescheid-shared/src/test/bescheid';
+import { createCommandStateResource } from '../../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { createVorgangWithEingangResource } from '../../../../../../vorgang-shared/test/vorgang';
+import { BescheidWizardAbschliessenButtonComponent } from '../abschliessen-button/bescheid-wizard-abschliessen-button.component';
+import { BescheidWizardStepTitleComponent } from '../step-title/bescheid-wizard-step-title.component';
+import { BescheidWizardStepperComponent } from '../stepper/bescheid-wizard-stepper.component';
+import { BescheidWizardSummaryComponent } from '../summary/bescheid-wizard-summary.component';
+import { BescheidWizardAntragBescheidenComponent } from './bescheid-wizard-antrag-bescheiden.component';
+import { BescheidWizardAntragBescheidenFormComponent } from './form/bescheid-wizard-antrag-bescheiden-form.component';
+import { BescheidWizardAntragBescheidenSummaryComponent } from './summary/bescheid-wizard-antrag-bescheiden-summary.component';
+
+describe('BescheidWizardAntragBescheidenComponent', () => {
+ let component: BescheidWizardAntragBescheidenComponent;
+ let fixture: ComponentFixture<BescheidWizardAntragBescheidenComponent>;
+
+ const wizardStepper: string = getDataTestIdOf('wizard-stepper');
+ const wizardStepTitle: string = getDataTestIdOf('wizard-step-title');
+ const antragBescheidenForm: string = getDataTestIdOf('antrag-bescheiden-form');
+ const abschliessenButton: string = getDataTestIdOf('wizard-abschliessen-button');
+ const wizardSummary: string = getDataTestIdOf('wizard-summary');
+ const antragBescheidenSummary: string = getDataTestIdOf('antrag-bescheiden-summary');
+
+ let bescheidService: Mock<BescheidService>;
+
+ beforeEach(() => {
+ bescheidService = mock(BescheidService);
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardAntragBescheidenComponent,
+ MockComponent(BescheidWizardStepTitleComponent),
+ MockComponent(BescheidWizardAntragBescheidenFormComponent),
+ MockComponent(BescheidWizardSummaryComponent),
+ MockComponent(BescheidWizardAntragBescheidenSummaryComponent),
+ MockComponent(BescheidWizardAbschliessenButtonComponent),
+ MockComponent(BescheidWizardStepperComponent),
+ ],
+ providers: [
+ {
+ provide: BescheidService,
+ useValue: bescheidService,
+ },
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardAntragBescheidenComponent);
+ component = fixture.componentInstance;
+ component.weiterClickEmitter = useFromMock(mock(EventEmitter<BescheidWizardStep>));
+ component.vorgangAbgeschlossen = useFromMock(mock(EventEmitter<void>));
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('template', () => {
+ describe('alfa-bescheid-wizard-stepper', () => {
+ function getElementComponent(): BescheidWizardStepperComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardStepperComponent);
+ }
+
+ it('should exists', () => {
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, wizardStepper);
+ });
+
+ describe('input', () => {
+ it('should set activeStep', () => {
+ fixture.detectChanges();
+
+ expect(getElementComponent().activeStep).toBe(BescheidWizardStep.AntragBescheiden);
+ });
+ });
+ });
+
+ describe('alfa-bescheid-wizard-step-title', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, wizardStepTitle);
+ });
+ });
+
+ describe('alfa-bescheid-wizard-summary', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, wizardSummary);
+ });
+ });
+
+ describe('alfa-bescheid-wizard-antrag-bescheiden-summary', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, antragBescheidenSummary);
+ });
+ });
+
+ describe('alfa-bescheid-wizard-abschliessen-button', () => {
+ function getElementComponent(): BescheidWizardAbschliessenButtonComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardAbschliessenButtonComponent);
+ }
+
+ it('should show', () => {
+ existsAsHtmlElement(fixture, abschliessenButton);
+ });
+
+ describe('input', () => {
+ it('should set vorgangWithEingangResource', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().vorgangWithEingangResource).toBe(component.vorgangWithEingangResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should call onVorgangAbgeschlossen', () => {
+ triggerEvent({
+ fixture,
+ name: 'vorgangAbgeschlossen',
+ elementSelector: abschliessenButton,
+ });
+
+ expect(component.vorgangAbgeschlossen.emit).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('alfa-bescheid-wizard-antrag-bescheiden-form', () => {
+ function getElementComponent(): BescheidWizardAntragBescheidenFormComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardAntragBescheidenFormComponent);
+ }
+
+ it('should show', () => {
+ existsAsHtmlElement(fixture, antragBescheidenForm);
+ });
+
+ describe('input', () => {
+ it('should set vorgangWithEingangResource', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().vorgangWithEingangResource).toBe(component.vorgangWithEingangResource);
+ });
+
+ it('should set bescheidResource', () => {
+ component.bescheidResource = createBescheidResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().bescheidResource).toBe(component.bescheidResource);
+ });
+
+ it('should set submitStateResource', () => {
+ component.submitStateResource = createCommandStateResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().submitStateResource).toBe(component.submitStateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should emit weiterClickEmitter', () => {
+ triggerEvent({
+ fixture,
+ name: 'weiterClickEmitter',
+ elementSelector: antragBescheidenForm,
+ });
+
+ expect(component.weiterClickEmitter.emit).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ad21a4d0358b3a81919618ad43a2765328c425d1
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component.ts
@@ -0,0 +1,20 @@
+import { BescheidResource, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { StateResource } from '@alfa-client/tech-shared';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Resource } from '@ngxp/rest';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-antrag-bescheiden',
+ templateUrl: './bescheid-wizard-antrag-bescheiden.component.html',
+})
+export class BescheidWizardAntragBescheidenComponent {
+ @Input() vorgangWithEingangResource: VorgangWithEingangResource;
+ @Input() bescheidResource: BescheidResource;
+ @Input() submitStateResource: StateResource<Resource>;
+
+ @Output() weiterClickEmitter: EventEmitter<BescheidWizardStep> = new EventEmitter<BescheidWizardStep>();
+ @Output() vorgangAbgeschlossen: EventEmitter<void> = new EventEmitter<void>();
+
+ public readonly bescheidWizardStep = BescheidWizardStep;
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..1dc1beea0753e8e1ccdd0eff9e7a2c20438c301e
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.html
@@ -0,0 +1,38 @@
+<div [formGroup]="formService.form" role="radiogroup" aria-label="Bescheidstatus">
+ <div class="my-10 flex max-w-2xl gap-8">
+ <ods-radio-button-card
+ label="bewilligt"
+ [name]="formServiceClass.FIELD_BEWILLIGT"
+ value="true"
+ data-test-id="button-bewilligt"
+ variant="bescheid_bewilligt"
+ ><ods-stamp-icon size="large"></ods-stamp-icon>
+ </ods-radio-button-card>
+ <ods-radio-button-card
+ label="abgelehnt"
+ [name]="formServiceClass.FIELD_BEWILLIGT"
+ value="false"
+ data-test-id="button-abgelehnt"
+ variant="bescheid_abgelehnt"
+ ><ods-close-icon size="large" class="fill-abgelehnt"></ods-close-icon>
+ </ods-radio-button-card>
+ </div>
+ <div class="flex w-full">
+ <ozgcloud-date-editor
+ [formControlName]="formServiceClass.FIELD_BESCHIEDEN_AM"
+ label="am"
+ aria-label="Bescheiddatum"
+ [required]="true"
+ >
+ </ozgcloud-date-editor>
+ </div>
+</div>
+<alfa-bescheid-wizard-weiter-button
+ *ngIf="
+ (vorgangWithEingangResource | hasLink: vorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT) ||
+ (bescheidResource | hasLink: bescheidLinkRel.UPDATE)
+ "
+ [submitStateResource]="submitStateResource"
+ (clickEmitter)="weiterClickEmitter.emit()"
+ data-test-id="weiter-button"
+></alfa-bescheid-wizard-weiter-button>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d81a9ee233fd8ce80910fe10ffb2b625dc3f09c4
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.spec.ts
@@ -0,0 +1,112 @@
+import { BescheidLinkRel, BescheidService } from '@alfa-client/bescheid-shared';
+import { HasLinkPipe } from '@alfa-client/tech-shared';
+import { existsAsHtmlElement, mock, notExistsAsHtmlElement, triggerEvent, useFromMock } from '@alfa-client/test-utils';
+import { DateEditorComponent } from '@alfa-client/ui';
+import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
+import { EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
+import { CloseIconComponent, RadioButtonCardComponent, StampIconComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
+import { createBescheidResource } from '../../../../../../../bescheid-shared/src/test/bescheid';
+import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
+import { createVorgangWithEingangResource } from '../../../../../../../vorgang-shared/test/vorgang';
+import { BescheidFormService } from '../../../bescheid.formservice';
+import { BescheidWizardWeiterButtonComponent } from '../../weiter-button/bescheid-wizard-weiter-button.component';
+import { BescheidWizardAntragBescheidenFormComponent } from './bescheid-wizard-antrag-bescheiden-form.component';
+
+describe('BescheidWizardAntragBescheidenFormComponent', () => {
+ let component: BescheidWizardAntragBescheidenFormComponent;
+ let fixture: ComponentFixture<BescheidWizardAntragBescheidenFormComponent>;
+
+ const weiterButton: string = getDataTestIdOf('weiter-button');
+
+ let formService: BescheidFormService;
+
+ beforeEach(async () => {
+ formService = new BescheidFormService(new UntypedFormBuilder(), useFromMock(mock(BescheidService)));
+
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardAntragBescheidenFormComponent,
+ HasLinkPipe,
+ MockComponent(BescheidWizardWeiterButtonComponent),
+ MockComponent(RadioButtonCardComponent),
+ MockComponent(StampIconComponent),
+ MockComponent(CloseIconComponent),
+ MockComponent(DateEditorComponent),
+ ],
+ providers: [
+ {
+ provide: BescheidFormService,
+ useValue: formService,
+ },
+ ],
+ imports: [ReactiveFormsModule],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardAntragBescheidenFormComponent);
+ component = fixture.componentInstance;
+ component.weiterClickEmitter = useFromMock(mock(EventEmitter<void>));
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('template', () => {
+ describe('alfa-bescheid-wizard-weiter-button', () => {
+ it('should exists if bescheid update link exists', () => {
+ component.bescheidResource = createBescheidResource([BescheidLinkRel.UPDATE]);
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, weiterButton);
+ });
+
+ it('should exists if create link exists', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource([
+ VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT,
+ ]);
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, weiterButton);
+ });
+
+ it('should not exists if update and create links missing', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+ component.bescheidResource = createBescheidResource();
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, weiterButton);
+ });
+
+ it('should not exists if update link missing', () => {
+ component.bescheidResource = createBescheidResource();
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, weiterButton);
+ });
+
+ describe('output', () => {
+ it('should emit weiterClickEmitter', () => {
+ component.bescheidResource = createBescheidResource([BescheidLinkRel.UPDATE]);
+
+ fixture.detectChanges();
+
+ triggerEvent({
+ fixture,
+ name: 'clickEmitter',
+ elementSelector: weiterButton,
+ });
+
+ expect(component.weiterClickEmitter.emit).toHaveBeenCalled();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b4b99c96e31bbb2702c7c0982de44ed7abc7bdbb
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component.ts
@@ -0,0 +1,24 @@
+import { BescheidLinkRel, BescheidResource } from '@alfa-client/bescheid-shared';
+import { StateResource } from '@alfa-client/tech-shared';
+import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Resource } from '@ngxp/rest';
+import { BescheidFormService } from '../../../bescheid.formservice';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-antrag-bescheiden-form',
+ templateUrl: './bescheid-wizard-antrag-bescheiden-form.component.html',
+})
+export class BescheidWizardAntragBescheidenFormComponent {
+ @Input() vorgangWithEingangResource: VorgangWithEingangResource;
+ @Input() bescheidResource: BescheidResource;
+ @Input() submitStateResource: StateResource<Resource>;
+
+ @Output() weiterClickEmitter = new EventEmitter<void>();
+
+ public readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
+ public readonly bescheidLinkRel = BescheidLinkRel;
+ public readonly formServiceClass = BescheidFormService;
+
+ constructor(public readonly formService: BescheidFormService) {}
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..995ee6afa5bd8ee9fdb5f5309264dc6ca853c769
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.html
@@ -0,0 +1,7 @@
+<ods-bescheid-status-text
+ *ngIf="formService.getBescheidFormValueChanges() | async as bescheid"
+ [bewilligt]="bescheid.bewilligt"
+ [dateText]="bescheid.beschiedenAm | date: 'dd.MM.yyyy'"
+ [hasBescheidDraft]="false"
+ data-test-id="bescheid-status-text"
+></ods-bescheid-status-text>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..588b4227c7a9ab76f83f438390a3b4ff717cd4e2
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.spec.ts
@@ -0,0 +1,97 @@
+import { Bescheid } from '@alfa-client/bescheid-shared';
+import { existsAsHtmlElement, getElementFromFixtureByType, Mock, mock, notExistsAsHtmlElement } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidStatusTextComponent } from '@ods/system';
+import { MockComponent } from 'ng-mocks';
+import { EMPTY, of } from 'rxjs';
+import { createBescheid } from '../../../../../../../bescheid-shared/src/test/bescheid';
+import { getDataTestIdOf } from '../../../../../../../tech-shared/test/data-test';
+import { BescheidFormService } from '../../../bescheid.formservice';
+import { BescheidWizardAntragBescheidenSummaryComponent } from './bescheid-wizard-antrag-bescheiden-summary.component';
+
+describe('BescheidWizardAntragBescheidenSummaryComponent', () => {
+ let component: BescheidWizardAntragBescheidenSummaryComponent;
+ let fixture: ComponentFixture<BescheidWizardAntragBescheidenSummaryComponent>;
+
+ const bescheidStatusText: string = getDataTestIdOf('bescheid-status-text');
+
+ let formService: Mock<BescheidFormService>;
+
+ beforeEach(() => {
+ formService = mock(BescheidFormService);
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardAntragBescheidenSummaryComponent, MockComponent(BescheidStatusTextComponent)],
+ providers: [{ provide: BescheidFormService, useValue: formService }],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardAntragBescheidenSummaryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('template', () => {
+ describe('ods-bescheid-status-text', () => {
+ function getElementComponent(): BescheidStatusTextComponent {
+ return getElementFromFixtureByType(fixture, BescheidStatusTextComponent);
+ }
+
+ it('should subscribe to bescheid value form changes', () => {
+ fixture.detectChanges();
+
+ expect(formService.getBescheidFormValueChanges).toHaveBeenCalled();
+ });
+
+ it('should NOT show', () => {
+ formService.getBescheidFormValueChanges.mockReturnValue(EMPTY);
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, bescheidStatusText);
+ });
+
+ it('should show', () => {
+ formService.getBescheidFormValueChanges.mockReturnValue(of(createBescheid()));
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, bescheidStatusText);
+ });
+
+ describe('input', () => {
+ it('should set bewilligt', () => {
+ const bescheid: Bescheid = createBescheid();
+ formService.getBescheidFormValueChanges.mockReturnValue(of(bescheid));
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().bewilligt).toBe(bescheid.bewilligt);
+ });
+
+ it('should set dateText', () => {
+ const bescheid: Bescheid = { ...createBescheid(), beschiedenAm: '2024-01-01' };
+ formService.getBescheidFormValueChanges.mockReturnValue(of(bescheid));
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().dateText).toBe('01.01.2024');
+ });
+
+ it('should set hasBescheidDraft', () => {
+ const bescheid: Bescheid = createBescheid();
+ formService.getBescheidFormValueChanges.mockReturnValue(of(bescheid));
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().hasBescheidDraft).toBeFalsy();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..dde93bf38267d618753bf41429fc0fceff973ad0
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { BescheidFormService } from '../../../bescheid.formservice';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-antrag-bescheiden-summary',
+ templateUrl: './bescheid-wizard-antrag-bescheiden-summary.component.html',
+})
+export class BescheidWizardAntragBescheidenSummaryComponent {
+ constructor(public readonly formService: BescheidFormService) {}
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..5f1b875910deb42d189e8077528fb9a6329826a7
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.html
@@ -0,0 +1,24 @@
+<ozgcloud-spinner
+ *ngIf="(vorgangWithEingangResource | hasLink: vorgangWithEingangLinkRel.BESCHEID_DRAFT) && !bescheidStateResource.resource"
+ [stateResource]="bescheidStateResource"
+ class="absolute flex size-full items-center justify-center"
+ data-test-id="bescheid-loading-spinner"
+></ozgcloud-spinner>
+
+<form [formGroup]="formService.form" class="h-full">
+ <div class="grid h-full">
+ <alfa-bescheid-wizard-antrag-bescheiden
+ *ngIf="activeStep === bescheidWizardStep.AntragBescheiden"
+ [vorgangWithEingangResource]="vorgangWithEingangResource"
+ [bescheidResource]="bescheidStateResource.resource"
+ [submitStateResource]="submitStateResource"
+ (weiterClickEmitter)="weiterClickEmitter.emit($event)"
+ (vorgangAbgeschlossen)="vorgangAbgeschlossen.emit()"
+ data-test-id="antrag-bescheiden-step"
+ ></alfa-bescheid-wizard-antrag-bescheiden>
+ <alfa-bescheid-wizard-dokumente-hochladen
+ *ngIf="activeStep === bescheidWizardStep.DokumenteHochladen"
+ data-test-id="dokumente-hochladen-step"
+ ></alfa-bescheid-wizard-dokumente-hochladen>
+ </div>
+</form>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..7e66bad67b2d553ba8f221bd69e480b1ae3b79de
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.spec.ts
@@ -0,0 +1,252 @@
+import { BescheidResource, BescheidService, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { HasLinkPipe, StateResource, createEmptyStateResource } from '@alfa-client/tech-shared';
+import {
+ Mock,
+ existsAsHtmlElement,
+ getElementFromFixtureByType,
+ mock,
+ notExistsAsHtmlElement,
+ triggerEvent,
+ useFromMock,
+} from '@alfa-client/test-utils';
+import { SpinnerComponent } from '@alfa-client/ui';
+import { VorgangWithEingangLinkRel } from '@alfa-client/vorgang-shared';
+import { EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
+import { MockComponent } from 'ng-mocks';
+import { createBescheidStateResource } from '../../../../../bescheid-shared/src/test/bescheid';
+import { createSuccessfullyDoneCommandStateResource } from '../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../tech-shared/test/data-test';
+import { createVorgangWithEingangResource } from '../../../../../vorgang-shared/test/vorgang';
+import { BescheidFormService } from '../bescheid.formservice';
+import { BescheidWizardAntragBescheidenComponent } from './antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component';
+import { BescheidWizardComponent } from './bescheid-wizard.component';
+import { BescheidWizardDokumenteHochladenComponent } from './dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component';
+import { BescheidWizardStepperComponent } from './stepper/bescheid-wizard-stepper.component';
+
+describe('BescheidWizardComponent', () => {
+ let component: BescheidWizardComponent;
+ let fixture: ComponentFixture<BescheidWizardComponent>;
+
+ const bescheidLoadingSpinner: string = getDataTestIdOf('bescheid-loading-spinner');
+ const antragBescheidenStep: string = getDataTestIdOf('antrag-bescheiden-step');
+ const dokumenteHochladenStep: string = getDataTestIdOf('dokumente-hochladen-step');
+
+ let bescheidService: Mock<BescheidService>;
+ let formService: BescheidFormService;
+
+ beforeEach(() => {
+ bescheidService = mock(BescheidService);
+ formService = new BescheidFormService(new UntypedFormBuilder(), useFromMock(bescheidService));
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardComponent,
+ MockComponent(BescheidWizardStepperComponent),
+ MockComponent(BescheidWizardAntragBescheidenComponent),
+ MockComponent(BescheidWizardDokumenteHochladenComponent),
+ MockComponent(SpinnerComponent),
+ HasLinkPipe,
+ ],
+ providers: [
+ {
+ provide: BescheidFormService,
+ useValue: formService,
+ },
+ ],
+ imports: [ReactiveFormsModule],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardComponent);
+ component = fixture.componentInstance;
+ component.weiterClickEmitter = useFromMock(mock(EventEmitter<BescheidWizardStep>));
+ component.vorgangAbgeschlossen = useFromMock(mock(EventEmitter<void>));
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('component', () => {
+ describe('set bescheidDraftStateResource', () => {
+ it('should patch form values', () => {
+ formService.patchValues = jest.fn();
+
+ component.bescheidStateResource = createBescheidStateResource();
+
+ expect(formService.patchValues).toHaveBeenCalledWith(component.bescheidStateResource.resource);
+ });
+
+ it('should NOT patch form values', () => {
+ formService.patchValues = jest.fn();
+
+ component.bescheidStateResource = createEmptyStateResource();
+
+ expect(formService.patchValues).not.toHaveBeenCalled();
+ });
+
+ it('should set bescheid state resource', () => {
+ component.bescheidStateResource = createBescheidStateResource();
+
+ expect(component.bescheidStateResource).toEqual(component.bescheidStateResource);
+ });
+ });
+ });
+
+ describe('template', () => {
+ beforeEach(() => {
+ component.bescheidStateResource = createBescheidStateResource();
+ });
+
+ describe('ozgcloud-spinner', () => {
+ it('should exists', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]);
+ component.bescheidStateResource = createEmptyStateResource();
+
+ fixture.detectChanges();
+
+ existsAsHtmlElement(fixture, bescheidLoadingSpinner);
+ });
+
+ it('should NOT exists if bescheid does not exists', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+ component.bescheidStateResource = createEmptyStateResource();
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, bescheidLoadingSpinner);
+ });
+
+ it('should NOT exists if bescheid initially loaded', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]);
+ component.bescheidStateResource = createBescheidStateResource();
+
+ fixture.detectChanges();
+
+ notExistsAsHtmlElement(fixture, bescheidLoadingSpinner);
+ });
+
+ describe('input', () => {
+ it('should set stateResource', () => {
+ component.vorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]);
+ component.bescheidStateResource = createEmptyStateResource();
+
+ fixture.detectChanges();
+
+ expect(getElementFromFixtureByType(fixture, SpinnerComponent).stateResource).toEqual(component.bescheidStateResource);
+ });
+ });
+ });
+
+ describe('alfa-bescheid-wizard-antrag-bescheiden', () => {
+ function getElementComponent(): BescheidWizardAntragBescheidenComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardAntragBescheidenComponent);
+ }
+
+ it('should show', () => {
+ givenActiveStep(1);
+ givenLoadedBescheidStateResrouce();
+
+ existsAsHtmlElement(fixture, antragBescheidenStep);
+ });
+
+ it.each([2, 3])('should NOT show in step %d', (step: number) => {
+ givenActiveStep(step);
+ givenLoadedBescheidStateResrouce();
+
+ notExistsAsHtmlElement(fixture, antragBescheidenStep);
+ });
+
+ describe('input', () => {
+ it('should set vorgangWithEingangResource', () => {
+ givenActiveStep(1);
+ givenLoadedBescheidStateResrouce();
+ component.vorgangWithEingangResource = createVorgangWithEingangResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().vorgangWithEingangResource).toBe(component.vorgangWithEingangResource);
+ });
+
+ it('should set bescheidResource', () => {
+ givenActiveStep(1);
+ givenLoadedBescheidStateResrouce();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().bescheidResource).toEqual(component.bescheidStateResource.resource);
+ });
+
+ it('should set submitStateResource', () => {
+ givenActiveStep(1);
+ givenLoadedBescheidStateResrouce();
+ component.submitStateResource = createSuccessfullyDoneCommandStateResource();
+
+ fixture.detectChanges();
+
+ expect(getElementComponent().submitStateResource).toEqual(component.submitStateResource);
+ });
+ });
+
+ describe('output', () => {
+ beforeEach(() => {
+ givenActiveStep(1);
+ givenLoadedBescheidStateResrouce();
+ });
+
+ it('should emit weiterClickEmitter', () => {
+ triggerEvent({
+ fixture,
+ name: 'weiterClickEmitter',
+ elementSelector: antragBescheidenStep,
+ data: BescheidWizardStep.DokumenteHochladen,
+ });
+
+ expect(component.weiterClickEmitter.emit).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should emit vorgangAbgeschlossen', () => {
+ triggerEvent({
+ fixture,
+ name: 'vorgangAbgeschlossen',
+ elementSelector: antragBescheidenStep,
+ });
+
+ expect(component.vorgangAbgeschlossen.emit).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('alfa-bescheid-wizard-dokumente-hochladen', () => {
+ it('should show', () => {
+ givenActiveStep(2);
+ givenLoadedBescheidStateResrouce();
+
+ existsAsHtmlElement(fixture, dokumenteHochladenStep);
+ });
+
+ it.each([1, 3])('should NOT show in step %d', (step: number) => {
+ givenActiveStep(step);
+ givenLoadedBescheidStateResrouce();
+
+ notExistsAsHtmlElement(fixture, dokumenteHochladenStep);
+ });
+ });
+ });
+
+ function givenActiveStep(step: number): void {
+ component.activeStep = step;
+ fixture.detectChanges();
+ }
+
+ function givenLoadedBescheidStateResrouce(): StateResource<BescheidResource> {
+ const resource: StateResource<BescheidResource> = createBescheidStateResource();
+ component.bescheidStateResource = resource;
+ fixture.detectChanges();
+ return resource;
+ }
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6b8a55df5b58c279ccb5c8c7523b71e27f14777d
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component.ts
@@ -0,0 +1,38 @@
+import { BescheidResource, BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { StateResource, isLoaded } from '@alfa-client/tech-shared';
+import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Resource } from '@ngxp/rest';
+import { BescheidFormService } from '../bescheid.formservice';
+
+@Component({
+ selector: 'alfa-bescheid-wizard',
+ templateUrl: './bescheid-wizard.component.html',
+})
+export class BescheidWizardComponent {
+ @Input() vorgangWithEingangResource: VorgangWithEingangResource;
+
+ @Input() set bescheidStateResource(value: StateResource<BescheidResource>) {
+ if (isLoaded(value)) {
+ this.formService.patchValues(value.resource);
+ }
+ this._bescheidStateResource = value;
+ }
+
+ get bescheidStateResource(): StateResource<BescheidResource> {
+ return this._bescheidStateResource;
+ }
+
+ @Input() activeStep: number;
+ @Input() submitStateResource: StateResource<Resource>;
+
+ @Output() weiterClickEmitter: EventEmitter<BescheidWizardStep> = new EventEmitter<BescheidWizardStep>();
+ @Output() vorgangAbgeschlossen: EventEmitter<void> = new EventEmitter<void>();
+
+ private _bescheidStateResource: StateResource<BescheidResource>;
+
+ public readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
+ public readonly bescheidWizardStep = BescheidWizardStep;
+
+ constructor(public readonly formService: BescheidFormService) {}
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..7cf2668837a7aa60195d8084d449b58bc2dca71e
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.html
@@ -0,0 +1,36 @@
+<div
+ class="relative m-6 max-w-2xl rounded-lg bg-modalBg p-6 shadow-xl"
+ data-test-id="bescheid-close-dialog"
+>
+ <div class="flex flex-col gap-6">
+ <div>
+ <h4 class="text-lg font-medium text-primary">Bescheiderstellung abbrechen</h4>
+ </div>
+ <div class="grow">
+ <p class="text-base">
+ Soll der Bescheid-Entwurf zur späteren Bearbeitung gespeichert oder verworfen werden?
+ </p>
+ </div>
+ <div class="flex gap-4">
+ <ozgcloud-stroked-button-with-spinner
+ [stateResource]="saveStateResource$ | async"
+ (clickEmitter)="save()"
+ data-test-id="bescheiderstellung-abbrechen-entwurf-speichern"
+ text="Entwurf speichern"
+ type="submit"
+ icon="check"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ <ozgcloud-stroked-button-with-spinner
+ [stateResource]="deleteStateResource$ | async"
+ (clickEmitter)="cancel()"
+ data-test-id="bescheiderstellung-abbrechen-entwurf-verwerfen"
+ text="Verwerfen"
+ color=""
+ icon="clear"
+ type="submit"
+ >
+ </ozgcloud-stroked-button-with-spinner>
+ </div>
+ </div>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..df7293c3aaf58a881b74c8db3cd173eea81b2cb3
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.spec.ts
@@ -0,0 +1,258 @@
+import { BescheidService } from '@alfa-client/bescheid-shared';
+import { CommandResource } from '@alfa-client/command-shared';
+import { StateResource, createErrorStateResource } from '@alfa-client/tech-shared';
+import {
+ DialogRefMock,
+ Mock,
+ createDialogRefMock,
+ existsAsHtmlElement,
+ getElementComponentFromFixtureByCss,
+ mock,
+ triggerEvent,
+} from '@alfa-client/test-utils';
+import { OzgcloudStrokedButtonWithSpinnerComponent } from '@alfa-client/ui';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { EMPTY, of } from 'rxjs';
+import { createBescheidResource } from '../../../../../../bescheid-shared/src/test/bescheid';
+import {
+ createCommandStateResource,
+ createSuccessfullyDoneCommandStateResource,
+} from '../../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { createApiError } from '../../../../../../tech-shared/test/error';
+import { singleColdCompleted } from '../../../../../../tech-shared/test/marbles';
+import { BescheidFormService } from '../../bescheid.formservice';
+import {
+ BescheidWizardCancelDialogContainerComponent,
+ CancelWizardDialogData,
+} from './bescheid-wizard-cancel-dialog-container.component';
+
+describe('BescheidWizardCancelDialogContainerComponent', () => {
+ let component: BescheidWizardCancelDialogContainerComponent;
+ let fixture: ComponentFixture<BescheidWizardCancelDialogContainerComponent>;
+
+ const speichernButton: string = getDataTestIdOf('bescheiderstellung-abbrechen-entwurf-speichern');
+ const verwerfenButton: string = getDataTestIdOf('bescheiderstellung-abbrechen-entwurf-verwerfen');
+
+ const dialogData: CancelWizardDialogData = {
+ bescheidResource: createBescheidResource(),
+ };
+
+ let formService: Mock<BescheidFormService>;
+ let bescheidService: Mock<BescheidService>;
+ let dialogRef: DialogRefMock;
+
+ beforeEach(() => {
+ formService = { ...mock(BescheidFormService), submit: jest.fn().mockReturnValue(EMPTY) };
+ bescheidService = { ...mock(BescheidService), bescheidVerwerfen: jest.fn().mockReturnValue(EMPTY) };
+ dialogRef = createDialogRefMock();
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardCancelDialogContainerComponent, MockComponent(OzgcloudStrokedButtonWithSpinnerComponent)],
+ providers: [
+ {
+ provide: BescheidService,
+ useValue: bescheidService,
+ },
+ {
+ provide: BescheidFormService,
+ useValue: formService,
+ },
+ {
+ provide: DIALOG_DATA,
+ useValue: dialogData,
+ },
+ {
+ provide: DialogRef,
+ useValue: dialogRef,
+ },
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardCancelDialogContainerComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('component', () => {
+ describe('save', () => {
+ beforeEach(() => {
+ component.closeDialogWithWizard = jest.fn();
+ });
+
+ it('should submit form', () => {
+ component.save();
+
+ expect(formService.submit).toHaveBeenCalled();
+ });
+
+ it('should emit save command state resource', () => {
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
+ formService.submit = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.save();
+
+ expect(component.saveStateResource$).toBeObservable(singleColdCompleted(commandStateResource));
+ });
+
+ it('should handle successfully saved bescheid', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ formService.submit = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.save();
+ component.saveStateResource$.subscribe();
+
+ expect(component.closeDialogWithWizard).toHaveBeenCalled();
+ });
+
+ it('should NOT handle successfully saved bescheid', () => {
+ const commandStateResource: StateResource<CommandResource> = createErrorStateResource(createApiError());
+ formService.submit = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.save();
+ component.saveStateResource$.subscribe();
+
+ expect(component.closeDialogWithWizard).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('cancel', () => {
+ beforeEach(() => {
+ component.closeDialogWithWizard = jest.fn();
+ });
+
+ it('should delete bescheid', () => {
+ component.cancel();
+
+ expect(bescheidService.bescheidVerwerfen).toHaveBeenCalled();
+ });
+
+ it('should NOT delete bescheid', () => {
+ component.bescheidResource = null;
+
+ component.cancel();
+
+ expect(bescheidService.bescheidVerwerfen).not.toHaveBeenCalled();
+ });
+
+ it('should emit delete command state resource', () => {
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
+ bescheidService.bescheidVerwerfen = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.cancel();
+
+ expect(component.deleteStateResource$).toBeObservable(singleColdCompleted(commandStateResource));
+ });
+
+ it('should close dialog on success', () => {
+ const commandStateResource: StateResource<CommandResource> = createSuccessfullyDoneCommandStateResource();
+ bescheidService.bescheidVerwerfen = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.cancel();
+ component.deleteStateResource$.subscribe();
+
+ expect(component.closeDialogWithWizard).toHaveBeenCalled();
+ });
+
+ it('should NOT close dialog on error', () => {
+ const commandStateResource: StateResource<CommandResource> = createErrorStateResource(createApiError());
+ bescheidService.bescheidVerwerfen = jest.fn().mockReturnValue(of(commandStateResource));
+
+ component.cancel();
+ component.deleteStateResource$.subscribe();
+
+ expect(component.closeDialogWithWizard).not.toHaveBeenCalled();
+ });
+
+ it('should close dialog with cancel result on non existing bescheid', () => {
+ component.bescheidResource = null;
+
+ component.cancel();
+
+ expect(component.closeDialogWithWizard).toHaveBeenCalled();
+ });
+ });
+
+ describe('closeDialogWithWizard', () => {
+ it('should close', () => {
+ component.closeDialogWithWizard();
+
+ expect(dialogRef.close).toHaveBeenCalledWith({ closeWizard: true });
+ });
+ });
+ });
+
+ describe('template', () => {
+ describe('ozgcloud-stroked-button-with-spinner Entwurf speichern', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, speichernButton);
+ });
+
+ describe('input', () => {
+ it('should set stateResource', () => {
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
+ component.saveStateResource$ = of(commandStateResource);
+
+ const elementComponent: OzgcloudStrokedButtonWithSpinnerComponent = getElementComponentFromFixtureByCss(
+ fixture,
+ speichernButton,
+ );
+
+ fixture.detectChanges();
+
+ expect(elementComponent.stateResource).toBe(commandStateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should call save', () => {
+ component.save = jest.fn();
+
+ triggerEvent({ fixture, name: 'clickEmitter', elementSelector: speichernButton });
+
+ expect(component.save).toHaveBeenCalled();
+ });
+ });
+ });
+
+ describe('ozgcloud-stroked-button-with-spinner Verwerfen', () => {
+ it('should show', () => {
+ existsAsHtmlElement(fixture, verwerfenButton);
+ });
+
+ describe('input', () => {
+ it('should set stateResource', () => {
+ const commandStateResource: StateResource<CommandResource> = createCommandStateResource();
+ component.deleteStateResource$ = of(commandStateResource);
+
+ const elementComponent: OzgcloudStrokedButtonWithSpinnerComponent = getElementComponentFromFixtureByCss(
+ fixture,
+ verwerfenButton,
+ );
+
+ fixture.detectChanges();
+
+ expect(elementComponent.stateResource).toBe(commandStateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should call delete', () => {
+ component.cancel = jest.fn();
+
+ triggerEvent({ fixture, name: 'clickEmitter', elementSelector: verwerfenButton });
+
+ expect(component.cancel).toHaveBeenCalled();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..beb6c19e288f404d7f491398f10107a61e0cdf97
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component.ts
@@ -0,0 +1,53 @@
+import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
+import { StateResource, isNotNil } from '@alfa-client/tech-shared';
+import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
+import { Component, Inject } from '@angular/core';
+import { Resource } from '@ngxp/rest';
+import { Observable } from 'rxjs';
+import { BescheidFormService } from '../../bescheid.formservice';
+
+export interface CancelWizardDialogData {
+ bescheidResource: BescheidResource;
+}
+
+export interface CancelWizardDialogResult {
+ closeWizard: boolean;
+}
+
+@Component({
+ templateUrl: './bescheid-wizard-cancel-dialog-container.component.html',
+})
+export class BescheidWizardCancelDialogContainerComponent {
+ public saveStateResource$: Observable<StateResource<Resource>>;
+ public deleteStateResource$: Observable<StateResource<Resource>>;
+
+ bescheidResource: BescheidResource;
+
+ constructor(
+ @Inject(DIALOG_DATA) readonly dialogData: CancelWizardDialogData,
+ public dialogRef: DialogRef<CancelWizardDialogResult>,
+ private readonly bescheidService: BescheidService,
+ private readonly formService: BescheidFormService,
+ ) {
+ this.bescheidResource = dialogData.bescheidResource;
+ }
+
+ public save(): void {
+ this.saveStateResource$ = this.formService.submit().pipe(tapOnCommandSuccessfullyDone(() => this.closeDialogWithWizard()));
+ }
+
+ public cancel(): void {
+ if (isNotNil(this.bescheidResource)) {
+ this.deleteStateResource$ = this.bescheidService
+ .bescheidVerwerfen()
+ .pipe(tapOnCommandSuccessfullyDone(() => this.closeDialogWithWizard()));
+ } else {
+ this.closeDialogWithWizard();
+ }
+ }
+
+ closeDialogWithWizard(): void {
+ this.dialogRef.close({ closeWizard: true });
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..e922efca768811f976d2a2fcc77e219e60ba54b1
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.html
@@ -0,0 +1,12 @@
+<div class="mt-2 grid h-full grid-cols-[min-content_1fr_1fr] gap-7">
+ <alfa-bescheid-wizard-stepper [activeStep]="bescheidWizardStep.DokumenteHochladen"></alfa-bescheid-wizard-stepper>
+ <div>
+ <alfa-bescheid-wizard-step-title label="Antrag bescheiden" [inactiveStep]="true"></alfa-bescheid-wizard-step-title>
+ <alfa-bescheid-wizard-step-title label="Dokumente hochladen"></alfa-bescheid-wizard-step-title>
+ <alfa-bescheid-wizard-dokumente-hochladen-form></alfa-bescheid-wizard-dokumente-hochladen-form>
+ </div>
+ <alfa-bescheid-wizard-summary>
+ <alfa-bescheid-wizard-antrag-bescheiden-summary></alfa-bescheid-wizard-antrag-bescheiden-summary>
+ <alfa-bescheid-wizard-dokumente-hochladen-summary></alfa-bescheid-wizard-dokumente-hochladen-summary>
+ </alfa-bescheid-wizard-summary>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..0ccc4edf5232f58f2f191cecc7d15076e08c13fe
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.spec.ts
@@ -0,0 +1,68 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { getElementFromFixtureByType } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { BescheidWizardAntragBescheidenSummaryComponent } from '../antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component';
+import { BescheidWizardStepTitleComponent } from '../step-title/bescheid-wizard-step-title.component';
+import { BescheidWizardStepperComponent } from '../stepper/bescheid-wizard-stepper.component';
+import { BescheidWizardSummaryComponent } from '../summary/bescheid-wizard-summary.component';
+import { BescheidWizardDokumenteHochladenComponent } from './bescheid-wizard-dokumente-hochladen.component';
+import { BescheidWizardDokumenteHochladenFormComponent } from './form/bescheid-wizard-dokumente-hochladen-form.component';
+import { BescheidWizardDokumenteHochladenSummaryComponent } from './summary/bescheid-wizard-dokumente-hochladen-summary.component';
+
+describe('BescheidWizardDokumenteHochladenComponent', () => {
+ let component: BescheidWizardDokumenteHochladenComponent;
+ let fixture: ComponentFixture<BescheidWizardDokumenteHochladenComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [
+ BescheidWizardDokumenteHochladenComponent,
+ MockComponent(BescheidWizardSummaryComponent),
+ MockComponent(BescheidWizardAntragBescheidenSummaryComponent),
+ MockComponent(BescheidWizardDokumenteHochladenSummaryComponent),
+ MockComponent(BescheidWizardStepTitleComponent),
+ MockComponent(BescheidWizardDokumenteHochladenFormComponent),
+ MockComponent(BescheidWizardStepperComponent),
+ ],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardDokumenteHochladenComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('template', () => {
+ describe('alfa-bescheid-wizard-stepper', () => {
+ function getElementComponent(): BescheidWizardStepperComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardStepperComponent);
+ }
+
+ describe('input', () => {
+ it('should set activeStep', () => {
+ fixture.detectChanges();
+
+ expect(getElementComponent().activeStep).toBe(BescheidWizardStep.DokumenteHochladen);
+ });
+ });
+ });
+
+ describe('alfa-bescheid-wizard-step-title', () => {
+ function getElementComponent(): BescheidWizardStepTitleComponent {
+ return getElementFromFixtureByType(fixture, BescheidWizardStepTitleComponent);
+ }
+
+ describe('input', () => {
+ it('should set inactiveStep', () => {
+ fixture.detectChanges();
+
+ expect(getElementComponent().inactiveStep).toBeTruthy();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3692f49cd9aa9268a6766928f34abb01b40d007b
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component.ts
@@ -0,0 +1,10 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-dokumente-hochladen',
+ templateUrl: './bescheid-wizard-dokumente-hochladen.component.html',
+})
+export class BescheidWizardDokumenteHochladenComponent {
+ public readonly bescheidWizardStep = BescheidWizardStep;
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..4bd1961e89455800dbdddd34d3de0e7904f9479a
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.html
@@ -0,0 +1 @@
+<p>bescheid-wizard-dokumente-hochladen-form works!</p>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..417a480c13b49e280112f8a4a85e69663902b722
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWizardDokumenteHochladenFormComponent } from './bescheid-wizard-dokumente-hochladen-form.component';
+
+describe('BescheidWizardDokumenteHochladenFormComponent', () => {
+ let component: BescheidWizardDokumenteHochladenFormComponent;
+ let fixture: ComponentFixture<BescheidWizardDokumenteHochladenFormComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardDokumenteHochladenFormComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardDokumenteHochladenFormComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..63df23e526cb61c40dbf89b8c459da46d6f6d836
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-dokumente-hochladen-form',
+ templateUrl: './bescheid-wizard-dokumente-hochladen-form.component.html',
+})
+export class BescheidWizardDokumenteHochladenFormComponent {}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..a1b71d424a4b35b04bf8b0aee379001bc748bd21
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.html
@@ -0,0 +1 @@
+<p>bescheid-wizard-dokumente-hochladen-summary works!</p>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..06b8b521caf49c7ff4f93ffa573dbd1301eb7c4a
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWizardDokumenteHochladenSummaryComponent } from './bescheid-wizard-dokumente-hochladen-summary.component';
+
+describe('BescheidWizardDokumenteHochladenSummaryComponent', () => {
+ let component: BescheidWizardDokumenteHochladenSummaryComponent;
+ let fixture: ComponentFixture<BescheidWizardDokumenteHochladenSummaryComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardDokumenteHochladenSummaryComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardDokumenteHochladenSummaryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b2d4ba96fc074645474734a6d9a68e2f030e6eeb
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-dokumente-hochladen-summary',
+ templateUrl: './bescheid-wizard-dokumente-hochladen-summary.component.html',
+})
+export class BescheidWizardDokumenteHochladenSummaryComponent {}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..637fb2235c8c3971f1f0aa961dc5ad64e0aa58c0
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.html
@@ -0,0 +1,3 @@
+<div class="text-base font-bold text-primary-600" data-test-class="step-caption" [class.min-h-28]="inactiveStep">
+ {{ label }}
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..854259fea8c01efb45c4a5d4e7a1e23f4520bbc0
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWizardStepTitleComponent } from './bescheid-wizard-step-title.component';
+
+describe('BescheidWizardStepTitleComponent', () => {
+ let component: BescheidWizardStepTitleComponent;
+ let fixture: ComponentFixture<BescheidWizardStepTitleComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardStepTitleComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardStepTitleComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..b2df6947c1cd9ce898d9f9400f967c403291f149
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component.ts
@@ -0,0 +1,10 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-step-title',
+ templateUrl: './bescheid-wizard-step-title.component.html',
+})
+export class BescheidWizardStepTitleComponent {
+ @Input() label: string;
+ @Input() inactiveStep: boolean = false;
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..cfdb969637c673c10e0697ceff8500be625d6c6f
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.html
@@ -0,0 +1,9 @@
+<div role="tablist">
+ <alfa-bescheid-wizard-step
+ *ngFor="let step of steps"
+ [activeStep]="activeStep"
+ [step]="step"
+ (stepChange)="stepChange.emit($event)"
+ [attr.data-test-id]="'wizard-step-' + step"
+ ></alfa-bescheid-wizard-step>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..a964c6ed04e417cd6ab487ce18baa9447391b96e
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.spec.ts
@@ -0,0 +1,151 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { getElementComponentFromFixtureByCss, triggerEvent } from '@alfa-client/test-utils';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MockComponent } from 'ng-mocks';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { BescheidWizardStepperComponent } from './bescheid-wizard-stepper.component';
+import { BescheidWizardStepComponent } from './step/bescheid-wizard-step.component';
+
+describe('BescheidWizardStepperComponent', () => {
+ let component: BescheidWizardStepperComponent;
+ let fixture: ComponentFixture<BescheidWizardStepperComponent>;
+
+ const antragBescheidenWizardStep: string = getDataTestIdOf('wizard-step-' + BescheidWizardStep.AntragBescheiden);
+ const dokumenteHochladenWizardStep: string = getDataTestIdOf('wizard-step-' + BescheidWizardStep.DokumenteHochladen);
+ const bescheidVersendenWizardStep: string = getDataTestIdOf('wizard-step-' + BescheidWizardStep.BescheidVersenden);
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardStepperComponent, MockComponent(BescheidWizardStepComponent)],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardStepperComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('should have number of steps', () => {
+ expect(component.steps).toEqual([
+ BescheidWizardStep.AntragBescheiden,
+ BescheidWizardStep.DokumenteHochladen,
+ BescheidWizardStep.BescheidVersenden,
+ ]);
+ });
+
+ describe('template', () => {
+ describe('alfa-bescheid-wizard-step', () => {
+ describe('input', () => {
+ it('should set activeStep for antrag bescheiden step', () => {
+ component.activeStep = 2;
+
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ antragBescheidenWizardStep,
+ );
+ expect(step.activeStep).toEqual(component.activeStep);
+ });
+
+ it('should set activeStep for dokumente hochladen step', () => {
+ component.activeStep = 2;
+
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ dokumenteHochladenWizardStep,
+ );
+ expect(step.activeStep).toEqual(component.activeStep);
+ });
+
+ it('should set activeStep for bescheid versenden step', () => {
+ component.activeStep = 2;
+
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ bescheidVersendenWizardStep,
+ );
+ expect(step.activeStep).toEqual(component.activeStep);
+ });
+
+ it('should set step for antrag bescheiden', () => {
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ antragBescheidenWizardStep,
+ );
+ expect(step.step).toEqual(BescheidWizardStep.AntragBescheiden);
+ });
+
+ it('should set step for dokumente hochladen', () => {
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ dokumenteHochladenWizardStep,
+ );
+ expect(step.step).toEqual(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should set step for bescheid versenden', () => {
+ fixture.detectChanges();
+
+ const step: BescheidWizardStepComponent = getElementComponentFromFixtureByCss<BescheidWizardStepComponent>(
+ fixture,
+ bescheidVersendenWizardStep,
+ );
+ expect(step.step).toEqual(BescheidWizardStep.BescheidVersenden);
+ });
+ });
+
+ describe('output', () => {
+ it('should emit stepChange for antrag bescheiden step', () => {
+ component.stepChange.emit = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'stepChange',
+ elementSelector: antragBescheidenWizardStep,
+ data: BescheidWizardStep.DokumenteHochladen,
+ });
+
+ expect(component.stepChange.emit).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should emit stepChange for dokumente hochladen step', () => {
+ component.stepChange.emit = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'stepChange',
+ elementSelector: dokumenteHochladenWizardStep,
+ data: BescheidWizardStep.DokumenteHochladen,
+ });
+
+ expect(component.stepChange.emit).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+
+ it('should emit stepChange for bescheid versenden step', () => {
+ component.stepChange.emit = jest.fn();
+
+ triggerEvent({
+ fixture,
+ name: 'stepChange',
+ elementSelector: bescheidVersendenWizardStep,
+ data: BescheidWizardStep.DokumenteHochladen,
+ });
+
+ expect(component.stepChange.emit).toHaveBeenCalledWith(BescheidWizardStep.DokumenteHochladen);
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..bd2343419cc4cbf386721324c58576a5bc4ef214
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component.ts
@@ -0,0 +1,18 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-stepper',
+ templateUrl: './bescheid-wizard-stepper.component.html',
+})
+export class BescheidWizardStepperComponent {
+ @Input() activeStep: BescheidWizardStep;
+
+ @Output() stepChange: EventEmitter<BescheidWizardStep> = new EventEmitter<BescheidWizardStep>();
+
+ public readonly steps: BescheidWizardStep[] = [
+ BescheidWizardStep.AntragBescheiden,
+ BescheidWizardStep.DokumenteHochladen,
+ BescheidWizardStep.BescheidVersenden,
+ ];
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..731c9cbbfa08b5112a536938d06c1d5471d53892
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.html
@@ -0,0 +1,57 @@
+<div class="relative z-10 flex min-h-28 flex-col items-center">
+ <div
+ class="-z-1 absolute w-1"
+ [ngClass]="
+ step === bescheidWizardStep.AntragBescheiden ?
+ isPrevious() ? 'bottom-0 top-2 bg-primary-600'
+ : 'bottom-0 top-2 bg-gray-500'
+ : step === bescheidWizardStep.DokumenteHochladen ?
+ isPrevious() ? 'bottom-0 top-0 bg-primary-600'
+ : 'bottom-0 top-0 bg-gray-500'
+ : step === bescheidWizardStep.BescheidVersenden ?
+ isActive() ? 'top-0 h-2 bg-primary-600'
+ : 'top-0 h-2 bg-gray-500'
+ : ''
+ "
+ aria-hidden="true"
+ ></div>
+
+ <button
+ class="z-10 flex"
+ (click)="clickHandler(step)"
+ [ngClass]="isPrevious() ? 'cursor-pointer' : 'cursor-default'"
+ [attr.data-test-id]="
+ step === bescheidWizardStep.AntragBescheiden ? 'step-1-button'
+ : step === bescheidWizardStep.DokumenteHochladen ? 'step-2-button'
+ : step === bescheidWizardStep.BescheidVersenden ? 'step-3-button'
+ : ''
+ "
+ role="tab"
+ [attr.aria-selected]="isActive()"
+ [attr.aria-disabled]="!isActive()"
+ attr.aria-controls="vorgang-detail-bescheiden-step-content-{{ step }}"
+ [tabindex]="
+ isActive() ? '0'
+ : isPrevious() ? '0'
+ : '-1'
+ "
+ [attr.aria-label]="
+ step === bescheidWizardStep.AntragBescheiden ? 'Step 1. Antrag bescheiden'
+ : step === bescheidWizardStep.DokumenteHochladen ? 'Step 2. Dokumente hinzufügen'
+ : step === bescheidWizardStep.BescheidVersenden ? 'Step 3. Bescheid versenden'
+ : ''
+ "
+ >
+ <span
+ class="flex size-10 items-center justify-center rounded-full"
+ [ngClass]="isActive() ? 'border-4 border-primary-600 bg-background-50' : 'border-transparent bg-transparent'"
+ >
+ <span
+ class="flex size-7 items-center justify-center rounded-full text-sm text-whitetext"
+ [ngClass]="isPrevious() || isActive() ? 'bg-primary-600' : 'bg-gray-500'"
+ >
+ {{ step }}
+ </span>
+ </span>
+ </button>
+</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8d880a7efefe4f8e37c492bf5905d7008ee8ce16
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.spec.ts
@@ -0,0 +1,126 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWizardStepComponent } from './bescheid-wizard-step.component';
+
+describe('BescheidWizardStepComponent', () => {
+ let component: BescheidWizardStepComponent;
+ let fixture: ComponentFixture<BescheidWizardStepComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardStepComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardStepComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('isActive', () => {
+ beforeEach(() => {
+ component.activeStep = BescheidWizardStep.DokumenteHochladen;
+ });
+
+ it('return true if step equals activeStep', () => {
+ component.step = BescheidWizardStep.DokumenteHochladen;
+
+ const isActive: boolean = component.isActive();
+
+ expect(isActive).toBeTruthy();
+ });
+
+ it('return false if step not equals activeStep', () => {
+ component.step = BescheidWizardStep.AntragBescheiden;
+
+ const isActive: boolean = component.isActive();
+
+ expect(isActive).toBeFalsy();
+ });
+ });
+
+ describe('isPrevious', () => {
+ beforeEach(() => {
+ component.activeStep = BescheidWizardStep.DokumenteHochladen;
+ });
+
+ it('return true if step is less than activeStep', () => {
+ component.step = BescheidWizardStep.AntragBescheiden;
+
+ const isPrevious: boolean = component.isPrevious();
+
+ expect(isPrevious).toBeTruthy();
+ });
+
+ it('return false if step equals activeStep', () => {
+ component.step = BescheidWizardStep.DokumenteHochladen;
+
+ const isPrevious: boolean = component.isPrevious();
+
+ expect(isPrevious).toBeFalsy();
+ });
+
+ it('return false if step is greater than activeStep', () => {
+ component.step = BescheidWizardStep.BescheidVersenden;
+
+ const isPrevious: boolean = component.isPrevious();
+
+ expect(isPrevious).toBeFalsy();
+ });
+ });
+
+ describe('isNext', () => {
+ beforeEach(() => {
+ component.activeStep = BescheidWizardStep.DokumenteHochladen;
+ });
+
+ it('return false if step is less than activeStep', () => {
+ component.step = BescheidWizardStep.AntragBescheiden;
+
+ const isNext: boolean = component.isNext();
+
+ expect(isNext).toBeFalsy();
+ });
+
+ it('return false if step equals activeStep', () => {
+ component.step = BescheidWizardStep.DokumenteHochladen;
+
+ const isNext: boolean = component.isNext();
+
+ expect(isNext).toBeFalsy();
+ });
+
+ it('return true if step is greater than activeStep', () => {
+ component.step = BescheidWizardStep.BescheidVersenden;
+
+ const isNext: boolean = component.isNext();
+
+ expect(isNext).toBeTruthy();
+ });
+ });
+
+ describe('clickHandler', () => {
+ beforeEach(() => {
+ component.stepChange.emit = jest.fn();
+ });
+
+ it('should emit step', () => {
+ component.isPrevious = jest.fn().mockReturnValue(true);
+
+ component.clickHandler(BescheidWizardStep.AntragBescheiden);
+
+ expect(component.stepChange.emit).toHaveBeenCalledWith(BescheidWizardStep.AntragBescheiden);
+ });
+
+ it('should not emit step', () => {
+ component.isPrevious = jest.fn().mockReturnValue(false);
+
+ component.clickHandler(BescheidWizardStep.AntragBescheiden);
+
+ expect(component.stepChange.emit).not.toHaveBeenCalled();
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ddb427d422f3e5f92a71a56445543c6281a4a426
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component.ts
@@ -0,0 +1,33 @@
+import { BescheidWizardStep } from '@alfa-client/bescheid-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-step',
+ templateUrl: './bescheid-wizard-step.component.html',
+})
+export class BescheidWizardStepComponent {
+ @Input() step: BescheidWizardStep;
+ @Input() activeStep: BescheidWizardStep;
+
+ @Output() stepChange: EventEmitter<BescheidWizardStep> = new EventEmitter<BescheidWizardStep>();
+
+ public readonly bescheidWizardStep = BescheidWizardStep;
+
+ public clickHandler(step: BescheidWizardStep): void {
+ if (this.isPrevious()) {
+ this.stepChange.emit(step);
+ }
+ }
+
+ public isActive(): boolean {
+ return this.step === this.activeStep;
+ }
+
+ public isPrevious(): boolean {
+ return this.step < this.activeStep;
+ }
+
+ public isNext(): boolean {
+ return this.step > this.activeStep;
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..9404884a6510a2e16cb20b1fd4d81c5701f89ce7
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.html
@@ -0,0 +1,4 @@
+<section class="flex h-full w-full flex-col overflow-auto rounded-xl bg-background-100 px-4 py-5">
+ <h3 class="mb-4 text-base font-bold text-primary-600">Bescheid</h3>
+ <ng-content></ng-content>
+</section>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3f38f047d8dc3e1233ea44b3c8c0c73418b31f03
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BescheidWizardSummaryComponent } from './bescheid-wizard-summary.component';
+
+describe('BescheidWizardSummaryTitleComponent', () => {
+ let component: BescheidWizardSummaryComponent;
+ let fixture: ComponentFixture<BescheidWizardSummaryComponent>;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardSummaryComponent],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardSummaryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8cf4be6c484c0989f294d8384748707444b812c3
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-summary',
+ templateUrl: './bescheid-wizard-summary.component.html',
+})
+export class BescheidWizardSummaryComponent {}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..0baf1ff340c2b506157e0c038d85bcb44c894279
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.html
@@ -0,0 +1,10 @@
+<ods-button-with-spinner
+ [stateResource]="submitStateResource"
+ (clickEmitter)="clickEmitter.emit()"
+ variant="primary"
+ size="medium"
+ class="mt-8 flex"
+ data-test-id="bescheid-weiter-button"
+ text="Weiter"
+>
+</ods-button-with-spinner>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fe96a125921eb3a4625480d865e1614395b27940
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.spec.ts
@@ -0,0 +1,65 @@
+import { CommandResource } from '@alfa-client/command-shared';
+import { createStateResource, StateResource } from '@alfa-client/tech-shared';
+import { getElementFromFixtureByType, Mock, mock, triggerEvent, useFromMock } from '@alfa-client/test-utils';
+import { EventEmitter } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ButtonWithSpinnerComponent } from '@ods/component';
+import { MockComponent } from 'ng-mocks';
+import { createCommandResource } from '../../../../../../command-shared/test/command';
+import { getDataTestIdOf } from '../../../../../../tech-shared/test/data-test';
+import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-weiter-button.component';
+
+describe('BescheidWizardWeiterButtonComponent', () => {
+ let component: BescheidWizardWeiterButtonComponent;
+ let fixture: ComponentFixture<BescheidWizardWeiterButtonComponent>;
+
+ const button: string = getDataTestIdOf('bescheid-weiter-button');
+
+ let clickEmitter: Mock<EventEmitter<MouseEvent>>;
+
+ beforeEach(() => {
+ clickEmitter = mock(EventEmitter);
+ });
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BescheidWizardWeiterButtonComponent, MockComponent(ButtonWithSpinnerComponent)],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BescheidWizardWeiterButtonComponent);
+ component = fixture.componentInstance;
+ component.clickEmitter = useFromMock(clickEmitter);
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ describe('template', () => {
+ describe('ods-button-with-spinner', () => {
+ describe('input', () => {
+ it('should set submitStateResource', () => {
+ const stateResource: StateResource<CommandResource> = createStateResource(createCommandResource(), true);
+ component.submitStateResource = stateResource;
+
+ fixture.detectChanges();
+
+ expect(getElementFromFixtureByType(fixture, ButtonWithSpinnerComponent).stateResource).toEqual(stateResource);
+ });
+ });
+
+ describe('output', () => {
+ it('should emit click', () => {
+ triggerEvent({
+ fixture,
+ name: 'clickEmitter',
+ elementSelector: button,
+ });
+
+ expect(clickEmitter.emit).toHaveBeenCalled();
+ });
+ });
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8348ca2bc0e80cd65557cfa8ae20b705a5e09598
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component.ts
@@ -0,0 +1,13 @@
+import { StateResource } from '@alfa-client/tech-shared';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Resource } from '@ngxp/rest';
+
+@Component({
+ selector: 'alfa-bescheid-wizard-weiter-button',
+ templateUrl: './bescheid-wizard-weiter-button.component.html',
+})
+export class BescheidWizardWeiterButtonComponent {
+ @Input() submitStateResource: StateResource<Resource>;
+
+ @Output() clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..31a7953ddbbe01a16efe3ef77db557379ab94995
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.spec.ts
@@ -0,0 +1,142 @@
+import { Bescheid, BescheidLinkRel, BescheidResource, BescheidSendBy, BescheidService } from '@alfa-client/bescheid-shared';
+import { formatForDatabase } from '@alfa-client/tech-shared';
+import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { registerLocaleData } from '@angular/common';
+import localeDe from '@angular/common/locales/de';
+import { UntypedFormBuilder } from '@angular/forms';
+import { faker } from '@faker-js/faker';
+import { ResourceUri } from '@ngxp/rest';
+import { EMPTY, Observable, of } from 'rxjs';
+import { createBescheid, createBescheidResource } from '../../../../bescheid-shared/src/test/bescheid';
+import { singleCold } from '../../../../tech-shared/test/marbles';
+import { createVorgangWithEingangResource } from '../../../../vorgang-shared/test/vorgang';
+import { BescheidFormService } from './bescheid.formservice';
+
+registerLocaleData(localeDe);
+
+describe('BescheidFormService', () => {
+ let service: BescheidFormService;
+ let bescheidService: Mock<BescheidService>;
+ const now: Date = new Date();
+ Date.now = jest.fn().mockReturnValue(now);
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource();
+
+ beforeEach(() => {
+ bescheidService = mock(BescheidService);
+ bescheidService.createBescheid.mockReturnValue(of(EMPTY));
+ service = new BescheidFormService(new UntypedFormBuilder(), useFromMock(bescheidService));
+ service.setVorgangWithEingangResource(vorgangWithEingangResource);
+ });
+
+ describe('doSubmit', () => {
+ it('should create bescheid', () => {
+ const formValue: Bescheid = createBescheid();
+ service.getBescheidFormValue = jest.fn().mockReturnValue(formValue);
+
+ service.submit();
+
+ expect(bescheidService.createBescheid).toHaveBeenCalledWith(vorgangWithEingangResource, formValue);
+ });
+ });
+
+ describe('patchValues', () => {
+ let bescheidResource: BescheidResource;
+ let patch: jest.Mock;
+
+ beforeEach(() => {
+ bescheidResource = createBescheidResource();
+ patch = service.patch = jest.fn();
+ });
+
+ it('should patch', () => {
+ service.patchValues(bescheidResource);
+
+ expect(patch).toHaveBeenCalledWith({
+ [BescheidFormService.FIELD_BESCHIEDEN_AM]: bescheidResource.beschiedenAm,
+ [BescheidFormService.FIELD_BEWILLIGT]: String(bescheidResource.bewilligt),
+ [BescheidFormService.FIELD_BESCHEID_DOCUMENT]: null,
+ [BescheidFormService.FIELD_SEND_BY]: String(bescheidResource.sendBy),
+ [BescheidFormService.FIELD_NACHRICHT_SUBJECT]: bescheidResource.nachrichtSubject,
+ [BescheidFormService.FIELD_NACHRICHT_TEXT]: bescheidResource.nachrichtText,
+ });
+ });
+
+ it('should patch sendBy to default', () => {
+ service.patchValues({
+ ...bescheidResource,
+ sendBy: undefined,
+ });
+
+ expect(patch).toHaveBeenCalledWith({
+ [BescheidFormService.FIELD_BESCHIEDEN_AM]: bescheidResource.beschiedenAm,
+ [BescheidFormService.FIELD_BEWILLIGT]: String(bescheidResource.bewilligt),
+ [BescheidFormService.FIELD_SEND_BY]: BescheidSendBy.NACHRICHT,
+ [BescheidFormService.FIELD_BESCHEID_DOCUMENT]: null,
+ [BescheidFormService.FIELD_NACHRICHT_SUBJECT]: bescheidResource.nachrichtSubject,
+ [BescheidFormService.FIELD_NACHRICHT_TEXT]: bescheidResource.nachrichtText,
+ });
+ });
+
+ it('should patch bescheid document uri', () => {
+ const bescheidDocumentUri: ResourceUri = faker.internet.url();
+ service.patchValues({
+ ...bescheidResource,
+ _links: {
+ ...bescheidResource._links,
+ [BescheidLinkRel.BESCHEID_DOCUMENT]: { href: bescheidDocumentUri },
+ },
+ });
+
+ expect(patch).toHaveBeenCalledWith({
+ [BescheidFormService.FIELD_BESCHIEDEN_AM]: bescheidResource.beschiedenAm,
+ [BescheidFormService.FIELD_BEWILLIGT]: String(bescheidResource.bewilligt),
+ [BescheidFormService.FIELD_SEND_BY]: BescheidSendBy.NACHRICHT,
+ [BescheidFormService.FIELD_BESCHEID_DOCUMENT]: bescheidDocumentUri,
+ [BescheidFormService.FIELD_NACHRICHT_SUBJECT]: bescheidResource.nachrichtSubject,
+ [BescheidFormService.FIELD_NACHRICHT_TEXT]: bescheidResource.nachrichtText,
+ });
+ });
+
+ it('should patch attachments', () => {
+ service.patchValues(bescheidResource);
+
+ expect(service.getFormValue().attachments).toEqual(bescheidResource.attachments);
+ });
+ });
+
+ describe('getBescheidFormValueChanges', () => {
+ const bescheid: Bescheid = createBescheid();
+
+ beforeEach(() => {
+ service.getBescheidFormValue = jest.fn().mockReturnValue(bescheid);
+ });
+
+ it('should emit bescheid', () => {
+ const bescheidFormValueChanges$: Observable<Bescheid> = service.getBescheidFormValueChanges();
+
+ expect(bescheidFormValueChanges$).toBeObservable(singleCold(bescheid));
+ });
+ });
+
+ describe('getBescheidFormValue', () => {
+ beforeEach(() => {
+ service.getFormValue = jest.fn().mockReturnValue({ beschiedenAm: now, bewilligt: 'true' });
+ });
+
+ it('should getFormValue', () => {
+ service.getBescheidFormValue();
+
+ expect(service.getFormValue).toHaveBeenCalled();
+ });
+
+ it('should return bescheid', () => {
+ const bescheid: Bescheid = service.getBescheidFormValue();
+
+ expect(bescheid).toEqual({
+ bewilligt: true,
+ beschiedenAm: formatForDatabase(now),
+ } as Bescheid);
+ });
+ });
+});
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.ts
new file mode 100644
index 0000000000000000000000000000000000000000..ca522ee6a9d6dae7505db2630572da013258d13f
--- /dev/null
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid.formservice.ts
@@ -0,0 +1,93 @@
+import { Bescheid, BescheidLinkRel, BescheidResource, BescheidSendBy, BescheidService } from '@alfa-client/bescheid-shared';
+import { AbstractFormService, StateResource, convertToBoolean, formatForDatabase } from '@alfa-client/tech-shared';
+import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
+import { Injectable } from '@angular/core';
+import { UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
+import { Resource, ResourceUri, getUrl, hasLink } from '@ngxp/rest';
+import { isUndefined } from 'lodash-es';
+import { Observable, startWith } from 'rxjs';
+
+@Injectable()
+export class BescheidFormService extends AbstractFormService {
+ static readonly FIELD_BESCHIEDEN_AM = 'beschiedenAm';
+ static readonly FIELD_BEWILLIGT = 'bewilligt';
+ static readonly FIELD_BESCHEID_DOCUMENT = 'bescheidDocument';
+ static readonly FIELD_ATTACHMENTS = 'attachments';
+ public static readonly FIELD_SEND_BY = 'sendBy';
+ static readonly FIELD_NACHRICHT_SUBJECT = 'nachrichtSubject';
+ static readonly FIELD_NACHRICHT_TEXT = 'nachrichtText';
+
+ static readonly FIELD_PATH_PREFIX = 'command.body';
+
+ private vorgangWithEingangResource: VorgangWithEingangResource;
+
+ constructor(
+ formBuilder: UntypedFormBuilder,
+ private readonly bescheidService: BescheidService,
+ ) {
+ super(formBuilder);
+ }
+
+ protected initForm(): UntypedFormGroup {
+ return this.formBuilder.group({
+ [BescheidFormService.FIELD_BESCHIEDEN_AM]: new UntypedFormControl(new Date(Date.now())),
+ [BescheidFormService.FIELD_BEWILLIGT]: new UntypedFormControl('true'),
+ [BescheidFormService.FIELD_SEND_BY]: new UntypedFormControl(BescheidSendBy.NACHRICHT),
+ [BescheidFormService.FIELD_BESCHEID_DOCUMENT]: new UntypedFormControl(null),
+ [BescheidFormService.FIELD_ATTACHMENTS]: new UntypedFormArray([]),
+ [BescheidFormService.FIELD_NACHRICHT_SUBJECT]: new UntypedFormControl(''),
+ [BescheidFormService.FIELD_NACHRICHT_TEXT]: new UntypedFormControl(''),
+ });
+ }
+
+ protected doSubmit(): Observable<StateResource<Resource>> {
+ return this.bescheidService.createBescheid(this.vorgangWithEingangResource, this.getBescheidFormValue());
+ }
+
+ protected getPathPrefix(): string {
+ return BescheidFormService.FIELD_PATH_PREFIX;
+ }
+
+ public patchValues(bescheid: BescheidResource): void {
+ const bescheidDocumentUri: ResourceUri = this.getBescheidDocumentUri(bescheid);
+ this.bescheidService.setDocumentUri(bescheidDocumentUri);
+ this.patch({
+ [BescheidFormService.FIELD_BESCHIEDEN_AM]: bescheid.beschiedenAm,
+ [BescheidFormService.FIELD_BEWILLIGT]: String(bescheid.bewilligt),
+ [BescheidFormService.FIELD_BESCHEID_DOCUMENT]: bescheidDocumentUri,
+ [BescheidFormService.FIELD_SEND_BY]: isUndefined(bescheid.sendBy) ? BescheidSendBy.NACHRICHT : bescheid.sendBy,
+ [BescheidFormService.FIELD_NACHRICHT_SUBJECT]: bescheid.nachrichtSubject,
+ [BescheidFormService.FIELD_NACHRICHT_TEXT]: bescheid.nachrichtText,
+ });
+ bescheid.attachments.forEach((attachmentLink) =>
+ (this.form.controls[BescheidFormService.FIELD_ATTACHMENTS] as UntypedFormArray).push(
+ new UntypedFormControl(attachmentLink),
+ ),
+ );
+ }
+
+ private getBescheidDocumentUri(bescheid: BescheidResource): ResourceUri | null {
+ if (hasLink(bescheid, BescheidLinkRel.BESCHEID_DOCUMENT)) {
+ return getUrl(bescheid, BescheidLinkRel.BESCHEID_DOCUMENT);
+ }
+ return null;
+ }
+
+ public getBescheidFormValueChanges(): Observable<Bescheid> {
+ return this.form.valueChanges.pipe(startWith(this.getBescheidFormValue()));
+ }
+
+ public getBescheidFormValue(): Bescheid {
+ const value: any = this.getFormValue();
+ return {
+ ...value,
+ beschiedenAm: formatForDatabase(value.beschiedenAm),
+ bewilligt: convertToBoolean(value.bewilligt),
+ attachments: value.attachments,
+ };
+ }
+
+ public setVorgangWithEingangResource(vorgangWithEingangResource: VorgangWithEingangResource): void {
+ this.vorgangWithEingangResource = vorgangWithEingangResource;
+ }
+}
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
index e80dff3c3e0610a0d46b4b5babfa41c1d713d01a..0b21469bbe360803b4356a8b03a23539b4073e97 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid.module.ts
@@ -13,12 +13,31 @@ import { DocumentInBescheidContainerComponent } from './bescheid-list-in-vorgang
import { BeschiedenDateContainerComponent } from './beschieden-date-in-vorgang-container/beschieden-date-container/beschieden-date-container.component';
import { BeschiedenDateInVorgangContainerComponent } from './beschieden-date-in-vorgang-container/beschieden-date-in-vorgang-container.component';
+import { ButtonWithSpinnerComponent } from '@ods/component';
import {
BescheidStatusTextComponent,
BescheidWrapperComponent,
+ ButtonComponent,
CloseIconComponent,
+ RadioButtonCardComponent,
StampIconComponent,
} from '@ods/system';
+import { BescheidWizardContainerComponent } from './bescheid-wizard-container/bescheid-wizard-container.component';
+import { BescheidWizardAbschliessenButtonComponent } from './bescheid-wizard-container/bescheid-wizard/abschliessen-button/bescheid-wizard-abschliessen-button.component';
+import { BescheidWizardAbschliessenDialogContainerComponent } from './bescheid-wizard-container/bescheid-wizard/abschliessen-dialog-container/bescheid-wizard-abschliessen-dialog-container.component';
+import { BescheidWizardAntragBescheidenComponent } from './bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/bescheid-wizard-antrag-bescheiden.component';
+import { BescheidWizardAntragBescheidenFormComponent } from './bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/form/bescheid-wizard-antrag-bescheiden-form.component';
+import { BescheidWizardAntragBescheidenSummaryComponent } from './bescheid-wizard-container/bescheid-wizard/antrag-bescheiden/summary/bescheid-wizard-antrag-bescheiden-summary.component';
+import { BescheidWizardComponent } from './bescheid-wizard-container/bescheid-wizard/bescheid-wizard.component';
+import { BescheidWizardCancelDialogContainerComponent } from './bescheid-wizard-container/bescheid-wizard/cancel-dialog-container/bescheid-wizard-cancel-dialog-container.component';
+import { BescheidWizardDokumenteHochladenComponent } from './bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/bescheid-wizard-dokumente-hochladen.component';
+import { BescheidWizardDokumenteHochladenFormComponent } from './bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/form/bescheid-wizard-dokumente-hochladen-form.component';
+import { BescheidWizardDokumenteHochladenSummaryComponent } from './bescheid-wizard-container/bescheid-wizard/dokumente-hochladen/summary/bescheid-wizard-dokumente-hochladen-summary.component';
+import { BescheidWizardStepTitleComponent } from './bescheid-wizard-container/bescheid-wizard/step-title/bescheid-wizard-step-title.component';
+import { BescheidWizardStepperComponent } from './bescheid-wizard-container/bescheid-wizard/stepper/bescheid-wizard-stepper.component';
+import { BescheidWizardStepComponent } from './bescheid-wizard-container/bescheid-wizard/stepper/step/bescheid-wizard-step.component';
+import { BescheidWizardSummaryComponent } from './bescheid-wizard-container/bescheid-wizard/summary/bescheid-wizard-summary.component';
+import { BescheidWizardWeiterButtonComponent } from './bescheid-wizard-container/bescheid-wizard/weiter-button/bescheid-wizard-weiter-button.component';
@NgModule({
imports: [
@@ -32,6 +51,9 @@ import {
BescheidWrapperComponent,
StampIconComponent,
CloseIconComponent,
+ ButtonWithSpinnerComponent,
+ RadioButtonCardComponent,
+ ButtonComponent,
],
declarations: [
BescheidInVorgangContainerComponent,
@@ -41,6 +63,22 @@ import {
DocumentInBescheidContainerComponent,
BeschiedenDateContainerComponent,
BeschiedenDateInVorgangContainerComponent,
+ BescheidWizardContainerComponent,
+ BescheidWizardComponent,
+ BescheidWizardStepComponent,
+ BescheidWizardStepperComponent,
+ BescheidWizardStepTitleComponent,
+ BescheidWizardSummaryComponent,
+ BescheidWizardWeiterButtonComponent,
+ BescheidWizardCancelDialogContainerComponent,
+ BescheidWizardAntragBescheidenComponent,
+ BescheidWizardAntragBescheidenFormComponent,
+ BescheidWizardAntragBescheidenSummaryComponent,
+ BescheidWizardDokumenteHochladenComponent,
+ BescheidWizardDokumenteHochladenFormComponent,
+ BescheidWizardDokumenteHochladenSummaryComponent,
+ BescheidWizardAbschliessenButtonComponent,
+ BescheidWizardAbschliessenDialogContainerComponent,
],
exports: [
BescheidInVorgangContainerComponent,
diff --git a/alfa-client/libs/command-shared/test/command.ts b/alfa-client/libs/command-shared/test/command.ts
index 6843ee1d96699bc59ad4aeab4b49f14b63f6cd0b..d0ffa279db7e9a62c14410cba5652806c41b5895 100644
--- a/alfa-client/libs/command-shared/test/command.ts
+++ b/alfa-client/libs/command-shared/test/command.ts
@@ -25,9 +25,17 @@ 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 { CommandLinkRel, 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 {
+ Command,
+ CommandListResource,
+ CommandOrder,
+ CommandResource,
+ CommandStatus,
+ CreateCommand,
+ CreateCommandProps,
+} from '../src/lib/command.model';
export function createCommand(): Command {
return {
@@ -68,15 +76,11 @@ export function createCommandErrorResource(linkRelations: string[] = []): Comman
};
}
-export function createCommandErrorStateResource(
- linkRelations: string[] = [],
-): StateResource<CommandResource> {
+export function createCommandErrorStateResource(linkRelations: string[] = []): StateResource<CommandResource> {
return createStateResource(createCommandErrorResource(linkRelations));
}
-export function createCreateCommand(
- order: CommandOrder = CommandOrder.VORGANG_ANNEHMEN,
-): CreateCommand {
+export function createCreateCommand(order: CommandOrder = CommandOrder.VORGANG_ANNEHMEN): CreateCommand {
return { order, body: null };
}
@@ -88,3 +92,11 @@ export function createCreateCommandProps(): CreateCommandProps {
snackBarMessage: faker.word.sample(5),
};
}
+
+export function createSuccessfullyDoneCommandStateResource(): StateResource<CommandResource> {
+ return createCommandStateResource([CommandLinkRel.EFFECTED_RESOURCE]);
+}
+
+export function createSuccessfullyDoneCommandResource(): CommandResource {
+ return createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]);
+}
diff --git a/alfa-client/libs/common/.eslintrc.json b/alfa-client/libs/common/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..6685b2e35bbf3f0d58387f6617c9bd749c0c55f2
--- /dev/null
+++ b/alfa-client/libs/common/.eslintrc.json
@@ -0,0 +1,45 @@
+{
+ "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": "lib",
+ "style": "camelCase"
+ }
+ ],
+ "@angular-eslint/component-selector": [
+ "error",
+ {
+ "type": "element",
+ "prefix": "lib",
+ "style": "kebab-case"
+ }
+ ]
+ }
+ },
+ {
+ "files": ["*.html"],
+ "extends": ["plugin:@nx/angular-template"],
+ "rules": {}
+ },
+ {
+ "files": ["*.json"],
+ "parser": "jsonc-eslint-parser",
+ "rules": {
+ "@nx/dependency-checks": [
+ "error",
+ {
+ "ignoredFiles": ["{projectRoot}/eslint.config.{js,cjs,mjs}"]
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/alfa-client/libs/common/README.md b/alfa-client/libs/common/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..dd1a64c606a0de52c0f174b2239362bd9ea5a717
--- /dev/null
+++ b/alfa-client/libs/common/README.md
@@ -0,0 +1,7 @@
+# common
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test common` to execute the unit tests.
diff --git a/alfa-client/libs/common/jest.config.ts b/alfa-client/libs/common/jest.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cc270a9a40a45f60ca8b165405c609383b92ebc6
--- /dev/null
+++ b/alfa-client/libs/common/jest.config.ts
@@ -0,0 +1,21 @@
+export default {
+ displayName: 'common',
+ preset: '../../jest.preset.js',
+ setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
+ coverageDirectory: '../../coverage/libs/common',
+ transform: {
+ '^.+\\.(ts|mjs|js|html)$': [
+ 'jest-preset-angular',
+ {
+ tsconfig: '<rootDir>/tsconfig.spec.json',
+ stringifyContentPathRegex: '\\.(html|svg)$',
+ },
+ ],
+ },
+ transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
+ snapshotSerializers: [
+ 'jest-preset-angular/build/serializers/no-ng-attributes',
+ 'jest-preset-angular/build/serializers/ng-snapshot',
+ 'jest-preset-angular/build/serializers/html-comment',
+ ],
+};
diff --git a/alfa-client/libs/common/project.json b/alfa-client/libs/common/project.json
new file mode 100644
index 0000000000000000000000000000000000000000..75ea075f15e55a052c0cc5e7f02564ae3748e547
--- /dev/null
+++ b/alfa-client/libs/common/project.json
@@ -0,0 +1,20 @@
+{
+ "name": "common",
+ "$schema": "../../node_modules/nx/schemas/project-schema.json",
+ "sourceRoot": "libs/common/src",
+ "prefix": "lib",
+ "projectType": "library",
+ "tags": [],
+ "targets": {
+ "test": {
+ "executor": "@nx/jest:jest",
+ "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+ "options": {
+ "jestConfig": "libs/common/jest.config.ts"
+ }
+ },
+ "lint": {
+ "executor": "@nx/eslint:lint"
+ }
+ }
+}
diff --git a/alfa-client/libs/common/src/index.ts b/alfa-client/libs/common/src/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f8f49f20b7993383fbce5faf8a3db0b1524766a0
--- /dev/null
+++ b/alfa-client/libs/common/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/build-info/build-info.component';
diff --git a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.html b/alfa-client/libs/common/src/lib/build-info/build-info.component.html
similarity index 95%
rename from alfa-client/libs/navigation/src/lib/build-info/build-info.component.html
rename to alfa-client/libs/common/src/lib/build-info/build-info.component.html
index 41cce668006927fdd81db4f1c49e8eaca49358cd..097debe503d2855dd2fed9cd631badf65e9f1836 100644
--- a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.html
+++ b/alfa-client/libs/common/src/lib/build-info/build-info.component.html
@@ -30,6 +30,4 @@
<span data-test-id="build-time">{{ buildTime }}</span>
</ng-container>
</p>
-<p *ngIf="isNotProduction" data-test-id="not-production-text" class="test-environment text-error">
- Achtung Testumgebung
-</p>
+<p *ngIf="isNotProduction" data-test-id="not-production-text" class="test-environment">Achtung Testumgebung</p>
diff --git a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.scss b/alfa-client/libs/common/src/lib/build-info/build-info.component.scss
similarity index 95%
rename from alfa-client/libs/navigation/src/lib/build-info/build-info.component.scss
rename to alfa-client/libs/common/src/lib/build-info/build-info.component.scss
index 73f433970c0765f31b0f88b78a30fad26513afdb..2764bb91702a4060dda18b98c81fae6ad74b90c7 100644
--- a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.scss
+++ b/alfa-client/libs/common/src/lib/build-info/build-info.component.scss
@@ -36,10 +36,6 @@
transform-origin: right bottom;
}
-:host-context(.dark) {
- color: #ccc;
-}
-
p {
margin: 0;
line-height: 1;
@@ -47,7 +43,7 @@ p {
font-style: normal;
font-weight: 400;
font-size: 0.6875rem;
- color: #999;
+ color: theme('colors.text/70');
&.version {
span {
@@ -61,4 +57,5 @@ p {
margin-right: $navigation-height + $header-height;
letter-spacing: 0.42em;
text-transform: uppercase;
+ color: theme('colors.error');
}
diff --git a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts b/alfa-client/libs/common/src/lib/build-info/build-info.component.spec.ts
similarity index 97%
rename from alfa-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts
rename to alfa-client/libs/common/src/lib/build-info/build-info.component.spec.ts
index 663ad95f94a684c5b02cae60201ed823b66e4eab..ee6c655e9b27be5f653ac86eb2fbafbcb57400de 100644
--- a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.spec.ts
+++ b/alfa-client/libs/common/src/lib/build-info/build-info.component.spec.ts
@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { FormatDateWithTimePipe } from '@alfa-client/tech-shared';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormatDateWithTimePipe } from '@alfa-client/tech-shared';
import { createApiRootResource } from 'libs/api-root-shared/test/api-root';
import { BuildInfoComponent } from './build-info.component';
@@ -47,7 +47,8 @@ describe('BuildInfoComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [BuildInfoComponent, FormatDateWithTimePipe],
+ imports: [BuildInfoComponent],
+ declarations: [FormatDateWithTimePipe],
}).compileComponents();
});
diff --git a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.ts b/alfa-client/libs/common/src/lib/build-info/build-info.component.ts
similarity index 94%
rename from alfa-client/libs/navigation/src/lib/build-info/build-info.component.ts
rename to alfa-client/libs/common/src/lib/build-info/build-info.component.ts
index be8f576c3288bfb1818b1976030e5f0894a10d8d..8d7182c2f837679916ebc9b91ee0dc7ed382ca63 100644
--- a/alfa-client/libs/navigation/src/lib/build-info/build-info.component.ts
+++ b/alfa-client/libs/common/src/lib/build-info/build-info.component.ts
@@ -21,13 +21,16 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { Component, Input } from '@angular/core';
import { ApiRootResource } from '@alfa-client/api-root-shared';
+import { Component, Input } from '@angular/core';
import * as DateUtil from '@alfa-client/tech-shared';
+import { CommonModule } from '@angular/common';
@Component({
selector: 'alfa-build-info',
+ imports: [CommonModule],
+ standalone: true,
templateUrl: './build-info.component.html',
styleUrls: ['./build-info.component.scss'],
})
diff --git a/alfa-client/libs/common/src/test-setup.ts b/alfa-client/libs/common/src/test-setup.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f7fad5e59f9d4e62a097bbea63040551de396175
--- /dev/null
+++ b/alfa-client/libs/common/src/test-setup.ts
@@ -0,0 +1,11 @@
+import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+ teardown: { destroyAfterEach: false },
+ errorOnUnknownProperties: true,
+ errorOnUnknownElements: true,
+});
diff --git a/alfa-client/libs/common/tailwind.config.js b/alfa-client/libs/common/tailwind.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9b5f51f460d135ef0a5398164cf2a820caaa020
--- /dev/null
+++ b/alfa-client/libs/common/tailwind.config.js
@@ -0,0 +1,14 @@
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
+const { join } = require('path');
+
+const sharedTailwindConfig = require('../../libs/design-system/src/lib/tailwind-preset/tailwind.config.js');
+
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+ presets: [sharedTailwindConfig],
+ content: [join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'), ...createGlobPatternsForDependencies(__dirname)],
+ theme: {
+ extend: {},
+ },
+ plugins: [],
+};
diff --git a/alfa-client/libs/common/tsconfig.json b/alfa-client/libs/common/tsconfig.json
new file mode 100644
index 0000000000000000000000000000000000000000..7cc6baf2f58ed5ccfba098131996f579979e9f18
--- /dev/null
+++ b/alfa-client/libs/common/tsconfig.json
@@ -0,0 +1,16 @@
+{
+ "extends": "../../tsconfig.base.json",
+ "files": [],
+ "include": [],
+ "references": [
+ {
+ "path": "./tsconfig.lib.json"
+ },
+ {
+ "path": "./tsconfig.spec.json"
+ }
+ ],
+ "compilerOptions": {
+ "target": "es2022"
+ }
+}
diff --git a/alfa-client/libs/common/tsconfig.lib.json b/alfa-client/libs/common/tsconfig.lib.json
new file mode 100644
index 0000000000000000000000000000000000000000..4cab05d46338c6e9d4dfe6512fd7eb7f60340d3d
--- /dev/null
+++ b/alfa-client/libs/common/tsconfig.lib.json
@@ -0,0 +1,12 @@
+{
+ "extends": "./tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../dist/out-tsc",
+ "declaration": true,
+ "declarationMap": true,
+ "inlineSources": true,
+ "types": []
+ },
+ "exclude": ["src/**/*.spec.ts", "src/test-setup.ts", "jest.config.ts", "src/**/*.test.ts"],
+ "include": ["src/**/*.ts"]
+}
diff --git a/alfa-client/libs/common/tsconfig.lib.prod.json b/alfa-client/libs/common/tsconfig.lib.prod.json
new file mode 100644
index 0000000000000000000000000000000000000000..61b523783f299f511f27248a42f86e5f9c29512f
--- /dev/null
+++ b/alfa-client/libs/common/tsconfig.lib.prod.json
@@ -0,0 +1,7 @@
+{
+ "extends": "./tsconfig.lib.json",
+ "compilerOptions": {
+ "declarationMap": false
+ },
+ "angularCompilerOptions": {}
+}
diff --git a/alfa-client/libs/common/tsconfig.spec.json b/alfa-client/libs/common/tsconfig.spec.json
new file mode 100644
index 0000000000000000000000000000000000000000..7870b7c011681fb77d6114001f44d3eeca69975b
--- /dev/null
+++ b/alfa-client/libs/common/tsconfig.spec.json
@@ -0,0 +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"]
+}
diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.html b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.html
index aecfd7e8dcaf39151ce1772d111f06068feb5c45..d099703c582741cc1044529cb41f5783cf472aec 100644
--- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.html
+++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.html
@@ -1,9 +1,8 @@
<ods-checkbox
[fieldControl]="fieldControl"
- [value]="value"
[inputId]="inputId"
[label]="label"
- [disabled]="disabled"
+ [disabled]="control.disabled"
[hasError]="hasError"
>
<ods-validation-error
diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
index 9c80662fb8d43561499969f3931569d0cb542e29..53ecd61b001e6ecc4a41e9cfa3dd42b8e44b6ed8 100644
--- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { faker } from '@faker-js/faker';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
import { createInvalidParam } from 'libs/tech-shared/test/error';
+import { MockNgControl } from '../../../../test/form/MockNgControl';
import { CheckboxEditorComponent } from './checkbox-editor.component';
describe('CheckboxEditorComponent', () => {
@@ -20,6 +21,7 @@ describe('CheckboxEditorComponent', () => {
fixture = TestBed.createComponent(CheckboxEditorComponent);
component = fixture.componentInstance;
component.label = labelText;
+ component.control = new MockNgControl();
fixture.detectChanges();
});
diff --git a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.ts b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.ts
index 4ed5d7b07e60146f9a3dc471563c855466d888d7..50b10bd356bcd62bb6de90dddc399817704d7581 100644
--- a/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.ts
+++ b/alfa-client/libs/design-component/src/lib/form/checkbox-editor/checkbox-editor.component.ts
@@ -1,5 +1,6 @@
import { TechSharedModule } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
import { CheckboxComponent } from '@ods/system';
import { FormControlEditorAbstractComponent } from '../formcontrol-editor.abstract.component';
import { ValidationErrorComponent } from '../validation-error/validation-error.component';
@@ -7,14 +8,12 @@ import { ValidationErrorComponent } from '../validation-error/validation-error.c
@Component({
selector: 'ods-checkbox-editor',
standalone: true,
- imports: [CheckboxComponent, ValidationErrorComponent, TechSharedModule],
+ imports: [CheckboxComponent, ValidationErrorComponent, TechSharedModule, ReactiveFormsModule],
templateUrl: './checkbox-editor.component.html',
})
export class CheckboxEditorComponent extends FormControlEditorAbstractComponent {
- @Input() value: string;
@Input() inputId: string;
@Input() label: string;
- @Input() disabled: boolean = false;
get hasError(): boolean {
return this.invalidParams.length > 0;
diff --git a/alfa-client/libs/design-component/src/lib/form/formcontrol-editor.abstract.component.ts b/alfa-client/libs/design-component/src/lib/form/formcontrol-editor.abstract.component.ts
index cb0f3f5842b32a3ce76321d194097c9a2f64229a..3c1f8d9a1d19fd69416b0dab478500ea65867218 100644
--- a/alfa-client/libs/design-component/src/lib/form/formcontrol-editor.abstract.component.ts
+++ b/alfa-client/libs/design-component/src/lib/form/formcontrol-editor.abstract.component.ts
@@ -24,15 +24,12 @@
import { InvalidParam } from '@alfa-client/tech-shared';
import { Component, OnDestroy, OnInit, Optional, Self } from '@angular/core';
import { ControlValueAccessor, NgControl, UntypedFormControl } from '@angular/forms';
-import { isEmpty } from 'lodash-es';
import { Subscription } from 'rxjs';
@Component({
template: 'NO UI',
})
-export abstract class FormControlEditorAbstractComponent
- implements ControlValueAccessor, OnInit, OnDestroy
-{
+export abstract class FormControlEditorAbstractComponent implements ControlValueAccessor, OnInit, OnDestroy {
readonly fieldControl: UntypedFormControl = new UntypedFormControl();
public onChange = (text: string | Date) => undefined;
public onTouched = () => undefined;
@@ -46,7 +43,6 @@ export abstract class FormControlEditorAbstractComponent
if (this.control) this.control.valueAccessor = this;
this.changesSubscr = this.fieldControl.valueChanges.subscribe((val) => {
- val = isEmpty(val) ? null : val;
this.onChange(val);
this.setErrors();
});
@@ -91,9 +87,7 @@ export abstract class FormControlEditorAbstractComponent
get invalidParams(): InvalidParam[] {
return this.fieldControl.errors ?
- Object.keys(this.fieldControl.errors).map(
- (key) => <InvalidParam>this.fieldControl.errors[key],
- )
+ Object.keys(this.fieldControl.errors).map((key) => <InvalidParam>this.fieldControl.errors[key])
: [];
}
}
diff --git a/alfa-client/libs/design-component/test/form/MockNgControl.ts b/alfa-client/libs/design-component/test/form/MockNgControl.ts
new file mode 100644
index 0000000000000000000000000000000000000000..80a3bc01a22b76cc868465ded2b84a0b057071ab
--- /dev/null
+++ b/alfa-client/libs/design-component/test/form/MockNgControl.ts
@@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+import { AbstractControl, ControlValueAccessor, NgControl, UntypedFormControl } from '@angular/forms';
+
+@Injectable()
+export class MockNgControl extends NgControl {
+ valueAccessor: ControlValueAccessor | null = null;
+
+ get control(): AbstractControl {
+ return new UntypedFormControl(null);
+ }
+
+ viewToModelUpdate(newValue: any): void {}
+}
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.spec.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.spec.ts
index 4848c4005e5493630f498836b2807519da953cbe..bd5d2317e9642c5a633183483b806921e908ca3e 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.spec.ts
@@ -1,6 +1,8 @@
+import { ENTER_KEY, ESCAPE_KEY } from '@alfa-client/tech-shared';
import { getElementFromFixture } from '@alfa-client/test-utils';
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { createKeydownKeyboardEvent } from '../../../../../test-utils/src/lib/keyboard';
import { DropdownMenuComponent } from './dropdown-menu.component';
describe('DropdownMenuComponent', () => {
@@ -140,27 +142,6 @@ describe('DropdownMenuComponent', () => {
});
});
- describe('isEscapeKey', () => {
- it('should return true', () => {
- const escapeKeyEvent: KeyboardEvent = {
- ...new KeyboardEvent('esc'),
- key: 'Escape',
- };
-
- const result: boolean = component.isEscapeKey(escapeKeyEvent);
-
- expect(result).toBe(true);
- });
-
- it('should return false', () => {
- const keyEvent: KeyboardEvent = new KeyboardEvent('whatever');
-
- const result: boolean = component.isEscapeKey(keyEvent);
-
- expect(result).toBe(false);
- });
- });
-
describe('closePopupAndFocusButton', () => {
beforeEach(() => {
component.isPopupOpen = true;
@@ -198,11 +179,8 @@ describe('DropdownMenuComponent', () => {
});
describe('onKeydownHandler', () => {
- const e: KeyboardEvent = new KeyboardEvent('test');
-
beforeEach(() => {
component.closePopupAndFocusButton = jest.fn();
- component.isEscapeKey = jest.fn();
});
describe('popup is closed', () => {
@@ -210,10 +188,12 @@ describe('DropdownMenuComponent', () => {
component.isPopupClosed = jest.fn().mockReturnValue(true);
});
- it('should not check for escape key', () => {
- component.onKeydownHandler(e);
+ it('should not close popup', () => {
+ component.closePopupAndFocusButton = jest.fn();
+
+ component.onKeydownHandler(createKeydownKeyboardEvent(ESCAPE_KEY));
- expect(component.isEscapeKey).not.toHaveBeenCalled();
+ expect(component.closePopupAndFocusButton).not.toHaveBeenCalled();
});
});
@@ -222,22 +202,14 @@ describe('DropdownMenuComponent', () => {
component.isPopupClosed = jest.fn().mockReturnValue(false);
});
- it('should check for escape key', () => {
- component.onKeydownHandler(e);
-
- expect(component.isEscapeKey).toHaveBeenCalled();
- });
-
- it('should handle escape key', () => {
- component.isEscapeKey = jest.fn().mockReturnValue(true);
-
- component.onKeydownHandler(e);
+ it('should close popup', () => {
+ component.onKeydownHandler(createKeydownKeyboardEvent(ESCAPE_KEY));
expect(component.closePopupAndFocusButton).toHaveBeenCalled();
});
- it('should not handle escape key', () => {
- component.onKeydownHandler(e);
+ it('should not close popup', () => {
+ component.onKeydownHandler(createKeydownKeyboardEvent(ENTER_KEY));
expect(component.closePopupAndFocusButton).not.toHaveBeenCalled();
});
diff --git a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.ts b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.ts
index 35cc64b06437d36745806052b651115d4d307b99..02a78af00276c13f33a7874dc1781f4c325624b3 100644
--- a/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.ts
+++ b/alfa-client/libs/design-system/src/lib/dropdown-menu/dropdown-menu/dropdown-menu.component.ts
@@ -1,3 +1,4 @@
+import { isEscapeKey } from '@alfa-client/tech-shared';
import { CdkTrapFocus } from '@angular/cdk/a11y';
import { CommonModule } from '@angular/common';
import { Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core';
@@ -7,7 +8,7 @@ import { twMerge } from 'tailwind-merge';
selector: 'ods-dropdown-menu',
standalone: true,
imports: [CommonModule, CdkTrapFocus],
- template: `<div class="relative w-fit">
+ template: ` <div class="relative w-fit">
<button
[ngClass]="[twMerge('block w-fit outline-2 outline-offset-2 outline-focus', buttonClass)]"
(click)="handleButtonClick()"
@@ -24,8 +25,7 @@ import { twMerge } from 'tailwind-merge';
</button>
<div
*ngIf="isPopupOpen"
- class="bg-dropdownBg absolute max-h-120 min-w-44 max-w-80
- animate-fadeIn overflow-y-auto rounded shadow-md focus:outline-none"
+ class="absolute z-50 max-h-120 min-w-44 max-w-80 animate-fadeIn overflow-y-auto rounded bg-dropdownBg shadow-md focus:outline-none"
[ngClass]="alignTo === 'left' ? 'right-0' : 'left-0'"
role="menu"
aria-modal="true"
@@ -53,7 +53,7 @@ export class DropdownMenuComponent {
@HostListener('document:keydown', ['$event'])
onKeydownHandler(e: KeyboardEvent): void {
if (this.isPopupClosed()) return;
- if (this.isEscapeKey(e)) this.closePopupAndFocusButton();
+ if (isEscapeKey(e)) this.closePopupAndFocusButton();
}
@HostListener('document:click', ['$event'])
@@ -86,10 +86,6 @@ export class DropdownMenuComponent {
this.buttonRef.nativeElement.focus();
}
- isEscapeKey(e: KeyboardEvent): boolean {
- return e.key === 'Escape';
- }
-
isPopupClosed(): boolean {
return !this.isPopupOpen;
}
diff --git a/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts
index 9cab0abad5aa6845f9a6f622fa7bfde8ca3d35ec..3fbc1b80bfb06f3aac9a6af622920803a313100b 100644
--- a/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.component.ts
@@ -1,3 +1,4 @@
+import { TechSharedModule } from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
@@ -5,24 +6,22 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms';
@Component({
selector: 'ods-checkbox',
standalone: true,
- imports: [CommonModule, ReactiveFormsModule],
+ imports: [CommonModule, ReactiveFormsModule, TechSharedModule],
template: `
<div>
- <div class="flex items-start gap-3 text-start">
+ <div class="relative flex items-start gap-3 text-start">
<input
type="checkbox"
- class="disabled:border-disabled-dark disabled:bg-disabled peer relative box-border size-5 shrink-0 appearance-none rounded-sm
- border bg-whitetext outline outline-2 outline-offset-2 outline-transparent
- hover:border-2 focus-visible:border-background-200 disabled:hover:border"
+ class="peer box-border size-5 shrink-0 appearance-none rounded-sm border bg-whitetext outline outline-2 outline-offset-2 outline-transparent hover:border-2 focus-visible:border-background-200 disabled:border-disabled-dark disabled:bg-disabled disabled:hover:border"
[ngClass]="
hasError ?
'border-error hover:border-error focus-visible:outline-error'
: 'border-primary hover:border-primary-hover focus-visible:outline-focus'
"
- [value]="value"
- [checked]="fieldControl.value"
+ [formControl]="fieldControl"
[attr.id]="inputId"
- [disabled]="disabled"
+ [attr.disabled]="disabled ? true : null"
+ [attr.data-test-id]="(label | convertForDataTest) + '-checkbox-editor'"
/>
<label class="leading-5 text-text" [attr.for]="inputId">{{ label }}</label>
<svg
@@ -43,7 +42,6 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms';
})
export class CheckboxComponent {
@Input() fieldControl: FormControl = new FormControl(false);
- @Input() value: string;
@Input() inputId: string;
@Input() label: string;
@Input() disabled: boolean = false;
diff --git a/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts
index ce8dd243e62d68c65d58f4298744e5ded9ebedf6..c7a56bc1fa4a36b16977718cc68b6ca445b25f30 100644
--- a/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts
+++ b/alfa-client/libs/design-system/src/lib/form/checkbox/checkbox.stories.ts
@@ -22,7 +22,6 @@ type Story = StoryObj<CheckboxComponent>;
export const Default: Story = {
args: {
- value: 'Checkbox value',
label: 'Basic checkbox',
inputId: '1',
disabled: false,
@@ -32,7 +31,6 @@ export const Default: Story = {
label: { description: 'Checkbox label' },
disabled: { description: 'Disabled state of checkbox' },
inputId: { description: 'Id of checkbox input' },
- value: { description: 'Value of checkbox' },
hasError: { description: 'Has checkbox the error state' },
fieldControl: {
description: 'Form control object',
diff --git a/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts b/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
index a534a5276d34b072c1b8edee6e95e362a5296d77..58dcedb8b91762b9155936d039e9b383e12dcb8f 100644
--- a/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
+++ b/alfa-client/libs/design-system/src/lib/form/text-input/text-input.component.ts
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { cva, VariantProps } from 'class-variance-authority';
-import { ErrorMessageComponent } from '../error-message/error-message.component';
const textInputVariants = cva(
[
@@ -15,8 +14,7 @@ const textInputVariants = cva(
variant: {
default:
'border-primary-600/50 focus-visible:outline-focus focus-visible:border-background-200 hover:border-primary-hover',
- error:
- 'border-error/50 hover:border-error focus-visible:outline-error focus-visible:border-background-200',
+ error: 'border-error/50 hover:border-error focus-visible:outline-error focus-visible:border-background-200',
},
},
defaultVariants: {
@@ -29,28 +27,21 @@ type TextInputVariants = VariantProps<typeof textInputVariants>;
@Component({
selector: 'ods-text-input',
standalone: true,
- imports: [CommonModule, ErrorMessageComponent, ReactiveFormsModule, TechSharedModule],
+ imports: [CommonModule, ReactiveFormsModule, TechSharedModule],
template: `
<div class="relative">
<label *ngIf="showLabel" [for]="id" class="text-md mb-2 block font-medium text-text">
{{ inputLabel }}<ng-container *ngIf="required"><i aria-hidden="true">*</i></ng-container>
</label>
<div class="mt-2">
- <div
- *ngIf="withPrefix"
- class="pointer-events-none absolute bottom-2 left-2 flex size-6 items-center justify-center"
- >
+ <div *ngIf="withPrefix" class="pointer-events-none absolute bottom-2 left-2 flex size-6 items-center justify-center">
<ng-content select="[prefix]" />
</div>
<input
type="text"
[id]="id"
[formControl]="fieldControl"
- [ngClass]="[
- textInputVariants({ variant }),
- withPrefix ? 'pl-10' : '',
- withSuffix ? 'pr-10' : '',
- ]"
+ [ngClass]="[textInputVariants({ variant }), withPrefix ? 'pl-10' : '', withSuffix ? 'pr-10' : '']"
[placeholder]="placeholder"
[autocomplete]="autocomplete"
[attr.aria-required]="required"
@@ -59,10 +50,7 @@ type TextInputVariants = VariantProps<typeof textInputVariants>;
(click)="clickEmitter.emit()"
#inputElement
/>
- <div
- *ngIf="withSuffix"
- class="absolute bottom-2 right-2 flex size-6 items-center justify-center"
- >
+ <div *ngIf="withSuffix" class="absolute bottom-2 right-2 flex size-6 items-center justify-center">
<ng-content select="[suffix]" />
</div>
</div>
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
index b83a6e167dbaabae7a8a6e4b6595086ff48bde93..f8f85ec82f7b0fe16fe4c828de802f913da07c57 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.spec.ts
@@ -1,8 +1,10 @@
+import { ENTER_KEY, ESCAPE_KEY } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { EventEmitter } from '@angular/core';
import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing';
import { Resource } from '@ngxp/rest';
import { Subscription } from 'rxjs';
+import { createKeydownKeyboardEvent } from '../../../../../test-utils/src/lib/keyboard';
import { InstantSearchComponent } from './instant-search.component';
import { InstantSearchQuery, InstantSearchResult } from './instant-search.model';
@@ -391,7 +393,6 @@ describe('InstantSearchComponent', () => {
beforeEach(() => {
component.isSearchResultsEmpty = jest.fn();
component.isArrowNavigationKey = jest.fn();
- component.isEscapeKey = jest.fn();
component.handleArrowNavigation = jest.fn();
component.handleEscape = jest.fn();
});
@@ -413,10 +414,12 @@ describe('InstantSearchComponent', () => {
expect(component.isArrowNavigationKey).not.toHaveBeenCalled();
});
- it('should ignore escape key handling', () => {
- component.onKeydownHandler(keyboardEvent);
+ it('should not handle escape key', () => {
+ component.handleEscape = jest.fn();
+
+ component.onKeydownHandler(createKeydownKeyboardEvent(ESCAPE_KEY));
- expect(component.isEscapeKey).not.toHaveBeenCalled();
+ expect(component.handleEscape).not.toHaveBeenCalled();
});
});
@@ -452,24 +455,14 @@ describe('InstantSearchComponent', () => {
component.isArrowNavigationKey = jest.fn().mockReturnValue(false);
});
- it('should check for escape key', () => {
- component.onKeydownHandler(keyboardEvent);
-
- expect(component.isEscapeKey).toHaveBeenCalled();
- });
-
it('should handle escape key', () => {
- component.isEscapeKey = jest.fn().mockReturnValue(true);
-
- component.onKeydownHandler(keyboardEvent);
+ component.onKeydownHandler(createKeydownKeyboardEvent(ESCAPE_KEY));
expect(component.handleEscape).toHaveBeenCalled();
});
it('should not handle escape key', () => {
- component.isEscapeKey = jest.fn().mockReturnValue(false);
-
- component.onKeydownHandler(keyboardEvent);
+ component.onKeydownHandler(createKeydownKeyboardEvent(ENTER_KEY));
expect(component.handleEscape).not.toHaveBeenCalled();
});
@@ -511,22 +504,6 @@ describe('InstantSearchComponent', () => {
});
});
- describe('isEscapeKey', () => {
- it('should return true', () => {
- const escapeKeyEvent = { ...new KeyboardEvent('esc'), key: 'Escape' };
-
- const result: boolean = component.isEscapeKey(escapeKeyEvent);
-
- expect(result).toBe(true);
- });
-
- it('should return false', () => {
- const result: boolean = component.isEscapeKey(new KeyboardEvent('not escape'));
-
- expect(result).toBe(false);
- });
- });
-
describe('isLastItemOrOutOfArray', () => {
it.each([3, 5])('should return true for %s', (index: number) => {
const result: boolean = component.isLastItemOrOutOfArray(index, 4);
diff --git a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.ts b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.ts
index 8b23822f25beea96c9bdf42a52c4eba075c50b9d..f62dc5c2d201e15a711aa8e7b6275275f1669755 100644
--- a/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.ts
+++ b/alfa-client/libs/design-system/src/lib/instant-search/instant-search/instant-search.component.ts
@@ -1,4 +1,10 @@
-import { EMPTY_STRING, isNotNil } from '@alfa-client/tech-shared';
+import {
+ EMPTY_STRING,
+ isArrowDownKey,
+ isArrowUpKey,
+ isEscapeKey,
+ isNotNil,
+} from '@alfa-client/tech-shared';
import { CommonModule } from '@angular/common';
import {
Component,
@@ -118,7 +124,7 @@ export class InstantSearchComponent implements OnInit, OnDestroy {
onKeydownHandler(e: KeyboardEvent): void {
if (this.isSearchResultsEmpty()) return;
if (this.isArrowNavigationKey(e)) this.handleArrowNavigation(e);
- if (this.isEscapeKey(e)) this.handleEscape(e);
+ if (isEscapeKey(e)) this.handleEscape(e);
}
@HostListener('document:click', ['$event'])
@@ -209,11 +215,7 @@ export class InstantSearchComponent implements OnInit, OnDestroy {
}
isArrowNavigationKey(e: KeyboardEvent): boolean {
- return e.key === 'ArrowDown' || e.key === 'ArrowUp';
- }
-
- isEscapeKey(e: KeyboardEvent): boolean {
- return e.key === 'Escape';
+ return isArrowDownKey(e) || isArrowUpKey(e);
}
onItemClicked(searchResult: InstantSearchResult<Resource>, index: number): void {
diff --git a/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts b/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts
index 0aef13978f11b606c0be0d6e0dbb6c297e8149e0..04eeffba56f4a341b60d448202972da84925cf35 100644
--- a/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts
+++ b/alfa-client/libs/design-system/src/lib/list/list-item/list-item.component.spec.ts
@@ -27,7 +27,7 @@ describe('ListItemComponent', () => {
describe('input', () => {
describe('routerLink', () => {
it('should set href attribute', () => {
- component.path = faker.system.filePath();
+ component.path = encodeURI(faker.system.filePath());
const resultingLink: string = 'http://localhost' + component.path;
const linkElement: HTMLLinkElement = getElementFromFixture(fixture, getDataTestClassOf('list-item-link'));
diff --git a/alfa-client/libs/navigation/src/lib/navigation.module.ts b/alfa-client/libs/navigation/src/lib/navigation.module.ts
index 0a98c2c4232b12ea4f7e1004d30f8828bdd0769f..1622cf215a88c546c52288e1ffdda3c1d28075b2 100644
--- a/alfa-client/libs/navigation/src/lib/navigation.module.ts
+++ b/alfa-client/libs/navigation/src/lib/navigation.module.ts
@@ -21,26 +21,20 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
import { UiModule } from '@alfa-client/ui';
import { UserAssistanceModule } from '@alfa-client/user-assistance';
import { UserProfileModule } from '@alfa-client/user-profile';
import { UserSettingsModule } from '@alfa-client/user-settings';
import { VorgangSharedUiModule } from '@alfa-client/vorgang-shared-ui';
-import { BuildInfoComponent } from './build-info/build-info.component';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
import { HeaderContainerComponent } from './header-container/header-container.component';
import { HeaderLogoComponent } from './header-container/header/header-logo/header-logo.component';
import { HeaderComponent } from './header-container/header/header.component';
@NgModule({
- declarations: [
- BuildInfoComponent,
- HeaderComponent,
- HeaderContainerComponent,
- HeaderLogoComponent,
- ],
+ declarations: [HeaderComponent, HeaderContainerComponent, HeaderLogoComponent],
imports: [
CommonModule,
UiModule,
@@ -50,6 +44,6 @@ import { HeaderComponent } from './header-container/header/header.component';
UserSettingsModule,
UserAssistanceModule,
],
- exports: [BuildInfoComponent, HeaderContainerComponent],
+ exports: [HeaderContainerComponent],
})
export class NavigationModule {}
diff --git a/alfa-client/libs/tech-shared/src/index.ts b/alfa-client/libs/tech-shared/src/index.ts
index 970130b8c3cc71fccd268eb842d34a249f578750..91817109a1f0fefeef0d83f63bc61c1422b9d3ca 100644
--- a/alfa-client/libs/tech-shared/src/index.ts
+++ b/alfa-client/libs/tech-shared/src/index.ts
@@ -29,6 +29,7 @@ export * from './lib/error/error.handler';
export * from './lib/error/error.util';
export * from './lib/form.util';
export * from './lib/http.util';
+export * from './lib/keyboard.util';
export * from './lib/message-code';
export * from './lib/ngrx/actions';
export * from './lib/pipe/convert-api-error-to-error-messages.pipe';
diff --git a/alfa-client/libs/tech-shared/src/lib/keyboard.util.spec.ts b/alfa-client/libs/tech-shared/src/lib/keyboard.util.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..641555ae216d025aced3cd4bd9150b349c391cfb
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/keyboard.util.spec.ts
@@ -0,0 +1,67 @@
+import { createKeydownKeyboardEvent } from '../../../test-utils/src/lib/keyboard';
+import {
+ ARROW_DOWN_KEY,
+ ARROW_UP_KEY,
+ ENTER_KEY,
+ ESCAPE_KEY,
+ isArrowDownKey,
+ isArrowUpKey,
+ isEnterKey,
+ isEscapeKey,
+} from './keyboard.util';
+
+describe('keyboard', () => {
+ describe('isEscapeKey', () => {
+ it('should return true', () => {
+ const isEscape: boolean = isEscapeKey(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ expect(isEscape).toBeTruthy();
+ });
+
+ it('should return false', () => {
+ const isEscape: boolean = isEscapeKey(createKeydownKeyboardEvent(ENTER_KEY));
+
+ expect(isEscape).toBeFalsy();
+ });
+ });
+
+ describe('isEnterKey', () => {
+ it('should return true', () => {
+ const isEnter: boolean = isEnterKey(createKeydownKeyboardEvent(ENTER_KEY));
+
+ expect(isEnter).toBeTruthy();
+ });
+
+ it('should return false', () => {
+ const isEnter: boolean = isEnterKey(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ expect(isEnter).toBeFalsy();
+ });
+ });
+ describe('isArrowUpKey', () => {
+ it('should return true', () => {
+ const isArrowUp: boolean = isArrowUpKey(createKeydownKeyboardEvent(ARROW_UP_KEY));
+
+ expect(isArrowUp).toBeTruthy();
+ });
+
+ it('should return false', () => {
+ const isArrowUp: boolean = isArrowUpKey(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ expect(isArrowUp).toBeFalsy();
+ });
+ });
+ describe('isArrowDownKey', () => {
+ it('should return true', () => {
+ const isArrowDown: boolean = isArrowDownKey(createKeydownKeyboardEvent(ARROW_DOWN_KEY));
+
+ expect(isArrowDown).toBeTruthy();
+ });
+
+ it('should return false', () => {
+ const isEnter: boolean = isArrowDownKey(createKeydownKeyboardEvent(ESCAPE_KEY));
+
+ expect(isEnter).toBeFalsy();
+ });
+ });
+});
diff --git a/alfa-client/libs/tech-shared/src/lib/keyboard.util.ts b/alfa-client/libs/tech-shared/src/lib/keyboard.util.ts
new file mode 100644
index 0000000000000000000000000000000000000000..879628cefa63b44b4408d7ac977ba29a8b9bdd39
--- /dev/null
+++ b/alfa-client/libs/tech-shared/src/lib/keyboard.util.ts
@@ -0,0 +1,20 @@
+export const ESCAPE_KEY = 'Escape';
+export const ENTER_KEY = 'Enter';
+export const ARROW_DOWN_KEY = 'ArrowDown';
+export const ARROW_UP_KEY = 'ArrowUp';
+
+export function isEscapeKey(keyboardEvent: KeyboardEvent) {
+ return keyboardEvent.key === ESCAPE_KEY;
+}
+
+export function isEnterKey(keyboardEvent: KeyboardEvent) {
+ return keyboardEvent.key === ENTER_KEY;
+}
+
+export function isArrowDownKey(keyboardEvent: KeyboardEvent) {
+ return keyboardEvent.key === ARROW_DOWN_KEY;
+}
+
+export function isArrowUpKey(keyboardEvent: KeyboardEvent) {
+ return keyboardEvent.key === ARROW_UP_KEY;
+}
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 e5a9f28f281136f4ac735e04259cc76ce15a051e..b8d4d562732d4553910f3b0020c7f96377798179 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
@@ -23,6 +23,7 @@
*/
import { Resource } from '@ngxp/rest';
+import { createCommandStateResource } from '../../../../command-shared/test/command';
import { DummyListLinkRel } from '../../../test/dummy';
import { createApiError } from '../../../test/error';
import { createDummyListResource, createDummyResource, toResource } from '../../../test/resource';
@@ -38,6 +39,7 @@ import {
isInvalidResourceCombination,
isLoaded,
isLoadingRequired,
+ isNotLoading,
isValidStateResource,
} from './resource.util';
@@ -167,19 +169,13 @@ describe('resource util', () => {
describe('containsLoading', () => {
it('should return true', () => {
- const contains = containsLoading([
- createEmptyStateResource(true),
- createEmptyStateResource(false),
- ]);
+ const contains = containsLoading([createEmptyStateResource(true), createEmptyStateResource(false)]);
expect(contains).toBeTruthy();
});
it('should return false', () => {
- const contains = containsLoading([
- createEmptyStateResource(false),
- createEmptyStateResource(false),
- ]);
+ const contains = containsLoading([createEmptyStateResource(false), createEmptyStateResource(false)]);
expect(contains).toBeFalsy();
});
@@ -193,10 +189,7 @@ describe('resource util', () => {
});
it('should return loaded', () => {
- const loaded = getSuccessfullyLoaded([
- createEmptyStateResource<Resource>(true),
- loadedStateResource,
- ]);
+ const loaded = getSuccessfullyLoaded([createEmptyStateResource<Resource>(true), loadedStateResource]);
expect(loaded).toEqual([loadedStateResource]);
});
@@ -230,10 +223,7 @@ describe('resource util', () => {
it('should return true on loaded stateResource while configResource is null', () => {
const stateResource: StateResource<Resource> = createStateResource(createDummyResource());
- const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(
- stateResource,
- null,
- );
+ const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(stateResource, null);
expect(isInvalidCombination).toBeTruthy();
});
@@ -242,10 +232,7 @@ describe('resource util', () => {
const stateResource: StateResource<Resource> = createEmptyStateResource();
const configResource: Resource = createDummyResource();
- const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(
- stateResource,
- configResource,
- );
+ const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(stateResource, configResource);
expect(isInvalidCombination).toBeTruthy();
});
@@ -257,10 +244,7 @@ describe('resource util', () => {
};
const configResource: Resource = createDummyResource();
- const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(
- stateResource,
- configResource,
- );
+ const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(stateResource, configResource);
expect(isInvalidCombination).toBeFalsy();
});
@@ -272,12 +256,29 @@ describe('resource util', () => {
};
const configResource: Resource = createDummyResource();
- const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(
- stateResource,
- configResource,
- );
+ const isInvalidCombination: boolean = isInvalidResourceCombination<Resource, Resource>(stateResource, configResource);
expect(isInvalidCombination).toBeTruthy();
});
});
+
+ describe('isNotLoading', () => {
+ it('should return true for empty state resource', () => {
+ const notLoading: boolean = isNotLoading(createEmptyStateResource());
+
+ expect(notLoading).toBeTruthy();
+ });
+
+ it('should return true', () => {
+ const notLoading: boolean = isNotLoading(createCommandStateResource());
+
+ expect(notLoading).toBeTruthy();
+ });
+
+ it('should return false', () => {
+ const notLoading: boolean = isNotLoading(createEmptyStateResource(true));
+
+ expect(notLoading).toBeFalsy();
+ });
+ });
});
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 4691f7998807aa6e0e35dbcea7d84a5fd4a09885..92900b7913c8f51f52166cbed03eeaf181557a06 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
@@ -69,6 +69,10 @@ export function isLoaded<T>(stateResource: StateResource<T>): boolean {
return !stateResource.loading && !stateResource.reload && isNotNull(stateResource.resource);
}
+export function isNotLoading<T>(stateResource: StateResource<T>): boolean {
+ return !stateResource.loading;
+}
+
export function hasStateResourceError(stateResource: StateResource<any>): boolean {
return !isNil(stateResource.error);
}
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 e14057ca1213095531293412d81b4952f80e5e1d..c2a00e20b56393869eb2be605d6585d1a85564b4 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
@@ -23,6 +23,7 @@
*/
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Injectable } from '@angular/core';
import { Resource } from '@ngxp/rest';
import { isNil } from 'lodash-es';
import { identity, Observable, OperatorFunction } from 'rxjs';
@@ -32,6 +33,7 @@ import { HttpError, InvalidParam, ProblemDetail } from '../tech.model';
import { isNotUndefined } from '../tech.util';
import { setInvalidParamValidationError } from '../validation/tech.validation.util';
+@Injectable()
export abstract class AbstractFormService<T extends Resource = Resource> {
form: UntypedFormGroup;
pathPrefix: string;
diff --git a/alfa-client/libs/test-utils/src/lib/dialog.ts b/alfa-client/libs/test-utils/src/lib/dialog.ts
index d9a32f03a17d554f48e5263d1df4c4b7bb552b9b..c882a2b8ca85ca7a09a87fb792aac41535b97249 100644
--- a/alfa-client/libs/test-utils/src/lib/dialog.ts
+++ b/alfa-client/libs/test-utils/src/lib/dialog.ts
@@ -1 +1,13 @@
-export const dialogRefMock = { close: jest.fn() };
+import { jest } from '@jest/globals';
+import { EMPTY, Observable } from 'rxjs';
+
+export class DialogRefMock<R = unknown> {
+ public keydownEvents: Observable<KeyboardEvent> = EMPTY;
+ public closed: Observable<R> = EMPTY;
+
+ public close = jest.fn();
+}
+
+export function createDialogRefMock<R = unknown>(): DialogRefMock<R> {
+ return new DialogRefMock();
+}
diff --git a/alfa-client/libs/test-utils/src/lib/helper.ts b/alfa-client/libs/test-utils/src/lib/helper.ts
index b95ce2e05c2a1912d502259ff1172ae34b16959b..95186d5b2b5cf003cbbb1a4cf33ec9388d1ebaa2 100644
--- a/alfa-client/libs/test-utils/src/lib/helper.ts
+++ b/alfa-client/libs/test-utils/src/lib/helper.ts
@@ -26,20 +26,22 @@ import { ComponentFixture } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { EventData } from './model';
-export function getElementFromFixtureByType<T>(
- fixture: ComponentFixture<any>,
- component: Type<T>,
-): T {
+export function getElementFromFixtureByType<T>(fixture: ComponentFixture<any>, component: Type<T>): T {
return getDebugElementFromFixtureByType(fixture, component).componentInstance as T;
}
-function getDebugElementFromFixtureByType<T>(
- fixture: ComponentFixture<any>,
- component: Type<T>,
-): DebugElement {
+function getDebugElementFromFixtureByType<T>(fixture: ComponentFixture<any>, component: Type<T>): DebugElement {
return fixture.debugElement.query(By.directive(component));
}
+export function getElementsFromFixtureByType<T>(fixture: ComponentFixture<any>, component: Type<T>): T[] {
+ return getDebugElementsFromFixtureByType(fixture, component).map((element: DebugElement) => element.componentInstance as T);
+}
+
+function getDebugElementsFromFixtureByType<T>(fixture: ComponentFixture<any>, component: Type<T>): DebugElement[] {
+ return fixture.debugElement.queryAll(By.directive(component));
+}
+
export function getElementFromFixture(fixture: ComponentFixture<any>, htmlElement: string): any {
return fixture.nativeElement.querySelector(htmlElement);
}
@@ -48,45 +50,33 @@ export function getElementsFromFixture(fixture: ComponentFixture<any>, htmlEleme
return fixture.nativeElement.querySelectorAll(htmlElement);
}
-export function dispatchEventFromFixture<T>(
- fixture: ComponentFixture<T>,
- elementSelector: string,
- event: string,
-): void {
+export function dispatchEventFromFixture<T>(fixture: ComponentFixture<T>, elementSelector: string, event: string): void {
const element: DebugElement = getDebugElementFromFixtureByCss(fixture, elementSelector);
element.nativeElement.dispatchEvent(new Event(event));
}
export function triggerEvent<T>(eventData: EventData<T>) {
- const element: DebugElement = getDebugElementFromFixtureByCss(
- eventData.fixture,
- eventData.elementSelector,
- );
+ const element: DebugElement = getDebugElementFromFixtureByCss(eventData.fixture, eventData.elementSelector);
element.triggerEventHandler(eventData.name, eventData.data);
}
-export function getDebugElementFromFixtureByCss(
- fixture: ComponentFixture<any>,
- query: string,
-): DebugElement {
+export function getDebugElementFromFixtureByCss(fixture: ComponentFixture<any>, query: string): DebugElement {
return fixture.debugElement.query(By.css(query));
}
+export function getElementComponentFromFixtureByCss<T>(fixture: ComponentFixture<any>, query: string): T {
+ return fixture.debugElement.query(By.css(query)).componentInstance as T;
+}
+
export function getElementFromDomRoot(fixture: ComponentFixture<any>, htmlElement: string): any {
return fixture.nativeElement.parentNode.querySelector(htmlElement);
}
-function getDebugElementFromFixtureByDirective(
- fixture: ComponentFixture<any>,
- query: Type<any>,
-): DebugElement {
+function getDebugElementFromFixtureByDirective(fixture: ComponentFixture<any>, query: Type<any>): DebugElement {
return fixture.debugElement.query(By.directive(query));
}
-function getAllDebugElementsFromFixtureByDirective(
- fixture: ComponentFixture<any>,
- query: Type<any>,
-): DebugElement[] {
+function getAllDebugElementsFromFixtureByDirective(fixture: ComponentFixture<any>, query: Type<any>): DebugElement[] {
return fixture.debugElement.queryAll(By.directive(query));
}
@@ -95,7 +85,5 @@ export function getMockComponent<T>(fixture: ComponentFixture<unknown>, componen
}
export function getMockComponents<T>(fixture: ComponentFixture<unknown>, component: Type<T>): T[] {
- return getAllDebugElementsFromFixtureByDirective(fixture, component).map(
- (debugElement) => <T>debugElement.componentInstance,
- );
+ return getAllDebugElementsFromFixtureByDirective(fixture, component).map((debugElement) => <T>debugElement.componentInstance);
}
diff --git a/alfa-client/libs/test-utils/src/lib/keyboard.ts b/alfa-client/libs/test-utils/src/lib/keyboard.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8f53ef59ed1ce4dbbc6e03e35a18fd8b6432a948
--- /dev/null
+++ b/alfa-client/libs/test-utils/src/lib/keyboard.ts
@@ -0,0 +1,3 @@
+export function createKeydownKeyboardEvent(key: string): KeyboardEvent {
+ return new KeyboardEvent('keydown', { key });
+}
diff --git a/alfa-client/libs/test-utils/src/lib/observable.ts b/alfa-client/libs/test-utils/src/lib/observable.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8748d82162cb6e4bafce46984753a2674a810b98
--- /dev/null
+++ b/alfa-client/libs/test-utils/src/lib/observable.ts
@@ -0,0 +1,10 @@
+import { Mock, mock } from '@alfa-client/test-utils';
+import { Observable, Subscription } from 'rxjs';
+
+export function createSubscribedObservableMock<T>(): [Mock<Observable<T>>, Mock<Subscription>] {
+ const observableMock: Mock<Observable<T>> = mock(Observable<T>);
+ observableMock.pipe.mockReturnValue(observableMock);
+ const subscription: Mock<Subscription> = mock(Subscription);
+ observableMock.subscribe.mockReturnValue(subscription);
+ return [observableMock, subscription];
+}
diff --git a/alfa-client/libs/ui/src/index.ts b/alfa-client/libs/ui/src/index.ts
index ed84f3db5d20804637786f2d47d4e2ad8fed0f65..db9b583e4c67de83d5638cee0b66f31acbbb4720 100644
--- a/alfa-client/libs/ui/src/index.ts
+++ b/alfa-client/libs/ui/src/index.ts
@@ -50,6 +50,7 @@ export * from './lib/ui/open-url-button/open-url-button.component';
export * from './lib/ui/ozgcloud-button/ozgcloud-button-with-spinner/ozgcloud-button-with-spinner.component';
export * from './lib/ui/ozgcloud-button/ozgcloud-icon-button-primary/ozgcloud-icon-button-primary.component';
export * from './lib/ui/ozgcloud-button/ozgcloud-stroked-button-with-spinner/ozgcloud-stroked-button-with-spinner.component';
+export * from './lib/ui/ozgcloud-dialog/ozgcloud-dialog.result';
export * from './lib/ui/ozgcloud-dialog/ozgcloud-dialog.service';
export * from './lib/ui/ozgcloud-icon/ozgcloud-icon.component';
export * from './lib/ui/ozgcloud-menu/ozgcloud-menu.component';
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.spec.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c927d248d6c5de7a207ca6ea492905a8369246c1
--- /dev/null
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.spec.ts
@@ -0,0 +1,82 @@
+import { createEmptyStateResource } from '@alfa-client/tech-shared';
+import { createSuccessfullyDoneCommandStateResource } from '../../../../../command-shared/test/command';
+import {
+ createDialogCancelResult,
+ createDialogResult,
+ isDialogCanceled,
+ isDialogSuccessfullyCompleted,
+ OzgcloudDialogCommandResult,
+} from './ozgcloud-dialog.result';
+
+describe('ozgcloud-dialog.result', () => {
+ describe('isDialogCanceled', () => {
+ it('should return true', () => {
+ const isDialogCancelled: boolean = isDialogCanceled({ stateResource: createEmptyStateResource() });
+
+ expect(isDialogCancelled).toBeTruthy();
+ });
+
+ it('should return false for null result', () => {
+ const isDialogCancelled: boolean = isDialogCanceled(null);
+
+ expect(isDialogCancelled).toBeFalsy();
+ });
+
+ it('should return false for null state resource', () => {
+ const isDialogCancelled: boolean = isDialogCanceled({ stateResource: null });
+
+ expect(isDialogCancelled).toBeFalsy();
+ });
+
+ it('should return false for non empty state resource', () => {
+ const isDialogCancelled: boolean = isDialogCanceled({ stateResource: createSuccessfullyDoneCommandStateResource() });
+
+ expect(isDialogCancelled).toBeFalsy();
+ });
+ });
+
+ describe('isDialogSuccessfullyCompleted', () => {
+ it('should return true', () => {
+ const isSuccessfullyCompleted: boolean = isDialogSuccessfullyCompleted({
+ stateResource: createSuccessfullyDoneCommandStateResource(),
+ });
+ expect(isSuccessfullyCompleted).toBeTruthy();
+ });
+
+ it('should return false for null result', () => {
+ const isSuccessfullyCompleted: boolean = isDialogSuccessfullyCompleted(null);
+
+ expect(isSuccessfullyCompleted).toBeFalsy();
+ });
+
+ it('should return false for null state resource', () => {
+ const isSuccessfullyCompleted: boolean = isDialogSuccessfullyCompleted({ stateResource: null });
+
+ expect(isSuccessfullyCompleted).toBeFalsy();
+ });
+
+ it('should return false for empty state resource', () => {
+ const isSuccessfullyCompleted: boolean = isDialogSuccessfullyCompleted({ stateResource: createEmptyStateResource() });
+
+ expect(isSuccessfullyCompleted).toBeFalsy();
+ });
+ });
+
+ describe('createDialogCancelResult', () => {
+ it('should create', () => {
+ const dialogResult: OzgcloudDialogCommandResult = createDialogCancelResult();
+
+ expect(dialogResult.stateResource).toEqual(createEmptyStateResource());
+ });
+ });
+
+ describe('createDialogResult', () => {
+ it('should create', () => {
+ const stateResource = createSuccessfullyDoneCommandStateResource();
+
+ const dialogCommandResult: OzgcloudDialogCommandResult = createDialogResult(stateResource);
+
+ expect(dialogCommandResult.stateResource).toBe(stateResource);
+ });
+ });
+});
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.ts
new file mode 100644
index 0000000000000000000000000000000000000000..7404c7632d1965e81e92933aa4c68f18017cc1ad
--- /dev/null
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.result.ts
@@ -0,0 +1,29 @@
+import { CommandResource, isSuccessfulDone } from '@alfa-client/command-shared';
+import {
+ StateResource,
+ createEmptyStateResource,
+ isEmptyStateResource,
+} from '@alfa-client/tech-shared';
+
+export class OzgcloudDialogCommandResult<D = unknown> {
+ stateResource: StateResource<CommandResource>;
+ data?: D;
+}
+
+export function createDialogCancelResult(): OzgcloudDialogCommandResult {
+ return { stateResource: createEmptyStateResource() };
+}
+
+export function createDialogResult(
+ stateResource: StateResource<CommandResource>,
+): OzgcloudDialogCommandResult {
+ return { stateResource };
+}
+
+export function isDialogCanceled(dialogResult?: OzgcloudDialogCommandResult): boolean {
+ return dialogResult && isEmptyStateResource(dialogResult.stateResource);
+}
+
+export function isDialogSuccessfullyCompleted(dialogResult?: OzgcloudDialogCommandResult): boolean {
+ return dialogResult && isSuccessfulDone(dialogResult.stateResource?.resource);
+}
diff --git a/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.service.ts b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.service.ts
index ca7bf24afd1e3f7fb1f4ba918cc6e3fe768aca33..61ff0c02a6c99af5ab62322705891bda9832e7d0 100644
--- a/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.service.ts
+++ b/alfa-client/libs/ui/src/lib/ui/ozgcloud-dialog/ozgcloud-dialog.service.ts
@@ -20,11 +20,11 @@ export class OzgcloudDialogService {
constructor(private dialog: Dialog) {}
- public openWizard<T, D>(component: ComponentType<T>, data?: D): DialogRef<T> {
- return this.openDialog<T>(component, this.buildDialogConfigWithData<D>(data, this.WIZARD_DIALOG_CONFIG));
+ public openWizard<C, D, R = unknown>(component: ComponentType<C>, data?: D): DialogRef<R> {
+ return this.openDialog<C, R>(component, this.buildDialogConfigWithData<D>(data, this.WIZARD_DIALOG_CONFIG));
}
- public open<T, D = unknown>(component: ComponentType<T>, data?: D): DialogRef<T> {
+ public open<C, D = unknown, R = unknown>(component: ComponentType<C>, data?: D): DialogRef<R> {
return this.openDialog(component, this.buildDialogConfigWithData(data));
}
@@ -36,13 +36,13 @@ export class OzgcloudDialogService {
return this.openInCallingComponentContext(component, viewContainerRef, data, this.GREY_BLUR_CONFIG);
}
- public openInCallingComponentContext<T, D = unknown>(
- component: ComponentType<T>,
+ public openInCallingComponentContext<C, D = unknown, R = unknown>(
+ component: ComponentType<C>,
viewContainerRef: ViewContainerRef,
data?: D,
dialogConfig?: DialogConfig,
- ): DialogRef<T> {
- return this.openDialog(component, this.buildDialogConfigWithData(data, { viewContainerRef, ...dialogConfig }));
+ ): DialogRef<R> {
+ return this.openDialog<C, R>(component, this.buildDialogConfigWithData(data, { viewContainerRef, ...dialogConfig }));
}
private buildDialogConfigWithData<D>(data: D, dialogConfig?: DialogConfig): DialogConfig | null {
@@ -52,8 +52,8 @@ export class OzgcloudDialogService {
return { ...dialogConfig, data };
}
- private openDialog<T>(component: ComponentType<T>, dialogConfig?: DialogConfig): DialogRef<T> {
- return this.dialog.open<T>(component, dialogConfig);
+ private openDialog<C, R = unknown>(component: ComponentType<C>, dialogConfig?: DialogConfig): DialogRef<R, C> {
+ return this.dialog.open<R, unknown, C>(component, dialogConfig);
}
public closeAll(): void {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index 5cda3412cc39266c656446c0c2e2bfc65aadb80a..d4eaeaf311e5360232e193238680f26f75bfd36e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -30,7 +30,7 @@
[text]="buttonText"
svgIcon="stamp"
[stateResource]="commandStateResource$ | async"
- (clickEmitter)="onClick()"
+ (clickEmitter)="bescheiden()"
>
</ozgcloud-stroked-button-with-spinner>
@@ -40,7 +40,7 @@
svgIcon="stamp"
[toolTip]="toolTipText"
[stateResource]="commandStateResource$ | async"
- (clickEmitter)="onClick()"
+ (clickEmitter)="bescheiden()"
>
</ozgcloud-icon-button-with-spinner>
</ng-container>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
index d6251e13d63c817db05ef4b8a744e5d100d88b82..9e0cd75bc9717c51e9b1a2fb8012e3906008e769 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
@@ -21,22 +21,19 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { BescheidResource, BescheidService, BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
-import {
- HasLinkPipe,
- StateResource,
- createEmptyStateResource,
- createStateResource,
-} from '@alfa-client/tech-shared';
-import { mock } from '@alfa-client/test-utils';
+import { createEmptyStateResource, createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
+import { Mock, mock } from '@alfa-client/test-utils';
import {
IconButtonWithSpinnerComponent,
OzgcloudDialogService,
OzgcloudStrokedButtonWithSpinnerComponent,
} from '@alfa-client/ui';
+import { BescheidenDialogData } from '@alfa-client/vorgang-detail';
import {
VorgangCommandService,
+ VorgangService,
VorgangWithEingangLinkRel,
VorgangWithEingangResource,
} from '@alfa-client/vorgang-shared';
@@ -48,7 +45,6 @@ import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorga
import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs';
import { createBescheidResource } from '../../../../../bescheid-shared/src/test/bescheid';
-import { BescheidenDialogData } from '../../vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.model';
import { VorgangDetailBescheidenComponent } from '../../vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
import { BescheidenButtonComponent } from './bescheiden-button.component';
@@ -59,12 +55,20 @@ describe('BescheidenButtonComponent', () => {
const bescheidenButton: string = getDataTestIdOf('bescheiden-button');
const bescheidenIconButton: string = getDataTestIdOf('bescheiden-icon-button');
- const vorgangCommandService = mock(VorgangCommandService);
- const ozgcloudDialogService = mock(OzgcloudDialogService);
- const bescheidService = mock(BescheidService);
+ let vorgangCommandService: Mock<VorgangCommandService>;
+ let ozgcloudDialogService: Mock<OzgcloudDialogService>;
+ let bescheidService: Mock<BescheidService>;
+ let vorgangService: Mock<VorgangService>;
const dialogRef = <DialogRef<VorgangDetailBescheidenComponent>>{};
+ beforeEach(() => {
+ vorgangCommandService = mock(VorgangCommandService);
+ ozgcloudDialogService = mock(OzgcloudDialogService);
+ bescheidService = mock(BescheidService);
+ vorgangService = mock(VorgangService);
+ });
+
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
@@ -86,6 +90,10 @@ describe('BescheidenButtonComponent', () => {
provide: BescheidService,
useValue: bescheidService,
},
+ {
+ provide: VorgangService,
+ useValue: vorgangService,
+ },
],
}).compileComponents();
@@ -172,23 +180,21 @@ describe('BescheidenButtonComponent', () => {
});
});
- describe('onClick', () => {
+ describe('bescheiden', () => {
describe('should open bescheid wizard', () => {
beforeEach(() => {
component.openBescheidenWizard = jest.fn();
- component.vorgang = createVorgangWithEingangResource([
- VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT,
- ]);
+ component.vorgang = createVorgangWithEingangResource([VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT]);
});
it('should open bescheid wizard when create bescheid draft link exists', () => {
- component.onClick();
+ component.bescheiden();
expect(component.openBescheidenWizard).toHaveBeenCalled();
});
it('should open bescheid wizard when bescheid draft exists', () => {
- component.onClick();
+ component.bescheiden();
expect(component.openBescheidenWizard).toHaveBeenCalled();
});
@@ -196,16 +202,14 @@ describe('BescheidenButtonComponent', () => {
describe('should do bescheiden', () => {
const command: CommandResource = createCommandResource();
- const comandStateResource$: Observable<StateResource<CommandResource>> = of(
- createStateResource(command),
- );
+ const comandStateResource$: Observable<StateResource<CommandResource>> = of(createStateResource(command));
beforeEach(() => {
vorgangCommandService.bescheiden.mockReturnValue(comandStateResource$);
});
it('should call vorgangCommandService.bescheiden', () => {
- component.onClick();
+ component.bescheiden();
expect(vorgangCommandService.bescheiden).toHaveBeenCalled();
});
@@ -213,7 +217,7 @@ describe('BescheidenButtonComponent', () => {
it('should assign response', () => {
component.commandStateResource$ = of(createEmptyStateResource<CommandResource>());
- component.onClick();
+ component.bescheiden();
expect(component.commandStateResource$).toBe(comandStateResource$);
});
@@ -245,6 +249,37 @@ describe('BescheidenButtonComponent', () => {
});
});
+ // TODO: Use this version after completed Bescheid refactoring and delete the other version below.
+ // describe('openBescheidenWizard', () => {
+ // let dialogRefMock: DialogRefMock<BescheidWizardDialogResult>;
+ //
+ // beforeEach(() => {
+ // dialogRefMock = createDialogRefMock<BescheidWizardDialogResult>();
+ // ozgcloudDialogService.openWizard.mockReturnValue(dialogRefMock);
+ // });
+ //
+ // it('should open wizard dialog', () => {
+ // const vorgang = createVorgangWithEingangResource();
+ // component.vorgang = vorgang;
+ //
+ // component.openBescheidenWizard();
+ //
+ // expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(BescheidWizardContainerComponent, {
+ // vorgangWithEingangResource: vorgang,
+ // });
+ // });
+ //
+ // it('should handleBescheidWizardClosed', () => {
+ // component.handleBescheidWizardClosed = jest.fn();
+ // const dialogResult: BescheidWizardDialogResult = { reloadVorgang: true };
+ // dialogRefMock.closed = of(dialogResult);
+ //
+ // component.openBescheidenWizard();
+ //
+ // expect(component.handleBescheidWizardClosed).toHaveBeenCalledWith(dialogResult);
+ // });
+ // });
+
describe('openBescheidenWizard', () => {
it('should init', () => {
component.openBescheidenWizard();
@@ -253,9 +288,7 @@ describe('BescheidenButtonComponent', () => {
});
it('should open bescheiden dialog with existing draft', () => {
- component.vorgang = createVorgangWithEingangResource([
- VorgangWithEingangLinkRel.BESCHEID_DRAFT,
- ]);
+ component.vorgang = createVorgangWithEingangResource([VorgangWithEingangLinkRel.BESCHEID_DRAFT]);
component.openBescheidenDialogWithExistingDraft = jest.fn();
component.openBescheidenWizard();
@@ -289,11 +322,10 @@ describe('BescheidenButtonComponent', () => {
describe('openBescheidenDialogWithExistingDraft', () => {
const bescheidDraftResource: BescheidResource = createBescheidResource();
- const bescheidDraftStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidDraftResource);
- const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource(
- [VorgangWithEingangLinkRel.BESCHEID_DRAFT],
- );
+ const bescheidDraftStateResource: StateResource<BescheidResource> = createStateResource(bescheidDraftResource);
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource([
+ VorgangWithEingangLinkRel.BESCHEID_DRAFT,
+ ]);
beforeEach(() => {
component.vorgang = vorgangWithEingangResource;
@@ -303,13 +335,10 @@ describe('BescheidenButtonComponent', () => {
it('should open wizard if bescheid draft loaded', () => {
component.openBescheidenDialogWithExistingDraft();
- expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(
- VorgangDetailBescheidenComponent,
- {
- bescheidDraftResource,
- vorgangWithEingangResource,
- },
- );
+ expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(VorgangDetailBescheidenComponent, {
+ bescheidDraftResource,
+ vorgangWithEingangResource,
+ });
});
it('should not open wizard if bescheid draft not loaded', () => {
@@ -333,11 +362,10 @@ describe('BescheidenButtonComponent', () => {
describe('openDialog', () => {
const bescheidDraftResource: BescheidResource = createBescheidResource();
- const bescheidDraftStateResource: StateResource<BescheidResource> =
- createStateResource(bescheidDraftResource);
- const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource(
- [VorgangWithEingangLinkRel.BESCHEID_DRAFT],
- );
+ const bescheidDraftStateResource: StateResource<BescheidResource> = createStateResource(bescheidDraftResource);
+ const vorgangWithEingangResource: VorgangWithEingangResource = createVorgangWithEingangResource([
+ VorgangWithEingangLinkRel.BESCHEID_DRAFT,
+ ]);
const dialogData: BescheidenDialogData = {
bescheidDraftResource: bescheidDraftResource,
@@ -347,16 +375,32 @@ describe('BescheidenButtonComponent', () => {
beforeEach(() => {
component.vorgang = vorgangWithEingangResource;
bescheidService.getBescheidDraftIfExists.mockReturnValue(of(bescheidDraftStateResource));
- ozgcloudDialogService.openWizard;
});
it('should call ozgcloudDialogService.openWizard', () => {
component.openDialog(dialogData);
- expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(
- VorgangDetailBescheidenComponent,
- dialogData,
- );
+ expect(ozgcloudDialogService.openWizard).toHaveBeenCalledWith(VorgangDetailBescheidenComponent, dialogData);
+ });
+ });
+
+ describe('handleBescheidWizardClosed', () => {
+ it('should reload current vorgang', () => {
+ component.handleBescheidWizardClosed({ reloadVorgang: true });
+
+ expect(vorgangService.reloadCurrentVorgang).toHaveBeenCalled();
+ });
+
+ it('should not reload current vorgang', () => {
+ component.handleBescheidWizardClosed({ reloadVorgang: false });
+
+ expect(vorgangService.reloadCurrentVorgang).not.toHaveBeenCalled();
+ });
+
+ it.each([null, undefined])('should not reload current vorgang if result nil', (dialogResult: BescheidWizardDialogResult) => {
+ component.handleBescheidWizardClosed(dialogResult);
+
+ expect(vorgangService.reloadCurrentVorgang).not.toHaveBeenCalled();
});
});
});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
index d76a5cf53225299d7f63695281c06c13bba00cc0..09bc8b97ae156ce071a5f9bd72d497190a86b04e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.ts
@@ -21,12 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { BescheidResource, BescheidService } from '@alfa-client/bescheid-shared';
+import { BescheidResource, BescheidService, BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
-import { StateResource, createEmptyStateResource, isLoaded } from '@alfa-client/tech-shared';
+import { StateResource, createEmptyStateResource, isLoaded, isNotNil } from '@alfa-client/tech-shared';
import { OzgcloudDialogService } from '@alfa-client/ui';
import {
VorgangCommandService,
+ VorgangService,
VorgangWithEingangLinkRel,
VorgangWithEingangResource,
} from '@alfa-client/vorgang-shared';
@@ -45,25 +46,23 @@ export class BescheidenButtonComponent implements OnInit {
@Input() vorgang: VorgangWithEingangResource;
@Input() showAsIconButton: boolean = false;
- commandStateResource$: Observable<StateResource<CommandResource>> = of(
- createEmptyStateResource<CommandResource>(),
- );
+ commandStateResource$: Observable<StateResource<CommandResource>> = of(createEmptyStateResource<CommandResource>());
readonly linkRel = VorgangWithEingangLinkRel;
get buttonText(): string {
- return hasLink(this.vorgang, VorgangWithEingangLinkRel.BESCHEID_DRAFT) ? 'Bescheiden fortsetzen'
- : 'Bescheiden';
+ return hasLink(this.vorgang, VorgangWithEingangLinkRel.BESCHEID_DRAFT) ? 'Bescheiden fortsetzen' : 'Bescheiden';
}
get toolTipText(): string {
- return hasLink(this.vorgang, VorgangWithEingangLinkRel.BESCHEID_DRAFT) ?
- 'Vorgang bescheiden fortsetzen'
- : 'Vorgang bescheiden';
+ return hasLink(this.vorgang, VorgangWithEingangLinkRel.BESCHEID_DRAFT) ? 'Vorgang bescheiden fortsetzen' : (
+ 'Vorgang bescheiden'
+ );
}
constructor(
private vorgangCommandService: VorgangCommandService,
+ private vorgangService: VorgangService,
private ozgcloudDialogService: OzgcloudDialogService,
private bescheidService: BescheidService,
) {}
@@ -72,7 +71,7 @@ export class BescheidenButtonComponent implements OnInit {
this.commandStateResource$ = this.vorgangCommandService.getBeschiedenCommand();
}
- public onClick(): void {
+ public bescheiden(): void {
if (this.shouldOpenBescheidenWizard()) {
this.openBescheidenWizard();
} else {
@@ -87,6 +86,23 @@ export class BescheidenButtonComponent implements OnInit {
);
}
+ // TODO: Use this version after completed Bescheid refactoring and delete the other version below.
+ // public openBescheidenWizard(): void {
+ // const dialogData: BescheidenDialogData = { vorgangWithEingangResource: this.vorgang };
+ // const dialogRef: DialogRef<BescheidWizardDialogResult> = this.ozgcloudDialogService.openWizard<
+ // BescheidWizardContainerComponent,
+ // BescheidenDialogData,
+ // BescheidWizardDialogResult
+ // >(BescheidWizardContainerComponent, dialogData);
+ // dialogRef.closed.subscribe((dialogResult: BescheidWizardDialogResult) => this.handleBescheidWizardClosed(dialogResult));
+ // }
+
+ handleBescheidWizardClosed(dialogResult: BescheidWizardDialogResult): void {
+ if (isNotNil(dialogResult) && dialogResult.reloadVorgang) {
+ this.vorgangService.reloadCurrentVorgang();
+ }
+ }
+
public openBescheidenWizard(): void {
this.bescheidService.init();
if (hasLink(this.vorgang, VorgangWithEingangLinkRel.BESCHEID_DRAFT)) {
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 a88075f699841c8e2b5d9c085023f6f087efc854..4aa88c6ad462e183f3e7e626034f402eb4d506e4 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,5 +1,6 @@
import { BescheidResource } from '@alfa-client/bescheid-shared';
import { PostfachService } from '@alfa-client/postfach-shared';
+import { isEscapeKey } from '@alfa-client/tech-shared';
import { OzgcloudDialogService } from '@alfa-client/ui';
import { VorgangService } from '@alfa-client/vorgang-shared';
import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog';
@@ -41,7 +42,7 @@ export class VorgangDetailBescheidenComponent implements OnDestroy, OnInit {
handleEscapeKey(): void {
this.keydownEventsSubscription = this.dialogRef.keydownEvents
- .pipe(filter((event) => event.key === 'Escape'))
+ .pipe(filter(isEscapeKey))
.subscribe(() => this.cancelWizard());
}
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
index ca73c782d282523f6ae32f0ef50fa9ec872d217f..6fa40dfad1eb725845134bfb68d2259d0e6ae6ea 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.spec.ts
@@ -30,21 +30,11 @@ import {
createEmptyStateResource,
createStateResource,
} from '@alfa-client/tech-shared';
-import {
- dispatchEventFromFixture,
- getElementFromFixture,
- mock,
- useFromMock,
-} from '@alfa-client/test-utils';
+import { dispatchEventFromFixture, getElementFromFixture, mock, useFromMock } from '@alfa-client/test-utils';
import { SpinnerComponent } from '@alfa-client/ui';
import { VorgangHeaderLinkRel, VorgangListService } from '@alfa-client/vorgang-shared';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import {
- ReactiveFormsModule,
- UntypedFormBuilder,
- UntypedFormControl,
- UntypedFormGroup,
-} from '@angular/forms';
+import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatButton } from '@angular/material/button';
import { MatFormFieldModule } from '@angular/material/form-field';
@@ -224,21 +214,15 @@ describe('VorgangSearchComponent', () => {
const result = component.buildSearchResultPreviewLabel(vorgangList);
- expect(result).toBe(
- '10 Vorschläge werden angezeigt, nutze Pfeiltaste nach unten, um diese zu erreichen',
- );
+ expect(result).toBe('10 Vorschläge werden angezeigt, nutze Pfeiltaste nach unten, um diese zu erreichen');
});
it('should return label for one search result', () => {
- const vorgangList = createStateResource(
- createVorgangListResourceWithResource([createVorgangResource()]),
- );
+ const vorgangList = createStateResource(createVorgangListResourceWithResource([createVorgangResource()]));
const result = component.buildSearchResultPreviewLabel(vorgangList);
- expect(result).toBe(
- 'Ein Vorschlag wird angezeigt, nutze Pfeiltaste nach unten, um den zu erreichen',
- );
+ expect(result).toBe('Ein Vorschlag wird angezeigt, nutze Pfeiltaste nach unten, um diesen zu erreichen');
});
it('should return empty string', () => {
@@ -298,6 +282,17 @@ describe('VorgangSearchComponent', () => {
});
});
+ describe('onKeydownHandler', () => {
+ it('should call formService setLastKeyPressed with key', () => {
+ const setLastKeyPressedSpy = jest.spyOn(VorgangSearchFormService.prototype, 'setLastKeyPressed');
+ const keyboardEvent: KeyboardEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+
+ component.onKeydownHandler(keyboardEvent);
+
+ expect(setLastKeyPressedSpy).toHaveBeenCalledWith('Enter');
+ });
+ });
+
describe('submit', () => {
it('should not navigate to search if search field is empty', () => {
const submitSpy = jest.spyOn(NavigationService.prototype, 'search');
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
index 7857c502c95a7b38bed14c9a85ef50d8a748a68a..e0c72ccc0a96eb5fd90cd4d66d262ea0484dfeea 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.component.ts
@@ -21,27 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import {
- EMPTY_STRING,
- StateResource,
- getEmbeddedResources,
- isNotNil,
-} from '@alfa-client/tech-shared';
-import {
- VorgangHeaderLinkRel,
- VorgangListLinkRel,
- VorgangListResource,
-} from '@alfa-client/vorgang-shared';
-import {
- Component,
- ElementRef,
- EventEmitter,
- Input,
- OnDestroy,
- OnInit,
- Output,
- ViewChild,
-} from '@angular/core';
+import { EMPTY_STRING, StateResource, getEmbeddedResources, isNotNil } from '@alfa-client/tech-shared';
+import { VorgangHeaderLinkRel, VorgangListLinkRel, VorgangListResource } from '@alfa-client/vorgang-shared';
+import { Component, ElementRef, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
import { MatAutocomplete } from '@angular/material/autocomplete';
import { MatButton } from '@angular/material/button';
import { Event, NavigationEnd, Router } from '@angular/router';
@@ -56,9 +38,7 @@ import { VorgangSearchFormService } from './vorgang-search.formservice';
providers: [VorgangSearchFormService],
})
export class VorgangSearchComponent implements OnInit, OnDestroy {
- @Input() set vorgangSearchPreviewList(
- vorgangListStateResource: StateResource<VorgangListResource>,
- ) {
+ @Input() set vorgangSearchPreviewList(vorgangListStateResource: StateResource<VorgangListResource>) {
this.vorgangListPreview = vorgangListStateResource;
this.searchResultPreviewLabel = this.buildSearchResultPreviewLabel(vorgangListStateResource);
}
@@ -93,6 +73,11 @@ export class VorgangSearchComponent implements OnInit, OnDestroy {
});
}
+ @HostListener('keydown', ['$event'])
+ onKeydownHandler(e: KeyboardEvent): void {
+ this.formService.setLastKeyPressed(e.key);
+ }
+
submit(): void {
this.previouslyEnteredSearchValue = this.formService.getValue();
this.formService.submit();
@@ -113,15 +98,9 @@ export class VorgangSearchComponent implements OnInit, OnDestroy {
}
}
- buildSearchResultPreviewLabel(
- vorgangListStateResource: StateResource<VorgangListResource>,
- ): string {
- const previewListLength = getEmbeddedResources(
- vorgangListStateResource,
- this.vorgangListLinkRel.VORGANG_HEADER_LIST,
- )?.length;
- if (previewListLength === 1)
- return 'Ein Vorschlag wird angezeigt, nutze Pfeiltaste nach unten, um den zu erreichen';
+ buildSearchResultPreviewLabel(vorgangListStateResource: StateResource<VorgangListResource>): string {
+ const previewListLength = getEmbeddedResources(vorgangListStateResource, this.vorgangListLinkRel.VORGANG_HEADER_LIST)?.length;
+ if (previewListLength === 1) return 'Ein Vorschlag wird angezeigt, nutze Pfeiltaste nach unten, um diesen zu erreichen';
if (previewListLength > 1)
return `${previewListLength} Vorschläge werden angezeigt, nutze Pfeiltaste nach unten, um diese zu erreichen`;
return EMPTY_STRING;
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
index 9e639e1a9c66bf31e06c51de51d176fffeb94321..45a888657048c0f222495b8fe905fe58b21ae3e6 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.spec.ts
@@ -24,11 +24,8 @@
import { NavigationService } from '@alfa-client/navigation-shared';
import { EMPTY_STRING, encodeUrlForEmbedding } from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
-import {
- VorgangHeaderLinkRel,
- VorgangListService,
- VorgangResource,
-} from '@alfa-client/vorgang-shared';
+import { VorgangHeaderLinkRel, VorgangListService, VorgangResource } from '@alfa-client/vorgang-shared';
+import { fakeAsync, tick } from '@angular/core/testing';
import { FormControl, UntypedFormBuilder } from '@angular/forms';
import { Params } from '@angular/router';
import { faker } from '@faker-js/faker';
@@ -74,6 +71,40 @@ describe('VorgangSearchFormService', () => {
});
});
+ describe('subscribeToValueChanges', () => {
+ it('should call setHasSearchString after debounce time', fakeAsync(() => {
+ const value = faker.word.sample();
+ const setHasSearchString = jest.spyOn(formService, 'setHasSearchString');
+
+ formService.subscribeToValueChanges();
+ formService.form.controls[formService.SEARCH_FIELD].patchValue(value);
+ tick(300);
+
+ expect(setHasSearchString).toHaveBeenCalledWith(value);
+ }));
+
+ it('should call handleValueChange after debounce time', fakeAsync(() => {
+ const value = faker.word.sample();
+ const handleValueChanges = jest.spyOn(formService, 'handleValueChanges');
+
+ formService.subscribeToValueChanges();
+ formService.form.controls[formService.SEARCH_FIELD].patchValue(value);
+ tick(300);
+
+ expect(handleValueChanges).toHaveBeenCalledWith(value);
+ }));
+
+ it('should not call handleValueChange if lastKeyPressed is Enter', fakeAsync(() => {
+ const handleValueChanges = jest.spyOn(formService, 'handleValueChanges');
+ formService.setLastKeyPressed('Enter');
+
+ formService.subscribeToValueChanges();
+ tick(300);
+
+ expect(handleValueChanges).not.toHaveBeenCalled();
+ }));
+ });
+
describe('handleValueChanges', () => {
describe('on should search for preview', () => {
beforeEach(() => {
@@ -234,9 +265,7 @@ describe('VorgangSearchFormService', () => {
});
describe('submitByPreviewList', () => {
- const vorgang: VorgangResource = createVorgangResource([
- VorgangHeaderLinkRel.VORGANG_WITH_EINGANG,
- ]);
+ const vorgang: VorgangResource = createVorgangResource([VorgangHeaderLinkRel.VORGANG_WITH_EINGANG]);
const searchString: string = faker.person.firstName();
it('should clear searchString', () => {
diff --git a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
index bf88a1381c9a827c61a71dc204f5cbaf820ca63a..b8449f8efc8fff93dda751c99212eb4a67b3bc41 100644
--- a/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
+++ b/alfa-client/libs/vorgang-shared-ui/src/lib/vorgang-search-container/vorgang-search/vorgang-search.formservice.ts
@@ -22,23 +22,13 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
import { NavigationService } from '@alfa-client/navigation-shared';
-import {
- EMPTY_STRING,
- hasMinLength,
- isNotEmpty,
- isNotNil,
- toResourceUri,
-} from '@alfa-client/tech-shared';
-import {
- VorgangHeaderLinkRel,
- VorgangListService,
- VorgangResource,
-} from '@alfa-client/vorgang-shared';
+import { EMPTY_STRING, hasMinLength, isNotEmpty, isNotNil, toResourceUri } from '@alfa-client/tech-shared';
+import { VorgangHeaderLinkRel, VorgangListService, VorgangResource } from '@alfa-client/vorgang-shared';
import { Injectable, OnDestroy } from '@angular/core';
import { FormGroup, UntypedFormBuilder, UntypedFormControl } from '@angular/forms';
import { Params } from '@angular/router';
import { isEmpty } from 'lodash-es';
-import { Observable, Subscription } from 'rxjs';
+import { filter, Observable, Subscription } from 'rxjs';
import { debounceTime, distinctUntilChanged, first, tap } from 'rxjs/operators';
@Injectable()
@@ -54,6 +44,8 @@ export class VorgangSearchFormService implements OnDestroy {
public lastSearchString: string;
public hasSearchString: boolean = false;
+ private lastKeyPressed: string;
+
constructor(
private formBuilder: UntypedFormBuilder,
private navigationService: NavigationService,
@@ -78,17 +70,24 @@ export class VorgangSearchFormService implements OnDestroy {
subscribeToValueChanges(): void {
this.fromControlSubscription = this.getSearchFormControl()
.valueChanges.pipe(
+ distinctUntilChanged(),
debounceTime(300),
+ filter(() => this.lastKeyPressedIsNotEnter()),
tap((value) => this.setHasSearchString(value)),
- distinctUntilChanged(),
)
- .subscribe((value) => this.handleValueChanges(value));
+ .subscribe((value) => {
+ this.handleValueChanges(value);
+ });
}
setHasSearchString(value: string): void {
this.hasSearchString = isNotEmpty(value);
}
+ private lastKeyPressedIsNotEnter(): boolean {
+ return this.lastKeyPressed !== 'Enter';
+ }
+
handleValueChanges(value: string): void {
if (this.shouldSearchForPreview(value)) {
this.vorgangListService.setSearchString(value);
@@ -99,9 +98,7 @@ export class VorgangSearchFormService implements OnDestroy {
}
shouldSearchForPreview(value: string): boolean {
- return (
- this.isSearchInputNotPristine() && hasMinLength(value, this.PREVIEW_SEARCH_STRING_MIN_LENGTH)
- );
+ return this.isSearchInputNotPristine() && hasMinLength(value, this.PREVIEW_SEARCH_STRING_MIN_LENGTH);
}
isSearchInputNotPristine(): boolean {
@@ -150,9 +147,7 @@ export class VorgangSearchFormService implements OnDestroy {
}
private navigateToVorgang(resource: VorgangResource): void {
- this.navigationService.navigateToVorgang(
- toResourceUri(resource, VorgangHeaderLinkRel.VORGANG_WITH_EINGANG),
- );
+ this.navigationService.navigateToVorgang(toResourceUri(resource, VorgangHeaderLinkRel.VORGANG_WITH_EINGANG));
}
navigateToVorgangListOnSearch(params: Params) {
@@ -178,4 +173,8 @@ export class VorgangSearchFormService implements OnDestroy {
public getValueChanges(): Observable<string> {
return this.getSearchFormControl().valueChanges;
}
+
+ public setLastKeyPressed(key: string): void {
+ this.lastKeyPressed = key;
+ }
}
diff --git a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
index adb12daf7e4ec5b14e8c3e505413869531193abb..a08b21697fa35477ad73dfcfef9456028c33f6a5 100644
--- a/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
+++ b/alfa-client/libs/zustaendige-stelle/src/lib/search-zustaendige-stelle-dialog/search-zustaendige-stelle-dialog.component.spec.ts
@@ -1,5 +1,13 @@
import { ToEmbeddedResourcesPipe } from '@alfa-client/tech-shared';
-import { EventData, Mock, dialogRefMock, getMockComponent, mock, triggerEvent } from '@alfa-client/test-utils';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ EventData,
+ getMockComponent,
+ Mock,
+ mock,
+ triggerEvent,
+} from '@alfa-client/test-utils';
import {
OrganisationsEinheitResource,
OrganisationsEinheitService,
@@ -27,8 +35,14 @@ describe('SearchZustaendigeStelleDialogComponent', () => {
const service: Mock<OrganisationsEinheitService> = mock(OrganisationsEinheitService);
const title: string = 'dummyTitle';
+ let dialogRefMock: DialogRefMock;
+
const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
+ beforeEach(() => {
+ dialogRefMock = createDialogRefMock();
+ });
+
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
diff --git a/alfa-client/package.json b/alfa-client/package.json
index 15566f3bb98956b3f22fa5508e1eb2c1bd073439..dd06dba54397af9899f304b0c302b950520a491c 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -1,6 +1,6 @@
{
"name": "alfa",
- "version": "1.2.0-SNAPSHOT",
+ "version": "1.3.0-SNAPSHOT",
"license": "MIT",
"scripts": {
"start": "nx run alfa:serve --port 4300 --disable-host-check",
diff --git a/alfa-client/pom.xml b/alfa-client/pom.xml
index 1db71743e5cc3a907ed88af1a2119597108c6003..bc81db6f0027dec1daf0f85400b260d2e7a65201 100644
--- a/alfa-client/pom.xml
+++ b/alfa-client/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.16.0-SNAPSHOT</version>
+ <version>2.17.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/alfa-client/run_helm_test.sh b/alfa-client/run_helm_test.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3fe6199df068b9c8b31b1cb39a1cff113339d871
--- /dev/null
+++ b/alfa-client/run_helm_test.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+set -x
+
+helm template ./src/main/helm/ -f ./src/test/helm-linter-values.yaml
+helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
+cd src/main/helm && helm unittest -f '../../test/helm/*.yaml' .
+
diff --git a/alfa-client/src/main/helm/Chart.yaml b/alfa-client/src/main/helm/Chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5ab647efd68f962b707bae9e7fd04b72b0c77613
--- /dev/null
+++ b/alfa-client/src/main/helm/Chart.yaml
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+apiVersion: v1
+appVersion: '1.0'
+description: A Helm chart for Alfa Client
+name: alfa-client
+version: 0.0.0-MANAGED-BY-JENKINS
+icon: https://simpleicons.org/icons/helm.svg
diff --git a/alfa-client/src/main/helm/templates/_helpers.tpl b/alfa-client/src/main/helm/templates/_helpers.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..300ff51779a0f4679bbc8f31a990f406078947da
--- /dev/null
+++ b/alfa-client/src/main/helm/templates/_helpers.tpl
@@ -0,0 +1,80 @@
+
+{{/* error check 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec) */}}
+{{/* Namespace */}}
+{{- define "app.namespace" -}}
+{{- if gt (len (.Release.Namespace)) 63 -}}
+{{- fail (printf ".Release.Namespace %s ist zu lang (max. 63 Zeichen)" .Release.Namespace) -}}
+{{- end -}}
+{{ printf "%s" .Release.Namespace }}
+{{- end -}}
+
+{{/* Chart: Name + Version */}}
+{{- define "app.chart" -}}
+{{- if gt (len (printf "%s-%s" .Chart.Name .Chart.Version)) 63 -}}
+{{- fail (printf ".Chart.Name-.Chart.Version %s-%s ist zu lang (max. 63 Zeichen)" .Chart.Name .Chart.Version) -}}
+{{- end -}}
+{{ printf "%s-%s" .Chart.Name .Chart.Version }}
+{{- end -}}
+
+{{/* Managed-by -> On Helm, this value is always Helm */}}
+{{- define "app.managedBy" -}}
+{{- if gt (len (.Release.Service)) 63 -}}
+{{- fail (printf ".Release.Service %s ist zu lang (max. 63 Zeichen)" .Release.Service) -}}
+{{- end -}}
+{{ printf "%s" .Release.Service }}
+{{- end -}}
+
+
+{{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
+{{- define "app.defaultLabels" }}
+app.kubernetes.io/instance: alfa-client
+app.kubernetes.io/managed-by: {{ include "app.managedBy" . }}
+app.kubernetes.io/name: {{ .Release.Name }}
+app.kubernetes.io/namespace: {{ include "app.namespace" . }}
+app.kubernetes.io/part-of: ozgcloud
+app.kubernetes.io/version: {{ .Chart.Version }}
+helm.sh/chart: {{ include "app.chart" . }}
+{{- end -}}
+
+{{- define "app.matchLabels" }}
+app.kubernetes.io/name: {{ .Release.Name }}
+app.kubernetes.io/namespace: {{ include "app.namespace" . }}
+{{- end -}}
+
+{{- define "app.serviceAccountName" -}}
+{{ printf "%s" ( (.Values.serviceAccount).name | default "alfa-client-service-account" ) }}
+{{- end -}}
+
+
+{{- define "app.baseDomain" -}}
+{{- printf "%s.%s" (include "app.ozgcloudBezeichner" .) (include "app.baseUrl" .) }}
+{{- end -}}
+
+{{- define "app.ozgcloudBezeichner" -}}
+{{- required "ozgcloud.bezeichner muss angegeben sein" (.Values.ozgcloud).bezeichner -}}
+{{- if lt 46 (len (.Values.ozgcloud).bezeichner) -}}
+{{ fail (printf "ozgcloud.bezeichner %s ist zu lang (max. 46 Zeichen)" (.Values.ozgcloud).bezeichner) }}
+{{- end -}}
+{{- end -}}
+
+{{- define "app.baseUrl" -}}
+{{- required "baseUrl muss angegeben sein" .Values.baseUrl }}
+{{- end -}}
+
+{{- define "app.getCustomList" -}}
+{{- with (.Values.env).customList -}}
+{{- if kindIs "map" . -}}
+{{ include "app.dictToList" . }}
+{{- else if kindIs "slice" . -}}
+{{ . | toYaml }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "app.dictToList" -}}
+{{- $customList := list -}}
+{{- range $key, $value := . -}}
+{{- $customList = append $customList (dict "name" $key "value" $value) }}
+{{- end -}}
+{{- $customList | toYaml -}}
+{{- end -}}
\ No newline at end of file
diff --git a/alfa-client/src/main/helm/templates/deployment.yaml b/alfa-client/src/main/helm/templates/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2f2e951bb88e2e8ef5597021e838f6875e98ff7b
--- /dev/null
+++ b/alfa-client/src/main/helm/templates/deployment.yaml
@@ -0,0 +1,122 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ .Release.Name }}
+ namespace: {{ include "app.namespace" . }}
+ labels:
+ {{- include "app.defaultLabels" . | indent 4 }}
+spec:
+ progressDeadlineSeconds: 600
+ replicas: {{ .Values.replicaCount }}
+ revisionHistoryLimit: 10
+ selector:
+ matchLabels:
+ {{- include "app.matchLabels" . | indent 6 }}
+ strategy:
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 0
+ type: RollingUpdate
+ template:
+ metadata:
+ labels:
+ {{- include "app.defaultLabels" . | indent 8 }}
+ component: alfa-client
+ spec:
+ {{- if (.Values.serviceAccount).create }}
+ serviceAccountName: {{ include "app.serviceAccountName" . }}
+ {{- end }}
+ topologySpreadConstraints:
+ - maxSkew: 1
+ topologyKey: kubernetes.io/hostname
+ whenUnsatisfiable: ScheduleAnyway
+ labelSelector:
+ matchLabels:
+ app.kubernetes.io/name: {{ .Release.Name }}
+
+ containers:
+ - env:
+ {{- with include "app.getCustomList" . }}
+{{ . | indent 8 }}
+ {{- end }}
+
+ image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
+ imagePullPolicy: Always
+ name: alfa-client
+
+ startupProbe:
+ httpGet:
+ path: /
+ port: 8080
+ scheme: HTTP
+ timeoutSeconds: 1
+ periodSeconds: 10
+ successThreshold: 1
+ failureThreshold: 3
+ readinessProbe:
+ httpGet:
+ path: /
+ port: 8080
+ scheme: HTTP
+ timeoutSeconds: 1
+ periodSeconds: 10
+ successThreshold: 1
+ failureThreshold: 3
+
+ resources:
+ {{- with .Values.resources }}
+{{ toYaml . | indent 10 }}
+ {{- end }}
+ securityContext:
+ allowPrivilegeEscalation: false
+ privileged: false
+ readOnlyRootFilesystem: false
+ runAsNonRoot: true
+ {{- with (.Values.securityContext).runAsUser }}
+ runAsUser: {{ . }}
+ {{- end }}
+ {{- with (.Values.securityContext).runAsGroup }}
+ runAsGroup: {{ . }}
+ {{- end }}
+ stdin: true
+ terminationMessagePath: /dev/termination-log
+ terminationMessagePolicy: File
+ tty: true
+
+
+ dnsConfig: {}
+ dnsPolicy: ClusterFirst
+ imagePullSecrets:
+ - name: {{ required "imagePullSecret must be set" .Values.imagePullSecret }}
+ restartPolicy: Always
+ {{- with .Values.hostAliases }}
+ hostAliases:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ schedulerName: default-scheduler
+ securityContext: {}
+ terminationGracePeriodSeconds: 30
diff --git a/alfa-client/src/main/helm/templates/ingress.yaml b/alfa-client/src/main/helm/templates/ingress.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9b132c168e1d2b889ace828273b9a2f4be9f97f0
--- /dev/null
+++ b/alfa-client/src/main/helm/templates/ingress.yaml
@@ -0,0 +1,40 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: {{ .Release.Name }}
+ namespace: {{ include "app.namespace" . }}
+ annotations:
+ {{- if (.Values.ingress).certManagerAnnotations -}}
+ {{- range (.Values.ingress).certManagerAnnotations }}
+{{ . | indent 4 }}
+ {{- end }}
+ {{- else if (.Values.ingress).use_staging_cert }}
+ cert-manager.io/cluster-issuer: letsencrypt-staging
+ {{- else }}
+ cert-manager.io/cluster-issuer: letsencrypt-prod
+ {{- end }}
+spec:
+ {{- if (.Values.ingress).className }}
+ ingressClassName: {{ .Values.ingress.className }}
+ {{- end }}
+ rules:
+ - http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: {{ .Release.Name }}
+ port:
+ number: 8080
+
+
+ host: {{ include "app.baseDomain" . }}
+ tls:
+ - hosts:
+ - {{ include "app.baseDomain" . }}
+ {{- if (.Values.ingress).tlsSecretName }}
+ secretName: {{ (.Values.ingress).tlsSecretName }}
+ {{- else }}
+ secretName: {{ .Values.ozgcloud.bezeichner }}-{{ .Release.Name }}-tls
+ {{- end }}
\ No newline at end of file
diff --git a/alfa-client/src/main/helm/templates/network_policy.yaml b/alfa-client/src/main/helm/templates/network_policy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..be4beaee8f68051efd4fe81f5b951026b23f2d95
--- /dev/null
+++ b/alfa-client/src/main/helm/templates/network_policy.yaml
@@ -0,0 +1,31 @@
+{{- if not (.Values.networkPolicy).disabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+ name: network-policy-alfa-client
+ namespace: {{ .Release.Namespace }}
+spec:
+ podSelector:
+ matchLabels:
+ {{- include "app.matchLabels" . | indent 6 }}
+ policyTypes:
+ - Ingress
+ - Egress
+ ingress:
+ - ports:
+ - port: 8080
+{{- with (.Values.networkPolicy).additionalIngressConfigLocal }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- with (.Values.networkPolicy).additionalIngressConfigGlobal }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+ egress:
+{{- with (.Values.networkPolicy).additionalEgressConfigLocal }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- with (.Values.networkPolicy).additionalEgressConfigGlobal }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+
+{{- end }}
\ No newline at end of file
diff --git a/alfa-client/src/main/helm/templates/service.yaml b/alfa-client/src/main/helm/templates/service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f880d0a8b0ad3d20a1a6171e748dd9ddc8332eb6
--- /dev/null
+++ b/alfa-client/src/main/helm/templates/service.yaml
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ .Release.Name }}
+ namespace: {{ include "app.namespace" . }}
+ labels:
+ {{- include "app.defaultLabels" . | indent 4 }}
+ component: alfa-client-service
+spec:
+ type: ClusterIP
+ ports:
+ - name: http
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+
+ selector:
+ {{- include "app.matchLabels" . | indent 4 }}
+ component: alfa-client
\ No newline at end of file
diff --git a/alfa-client/src/main/helm/values.yaml b/alfa-client/src/main/helm/values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..01563f82eb895a00dd6a35619b38c5a7bb717d27
--- /dev/null
+++ b/alfa-client/src/main/helm/values.yaml
@@ -0,0 +1,6 @@
+image:
+ repo: docker.ozg-sh.de
+ name: alfa-client
+ tag: 0.1.0 # [default: latest]
+replicaCount: 1
+
diff --git a/alfa-client/src/test/helm-linter-values.yaml b/alfa-client/src/test/helm-linter-values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..243fca6113fc6e4e0f69479e0178e775f2d0c21f
--- /dev/null
+++ b/alfa-client/src/test/helm-linter-values.yaml
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+baseUrl: test.sh.ozg-cloud.de
+
+ozgcloud:
+ bezeichner: helm
+
+imagePullSecret: test-image-secret
+
+networkPolicy:
+ dnsServerNamespace: dummy-dns
+
diff --git a/alfa-client/src/test/helm/deployment_63_char_test.yaml b/alfa-client/src/test/helm/deployment_63_char_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9aa0a8de91f7f17a01ff1120fa8be31e5aa2fa3d
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_63_char_test.yaml
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deyploment less than 63 chars
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: should fail on .Release.Namespace length longer than 63 characters
+ release:
+ namespace: test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
+ asserts:
+ - failedTemplate:
+ errorMessage: .Release.Namespace test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
+ - it: should not fail on .Release.Namespace length less than 63 characters
+ asserts:
+ - notFailedTemplate: {}
+ - it: should fail on .Chart.Name-.Chart.Version length longer than 63 characters
+ chart:
+ version: 1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
+ asserts:
+ - failedTemplate:
+ errorMessage: .Chart.Name-.Chart.Version alfa-client-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
+ - it: should not fail on .Chart.Name-.Chart.Version length less than 63 characters
+ asserts:
+ - notFailedTemplate: {}
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_container_basic_test.yaml b/alfa-client/src/test/helm/deployment_container_basic_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..98f94de514785c7cd5401ca79e7abe053e868d6a
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_container_basic_test.yaml
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment container basics
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: should have correct values for container image, name, imagePullPolicy
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].image
+ value: docker.ozg-sh.de/alfa-client:0.1.0
+ - equal:
+ path: spec.template.spec.containers[0].name
+ value: alfa-client
+ - equal:
+ path: spec.template.spec.containers[0].imagePullPolicy
+ value: Always
+
+
diff --git a/alfa-client/src/test/helm/deployment_container_other_values_test.yaml b/alfa-client/src/test/helm/deployment_container_other_values_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f8f356b2e2cb81c04ac7664a9e3c1b70958e0363
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_container_other_values_test.yaml
@@ -0,0 +1,49 @@
+
+ #
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment container other values
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: should have correct values for container terminationMessagePolicy, terminationMessagePath, stdin, tty
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].terminationMessagePolicy
+ value: File
+ - equal:
+ path: spec.template.spec.containers[0].terminationMessagePath
+ value: /dev/termination-log
+ - equal:
+ path: spec.template.spec.containers[0].stdin
+ value: true
+ - equal:
+ path: spec.template.spec.containers[0].tty
+ value: true
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_container_security_context_test.yaml b/alfa-client/src/test/helm/deployment_container_security_context_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..063aac4ae72c7c885a472a2c76b9e10aa3592a0b
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_container_security_context_test.yaml
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment container security context
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: check default values of spec.containers[0].securityContext
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+ value: false
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.privileged
+ value: false
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+ value: false
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.runAsNonRoot
+ value: true
+ - isNull:
+ path: spec.template.spec.containers[0].securityContext.runAsUser
+ - isNull:
+ path: spec.template.spec.containers[0].securityContext.runAsGroup
+ - it: check containers runAsUser
+ set:
+ securityContext.runAsUser: 1000
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.runAsUser
+ value: 1000
+ - it: check runAsGroup
+ set:
+ securityContext.runAsGroup: 1000
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].securityContext.runAsGroup
+ value: 1000
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_defaults_labels_test.yaml b/alfa-client/src/test/helm/deployment_defaults_labels_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d1ff0f164c2da7abff8098487ba39fb834ceba38
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_defaults_labels_test.yaml
@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment default labels
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: check metadata.labels
+ asserts:
+ - equal:
+ path: metadata.labels
+ value:
+ app.kubernetes.io/instance: alfa-client
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: alfa-client
+ app.kubernetes.io/namespace: sh-helm-test
+ app.kubernetes.io/part-of: ozgcloud
+ app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
+ helm.sh/chart: alfa-client-0.0.0-MANAGED-BY-JENKINS
+
+ - it: should set spec.selector.matchLabels
+ asserts:
+ - equal:
+ path: spec.selector.matchLabels
+ value:
+ app.kubernetes.io/name: alfa-client
+ app.kubernetes.io/namespace: sh-helm-test
+
+
+ - it: should have correct deyploment spec.template.metadata.labels
+ asserts:
+ - equal:
+ path: spec.template.metadata.labels
+ value:
+ app.kubernetes.io/instance: alfa-client
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: alfa-client
+ app.kubernetes.io/namespace: sh-helm-test
+ app.kubernetes.io/part-of: ozgcloud
+ app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
+ component: alfa-client
+ helm.sh/chart: alfa-client-0.0.0-MANAGED-BY-JENKINS
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/alfa-client/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1f50b122dcdacdecb722422553e2158907a09971
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment topology spread constrains
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: check default values of spec.template.spec.topologySpreadConstraints
+ asserts:
+ - isKind:
+ of: Deployment
+ - equal:
+ path: spec.template.spec.topologySpreadConstraints[0].maxSkew
+ value: 1
+ - equal:
+ path: spec.template.spec.topologySpreadConstraints[0].topologyKey
+ value: kubernetes.io/hostname
+ - equal:
+ path: spec.template.spec.topologySpreadConstraints[0].whenUnsatisfiable
+ value: ScheduleAnyway
+ - equal:
+ path: spec.template.spec.topologySpreadConstraints[0].labelSelector.matchLabels["app.kubernetes.io/name"]
+ value: alfa-client
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_env_test.yaml b/alfa-client/src/test/helm/deployment_env_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..802602a558241461dbc490613146e339aee00802
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_env_test.yaml
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment container environments
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: check customList as list
+ set:
+ env.customList:
+ - name: my_test_environment_name
+ value: "A test value"
+ - name: test_environment
+ value: "B test value"
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: my_test_environment_name
+ value: "A test value"
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: test_environment
+ value: "B test value"
+ - it: check customList as dict
+ set:
+ env.customList:
+ my_test_environment_name: "A test value"
+ test_environment: "B test value"
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: my_test_environment_name
+ value: "A test value"
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: test_environment
+ value: "B test value"
+
+ - it: check customList test value is not set by default
+ asserts:
+ - isEmpty:
+ path: spec.template.spec.containers[0].env
+
+
diff --git a/alfa-client/src/test/helm/deployment_host_aliases_test.yaml b/alfa-client/src/test/helm/deployment_host_aliases_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ad5d1f8f66a03d2e87fc591fb3b06ae84f0d0077
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_host_aliases_test.yaml
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: deployment host aliases
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+tests:
+ - it: should not set spec.template.spec.hostAliases
+ asserts:
+ - isNull:
+ path: spec.template.spec.hostAliases
+ - it: should set spec.template.spec.hostAliases
+ set:
+ hostAliases:
+ - ip: "127.0.0.1"
+ hostname:
+ - "eins"
+ - "zwei"
+ asserts:
+ - contains:
+ path: spec.template.spec.hostAliases
+ content:
+ ip: "127.0.0.1"
+ hostname:
+ - "eins"
+ - "zwei"
diff --git a/alfa-client/src/test/helm/deployment_imagepull_secret_test.yaml b/alfa-client/src/test/helm/deployment_imagepull_secret_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..96e8e2b6e5bf8d735102854d8a1cc4195c5710de
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment image pull secret
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+
+
+tests:
+ - it: should use correct imagePull secret
+ set:
+ imagePullSecret: test-image-secret
+ asserts:
+ - equal:
+ path: spec.template.spec.imagePullSecrets[0].name
+ value: test-image-secret
+ - it: should fail template when image pull secret not set
+ asserts:
+ - failedTemplate:
+ errormessage: imagePullSecret must be set
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/deployment_resources_test.yaml b/alfa-client/src/test/helm/deployment_resources_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c053aeb0639d0c495699aa85667f1fddb6c6a82e
--- /dev/null
+++ b/alfa-client/src/test/helm/deployment_resources_test.yaml
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment container resources
+release:
+ name: alfa-client
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+tests:
+ - it: should generate resources when values set
+ set:
+ resources:
+ limits:
+ cpu: 11m
+ memory: 22Mi
+ requests:
+ cpu: 33m
+ memory: 44Mi
+ asserts:
+ - equal:
+ path: spec.template.spec.containers[0].resources.limits.cpu
+ value: 11m
+ - equal:
+ path: spec.template.spec.containers[0].resources.limits.memory
+ value: 22Mi
+ - equal:
+ path: spec.template.spec.containers[0].resources.requests.cpu
+ value: 33m
+ - equal:
+ path: spec.template.spec.containers[0].resources.requests.memory
+ value: 44Mi
+ - it: should not generate resources when values not set
+ asserts:
+ - isEmpty:
+ path: spec.template.spec.containers[0].resources
+
diff --git a/alfa-client/src/test/helm/deyploment_general_value_test.yaml b/alfa-client/src/test/helm/deyploment_general_value_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..081ae623bd6c0db6b518a0eb7753fc0632b03fe1
--- /dev/null
+++ b/alfa-client/src/test/helm/deyploment_general_value_test.yaml
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test deployment general values
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/deployment.yaml
+set:
+ imagePullSecret: test-image-secret
+
+
+tests:
+ - it: should have correct apiVersion
+ asserts:
+ - isKind:
+ of: Deployment
+ - isAPIVersion:
+ of: "apps/v1"
+
+ - it: should have correct deployment metadata
+ asserts:
+ - equal:
+ path: metadata.name
+ value: alfa-client
+ - equal:
+ path: metadata.namespace
+ value: sh-helm-test
+
+
+ - it: should have correct deyployment general spec values
+ asserts:
+ - equal:
+ path: spec.progressDeadlineSeconds
+ value: 600
+ - equal:
+ path: spec.replicas
+ value: 1
+ - equal:
+ path: spec.revisionHistoryLimit
+ value: 10
+ - it: should have correct deployment spec strategy values
+ asserts:
+ - equal:
+ path: spec.strategy
+ value:
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 0
+ type: RollingUpdate
+
+
diff --git a/alfa-client/src/test/helm/ingress_tests.yaml b/alfa-client/src/test/helm/ingress_tests.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1f1fa4729a117bfc02ccb9e5afc442b87f92d39b
--- /dev/null
+++ b/alfa-client/src/test/helm/ingress_tests.yaml
@@ -0,0 +1,168 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test ingress.yaml
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/ingress.yaml
+
+tests:
+ - it: check ingress kind
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - isKind:
+ of: Ingress
+ - it: should create default ingress tls
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.tls[0].secretName
+ value: helm-alfa-client-tls
+ - it: should set ingress tls
+ set:
+ ingress:
+ tlsSecretName: client-tls
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.tls[0].secretName
+ value: client-tls
+
+ - it: should not create ingress tls/ingressClass by default
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - isNull:
+ path: spec.ingressClassName
+ - it: should set ingress tls/ingressClass
+ set:
+ ingress:
+ className: ingress
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.ingressClassName
+ value: ingress
+
+
+ - it: should use default letsencrypt-prod cluster-issuer
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: metadata.annotations["cert-manager.io/cluster-issuer"]
+ value: letsencrypt-prod
+
+ - it: should use letsencrypt-staging cluster-issuer
+ set:
+ ingress.use_staging_cert: true
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: metadata.annotations["cert-manager.io/cluster-issuer"]
+ value: letsencrypt-staging
+
+ - it: should use letsencrypt-prod cluster-issuer
+ set:
+ ingress.use_staging_cert: false
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: metadata.annotations["cert-manager.io/cluster-issuer"]
+ value: letsencrypt-prod
+
+ - it: should create tls hosts name correctly
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.tls[0].hosts[0]
+ value: helm.test.by.ozg-cloud.de
+
+ - it: should create rules correctly
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.rules[0].http.paths[0]
+ value:
+ path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: alfa-client
+ port:
+ number: 8080
+
+
+ - it: should set hostname
+ set:
+ ozgcloud:
+ bezeichner: helm
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - equal:
+ path: spec.rules[0].host
+ value: helm.test.by.ozg-cloud.de
+ - it: should fail template when baseUrl not set
+ set:
+ ozgcloud:
+ bezeichner: helm
+ asserts:
+ - failedTemplate:
+ errormessage: baseUrl muss angegeben sein
+
+ - it: should fail template when bezeichner not set
+ set:
+ ozgcloud:
+ baseUrl: test.by.ozg-cloud.de
+ asserts:
+ - failedTemplate:
+ errormessage: ozgcloud.bezeichner muss angegeben sein
+
+
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/network_policy_test.yaml b/alfa-client/src/test/helm/network_policy_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..55468aaf0a2032297a684f32e0c8fa06248f8766
--- /dev/null
+++ b/alfa-client/src/test/helm/network_policy_test.yaml
@@ -0,0 +1,132 @@
+#
+# Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: network policy alfa-client test
+release:
+ name: alfa-client
+ namespace: by-helm-test
+templates:
+ - templates/network_policy.yaml
+
+tests:
+ - it: should match apiVersion
+ asserts:
+ - isAPIVersion:
+ of: networking.k8s.io/v1
+ - it: should match kind
+ asserts:
+ - isKind:
+ of: NetworkPolicy
+ - it: validate metadata
+ asserts:
+ - equal:
+ path: metadata
+ value:
+ name: network-policy-alfa-client
+ namespace: by-helm-test
+
+ - it: should add additionalIngressConfig local
+ set:
+ networkPolicy:
+ additionalIngressConfigLocal:
+ - from:
+ - podSelector:
+ matchLabels:
+ component: client2
+ asserts:
+ - contains:
+ path: spec.ingress
+ content:
+ from:
+ - podSelector:
+ matchLabels:
+ component: client2
+ - it: should add additionalIngressConfig global
+ set:
+ networkPolicy:
+ additionalIngressConfigGlobal:
+ - from:
+ - podSelector:
+ matchLabels:
+ component: client2
+ asserts:
+ - contains:
+ path: spec.ingress
+ content:
+ from:
+ - podSelector:
+ matchLabels:
+ component: client2
+
+ - it: should add additionalEgressConfig local
+ set:
+ networkPolicy:
+ additionalEgressConfigLocal:
+ - to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
+ asserts:
+ - contains:
+ path: spec.egress
+ content:
+ to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
+
+ - it: should add additionalEgressConfig global
+ set:
+ networkPolicy:
+ additionalEgressConfigGlobal:
+ - to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
+ asserts:
+ - contains:
+ path: spec.egress
+ content:
+ to:
+ - ipBlock:
+ cidr: 1.2.3.4/32
+
+
+ - it: test network policy disabled
+ set:
+ networkPolicy:
+ disabled: true
+ asserts:
+ - hasDocuments:
+ count: 0
+
+ - it: test network policy unset should be disabled
+ set:
+ networkPolicy:
+ disabled: false
+ asserts:
+ - hasDocuments:
+ count: 1
+
+ - it: test network policy should be enabled by default
+ asserts:
+ - hasDocuments:
+ count: 1
\ No newline at end of file
diff --git a/alfa-client/src/test/helm/service_test.yaml b/alfa-client/src/test/helm/service_test.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5ac4691125d01fe6a9ec94c336bbda918b48e33
--- /dev/null
+++ b/alfa-client/src/test/helm/service_test.yaml
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test service
+release:
+ name: alfa-client
+ namespace: sh-helm-test
+templates:
+ - templates/service.yaml
+tests:
+ - it: should have the label component with correct value
+ asserts:
+ - isKind:
+ of: Service
+ - isAPIVersion:
+ of: v1
+ - equal:
+ path: metadata.labels.component
+ value: alfa-client-service
+ - it: should be of type ClusterIP
+ asserts:
+ - equal:
+ path: spec.type
+ value: ClusterIP
+
+ - it: selector should contain the component label with correct value
+ asserts:
+ - equal:
+ path: spec.selector.component
+ value: alfa-client
+
+ - it: selector should contain helm recommended labels name and namespace
+ asserts:
+ - equal:
+ path: spec.selector
+ value:
+ app.kubernetes.io/name: alfa-client
+ app.kubernetes.io/namespace: sh-helm-test
+ component: alfa-client
+
+ - it: check component label for service
+ asserts:
+ - equal:
+ path: metadata.labels["component"]
+ value: alfa-client-service
\ No newline at end of file
diff --git a/alfa-client/tsconfig.base.json b/alfa-client/tsconfig.base.json
index 074d37046bc7c1d420bba5c631c72ec945d9b276..5fa256e28ccf0dd8ac93135af48e7e0180ed359d 100644
--- a/alfa-client/tsconfig.base.json
+++ b/alfa-client/tsconfig.base.json
@@ -61,7 +61,8 @@
"@alfa-client/zustaendige-stelle-shared": ["libs/zustaendige-stelle-shared/src/index.ts"],
"@ods/component": ["libs/design-component/src/index.ts"],
"@ods/system": ["libs/design-system/src/index.ts"],
- "authentication": ["libs/authentication/src/index.ts"]
+ "authentication": ["libs/authentication/src/index.ts"],
+ "@alfa-client/common": ["libs/common/src/index.ts"]
}
},
"exclude": ["node_modules", "tmp"]
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index 5e51365a7d41f0fcd9ef379a087e14e8dfc61a90..0e525317561ed9079b2ab7d835095f12c8bad3e9 100644
--- a/alfa-server/pom.xml
+++ b/alfa-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.16.0-SNAPSHOT</version>
+ <version>2.17.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-server</artifactId>
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 1065a01112aada11a850d06625ae570b63e78207..93c8b05cf47e11929e6e9dd39f0cb4001c893e81 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.16.0-SNAPSHOT</version>
+ <version>2.17.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-service</artifactId>
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
index f314dbef0bf2c48ccfb35d1f974ce9e6edaa91cc..19bea4224f26612e6447965cc090ab8eb52efbec 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoServiceTest.java
@@ -33,9 +33,7 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
-import org.mockito.Mock;
import org.mockito.Spy;
-import org.springframework.core.io.ResourceLoader;
import org.springframework.test.util.ReflectionTestUtils;
class ForwardingLandesnetzInfoServiceTest {
@@ -43,8 +41,6 @@ class ForwardingLandesnetzInfoServiceTest {
@Spy
@InjectMocks
private ForwardingLandesnetzInfoService service;
- @Mock
- private ResourceLoader resourceLoader;
@DisplayName("Is email in landesnetz")
@Nested
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index d263dd38d2a153faa29682be9c8031a3423c79b6..2db32ff216f30bcb909316f6d70cd9c289a2225b 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.16.0-SNAPSHOT</version>
+ <version>2.17.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-xdomea</artifactId>
diff --git a/pom.xml b/pom.xml
index b94a9aeca3933d3690cf4dfe516a54515f43d240..5067c9c7799b3515533c79ca1a33dc45c85b2765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.16.0-SNAPSHOT</version>
+ <version>2.17.0-SNAPSHOT</version>
<name>Alfa Parent</name>
<packaging>pom</packaging>