From 1a2a93a95f7ea384975d0921c2416fc4add4d3c4 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 16 Jun 2023 14:36:24 +0300 Subject: [PATCH] #8738 - Disable input fields in finalised DMPs/datasets. 1. dataset-editor.component.html & form-composite-field.component.html & form-field.component.html & form-section.component.html: Added [editable] parameter input in or [disabled] attribute in inputs, buttons, and to disable then when form is disabled & do not add "pointer" class when form is disabled. 2. form-field.component.ts: For DatasetIdentifier and Validation view styles, when removing and re-adding control, check if form was disabled and disable it again. 3. form-section.component.ts: In method "addMultipleField()", return without doing anything when form is disabled. --- .../dataset-editor.component.html | 3 ++- .../form-composite-field.component.html | 6 +++--- .../form-field/form-field.component.html | 20 +++++++++++-------- .../form-field/form-field.component.ts | 8 ++++++++ .../form-section/form-section.component.html | 10 +++++----- .../form-section/form-section.component.ts | 3 +++ 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html index a7be0544d..cb8dab53d 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html @@ -32,7 +32,8 @@ + ((formGroup.get('description').touched && (formGroup.get('description').hasError('required') || formGroup.get('description').hasError('backendError'))) ? 'required' : '')" + [editable]="!formGroup.get('description').disabled">
{{formGroup.get('description').getError('backendError').message}} diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html index 24f35ac7a..471e5623b 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html @@ -10,7 +10,7 @@
-
@@ -64,10 +64,10 @@ {{fieldFormGroup.getRawValue() | fieldValue | translate}} - - diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html index ccfc2e038..e24890e11 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html @@ -114,7 +114,8 @@ [placeholder]="form.get('data').value.label" [required]="form.get('validationRequired').value" [wrapperClasses]="'full-width editor ' + - ((form.get('validationRequired').value && form.get('value').touched && form.get('value').hasError('required')) ? 'required' : '')"> + ((form.get('validationRequired').value && form.get('value').touched && form.get('value').hasError('required')) ? 'required' : '')" + [editable]="!form.get('value').disabled">
@@ -125,7 +126,7 @@
+ [multiple]="false" [accept]="typesToString()" [disabled]="form.get('value').disabled"> {{ form.value.value.name }} @@ -134,12 +135,13 @@
- @@ -422,12 +424,14 @@
- + {{'GENERAL.VALIDATION.REQUIRED' | translate}} - + {{ type.name }} @@ -451,7 +455,7 @@
-
+
{{'GENERAL.VALIDATION.REQUIRED' | translate}} @@ -467,7 +471,7 @@
- + {{'GENERAL.VALIDATION.REQUIRED' | translate}}
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts index 23320fe92..dcd6039f9 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts @@ -314,8 +314,12 @@ export class FormFieldComponent extends BaseComponent implements OnInit { break; case DatasetProfileFieldViewStyle.DatasetIdentifier: const value = this.form.get('value').value; + const disabled = this.form.disabled; this.form.removeControl('value'); this.form.addControl('value', new DatasetIdModel(value).buildForm()); + if(disabled) { + this.form.disable(); + } this.datasetIdInitialized = true; break; case DatasetProfileFieldViewStyle.Currency: @@ -329,8 +333,12 @@ export class FormFieldComponent extends BaseComponent implements OnInit { break; case DatasetProfileFieldViewStyle.Validation: const value1 = this.form.get('value').value; + const disabled1 = this.form.disabled; this.form.removeControl('value'); this.form.addControl('value', new DatasetIdModel(value1).buildForm()); + if(disabled1) { + this.form.disable(); + } //this.datasetIdInitialized = true; break; } diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html index a71b95049..43c45f710 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html @@ -32,7 +32,7 @@
- + @@ -44,7 +44,7 @@ + [wrapperClasses]="'mb-2'" [editable]="!compositeFieldFormGroup.get('commentFieldValue').disabled">
@@ -116,7 +116,7 @@ - + @@ -139,7 +139,7 @@
- + @@ -151,7 +151,7 @@ + [wrapperClasses]="' mb-2'" [editable]="!fieldsetEntry.form.get('commentFieldValue').disabled">
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts index a87a937a9..c7ca771b8 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts @@ -217,6 +217,9 @@ export class FormSectionComponent extends BaseComponent implements OnInit, OnCha } addMultipleField(fieldsetIndex: number) { + if(this.form.get('compositeFields').get('' + fieldsetIndex).disabled) { + return; + } const compositeFieldToBeCloned = (this.form.get('compositeFields').get('' + fieldsetIndex) as FormGroup).getRawValue(); const multiplicityItemsArray = ((this.form.get('compositeFields').get('' + fieldsetIndex).get('multiplicityItems')));