From eaa3d96bc7e596a65f2f3d4713060a4c4404c85d Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Wed, 6 Oct 2021 15:25:37 +0200
Subject: [PATCH] [CST-4659] Deque accessibility issues - 470010 and tests

---
 .../ds-dynamic-form-control-container.component.html          | 2 +-
 .../models/date-picker/date-picker.component.spec.ts          | 1 +
 src/app/shared/testing/dynamic-form-mock-services.ts          | 3 ++-
 .../upload/file/edit/section-upload-file-edit.model.ts        | 4 ++--
 src/assets/i18n/en.json5                                      | 4 ++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 3cf06e4121..fc115e043a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -11,7 +11,7 @@
   <div [ngClass]="{'form-row': model.hasLanguages || isRelationship,
                       'd-none': value?.isVirtual && (model.hasSelectableMetadata || context?.index > 0)}">
     <div [ngClass]="getClass('grid', 'control')">
-      <div [attr.aria-labelledby]="id + '_errors'">
+      <div>
         <ng-container #componentViewContainer></ng-container>
       </div>
       <small *ngIf="hasHint && ((model.repeatable === false && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index 87e49956bb..4989dab93a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -69,6 +69,7 @@ describe('DsDatePickerComponent test suite', () => {
             [bindId]='bindId'
             [group]='group'
             [model]='model'
+            [legend]='legend'
             (blur)='onBlur($event)'
             (change)='onValueChange($event)'
             (focus)='onFocus($event)'></ds-date-picker>`;
diff --git a/src/app/shared/testing/dynamic-form-mock-services.ts b/src/app/shared/testing/dynamic-form-mock-services.ts
index 2cf705ff90..1cbd470e23 100644
--- a/src/app/shared/testing/dynamic-form-mock-services.ts
+++ b/src/app/shared/testing/dynamic-form-mock-services.ts
@@ -1,5 +1,6 @@
 export const mockDynamicFormLayoutService = jasmine.createSpyObj('DynamicFormLayoutService', {
-  getElementId: jasmine.createSpy('getElementId')
+  getElementId: jasmine.createSpy('getElementId'),
+  getClass: 'class',
 });
 
 export const mockDynamicFormValidationService = jasmine.createSpyObj('DynamicFormValidationService', {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 300a4b461f..14886128a5 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -74,7 +74,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke
     required: null
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required'
+    required: 'submission.sections.upload.form.date-required-from'
   }
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
@@ -104,7 +104,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM
     required: null
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required'
+    required: 'submission.sections.upload.form.date-required-until'
   }
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4b6356f556..f3f09da1d4 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3599,6 +3599,10 @@
 
   "submission.sections.upload.form.date-required": "Date is required.",
 
+  "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+
+  "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+
   "submission.sections.upload.form.from-label": "Grant access from",
 
   "submission.sections.upload.form.from-placeholder": "From",