From f9a8d3a4bfd71724e121fd2e6f391eff2acd7fa0 Mon Sep 17 00:00:00 2001 From: Silviu Popa Date: Fri, 9 Aug 2019 16:45:26 +0300 Subject: [PATCH] [ADF-4797] - fix null value for display text when the field it's not visible (#4987) * fix reset display text value when it's not visible * change invalid unit test * change unit test * use alpha to test --- demo-shell/package.json | 2 +- lib/cli/package.json | 2 +- lib/content-services/package.json | 4 ++-- .../widget-visibility-cloud.service.spec.ts | 4 ++-- .../services/widget-visibility.service.spec.ts | 4 ++-- .../form/services/widget-visibility.service.ts | 3 --- lib/core/package.json | 2 +- lib/extensions/package.json | 2 +- lib/insights/package.json | 6 +++--- lib/process-services-cloud/package.json | 6 +++--- lib/process-services/package.json | 6 +++--- lib/testing/package.json | 2 +- package.json | 16 ++++++++-------- 13 files changed, 28 insertions(+), 31 deletions(-) diff --git a/demo-shell/package.json b/demo-shell/package.json index cc997f7b72..4533756096 100644 --- a/demo-shell/package.json +++ b/demo-shell/package.json @@ -1,7 +1,7 @@ { "name": "Alfresco-ADF-Angular-Demo", "description": "Demo shell for Alfresco Angular components", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "repository": { "type": "git", diff --git a/lib/cli/package.json b/lib/cli/package.json index 9b72d82cd4..a84068497e 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-cli", "description": "Alfresco ADF cli and utils", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "bin": { "adf-license": "./bin/doc/licenseList.js", diff --git a/lib/content-services/package.json b/lib/content-services/package.json index 766ea38c0f..f2d7e72caf 100644 --- a/lib/content-services/package.json +++ b/lib/content-services/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-content-services", "description": "Alfresco ADF content services", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-content-services.js", "repository": { @@ -27,7 +27,7 @@ "@angular/router": ">=7.0.3", "@alfresco/js-api": "3.4.0", "rxjs": ">=6.2.2", - "@alfresco/adf-core": "3.4.0", + "@alfresco/adf-core": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "@ngx-translate/core": ">=11.0.0", "hammerjs": ">=2.0.8", "moment": ">=2.22.2", diff --git a/lib/core/form/services/widget-visibility-cloud.service.spec.ts b/lib/core/form/services/widget-visibility-cloud.service.spec.ts index ba51e2dd8b..dbd147850a 100644 --- a/lib/core/form/services/widget-visibility-cloud.service.spec.ts +++ b/lib/core/form/services/widget-visibility-cloud.service.spec.ts @@ -530,7 +530,7 @@ describe('WidgetVisibilityCloudService', () => { expect(fakeFormField.isVisible).toBeFalsy(); }); - it('should reset value when the field is not visibile', () => { + it('should notreset value when the field is not visibile', () => { visibilityObjTest.leftValue = 'test_1'; visibilityObjTest.operator = '=='; visibilityObjTest.rightType = WidgetTypeEnum.field; @@ -539,7 +539,7 @@ describe('WidgetVisibilityCloudService', () => { service.refreshEntityVisibility(fakeFormField); expect(fakeFormField.isVisible).toBeFalsy(); - expect(fakeFormField.value).toEqual(null); + expect(fakeFormField.value).toEqual('FAKE_FORM_FIELD_VALUE'); }); it('should return true when the visibility condition is not valid', () => { diff --git a/lib/core/form/services/widget-visibility.service.spec.ts b/lib/core/form/services/widget-visibility.service.spec.ts index 43ba333b55..fdf6be9249 100644 --- a/lib/core/form/services/widget-visibility.service.spec.ts +++ b/lib/core/form/services/widget-visibility.service.spec.ts @@ -914,7 +914,7 @@ describe('WidgetVisibilityService', () => { expect(contModel.isVisible).toBeFalsy(); }); - it('should set null value when the field is not visibile', () => { + it('should not set null value when the field is not visibile', () => { visibilityObjTest.leftFormFieldId = 'test_4'; visibilityObjTest.operator = '!='; visibilityObjTest.rightFormFieldId = 'dropdown'; @@ -922,7 +922,7 @@ describe('WidgetVisibilityService', () => { service.refreshEntityVisibility(fakeFormField); expect(fakeFormField.isVisible).toBeFalsy(); - expect(fakeFormField.value).toEqual(null); + expect(fakeFormField.value).toEqual('FAKE_FORM_FIELD_VALUE'); }); }); diff --git a/lib/core/form/services/widget-visibility.service.ts b/lib/core/form/services/widget-visibility.service.ts index 8fc01d7edd..ef9d83ed94 100644 --- a/lib/core/form/services/widget-visibility.service.ts +++ b/lib/core/form/services/widget-visibility.service.ts @@ -48,9 +48,6 @@ export class WidgetVisibilityService { refreshEntityVisibility(element: FormFieldModel | TabModel) { const visible = this.evaluateVisibility(element.form, element.visibilityCondition); - if (!visible && element instanceof FormFieldModel) { - element.value = null; - } element.isVisible = visible; } diff --git a/lib/core/package.json b/lib/core/package.json index ed33f769dc..70c2510b7a 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-core", "description": "Alfresco ADF core", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-core.js", "repository": { diff --git a/lib/extensions/package.json b/lib/extensions/package.json index 70400e864b..6142ce0473 100644 --- a/lib/extensions/package.json +++ b/lib/extensions/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-extensions", "description": "Provides extensibility support for ADF applications.", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "license": "Apache-2.0", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-extensions.js", diff --git a/lib/insights/package.json b/lib/insights/package.json index 043aac164d..1d1c9ad92f 100644 --- a/lib/insights/package.json +++ b/lib/insights/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-insights", "description": "Alfresco ADF insights", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-insights.js", "repository": { @@ -27,8 +27,8 @@ "@angular/router": ">=7.0.3", "@alfresco/js-api": "3.4.0", "rxjs": ">=6.2.2", - "@alfresco/adf-core": "3.4.0", - "@alfresco/adf-content-services": "3.4.0", + "@alfresco/adf-core": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-content-services": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "@ngx-translate/core": ">=11.0.0", "chart.js": ">=2.5.0", "core-js": ">=2.5.4", diff --git a/lib/process-services-cloud/package.json b/lib/process-services-cloud/package.json index 3c532faafa..8297924b13 100644 --- a/lib/process-services-cloud/package.json +++ b/lib/process-services-cloud/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-process-services-cloud", "description": "Alfresco ADF process services cloud", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-process-services-cloud.js", "repository": { @@ -27,8 +27,8 @@ "@angular/router": ">=7.0.3", "@alfresco/js-api": "3.4.0", "rxjs": ">=6.2.2", - "@alfresco/adf-core": "3.4.0", - "@alfresco/adf-content-services": "3.4.0", + "@alfresco/adf-core": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-content-services": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "@ngx-translate/core": ">=11.0.0", "hammerjs": ">=2.0.8", "moment": ">=2.22.2", diff --git a/lib/process-services/package.json b/lib/process-services/package.json index c4d4665e1f..5cc3d5e82d 100644 --- a/lib/process-services/package.json +++ b/lib/process-services/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-process-services", "description": "Alfresco ADF process services", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "bundles/adf-process-services.js", "repository": { @@ -27,8 +27,8 @@ "@angular/router": ">=7.0.3", "@alfresco/js-api": "3.4.0", "rxjs": ">=6.2.2", - "@alfresco/adf-core": "3.4.0", - "@alfresco/adf-content-services": "3.4.0", + "@alfresco/adf-core": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-content-services": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "@ngx-translate/core": ">=11.0.0", "core-js": ">=2.5.4", "hammerjs": ">=2.0.8", diff --git a/lib/testing/package.json b/lib/testing/package.json index c7b4376941..320e440cdc 100644 --- a/lib/testing/package.json +++ b/lib/testing/package.json @@ -1,7 +1,7 @@ { "name": "@alfresco/adf-testing", "description": "Alfresco ADF testing page and utils", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "repository": { "type": "git", diff --git a/package.json b/package.json index cc583de4c5..c04ba6a8e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "alfresco-components", "description": "Alfresco Angular components", - "version": "3.4.0", + "version": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "author": "Alfresco Software, Ltd.", "main": "./index.js", "scripts": { @@ -73,13 +73,13 @@ "process services-cloud" ], "dependencies": { - "@alfresco/adf-content-services": "3.4.0", - "@alfresco/adf-core": "3.4.0", - "@alfresco/adf-extensions": "3.4.0", - "@alfresco/adf-insights": "3.4.0", - "@alfresco/adf-process-services": "3.4.0", - "@alfresco/adf-process-services-cloud": "3.4.0", - "@alfresco/adf-testing": "3.4.0", + "@alfresco/adf-content-services": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-core": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-extensions": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-insights": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-process-services": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-process-services-cloud": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", + "@alfresco/adf-testing": "3.4.0-a8ef686cddc5364975fbddba68e6683305f47d42", "@alfresco/js-api": "3.4.0", "@angular/animations": "^7.2.15", "@angular/cdk": "7.3.7",