From 6b5dd86a3557e8eed2c4584f5d16df5654cbc57b Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Wed, 8 Jan 2020 16:03:08 +0200 Subject: Fix the format of supplementary file and user params for aLaCarte requests supplementary file shall be in format [{"name": "fieldName", "value" : "xyz"}] Also this is the format of each param in user params for aLaCarte requests and old macros Issue-ID: VID-743 Change-Id: I579298ce3f0b789a7a69e6af5a85bfbd50ae9fc0 Signed-off-by: Eylon Malin --- .../vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'vid-webpack-master/src/app/shared/components') diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts index 2ca992f08..3137b2504 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts @@ -1,10 +1,6 @@ import {LogService} from "../../../../utils/log/log.service"; import {NgRedux} from "@angular-redux/store"; -import { - ControlGeneratorUtil, - SDN_C_PRE_LOAD, - SUPPLEMENTARY_FILE -} from "../../../genericForm/formControlsServices/control.generator.util.service"; +import {ControlGeneratorUtil, SDN_C_PRE_LOAD, SUPPLEMENTARY_FILE} from "../../../genericForm/formControlsServices/control.generator.util.service"; import {AaiService} from "../../../../services/aaiService/aai.service"; import {HttpClient} from "@angular/common/http"; import {GenericFormService} from "../../../genericForm/generic-form.service"; @@ -191,7 +187,7 @@ describe('VFModule popup service', () => { }; form.controls = { supplementaryFile_hidden_content : { - value: '{"c": "c", "d": 1}' + value: '[{"name": "c", "value": "c"}, {"name": "d", "value": "1"}]' }, supplementaryFile_hidden : { value: { @@ -203,7 +199,7 @@ describe('VFModule popup service', () => { let expectedMergePayload = { a: "value", b: "another", - supplementaryFileContent: {c: "c", d: 1}, + supplementaryFileContent: [{"name": "c", "value": "c"}, {"name": "d", "value": "1"}], supplementaryFileName: "name" }; -- cgit 1.2.3-korg