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-1938 - added first stack of visibility tests for form (#5489)

Browse Source 
* AAE-1938 - added first stack of visibility tests for form

* AAE-1938 - fixed unit test after form service changes

* AAE-1938 - rebased with last development

* AAE-1938 - fixed failing e2e

* AAE-1938 - fixed mock definition to match updated service behaviour

* Fixed failing e2e

* AAE-1938 - try to fix cancel uploads
This commit is contained in:
Vito
2020-02-26 14:46:01 +00:00
committed by GitHub
parent 6ef07fe73f
commit 1e67f50346
9 changed files with 2578 additions and 1930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/form/services/form.service.spec.ts
View File

@@ -396,7 +396,7 @@ describe('Form service', () => {
});
it('should parse a Form Definition with tabs', () => {
expect(formModelTabs.formDefinition).toBeDefined();
expect(formModelTabs.formRepresentation.formDefinition).toBeDefined();
const formParsed = service.parseForm(formModelTabs);
expect(formParsed).toBeDefined();
});

15
lib/core/form/services/form.service.ts
View File

@@ -102,10 +102,21 @@ export class FormService {
*/
parseForm(json: any, data?: FormValues, readOnly: boolean = false): FormModel {
if (json) {
const form = new FormModel(json, data, readOnly, this);
const flattenForm = {
...json.formRepresentation,
...json.formRepresentation.formDefinition
};
delete flattenForm.formDefinition;
const formValues: FormValues = {};
(data || []).forEach(variable => {
formValues[variable.name] = variable.value;
});
const form = new FormModel(flattenForm, formValues, readOnly);
if (!json.fields) {
form.outcomes = [
new FormOutcomeModel(form, {
new FormOutcomeModel(<any> form, {
id: '$save',
name: FormOutcomeModel.SAVE_ACTION,
isSystem: true