diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.model.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.model.ts
index 6632f6e6d..ade0c6dbd 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.model.ts
@@ -5,7 +5,7 @@ import { DmpBlueprintStatus } from "@app/core/common/enum/dmp-blueprint-status";
import { DmpBlueprintSystemFieldType } from "@app/core/common/enum/dmp-blueprint-system-field-type";
import { DescriptionTemplatesInSection, DescriptionTemplatesInSectionPersist, DmpBlueprint, DmpBlueprintDefinition, DmpBlueprintDefinitionPersist, DmpBlueprintDefinitionSection, DmpBlueprintDefinitionSectionPersist, DmpBlueprintPersist, ExtraFieldInSection, FieldInSection, FieldInSectionPersist, ReferenceTypeFieldInSection, SystemFieldInSection } from "@app/core/model/dmp-blueprint/dmp-blueprint";
import { BaseEditorModel } from "@common/base/base-form-editor-model";
-import { BackendErrorValidator } from "@common/forms/validation/custom-validator";
+import { BackendErrorValidator, DmpBlueprintSystemFieldRequiredValidator } from "@common/forms/validation/custom-validator";
import { ValidationErrorModel } from "@common/forms/validation/error-model/validation-error-model";
import { Validation, ValidationContext } from "@common/forms/validation/validation-context";
import { Guid } from "@common/types/guid";
@@ -142,7 +142,7 @@ export class DmpBlueprintDefinitionEditorModel implements DmpBlueprintDefinition
const baseContext: ValidationContext = new ValidationContext();
const baseValidationArray: Validation[] = new Array();
- baseValidationArray.push({ key: 'sections', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}sections`)] });
+ baseValidationArray.push({ key: 'sections', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}sections`), DmpBlueprintSystemFieldRequiredValidator()] });
baseContext.validation = baseValidationArray;
return baseContext;
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 54b4451e7..c4f803dd3 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1274,6 +1274,7 @@
},
"SECTIONS-REQUIRED": "Required",
"FIELDS-REQUIRED": "Required",
+ "SYSTEM-FIELDS-REQUIRED": "Title and Description are required",
"FIELDS": {
"NAME": "Name",
"SECTIONS": "Sections",
diff --git a/dmp-frontend/src/common/forms/validation/custom-validator.ts b/dmp-frontend/src/common/forms/validation/custom-validator.ts
index e8db1e8af..a3f0c4040 100644
--- a/dmp-frontend/src/common/forms/validation/custom-validator.ts
+++ b/dmp-frontend/src/common/forms/validation/custom-validator.ts
@@ -1,6 +1,7 @@
-import { AbstractControl, ValidatorFn, Validators } from '@angular/forms';
+import { AbstractControl, UntypedFormArray, UntypedFormGroup, ValidatorFn, Validators } from '@angular/forms';
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
import { isNullOrUndefined } from '@app/utilities/enhancers/utils';
+import { DmpBlueprintSystemFieldType } from '@app/core/common/enum/dmp-blueprint-system-field-type';
export function BackendErrorValidator(errorModel: ValidationErrorModel, propertyName: string): ValidatorFn {
return (control: AbstractControl): { [key: string]: any } => {
@@ -98,3 +99,27 @@ export function PasswordMatchValidator(passwordControlName: string, repeatPasswo
return null;
};
}
+
+export function DmpBlueprintSystemFieldRequiredValidator(): ValidatorFn {
+ return (control: AbstractControl): { [key: string]: any } => {
+ let foundTitle = false;
+ let foundDescription = false;
+
+ const sectionsFormArray = (control as UntypedFormArray);
+ if (sectionsFormArray.controls != null && sectionsFormArray.controls.length > 0 ){
+ sectionsFormArray.controls.forEach((section, index) => {
+ const fieldsFormArray = section.get('fields') as UntypedFormArray;
+ if (fieldsFormArray && fieldsFormArray.length > 0){
+ if (fieldsFormArray.controls.some(y => (y as UntypedFormGroup).get('systemFieldType')?.value === DmpBlueprintSystemFieldType.Title)){
+ foundTitle = true;
+ }
+ if (fieldsFormArray.controls.some(y => (y as UntypedFormGroup).get('systemFieldType')?.value === DmpBlueprintSystemFieldType.Description)){
+ foundDescription = true;
+ }
+ }
+ });
+ }
+ return foundTitle && foundDescription ? null : { 'dmpBlueprintSystemFieldRequired': true };
+
+ };
+}