inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-2840] Not able to complete a task with attach file widget with mappings (#5809)

Browse Source 
* [AAE-2840] Check pipeline with possible fix

* Remove update form loop causing overwriting of the form values

* Revert ACA-3235 causing form values regression
This commit is contained in:
arditdomi
2020-06-24 13:35:47 +01:00
committed by GitHub
parent 094f247889
commit f76e0cd0bb
5 changed files with 1 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/core/form/components/form-field/form-field.component.spec.ts
View File

@@ -22,7 +22,6 @@ import { TextWidgetComponent, CheckboxWidgetComponent } from '../widgets/index';
import { FormFieldComponent } from './form-field.component';
import { setupTestBed } from '../../../testing/setup-test-bed';
import { FormBaseModule } from '../../form-base.module';
import { formWithOneVisibleAndOneInvisibleFieldMock, formWithOneVisibleAndOneInvisibleTabMock } from '../mock/form-renderer.component.mock';
import { CoreTestingModule } from '../../../testing';
import { TranslateModule } from '@ngx-translate/core';
@@ -148,78 +147,6 @@ describe('FormFieldComponent', () => {
expect(fixture.nativeElement.querySelector('#field-FAKE-TXT-WIDGET-container').hidden).toBeTruthy();
});
it('Should remove invisible field value from the form values', (done) => {
const fakeFormWithField = new FormModel(formWithOneVisibleAndOneInvisibleFieldMock);
const mockNameFiled = fakeFormWithField.getFormFields().find((field) => field.id === 'mockname');
const mockMobileFiled = fakeFormWithField.getFormFields().find((field) => field.id === 'mockmobilenumber');
expect(mockNameFiled.name).toBe('Mock Name', 'Visibile field');
expect(mockMobileFiled.name).toBe('Mock Mobile Number', 'Invisible field');
component.field = mockNameFiled;
fixture.detectChanges();
fixture.whenStable().then(() => {
expect(component.field.form.values).toEqual({ mockname: 'Mock value' });
expect(component.field.form.values[mockNameFiled.id]).toBeDefined();
expect(component.field.form.values[mockMobileFiled.id]).not.toBeDefined();
done();
});
});
it('Should remove invisible tab fields value from the form values', (done) => {
const fakeFormWithTab = new FormModel(formWithOneVisibleAndOneInvisibleTabMock);
const tabOneNameField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockname');
const tabOneMobileField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockmobilenumber');
const tabTwoAddressField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockaddress');
const tabTwoEmailField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockemail');
expect(tabOneNameField.name).toBe('Mock Name', 'Visibile field');
expect(tabOneMobileField.name).toBe('Mock Mobile Number', 'Invisible field');
expect(tabTwoEmailField.name).toBe('Mock Email', 'Invisible field');
expect(tabTwoAddressField.name).toBe('Mock Address', 'Invisible field');
component.field = tabOneNameField;
fixture.detectChanges();
fixture.whenStable().then(() => {
expect(component.field.form.values).toEqual({ mockname: null });
expect(component.field.form.values[tabOneNameField.id]).toBeDefined();
expect(component.field.form.values[tabOneMobileField.id]).not.toBeDefined();
expect(component.field.form.values[tabTwoAddressField.id]).not.toBeDefined();
expect(component.field.form.values[tabTwoEmailField.id]).not.toBeDefined();
done();
});
});
it('Should add tab invisible fields value to the form values if the tab get visible', (done) => {
const fakeFormWithTab = new FormModel(formWithOneVisibleAndOneInvisibleTabMock);
const tabOneNameField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockname');
const tabOneMobileField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockmobilenumber');
const tabTwoAddressField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockaddress');
const tabTwoEmailField = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockemail');
expect(tabOneNameField.name).toBe('Mock Name', 'Visibile field');
expect(tabOneMobileField.name).toBe('Mock Mobile Number', 'Invisible field');
expect(tabTwoEmailField.name).toBe('Mock Email', 'Invisible field');
expect(tabTwoAddressField.name).toBe('Mock Address', 'Invisible field');
component.field = tabOneNameField;
component.field.value = 'test';
fixture.detectChanges();
fixture.whenStable().then(() => {
expect(component.field.form.values).toEqual({ mockname: 'test', mockmobilenumber: null, mockemail: null, mockaddress: null });
done();
});
});
it('[C213878] - Should fields be correctly rendered when filled with process variables', async () => {
const field = new FormFieldModel(form, {
fieldType: 'HyperlinkRepresentation',

1
lib/core/form/components/form-field/form-field.component.ts
View File

@@ -98,7 +98,6 @@ export class FormFieldComponent implements OnInit, OnDestroy {
instance.fieldChanged.subscribe((field) => {
if (field && this.field.form) {
this.visibilityService.refreshVisibility(field.form);
this.visibilityService.removeInvisibleFormValues(field.form);
field.form.onFormFieldChanged(field);
}
});

438
lib/core/form/components/mock/form-renderer.component.mock.ts
View File

@@ -1334,441 +1334,3 @@ export const radioWidgetVisibiltyForm = {
}
}
};
export const formWithOneVisibleAndOneInvisibleFieldMock = {
tabs: [],
fields: [
{
fieldType: 'ContainerRepresentation',
id: '1588915084743',
name: 'Label',
type: 'container',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: null,
className: null,
dateDisplayFormat: null,
layout: null,
sizeX: 2,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null,
numberOfColumns: 2,
fields: {
'1': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockname',
name: 'Mock Name',
type: 'text',
value: 'Mock value',
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: null,
className: null,
params: {
existingColspan: 1,
maxColspan: 2
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null
}
],
'2': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockmobilenumber',
name: 'Mock Mobile Number',
type: 'text',
value: 'Mock invisible value',
required: false,
readOnly: false,
overrideId: false,
isVisible: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: null,
className: null,
params: {
existingColspan: 1,
maxColspan: 1
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: {
leftFormFieldId: 'mockname',
leftRestResponseId: null,
operator: '==',
rightValue: 'test',
rightType: null,
rightFormFieldId: '',
rightRestResponseId: '',
nextConditionOperator: '',
nextCondition: null
}
}
]
}
}
],
outcomes: [],
javascriptEvents: [],
className: '',
style: '',
customFieldTemplates: {},
metadata: {},
variables: [],
customFieldsValueInfo: {},
gridsterForm: false
};
export const formWithOneVisibleAndOneInvisibleTabMock = {
tabs: [
{
id: 'tab1',
title: 'TabOne',
visibilityCondition: null
},
{
id: 'tab2',
title: 'TabTwo',
visibilityCondition: {
leftFormFieldId: 'mockname',
leftRestResponseId: null,
operator: '==',
rightValue: 'test',
rightType: null,
rightFormFieldId: '',
rightRestResponseId: '',
nextConditionOperator: '',
nextCondition: null
}
}
],
fields: [
{
fieldType: 'ContainerRepresentation',
id: '1588931207573',
name: 'Label',
type: 'container',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab2',
className: null,
dateDisplayFormat: null,
layout: null,
sizeX: 2,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null,
numberOfColumns: 2,
fields: {
'1': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockaddress',
name: 'Mock Address',
type: 'text',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab2',
className: null,
params: {
existingColspan: 1,
maxColspan: 2
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null
}
],
'2': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockemail',
name: 'Mock Email',
type: 'text',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab2',
className: null,
params: {
existingColspan: 1,
maxColspan: 1
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null
}
]
}
},
{
fieldType: 'ContainerRepresentation',
id: '1588915084743',
name: 'Label',
type: 'container',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab1',
className: null,
dateDisplayFormat: null,
layout: null,
sizeX: 2,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null,
numberOfColumns: 2,
fields: {
'1': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockname',
name: 'Mock Name',
type: 'text',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab1',
className: null,
params: {
existingColspan: 1,
maxColspan: 2
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: null
}
],
'2': [
{
fieldType: 'FormFieldRepresentation',
id: 'mockmobilenumber',
name: 'Mock Mobile Number',
type: 'text',
value: null,
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
minValue: null,
maxValue: null,
regexPattern: null,
optionType: null,
hasEmptyValue: null,
options: null,
restUrl: null,
restResponsePath: null,
restIdProperty: null,
restLabelProperty: null,
tab: 'tab1',
className: null,
params: {
existingColspan: 1,
maxColspan: 1
},
dateDisplayFormat: null,
layout: {
row: -1,
column: -1,
colspan: 1
},
sizeX: 1,
sizeY: 1,
row: -1,
col: -1,
visibilityCondition: {
leftFormFieldId: 'mockname',
leftRestResponseId: null,
operator: '==',
rightValue: 'test',
rightType: null,
rightFormFieldId: '',
rightRestResponseId: '',
nextConditionOperator: '',
nextCondition: null
}
}
]
}
}
],
outcomes: [],
javascriptEvents: [],
className: '',
style: '',
customFieldTemplates: {},
metadata: {},
variables: [],
customFieldsValueInfo: {},
gridsterForm: false
};

52
lib/core/form/services/widget-visibility.service.spec.ts
View File

@@ -32,7 +32,6 @@ import { fakeTaskProcessVariableModels,
formValues, complexVisibilityJsonVisible,
complexVisibilityJsonNotVisible, tabVisibilityJsonMock,
tabInvalidFormVisibility } from 'core/mock/form/widget-visibility.service.mock';
import { formWithOneVisibleAndOneInvisibleFieldMock, formWithOneVisibleAndOneInvisibleTabMock } from '../components/mock/form-renderer.component.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { TranslateModule } from '@ngx-translate/core';
@@ -1052,55 +1051,4 @@ describe('WidgetVisibilityService', () => {
expect(invalidTabVisibilityJsonModel.isValid).toBeTruthy();
});
});
describe('Remove invisible field values', () => {
let fakeFormWithField: FormModel;
let fakeFormWithTab: FormModel;
beforeEach(() => {
fakeFormWithField = new FormModel(formWithOneVisibleAndOneInvisibleFieldMock);
fakeFormWithTab = new FormModel(formWithOneVisibleAndOneInvisibleTabMock);
});
it('Should remove invisible field value from the form values', () => {
service.refreshVisibility(fakeFormWithField);
service.removeInvisibleFormValues(fakeFormWithField);
expect(fakeFormWithField.values).toEqual({ mockname: 'Mock value' });
});
it('Should be able to add field value to the form values if the field get visible', () => {
service.refreshVisibility(fakeFormWithField);
service.removeInvisibleFormValues(fakeFormWithField);
expect(fakeFormWithField.values).toEqual({ mockname: 'Mock value' });
const mockNameFiled = fakeFormWithField.getFormFields().find((field) => field.id === 'mockname');
mockNameFiled.value = 'test';
mockNameFiled.updateForm();
service.refreshVisibility(fakeFormWithField);
service.removeInvisibleFormValues(fakeFormWithField);
expect(fakeFormWithField.values).toEqual({ mockname: 'test', mockmobilenumber: 'Mock invisible value' });
});
it('Should be able to remove invisible tab fields value from the form values', () => {
service.refreshVisibility(fakeFormWithTab);
expect(fakeFormWithTab.values).toEqual({ mockname: null, mockmobilenumber: null, mockemail: null, mockaddress: null });
service.removeInvisibleFormValues(fakeFormWithTab);
expect(fakeFormWithTab.values).toEqual({ mockname: null });
});
it('Should be able to add tab fields value to the form values if the tab get visible', () => {
service.refreshVisibility(fakeFormWithTab);
expect(fakeFormWithTab.values).toEqual({ mockname: null, mockmobilenumber: null, mockemail: null, mockaddress: null });
const mockNameFiled = fakeFormWithTab.getFormFields().find((field) => field.id === 'mockname');
mockNameFiled.value = 'test';
mockNameFiled.updateForm();
service.refreshVisibility(fakeFormWithTab);
service.removeInvisibleFormValues(fakeFormWithTab);
expect(fakeFormWithTab.values).toEqual({ mockname: 'test', mockmobilenumber: null, mockemail: null, mockaddress: null });
});
});
});

18
lib/core/form/services/widget-visibility.service.ts
View File

@@ -20,7 +20,7 @@ import { LogService } from '../../services/log.service';
import { Injectable } from '@angular/core';
import moment from 'moment-es6';
import { Observable, from, throwError } from 'rxjs';
import { FormFieldModel, FormModel, TabModel, ContainerModel, FormFieldTypes } from '../components/widgets/core/index';
import { FormFieldModel, FormModel, TabModel, ContainerModel } from '../components/widgets/core/index';
import { TaskProcessVariableModel } from '../models/task-process-variable.model';
import { WidgetVisibilityModel, WidgetTypeEnum } from '../models/widget-visibility.model';
import { map, catchError } from 'rxjs/operators';
@@ -323,22 +323,6 @@ export class WidgetVisibilityService {
return res || {};
}
removeInvisibleFormValues(formModel: FormModel) {
if (formModel) {
formModel.getFormFields().map((field: FormFieldModel) => {
if (field.type !== FormFieldTypes.CONTAINER) {
if (!field.isVisible) {
delete formModel.values[field.id];
} else {
field.updateForm();
}
}
return field;
});
}
return formModel;
}
private isValidOperator(operator: string): boolean {
return operator !== undefined;
}