From e558c994044f203ee79f09179404e38259917151 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 10 Sep 2020 11:27:04 +0300
Subject: [PATCH] Fixed issue with visibility rules not working

---
 .../dataset-editor-details.component.html                  | 2 +-
 .../dataset-description-form.model.ts                      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
index c83f51eff..93834ce1a 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.html
@@ -64,7 +64,7 @@
 		</div>
 		<app-dataset-external-references-editor-component (formChanged)="onFormChanged($event)" [formGroup]="formGroup" [viewOnly]="viewOnly"></app-dataset-external-references-editor-component>
 		<div *ngIf="hasProfileId() && formGroup.get('datasetProfileDefinition') !== null">
-			<app-dataset-description [form]="formGroup.get('datasetProfileDefinition')" [datasetProfileId]="getProfileId()" (formChanged)="onFormChanged($event)"></app-dataset-description>
+			<app-dataset-description [form]="formGroup.get('datasetProfileDefinition')" [visibilityRules]="formGroup.get('datasetProfileDefinition').get('rules').value" [datasetProfileId]="getProfileId()" (formChanged)="onFormChanged($event)"></app-dataset-description>
 		</div>
 		<!-- <app-dataset-description [form]="formGroup.get('datasetProfileDefinition')" [visibilityRules]="formGroup.get('datasetProfileDefinition').get('rules')" [datasetProfileId]="formGroup.get('profile').value">
 		</app-dataset-description> -->
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts
index fd8824ba3..1dc2c0923 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.model.ts
@@ -11,12 +11,15 @@ import { Page } from "../../../core/model/dataset-profile-definition/page";
 import { Rule } from "../../../core/model/dataset-profile-definition/rule";
 import { Section } from "../../../core/model/dataset-profile-definition/section";
 import { ViewStyle } from "../../../core/model/dataset-profile-definition/view-style";
+import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
+import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 
 export class DatasetDescriptionFormEditorModel extends BaseFormModel {
 
 	public status: number;
 	public pages: Array<DatasetDescriptionPageEditorModel> = [];
 	public rules: Rule[] = [];
+	public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
 
 	fromModel(item: DatasetProfileDefinitionModel): DatasetDescriptionFormEditorModel {
 		this.status = item.status;
@@ -26,7 +29,9 @@ export class DatasetDescriptionFormEditorModel extends BaseFormModel {
 	}
 
 	buildForm(): FormGroup {
-		const formGroup: FormGroup = new FormBuilder().group({});
+		const formGroup: FormGroup = new FormBuilder().group({
+			rules: [{ value: this.rules, disabled: false }, BackendErrorValidator(this.validationErrorModel, 'rules')]
+		});
 		const pagesFormArray = new Array<FormGroup>();
 
 		this.pages.forEach(item => {