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 9491e06314f..4aa96cda897 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 @@ -583,8 +583,9 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo isNotRequiredGroupAndEmpty(): boolean { const parent = this.model.parent; - - if (hasValue(parent) && parent.type === 'GROUP') { + // Check if the model is part of a group, the group needs to be an inner form and be in the submission form not in a nested form. + // The check hasValue(parent.parent) tells if the parent is in the submission or in a modal (nested cases) + if (hasValue(parent) && parent.type === 'GROUP' && this.model.isModelOfInnerForm && hasValue(parent.parent)) { const groupHasSomeValue = parent.group.some(elem => !!elem.value); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html index 5c88af76bcc..bf612ee469a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html @@ -14,6 +14,7 @@ [attr.aria-labelledby]="'label_' + model.id" [attr.tabindex]="item.index" [checked]="item.value" + [class.is-invalid]="showErrorMessages" [id]="model.id + item.id" [formControlName]="item.id" [name]="model.name" @@ -46,6 +47,7 @@