From f8f6e2b7d08d818673708b3e013e904289f98588 Mon Sep 17 00:00:00 2001
From: Tomasz Nastaly <tomasz.nastaly@hyland.com>
Date: Thu, 31 Jul 2025 15:21:12 +0200
Subject: [PATCH] AAE-36582 Update errors containers in widgets

---
 .../components/form-renderer.component.scss   | 16 ++++++---
 lib/core/test-results/.last-run.json          |  4 +++
 .../display-external-property.widget.html     | 35 ++++++++++---------
 .../dropdown/dropdown-cloud.widget.html       | 14 ++++----
 .../widgets/dropdown/dropdown-cloud.widget.ts |  3 +-
 5 files changed, 43 insertions(+), 29 deletions(-)
 create mode 100644 lib/core/test-results/.last-run.json

diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss
index 0cf546cf9e..b283847a1a 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -264,6 +264,18 @@
         line-height: 64px;
         margin-right: 15px;
     }
+
+    &-error-messages-container {
+        min-height: 35px;
+    }
+
+    &-error-messages-container-visible {
+        visibility: visible;
+    }
+
+    &-error-messages-container-hidden {
+        visibility: hidden;
+    }
 }
 
 form-field {
@@ -275,7 +287,3 @@ form-field {
         line-height: normal;
     }
 }
-
-.adf-error-messages-container {
-    min-height: 35px;
-}
diff --git a/lib/core/test-results/.last-run.json b/lib/core/test-results/.last-run.json
new file mode 100644
index 0000000000..5fca3f84bc
--- /dev/null
+++ b/lib/core/test-results/.last-run.json
@@ -0,0 +1,4 @@
+{
+  "status": "failed",
+  "failedTests": []
+}
\ No newline at end of file
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/display-external-property/display-external-property.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/display-external-property/display-external-property.widget.html
index a708c00e0a..9fe4680574 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/display-external-property/display-external-property.widget.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/display-external-property/display-external-property.widget.html
@@ -13,29 +13,30 @@
     <div>
         <mat-form-field class="adf-form-field-input" [floatLabel]="field.placeholder ? 'always' : null">
             @if( (field.name || field?.required) && !field.leftLabels) {
-            <mat-label class="adf-label" [attr.for]="field.id">
-                {{ field.name | translate }}
-            </mat-label>
-                 }
-            <input matInput
-                   class="adf-input"
-                   type="text"
-                   data-automation-id="adf-display-external-property-widget"
-                   [id]="field.id"
-                   [formControl]="propertyControl"
-                   [required]="field.required"
-            >
+            <mat-label class="adf-label" [attr.for]="field.id"> {{ field.name | translate }} </mat-label>
+            }
+            <input
+                matInput
+                class="adf-input"
+                type="text"
+                data-automation-id="adf-display-external-property-widget"
+                [id]="field.id"
+                [formControl]="propertyControl"
+                [required]="field.required"
+            />
 
             <ng-container *ngIf="previewState">
-                <span class="adf-display-external-property-widget-preview"
-                       data-automation-id="adf-display-external-property-widget-preview"
-                >
+                <span class="adf-display-external-property-widget-preview" data-automation-id="adf-display-external-property-widget-preview">
                     {{ field.params.externalPropertyLabel }}
                 </span>
             </ng-container>
         </mat-form-field>
 
-        <ng-container *ngIf="!previewState">
+        <div
+            class="adf-error-messages-container"
+            [ngClass]="!previewState ? 'adf-error-messages-container-visible' : 'adf-error-messages-container-hidden'"
+        >
             <error-widget *ngIf="propertyLoadFailed" [required]="'FORM.FIELD.EXTERNAL_PROPERTY_LOAD_FAILED' | translate" />
-        </ng-container>
+        </div>
+    </div>
 </div>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html
index 7d6517fc9b..39c48994f0 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.html
@@ -11,7 +11,8 @@
     </div>
     <div>
         <mat-form-field class="adf-form-field-input">
-            @if ( (field.name || this.field?.required) && !field.leftLabels) {  <mat-label class="adf-label" [attr.for]="field.id">{{ field.name | translate }}</mat-label> }
+            @if ( (field.name || this.field?.required) && !field.leftLabels) {
+            <mat-label class="adf-label" [attr.for]="field.id">{{ field.name | translate }}</mat-label> }
             <mat-select
                 class="adf-select"
                 [formControl]="dropdownControl"
@@ -29,12 +30,11 @@
                 <mat-option id="readonlyOption" *ngIf="isReadOnlyType" [value]="field.value">{{field.value}}</mat-option>
             </mat-select>
         </mat-form-field>
-        <div class="adf-error-messages-container" *ngIf="!previewState && !field.readOnly">
-            <error-widget
-                class="adf-dropdown-required-message"
-                *ngIf="showRequiredMessage"
-                required="{{ 'FORM.FIELD.REQUIRED' | translate }}"
-            />
+        <div
+            class="adf-error-messages-container"
+            [ngClass]="!previewState && !field.readOnly ? 'adf-error-messages-container-visible' : 'adf-error-messages-container-hidden'"
+        >
+            <error-widget class="adf-dropdown-required-message" *ngIf="showRequiredMessage" required="{{ 'FORM.FIELD.REQUIRED' | translate }}" />
             <error-widget
                 class="adf-dropdown-failed-message"
                 *ngIf="isRestApiFailed"
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
index f9376a4357..31661cbcfa 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.ts
@@ -29,7 +29,7 @@ import {
     SelectFilterInputComponent,
     WidgetComponent
 } from '@alfresco/adf-core';
-import { AsyncPipe, NgFor, NgIf } from '@angular/common';
+import { AsyncPipe, NgClass, NgFor, NgIf } from '@angular/common';
 import { Component, DestroyRef, inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -59,6 +59,7 @@ export const HIDE_FILTER_LIMIT = 5;
     imports: [
         NgIf,
         NgFor,
+        NgClass,
         AsyncPipe,
         ReactiveFormsModule,
         MatFormFieldModule,