From e13ce5f93c8599814a7261abddd715c08e8fd352 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Tue, 15 Apr 2025 13:31:32 +0200
Subject: [PATCH 01/10] [DURACOM-347] make placeholder presence in model
 configurable,fix wrongly used placeholder in date legend

---
 .../ds-dynamic-form-control-container.component.html  |  2 +-
 .../ds-dynamic-form-control-container.component.ts    |  4 ++++
 .../models/date-picker/date-picker.component.html     | 11 +++++------
 .../shared/form/builder/parsers/date-field-parser.ts  |  4 ++--
 src/app/shared/form/builder/parsers/field-parser.ts   |  5 ++++-
 src/config/default-app-config.ts                      |  1 +
 src/config/submission-config.interface.ts             |  1 +
 7 files changed, 18 insertions(+), 10 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 1a14469a2e0..e145d9d55dc 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
@@ -2,7 +2,7 @@
      [class.d-none]="model.hidden"
   [formGroup]="group"
   [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
-  @if (!isCheckbox && hasLabel) {
+  @if (!isCheckbox && hasLabel && !isDateField) {
     <label
       [id]="'label_' + model.id"
       [for]="id"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 534300b55df..2adedc08278 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -324,6 +324,10 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     return this.model.type === DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX || this.model.type === DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH;
   }
 
+  get isDateField(): boolean {
+    return this.model.type === DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER;
+  }
+
   ngOnChanges(changes: SimpleChanges) {
     if (changes && !this.isRelationship && hasValue(this.group.get(this.model.id))) {
       super.ngOnChanges(changes);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 5d38f9e9084..cfcde982884 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -2,12 +2,11 @@
   <fieldset class="d-flex justify-content-start flex-wrap gap-2">
     @if (!model.repeatable) {
       <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
-        {{ model.placeholder }}
-        @if (model.required) {
-          <span>*</span>
-        }
-      </legend>
-    }
+        {{model.label}} @if (model.required) {
+        <span>*</span>
+      }
+    </legend>
+  }
   <ds-number-picker
     tabindex="0"
     [id]="model.id + '_year'"
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
index 8104568b1aa..a9c35dba861 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -11,8 +11,8 @@ export class DateFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any {
     let malformedDate = false;
-    const inputDateModelConfig: DynamicDsDateControlModelConfig = this.initModel(null, false, true);
-    inputDateModelConfig.legend = this.configData.label;
+    const inputDateModelConfig: DynamicDsDatePickerModelConfig = this.initModel(null, label, true);
+    inputDateModelConfig.legend = this.configData.repeatable ? null : this.configData.label;
     inputDateModelConfig.disabled = inputDateModelConfig.readOnly;
     inputDateModelConfig.toggleIcon = 'fas fa-calendar';
     this.setValues(inputDateModelConfig as any, fieldValue);
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index e4543bcff8d..8499a0672f1 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -32,6 +32,7 @@ import { VisibilityType } from './../../../../submission/sections/visibility-typ
 import { setLayout } from './parser.utils';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
+import { environment } from "../../../../../environments/environment";
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -306,7 +307,9 @@ export abstract class FieldParser {
     if (hint) {
       controlModel.hint = this.configData.hints || '&nbsp;';
     }
-    controlModel.placeholder = this.configData.label;
+    if (!environment.submission.hidePlaceholderForBasicFields) {
+      controlModel.placeholder = this.configData.label;
+    }
 
     if (this.configData.mandatory && setErrors) {
       this.markAsRequired(controlModel);
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index d8ed3764558..9fa7415f24a 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -254,6 +254,7 @@ export class DefaultAppConfig implements AppConfig {
         ],
       },
     },
+    hidePlaceholderForBasicFields: true
   };
 
   // Fallback language in which the UI will be rendered if the user's browser language is not an active language
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index afc81a39e25..214a23639cb 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -36,4 +36,5 @@ export interface SubmissionConfig extends Config {
   duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
+  hidePlaceholderForBasicFields?: boolean;
 }

From a568aa21ce7224a314e206fbbdc2e2f525c0bbc3 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 16 Apr 2025 12:37:57 +0200
Subject: [PATCH 02/10] [DURACOM-347] refactor, add test and doc

---
 config/config.example.yml                                | 5 +++++
 .../ds-dynamic-form-control-container.component.html     | 9 ++++-----
 .../ds-dynamic-form-control-container.component.spec.ts  | 8 ++++++++
 .../form/builder/parsers/date-field-parser.spec.ts       | 8 ++++++++
 src/app/shared/form/builder/parsers/date-field-parser.ts | 2 +-
 src/app/shared/form/builder/parsers/field-parser.ts      | 7 +++++--
 src/config/default-app-config.ts                         | 2 +-
 src/config/submission-config.interface.ts                | 2 +-
 src/environments/environment.test.ts                     | 1 +
 9 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 7b89b0d1f65..1f7773e87b0 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -237,6 +237,11 @@ submission:
         - value: default
           style: text-muted
           icon: fa-circle-xmark
+  # If set to true avoid setting placeholder for simple fields, where the placeholder would be the same as the label.
+  # The default is set to true as placeholders that do not provide additional information to the field are to be avoided as they could cause accessibility issue.
+  # More info on the topic can be found at https://www.deque.com/blog/accessible-forms-the-problem-with-placeholders/
+  ignorePlaceholderForSimpleFields:
+
 
 #  Fallback language in which the UI will be rendered if the user's browser language is not an active language
 fallbackLanguage: en
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 e145d9d55dc..2511a00ef9a 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
@@ -1,14 +1,14 @@
 <div [class.mb-2]="hasLabel || model.type === 'DATE' || (model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-2')"
      [class.d-none]="model.hidden"
-  [formGroup]="group"
-  [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
+     [formGroup]="group"
+     [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
   @if (!isCheckbox && hasLabel && !isDateField) {
     <label
       [id]="'label_' + model.id"
       [for]="id"
       class="form-label"
       [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
-    [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
+      [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
   }
   <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: { $implicit: model };"></ng-container>
   <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
@@ -20,8 +20,7 @@
       </div>
 
       @if (hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)) {
-<small
-             class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+        <small class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
       }
       <!-- In case of repeatable fields show empty space for all elements except the first -->
       @if (context?.parent?.groups?.length > 1 && (!showErrorMessages || errorMessages.length === 0)) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index b9335f20783..4c564f34346 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -434,4 +434,12 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     });
   });
 
+  it('should not show a label if is a checkbox or a date field', () => {
+    const checkboxLabel =  fixture.debugElement.query(By.css('#label_' + formModel[0].id));
+    const dsDatePickerLabel =  fixture.debugElement.query(By.css('#label_' + formModel[22].id));
+
+    expect(checkboxLabel).toBeNull();
+    expect(dsDatePickerLabel).toBeNull();
+  });
+
 });
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index ec2172523fe..a75f050c4c6 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -67,4 +67,12 @@ describe('DateFieldParser test suite', () => {
 
     expect(fieldModel.value).toEqual(expectedValue);
   });
+
+  it('should skip setting the placeholder when ignore ignorePlaceholderForSimpleFields is true', () => {
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
+    parser.ignorePlaceholderForSimpleFields = true;
+    const fieldModel = parser.parse();
+
+    expect(fieldModel.placeholder).toBeNull();
+  });
 });
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
index a9c35dba861..d086bd11ac6 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -11,7 +11,7 @@ export class DateFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any {
     let malformedDate = false;
-    const inputDateModelConfig: DynamicDsDatePickerModelConfig = this.initModel(null, label, true);
+    const inputDateModelConfig: DynamicDsDateControlModelConfig = this.initModel(null, label, true);
     inputDateModelConfig.legend = this.configData.repeatable ? null : this.configData.label;
     inputDateModelConfig.disabled = inputDateModelConfig.readOnly;
     inputDateModelConfig.toggleIcon = 'fas fa-calendar';
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 8499a0672f1..cd7b67ad951 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -6,6 +6,7 @@ import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import uniqueId from 'lodash/uniqueId';
 
+import { environment } from '../../../../../environments/environment';
 import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { isNgbDateStruct } from '../../../date.util';
@@ -32,7 +33,6 @@ import { VisibilityType } from './../../../../submission/sections/visibility-typ
 import { setLayout } from './parser.utils';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
-import { environment } from "../../../../../environments/environment";
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
@@ -54,6 +54,8 @@ export abstract class FieldParser {
    */
   protected typeField: string;
 
+  ignorePlaceholderForSimpleFields: boolean;
+
   constructor(
     @Inject(SUBMISSION_ID) protected submissionId: string,
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
@@ -61,6 +63,7 @@ export abstract class FieldParser {
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
     protected translate: TranslateService,
   ) {
+    this.ignorePlaceholderForSimpleFields = environment.submission.ignorePlaceholderForSimpleFields;
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -307,7 +310,7 @@ export abstract class FieldParser {
     if (hint) {
       controlModel.hint = this.configData.hints || '&nbsp;';
     }
-    if (!environment.submission.hidePlaceholderForBasicFields) {
+    if (!this.ignorePlaceholderForSimpleFields) {
       controlModel.placeholder = this.configData.label;
     }
 
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 9fa7415f24a..47bef570b20 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -254,7 +254,7 @@ export class DefaultAppConfig implements AppConfig {
         ],
       },
     },
-    hidePlaceholderForBasicFields: true
+    ignorePlaceholderForSimpleFields: true,
   };
 
   // Fallback language in which the UI will be rendered if the user's browser language is not an active language
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index 214a23639cb..3f6a9c7726d 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -36,5 +36,5 @@ export interface SubmissionConfig extends Config {
   duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
-  hidePlaceholderForBasicFields?: boolean;
+  ignorePlaceholderForSimpleFields?: boolean;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index c36da8cb739..2cee86697b6 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -195,6 +195,7 @@ export const environment: BuildConfig = {
         ],
       },
     },
+    ignorePlaceholderForSimpleFields: false,
   },
 
   // NOTE: will log all redux actions and transfers in console

From cb7f454a202b00b63bee7c3193c45db48542de65 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 16 Apr 2025 15:58:11 +0200
Subject: [PATCH 03/10] [DURACOM-347] fix placeholder used as aria label

---
 .../dynamic-scrollable-dropdown.component.html              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index e55420aa9f4..0f8b488b9e8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -14,7 +14,7 @@
     }
     <input class="form-control"
       [attr.aria-controls]="'combobox_' + id + '_listbox'"
-      [attr.aria-label]="model.placeholder"
+      [attr.aria-label]="model.label"
       [attr.autoComplete]="model.autoComplete"
       [class.is-invalid]="showErrorMessages"
       [class.scrollable-dropdown-input]="!model.readOnly"
@@ -32,11 +32,11 @@
 
   <div #dropdownMenu ngbDropdownMenu
     class="dropdown-menu scrollable-dropdown-menu w-100"
-    [attr.aria-label]="model.placeholder | translate">
+    [attr.aria-label]="model.label | translate">
     <div class="scrollable-menu"
       role="listbox"
       [id]="'combobox_' + id + '_listbox'"
-      [attr.aria-label]="model.placeholder | translate"
+      [attr.aria-label]="model.label | translate"
       infiniteScroll
       [infiniteScrollDistance]="2"
       [infiniteScrollThrottle]="50"

From bdf50373221ad3f1c3bbc98e15958b6da60b3c9b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Oct 2025 12:17:59 +0200
Subject: [PATCH 04/10] [DURACOM-347] refactor, fix missing label for library
 components

---
 config/config.example.yml                     |  2 +-
 ...c-form-control-container.component.spec.ts | 33 +++++++++++++++++++
 ...ynamic-form-control-container.component.ts | 28 ++++++++++++++++
 .../onebox/dynamic-onebox.component.html      |  2 +-
 .../builder/parsers/date-field-parser.spec.ts |  4 +--
 .../form/builder/parsers/field-parser.ts      |  8 +++--
 src/config/default-app-config.ts              |  2 +-
 src/config/submission-config.interface.ts     |  2 +-
 src/environments/environment.test.ts          |  2 +-
 9 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 1f7773e87b0..e394a4f107c 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -240,7 +240,7 @@ submission:
   # If set to true avoid setting placeholder for simple fields, where the placeholder would be the same as the label.
   # The default is set to true as placeholders that do not provide additional information to the field are to be avoided as they could cause accessibility issue.
   # More info on the topic can be found at https://www.deque.com/blog/accessible-forms-the-problem-with-placeholders/
-  ignorePlaceholderForSimpleFields:
+  omitSimpleFieldPlaceholders:
 
 
 #  Fallback language in which the UI will be rendered if the user's browser language is not an active language
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index 4c564f34346..daee4a2b394 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -223,6 +223,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
   testWSI.item = of(createSuccessfulRemoteDataObject(testItem));
   const actions$: ReplaySubject<any> = new ReplaySubject<any>(1);
 
+  const renderer = jasmine.createSpyObj('Renderer2', ['setAttribute']);
+
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
@@ -442,4 +444,35 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     expect(dsDatePickerLabel).toBeNull();
   });
 
+  it('should not call handleAriaLabelForLibraryComponents if is SSR', () => {
+    (component as any).platformId = 'server';
+    (component as any).componentRef = {
+      instance: new DynamicNGBootstrapInputComponent(null, null),
+      location: { nativeElement: document.createElement('div') },
+    } as any;
+    fixture.detectChanges();
+
+    (component as any).handleAriaLabelForLibraryComponents();
+
+    expect(renderer.setAttribute).not.toHaveBeenCalled();
+  });
+
+  it('should set aria-label when valid input and additional property ariaLabel exist and is on browser', () => {
+    (component as any).platformId = 'browser';
+    const inputEl = document.createElement('input');
+    const hostEl = {
+      querySelector: jasmine.createSpy('querySelector').and.returnValue(inputEl),
+    };
+
+    (component as any).componentRef = {
+      instance: new DynamicNGBootstrapInputComponent(null, null),
+      location: { nativeElement: hostEl },
+    } as any;
+    (component as any).renderer = renderer;
+    component.model = { additional: { ariaLabel: 'Accessible Label' } } as any;
+    fixture.detectChanges();
+    (component as any).handleAriaLabelForLibraryComponents();
+    expect(renderer.setAttribute).toHaveBeenCalledWith(inputEl, 'aria-label', 'Accessible Label');
+  });
+
 });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 2adedc08278..88de02ed10c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  isPlatformBrowser,
   NgClass,
   NgTemplateOutlet,
 } from '@angular/common';
@@ -19,7 +20,9 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  PLATFORM_ID,
   QueryList,
+  Renderer2,
   SimpleChanges,
   Type,
   ViewChild,
@@ -44,6 +47,7 @@ import {
   DynamicFormArrayModel,
   DynamicFormComponentService,
   DynamicFormControl,
+  DynamicFormControlComponent,
   DynamicFormControlContainerComponent,
   DynamicFormControlEvent,
   DynamicFormControlEventType,
@@ -129,8 +133,10 @@ import {
   ReorderableRelationship,
 } from './existing-metadata-list-element/existing-metadata-list-element.component';
 import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
+import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
 import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 
 @Component({
   selector: 'ds-dynamic-form-control-container',
@@ -223,6 +229,8 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(DYNAMIC_FORM_CONTROL_MAP_FN) protected dynamicFormControlFn: DynamicFormControlMapFn,
     private actions$: Actions,
+    protected renderer: Renderer2,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
     super(ref, componentFactoryResolver, layoutService, validationService, dynamicFormComponentService, relationService);
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
@@ -349,6 +357,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
 
   ngAfterViewInit() {
     this.showErrorMessagesPreviousStage = this.showErrorMessages;
+    this.handleAriaLabelForLibraryComponents();
   }
 
   protected createFormControlComponent(): void {
@@ -520,4 +529,23 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     this.subs.push(collection$.subscribe((collection) => this.collection = collection));
 
   }
+
+  private handleAriaLabelForLibraryComponents(): void {
+    if (!isPlatformBrowser(this.platformId)) {
+      return;
+    }
+
+    if ((this.componentRef.instance instanceof DynamicFormControlComponent) &&
+      !(this.componentRef.instance instanceof DsDynamicFormArrayComponent) &&
+      !(this.componentRef.instance instanceof DsDynamicFormGroupComponent) &&
+      this.componentRef.location.nativeElement) {
+      const inputEl: HTMLElement | null =
+        this.componentRef.location.nativeElement.querySelector('input,textarea,select,[role="textbox"]');
+
+
+      if (inputEl &&  this.model?.additional?.ariaLabel) {
+        this.renderer.setAttribute(inputEl, 'aria-label', this.model.additional.ariaLabel);
+      }
+    }
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index da6de76594c..a9beff40dcd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -41,7 +41,7 @@
            class="form-control"
            [attr.aria-labelledby]="'label_' + model.id"
            [attr.autoComplete]="model.autoComplete"
-           [attr.aria-label]="model.label | translate"
+           [attr.aria-label]="(model.label || model?.additional?.ariaLabel) | translate"
            [class.is-invalid]="showErrorMessages"
            [id]="model.id"
            [inputFormatter]="formatter"
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index a75f050c4c6..25cca217e99 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -68,9 +68,9 @@ describe('DateFieldParser test suite', () => {
     expect(fieldModel.value).toEqual(expectedValue);
   });
 
-  it('should skip setting the placeholder when ignore ignorePlaceholderForSimpleFields is true', () => {
+  it('should skip setting the placeholder when ignore omitSimpleFieldPlaceholders is true', () => {
     const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
-    parser.ignorePlaceholderForSimpleFields = true;
+    parser.omitSimpleFieldPlaceholders = true;
     const fieldModel = parser.parse();
 
     expect(fieldModel.placeholder).toBeNull();
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index cd7b67ad951..4d5c944cd40 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -54,7 +54,7 @@ export abstract class FieldParser {
    */
   protected typeField: string;
 
-  ignorePlaceholderForSimpleFields: boolean;
+  omitSimpleFieldPlaceholders: boolean;
 
   constructor(
     @Inject(SUBMISSION_ID) protected submissionId: string,
@@ -63,7 +63,7 @@ export abstract class FieldParser {
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
     protected translate: TranslateService,
   ) {
-    this.ignorePlaceholderForSimpleFields = environment.submission.ignorePlaceholderForSimpleFields;
+    this.omitSimpleFieldPlaceholders = environment.submission.omitSimpleFieldPlaceholders;
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -310,8 +310,10 @@ export abstract class FieldParser {
     if (hint) {
       controlModel.hint = this.configData.hints || '&nbsp;';
     }
-    if (!this.ignorePlaceholderForSimpleFields) {
+    if (!this.omitSimpleFieldPlaceholders) {
       controlModel.placeholder = this.configData.label;
+    } else {
+      controlModel.additional = { ...controlModel.additional, ariaLabel: this.configData.label };
     }
 
     if (this.configData.mandatory && setErrors) {
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 47bef570b20..6a82f197360 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -254,7 +254,7 @@ export class DefaultAppConfig implements AppConfig {
         ],
       },
     },
-    ignorePlaceholderForSimpleFields: true,
+    omitSimpleFieldPlaceholders: true,
   };
 
   // Fallback language in which the UI will be rendered if the user's browser language is not an active language
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index 3f6a9c7726d..842dc868fd9 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -36,5 +36,5 @@ export interface SubmissionConfig extends Config {
   duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
-  ignorePlaceholderForSimpleFields?: boolean;
+  omitSimpleFieldPlaceholders?: boolean;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 2cee86697b6..2fcab5df2b4 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -195,7 +195,7 @@ export const environment: BuildConfig = {
         ],
       },
     },
-    ignorePlaceholderForSimpleFields: false,
+    omitSimpleFieldPlaceholders: false,
   },
 
   // NOTE: will log all redux actions and transfers in console

From 90f01a0977c8ffa34f05bfc78f9172e7d39fa897 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 24 Oct 2025 13:03:37 +0200
Subject: [PATCH 05/10] [DURACOM-347] remove unnecessary check and fix circular
 dependency

---
 .../ds-dynamic-form-control-container.component.spec.ts     | 1 +
 .../ds-dynamic-form-control-container.component.ts          | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
index daee4a2b394..f4174827c46 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -288,6 +288,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     });
 
     fixture.detectChanges();
+    renderer.setAttribute.calls.reset();
     testElement = debugElement.query(By.css(`input[id='${testModel.id}']`));
   }));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 88de02ed10c..8af62d6e22b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -42,7 +42,7 @@ import {
 } from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_MAP_FN,
-  DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
+  DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DynamicFormArrayComponent,
   DynamicFormArrayGroupModel,
   DynamicFormArrayModel,
   DynamicFormComponentService,
@@ -133,7 +133,6 @@ import {
   ReorderableRelationship,
 } from './existing-metadata-list-element/existing-metadata-list-element.component';
 import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
-import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
 import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
 import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
@@ -536,8 +535,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     }
 
     if ((this.componentRef.instance instanceof DynamicFormControlComponent) &&
-      !(this.componentRef.instance instanceof DsDynamicFormArrayComponent) &&
-      !(this.componentRef.instance instanceof DsDynamicFormGroupComponent) &&
+      !(this.componentRef.instance instanceof DynamicFormArrayComponent) &&
       this.componentRef.location.nativeElement) {
       const inputEl: HTMLElement | null =
         this.componentRef.location.nativeElement.querySelector('input,textarea,select,[role="textbox"]');

From 8346cf5fc113ee1c6e33da6dd898acdbdb91ab60 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 6 Feb 2026 16:12:19 +0100
Subject: [PATCH 06/10] [DURACOM-347] remove property, disable placeholder on
 date field and concat/series (replace with labels)

---
 config/config.example.yml                              |  5 -----
 .../shared/form/builder/parsers/concat-field-parser.ts |  8 ++++----
 .../form/builder/parsers/date-field-parser.spec.ts     |  3 +--
 src/app/shared/form/builder/parsers/field-parser.ts    | 10 ++--------
 .../form/number-picker/number-picker.component.html    |  1 -
 src/config/default-app-config.ts                       |  1 -
 src/config/submission-config.interface.ts              |  1 -
 src/environments/environment.test.ts                   |  1 -
 8 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index e394a4f107c..7b89b0d1f65 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -237,11 +237,6 @@ submission:
         - value: default
           style: text-muted
           icon: fa-circle-xmark
-  # If set to true avoid setting placeholder for simple fields, where the placeholder would be the same as the label.
-  # The default is set to true as placeholders that do not provide additional information to the field are to be avoided as they could cause accessibility issue.
-  # More info on the topic can be found at https://www.deque.com/blog/accessible-forms-the-problem-with-placeholders/
-  omitSimpleFieldPlaceholders:
-
 
 #  Fallback language in which the UI will be rendered if the user's browser language is not an active language
 fallbackLanguage: en
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index 751128446bd..98f47942aec 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -92,18 +92,18 @@ export class ConcatFieldParser extends FieldParser {
     concatGroup.disabled = input1ModelConfig.readOnly;
 
     if (isNotEmpty(this.firstPlaceholder)) {
-      input1ModelConfig.placeholder = this.firstPlaceholder;
+      input1ModelConfig.label = this.firstPlaceholder;
     }
 
     if (isNotEmpty(this.secondPlaceholder)) {
-      input2ModelConfig.placeholder = this.secondPlaceholder;
+      input2ModelConfig.label = this.secondPlaceholder;
     }
 
     // Split placeholder if is like 'placeholder1/placeholder2'
     const placeholder = this.configData.label.split('/');
     if (placeholder.length === 2) {
-      input1ModelConfig.placeholder = placeholder[0];
-      input2ModelConfig.placeholder = placeholder[1];
+      input1ModelConfig.label = placeholder[0];
+      input2ModelConfig.label = placeholder[1];
     }
 
     const model1 = new DsDynamicInputModel(input1ModelConfig, clsInput);
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 25cca217e99..5a5c80987b3 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -68,9 +68,8 @@ describe('DateFieldParser test suite', () => {
     expect(fieldModel.value).toEqual(expectedValue);
   });
 
-  it('should skip setting the placeholder when ignore omitSimpleFieldPlaceholders is true', () => {
+  it('should skip setting the placeholder', () => {
     const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
-    parser.omitSimpleFieldPlaceholders = true;
     const fieldModel = parser.parse();
 
     expect(fieldModel.placeholder).toBeNull();
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 4d5c944cd40..5431555cc45 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -54,8 +54,6 @@ export abstract class FieldParser {
    */
   protected typeField: string;
 
-  omitSimpleFieldPlaceholders: boolean;
-
   constructor(
     @Inject(SUBMISSION_ID) protected submissionId: string,
     @Inject(CONFIG_DATA) protected configData: FormFieldModel,
@@ -63,7 +61,6 @@ export abstract class FieldParser {
     @Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
     protected translate: TranslateService,
   ) {
-    this.omitSimpleFieldPlaceholders = environment.submission.omitSimpleFieldPlaceholders;
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -310,11 +307,8 @@ export abstract class FieldParser {
     if (hint) {
       controlModel.hint = this.configData.hints || '&nbsp;';
     }
-    if (!this.omitSimpleFieldPlaceholders) {
-      controlModel.placeholder = this.configData.label;
-    } else {
-      controlModel.additional = { ...controlModel.additional, ariaLabel: this.configData.label };
-    }
+
+    controlModel.additional = { ...controlModel.additional, ariaLabel: this.configData.label };
 
     if (this.configData.mandatory && setErrors) {
       this.markAsRequired(controlModel);
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 807bb0acf13..e704e278c6a 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -26,7 +26,6 @@
         [readonly]="disabled"
         [disabled]="disabled"
         [ngClass]="{'is-invalid': invalid}"
-        placeholder="{{'form.number-picker.label.' + placeholder | translate }}"
         title="{{'form.number-picker.label.' + placeholder | translate}}"
         [attr.aria-labelledby]="id + ' increment-' + id + ' decrement-' + id"
     >
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 6a82f197360..d8ed3764558 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -254,7 +254,6 @@ export class DefaultAppConfig implements AppConfig {
         ],
       },
     },
-    omitSimpleFieldPlaceholders: true,
   };
 
   // Fallback language in which the UI will be rendered if the user's browser language is not an active language
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index 842dc868fd9..afc81a39e25 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -36,5 +36,4 @@ export interface SubmissionConfig extends Config {
   duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
-  omitSimpleFieldPlaceholders?: boolean;
 }
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 2fcab5df2b4..c36da8cb739 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -195,7 +195,6 @@ export const environment: BuildConfig = {
         ],
       },
     },
-    omitSimpleFieldPlaceholders: false,
   },
 
   // NOTE: will log all redux actions and transfers in console

From 1757b40644799c1ee2747de3115e38b92e40fa18 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Fri, 6 Feb 2026 16:36:28 +0100
Subject: [PATCH 07/10] [DURACOM-347] fix html indentation

---
 .../models/date-picker/date-picker.component.html          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index cfcde982884..3e6e05c7f74 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -2,9 +2,10 @@
   <fieldset class="d-flex justify-content-start flex-wrap gap-2">
     @if (!model.repeatable) {
       <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
-        {{model.label}} @if (model.required) {
-        <span>*</span>
-      }
+        {{model.label}}
+        @if (model.required) {
+          <span>*</span>
+        }
     </legend>
   }
   <ds-number-picker

From d6107b735800a8934919ee87baae88f7507e6a06 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 2 Apr 2026 17:26:40 +0200
Subject: [PATCH 08/10] [DURACOM-347] fix tests

---
 src/app/shared/form/builder/parsers/date-field-parser.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 5a5c80987b3..4572b083e0f 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -69,7 +69,7 @@ describe('DateFieldParser test suite', () => {
   });
 
   it('should skip setting the placeholder', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, null, translateService);
     const fieldModel = parser.parse();
 
     expect(fieldModel.placeholder).toBeNull();

From 1a9ae799a65a149e1a5eaab13ec1b31f18bf84d7 Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Wed, 8 Apr 2026 18:08:27 +0200
Subject: [PATCH 09/10] [DURACOM-347] fix test, missing import

---
 .../ds-dynamic-form-control-container.component.ts           | 5 +++--
 .../shared/form/builder/parsers/date-field-parser.spec.ts    | 2 +-
 src/app/shared/form/builder/parsers/field-parser.ts          | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 8af62d6e22b..3e239ce2844 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -42,7 +42,8 @@ import {
 } from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_MAP_FN,
-  DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX, DynamicFormArrayComponent,
+  DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
+  DynamicFormArrayComponent,
   DynamicFormArrayGroupModel,
   DynamicFormArrayModel,
   DynamicFormComponentService,
@@ -134,8 +135,8 @@ import {
 } from './existing-metadata-list-element/existing-metadata-list-element.component';
 import { ExistingRelationListElementComponent } from './existing-relation-list-element/existing-relation-list-element.component';
 import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
 import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
 
 @Component({
   selector: 'ds-dynamic-form-control-container',
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
index 4572b083e0f..5a5c80987b3 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.spec.ts
@@ -69,7 +69,7 @@ describe('DateFieldParser test suite', () => {
   });
 
   it('should skip setting the placeholder', () => {
-    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, null, translateService);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions, translateService);
     const fieldModel = parser.parse();
 
     expect(fieldModel.placeholder).toBeNull();
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 5431555cc45..5825c6edfbb 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -6,7 +6,6 @@ import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import uniqueId from 'lodash/uniqueId';
 
-import { environment } from '../../../../../environments/environment';
 import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { isNgbDateStruct } from '../../../date.util';

From 9279b3d494dbfa29f8a3cc8840f6d3fd110b670b Mon Sep 17 00:00:00 2001
From: FrancescoMolinaro <francesco.molinaro@4science.com>
Date: Thu, 9 Apr 2026 09:07:52 +0200
Subject: [PATCH 10/10] [DURACOM-347] add missing aria label improvement in
 onebox

---
 .../models/onebox/dynamic-onebox.component.html                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index a9beff40dcd..8b6767ebf7b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -71,7 +71,7 @@
     <input class="form-control"
            [attr.aria-labelledby]="'label_' + model.id"
            [attr.autoComplete]="model.autoComplete"
-           [attr.aria-label]="model.label | translate"
+           [attr.aria-label]="(model.label || model?.additional?.ariaLabel) | translate"
            [class.is-invalid]="showErrorMessages"
            [class.tree-input]="!model.readOnly"
            [id]="id"