From d2a7755c029d378c531faece1ba44cef48bebae1 Mon Sep 17 00:00:00 2001 From: ikram Date: Sun, 12 Jul 2020 10:06:24 -0400 Subject: Add Pause Functionality from Inside VF Module's Edit Dialog Issue-ID: VID-858 Allow user to choose adding (and removing) Pause points from within the Edit Dialog of the VF Module. Currently, the support of adding is only from the vertical ellipsis menu. Also, there is currently no option of removing the pause point. This functionality will allow this to happen as well since inside the Edit dialog, the option is a checkbox which can now unchecked. Note: removing the pause point from within the vertical ellipse after being added will be covered in a separate user story. However, the desired functionality can still be reached using this commit as describe above. Signed-off-by: ikram Change-Id: I90f9933ef445994d410c89e88f6d518a30ff3c60 --- .../genericFormServices/vfModule/vfModule.popup.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule') diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts index 6bf593462..70b23f23b 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts @@ -22,6 +22,7 @@ import * as _ from 'lodash'; import {createVFModuleInstance, updateVFModuleInstance} from "../../../../storeUtil/utils/vfModule/vfModule.actions"; import {SharedControllersService} from "../../../genericForm/formControlsServices/sharedControlles/shared.controllers.service"; import {SharedTreeService} from "../../../../../drawingBoard/service-planning/objectsToTree/shared.tree.service"; +import {PauseStatus} from "../../../../models/serviceInstanceActions"; export abstract class VfModulePopupServiceBase { dynamicInputs: any; @@ -33,10 +34,11 @@ export abstract class VfModulePopupServiceBase { closeDialogEvent: Subject = new Subject(); isUpdateMode: boolean; storeVFModule = (that, formValues: any): void => { + formValues.pauseInstantiation = (formValues.pauseInstantiation || formValues.pauseInstantiation === PauseStatus.AFTER_COMPLETION) + ? PauseStatus.AFTER_COMPLETION : null; formValues.modelInfo = new ModelInfo(that.model); formValues.uuid = formValues.modelInfo.uuid; formValues.isMissingData = false; - if (!that.uuidData.vFModuleStoreKey) { this._store.dispatch(createVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, 0, that.uuidData.vnfStoreKey)); } else { @@ -67,7 +69,6 @@ export abstract class VfModulePopupServiceBase { getModelInformation(serviceId: string, modelName: string, vfModuleModeNode:ITreeNode) { this._aaiService.getServiceModelById(serviceId).subscribe((result: any) => { this.serviceModel = new ServiceModel(result); - this.model = this._basicPopupService.getModelFromResponse(result, 'vfModules', modelName); const serviceInstance = this._store.getState().service.serviceInstance[serviceId]; this.modelInformations = [ -- cgit 1.2.3-korg