From eb9f1745bff2afc989f9ed31c327089664c84f34 Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Tue, 26 Mar 2024 16:49:27 +0100
Subject: [PATCH] OZG-4995 Make potentially empty form field clear in name of
method
---
.../organisationseinheit.formservice.spec.ts | 4 ++--
.../organisationseinheit.formservice.ts | 12 ++++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
index d7d9d2d97e..d7cd5319e0 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.spec.ts
@@ -125,7 +125,7 @@ describe('OrganisationseinheitFormService', () => {
});
formService.create();
- expect(userService.createOrganisationseinheit).toHaveBeenCalledWith(null, []);
+ expect(userService.createOrganisationseinheit).toHaveBeenCalledWith('', []);
});
it('should return progress observable', () => {
@@ -160,7 +160,7 @@ describe('OrganisationseinheitFormService', () => {
expect(userService.saveOrganisationseinheit).toHaveBeenCalledWith({
id: formService.source.id,
- name: null,
+ name: '',
organisationseinheitIds: [],
});
});
diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
index 73ff18ade3..296b625030 100644
--- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
+++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit.formservice.ts
@@ -58,15 +58,23 @@ export class OrganisationseinheitFormservice {
}
private getName(): string {
- return this.form.get(OrganisationseinheitFormservice.ORGANISATIONSEINHEIT_NAME_FIELD).value;
+ return this.getStringFromPotentiallyEmptyField(
+ OrganisationseinheitFormservice.ORGANISATIONSEINHEIT_NAME_FIELD,
+ );
}
private getOrganisationseinheitIds(): string[] {
return this.splitOrganisationseinheitIds(
- this.form.get(OrganisationseinheitFormservice.ORGANISATIONSEINHEIT_IDS_FIELD).value ?? '',
+ this.getStringFromPotentiallyEmptyField(
+ OrganisationseinheitFormservice.ORGANISATIONSEINHEIT_IDS_FIELD,
+ ),
);
}
+ private getStringFromPotentiallyEmptyField(fieldName: string): string {
+ return this.form.get(fieldName).value ?? '';
+ }
+
public isPatch(): boolean {
return isNotNil(this.source);
}
--
GitLab