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 46f0eaad46..956c09af4d 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.scss +++ b/lib/core/src/lib/form/components/form-renderer.component.scss @@ -20,6 +20,12 @@ .mat-mdc-form-field-infix { width: auto; } + + .adf-form-field-input:not(.adf-inplace-input-mat-form-field, .adf-people-cloud, .adf-cloud-group) { + #{ms.$mat-form-field-subscript-wrapper} { + height: 40px; + } + } } .alfresco-tabs-widget { @@ -40,7 +46,7 @@ .adf-container-widget { .adf-form-field-input:not(.adf-inplace-input-mat-form-field, .adf-people-cloud, .adf-cloud-group) { - margin-bottom: 35px; + margin-bottom: 0; } .adf-grid-list { @@ -265,7 +271,7 @@ } &-error-messages-container { - min-height: 35px; + height: 40px; } &-error-messages-container-visible { diff --git a/lib/core/src/lib/form/components/form-section/form-section.component.scss b/lib/core/src/lib/form/components/form-section/form-section.component.scss index 6092f1882e..ffe36b363a 100644 --- a/lib/core/src/lib/form/components/form-section/form-section.component.scss +++ b/lib/core/src/lib/form/components/form-section/form-section.component.scss @@ -5,7 +5,7 @@ &-single-column { display: flex; flex-wrap: inherit; - align-items: center; + align-items: flex-start; gap: 1%; @include flex.layout-bp(lt-md) { diff --git a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.html b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.html index b9c020a0c8..5eee1f9435 100644 --- a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.html +++ b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.html @@ -16,10 +16,9 @@ *
diff --git a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts index 5c9eda7791..d1a340e48c 100644 --- a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts +++ b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.ts @@ -17,7 +17,7 @@ /* eslint-disable @angular-eslint/component-selector */ -import { NgClass, NgIf } from '@angular/common'; +import { NgClass } from '@angular/common'; import { Component, ViewEncapsulation } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; @@ -47,7 +47,7 @@ import { WidgetComponent } from '../widget.component'; '(invalid)': 'event($event)', '(select)': 'event($event)' }, - imports: [NgClass, MatCheckboxModule, FormsModule, TranslatePipe, ErrorWidgetComponent, NgIf], + imports: [NgClass, MatCheckboxModule, FormsModule, TranslatePipe, ErrorWidgetComponent], encapsulation: ViewEncapsulation.None }) export class CheckboxWidgetComponent extends WidgetComponent {} diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.scss b/lib/core/src/lib/form/components/widgets/error/error.component.scss index 026768b39d..2b57daf87a 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.scss +++ b/lib/core/src/lib/form/components/widgets/error/error.component.scss @@ -10,12 +10,16 @@ } } +error-widget { + display: block; +} + .adf-error { display: flex; align-items: center; &-widget-container { - height: auto; + height: 40px; } &-animate { diff --git a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.scss b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.scss index a5f2b96287..91025303f0 100644 --- a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.scss +++ b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.scss @@ -1,6 +1,7 @@ .adf-hyperlink-widget { padding: 0.4375em 0; border-top: 0.8438em solid transparent; + margin-bottom: 20px; a { color: var(--mat-sys-primary); diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.scss b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.scss index 435d152e6e..242d172457 100644 --- a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.scss +++ b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.scss @@ -43,6 +43,6 @@ @include mixins.adf-error-icon; } -.adf-container-widget .adf-multiline-text-widget .adf-form-field-input.adf-has-counter { - margin-bottom: 44px; +.adf-container-widget .adf-multiline-text-widget mat-form-field.adf-form-field-input.adf-has-counter { + margin-bottom: 20px; } diff --git a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.scss b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.scss index 33e09becd6..843afbe1cd 100644 --- a/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.scss +++ b/lib/core/src/lib/form/components/widgets/repeat/repeat.widget.scss @@ -9,7 +9,8 @@ } &-row-action { - margin-left: 10px; + margin-inline-start: 10px; + margin-block-end: 35px; } &-row-limit { diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss index 31fa2b1208..dba941cafa 100644 --- a/lib/core/src/lib/styles/_mat-selectors.scss +++ b/lib/core/src/lib/styles/_mat-selectors.scss @@ -17,6 +17,7 @@ $mat-button: '.mat-mdc-button'; $mat-button-label: '.mdc-button__label'; $mat-form-field: '.mat-mdc-form-field'; $mat-form-field-wrapper: '.mat-mdc-text-field-wrapper'; +$mat-form-field-subscript-wrapper: '.mat-mdc-form-field-subscript-wrapper'; $mat-line-ripple: '.mdc-line-ripple'; $mat-form-field-prefix: '.mat-mdc-form-field-text-prefix'; $mat-form-field-suffix: '.mat-mdc-form-field-text-suffix'; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html index 0fea08b342..cb90cebccc 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html @@ -1,21 +1,26 @@ diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.html index 4bc5484ca1..a973a54176 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.html +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.html @@ -1,31 +1,23 @@ diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.scss b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.scss index 532599f8e3..ed9398c207 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.scss +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.scss @@ -1,4 +1,5 @@ .adf-data-table-widget-failed-message { + display: block; margin: 10px; } diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.spec.ts index 2ec50a2d85..f770440650 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.spec.ts @@ -283,7 +283,8 @@ describe('DataTableWidgetComponent', () => { const failedErrorMsgElement = fixture.debugElement.query(By.css('.adf-data-table-widget-failed-message')); assertData(mockCountryColumns, []); - expect(failedErrorMsgElement).toBeNull(); + expect(failedErrorMsgElement).toBeTruthy(); + expect(failedErrorMsgElement.nativeElement.textContent.trim()).toBe(''); }); it('path points to single object with appropriate schema definition', () => { @@ -294,7 +295,8 @@ describe('DataTableWidgetComponent', () => { const failedErrorMsgElement = fixture.debugElement.query(By.css('.adf-data-table-widget-failed-message')); assertData(mockCountryColumns, [mockEuropeCountriesRows[1]]); - expect(failedErrorMsgElement).toBeNull(); + expect(failedErrorMsgElement).toBeTruthy(); + expect(failedErrorMsgElement.nativeElement.textContent.trim()).toBe(''); }); }); diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.ts index 15034eed76..a49c9ade68 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/data-table/data-table.widget.ts @@ -27,7 +27,6 @@ import { NoContentTemplateDirective, EmptyContentComponent } from '@alfresco/adf-core'; -import { NgIf } from '@angular/common'; import { TranslatePipe } from '@ngx-translate/core'; import { FormCloudService } from '../../../services/form-cloud.service'; import { TaskVariableCloud } from '../../../models/task-variable-cloud.model'; @@ -36,7 +35,7 @@ import { DataTablePathParserHelper } from './helpers/data-table-path-parser.help @Component({ standalone: true, - imports: [NgIf, TranslatePipe, FormBaseModule, DataTableComponent, NoContentTemplateDirective, EmptyContentComponent], + imports: [TranslatePipe, FormBaseModule, DataTableComponent, NoContentTemplateDirective, EmptyContentComponent], selector: 'data-table', templateUrl: './data-table.widget.html', styleUrls: ['./data-table.widget.scss'], diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.html index 83b2abe75f..e3ed0116de 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.html +++ b/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.html @@ -4,11 +4,13 @@ [class.adf-readonly]="field.readOnly" [class.adf-left-label-input-container]="field.leftLabels" > -