From 7f3144194661d1ebce926a38ed603a78b6dc8e92 Mon Sep 17 00:00:00 2001 From: Vito Date: Tue, 1 Dec 2020 23:58:32 +0000 Subject: [PATCH] [ADF-5294] - fixed problem on form rendering (#6405) Co-authored-by: Vito Albano --- .../components/form-renderer.component.spec.ts | 18 ++++++++++++++++-- .../form/components/widgets/core/form.model.ts | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/core/form/components/form-renderer.component.spec.ts b/lib/core/form/components/form-renderer.component.spec.ts index 7300165775..aba7904b03 100644 --- a/lib/core/form/components/form-renderer.component.spec.ts +++ b/lib/core/form/components/form-renderer.component.spec.ts @@ -325,8 +325,8 @@ describe('Form Renderer Component', () => { expect(formRendererComponent.formDefinition.isValid).toBe(true, 'Form should be valid when required field are filled'); }); - it('[C309654] - Should display Number widget spans on 2 columns when colspan is set to 2', async () => { - formRendererComponent.formDefinition = formService.parseForm(colspanForm.formRepresentation.formDefinition, null , false, false); + it('[C309654] - Should display Number widget spans on 2 columns when colspan is set to 2 and grid view is active', async () => { + formRendererComponent.formDefinition = formService.parseForm(colspanForm.formRepresentation.formDefinition, null , false, true); fixture.detectChanges(); await fixture.whenStable(); const formSizedElement = fixture.nativeElement.querySelector('#field-2bc275fb-e113-4d7d-885f-6e74a7332d40-container div.adf-grid-list'); @@ -340,6 +340,20 @@ describe('Form Renderer Component', () => { expect(fullWidthElement.style['grid-area']).toBe('auto / auto / span 1 / span 2'); }); + it('[C309654] - Should display Number widget spans on 2 columns when colspan is set to 2 and grid view is not active', async () => { + formRendererComponent.formDefinition = formService.parseForm(colspanForm.formRepresentation.formDefinition, null , false, false); + fixture.detectChanges(); + await fixture.whenStable(); + const formSizedElement = fixture.nativeElement.querySelector('#field-2bc275fb-e113-4d7d-885f-6e74a7332d40-container section.adf-grid-list-column-view'); + expectElementToBeVisible(formSizedElement); + const sectionGridElement: HTMLElement[] = fixture.nativeElement.querySelectorAll('#field-2bc275fb-e113-4d7d-885f-6e74a7332d40-container section .adf-grid-list-single-column'); + sectionGridElement.forEach((element) => { + expect(element.style['width']).toBe('50%', 'Elemens is wrong sized for this section'); + }); + const fullWidthElement = fixture.nativeElement.querySelector('#field-d52ada4e-cbdc-4f0c-a480-5b85fa00e4f8-container section.adf-grid-list-column-view .adf-grid-list-single-column'); + expect(fullWidthElement.style['width']).toBe('100%'); + }); + it('[C309655] - Should display validation error message when Number widget has invalid value', async () => { formRendererComponent.formDefinition = formService.parseForm(numberNotRequiredForm.formRepresentation.formDefinition); fixture.detectChanges(); diff --git a/lib/core/form/components/widgets/core/form.model.ts b/lib/core/form/components/widgets/core/form.model.ts index 163bc1689d..e3a78a30c4 100644 --- a/lib/core/form/components/widgets/core/form.model.ts +++ b/lib/core/form/components/widgets/core/form.model.ts @@ -99,7 +99,7 @@ export class FormModel { this.className = json.className || ''; this.variables = json.variables || []; this.processVariables = json.processVariables || []; - this.enableFixedSpace = enableFixedSpace || true; + this.enableFixedSpace = enableFixedSpace ? true : false; const tabCache: FormWidgetModelCache = {};