From 75f630968234a4451948fd7f8803e526748d223d Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 28 Nov 2019 09:53:16 +0200 Subject: fix some methods signature to be more TypeScript Issue-ID: VID-603 Signed-off-by: Eylon Malin Change-Id: I50225f014abf0717b779f15f22a2185f1f92650b --- .../vfModuleUpgrade/vfModule.upgrade.popuop.service.ts | 2 +- .../vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 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.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts index 01026867e..bbfe8705e 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts @@ -40,7 +40,7 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase { getDynamicInputs = () => null; - getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean) { + getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean): FormControlModel[] { let result: FormControlModel[] =[ this.getRetainAssignmentsControl(), this.getRetainVolumeGroupsControl(), 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 e20964d29..7c1cc084a 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 @@ -19,6 +19,7 @@ import {instance, mock} from "ts-mockito"; import {GeneralActions} from "../../../../storeUtil/utils/general/general.actions"; import {VfModuleActions} from "../../../../storeUtil/utils/vfModule/vfModule.actions"; import {ServiceActions} from "../../../../storeUtil/utils/service/service.actions"; +import {FormControlModel} from "../../../../models/formControlModels/formControl.model"; class MockModalService {} @@ -94,13 +95,13 @@ describe('VFModule popup service', () => { expect(service.getTitle()).toBe("Upgrade Module") }); - function findControlByName(controls, controlName) { + function findControlByName(controls: FormControlModel[], controlName: string) : FormControlModel { return controls.find((control) => { return control.controlName === controlName; }); } - function getControlByNameAndCheckValue(controlName, expectedValue ) { + function getControlByNameAndCheckValue(controlName: string, expectedValue: any) { const controls = service.getControls('serviceId', 'vnfStoreKey', 'vfModuleId', true); const control = findControlByName(controls, controlName); expect(control).toBeDefined(); -- cgit 1.2.3-korg