1 files changed, 43 insertions, 23 deletions

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 ff3f23ff4..b82074d9c 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
@@ -1,8 +1,7 @@
 import {Injectable} from "@angular/core";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
 import {FormGroup} from "@angular/forms";
-import {VfModulePopuopService} from "../vfModule/vfModule.popuop.service";
-import {FormPopupDetails} from "../../../../models/formControlModels/formPopupDetails.model";
+import {VfModulePopupServiceBase} from "../vfModule/vfModule.popuop.service";
 import {updateVFModuleField, upgradeVFModule} from "../../../../storeUtil/utils/vfModule/vfModule.actions";
 import {SharedTreeService} from "../../../../../drawingBoard/service-planning/objectsToTree/shared.tree.service";
 import {NgRedux} from "@angular-redux/store";
@@ -13,14 +12,17 @@ import {IframeService} from "../../../../utils/iframe.service";
 import {DefaultDataGeneratorService} from "../../../../services/defaultDataServiceGenerator/default.data.generator.service";
 import {AaiService} from "../../../../services/aaiService/aai.service";
 import {BasicPopupService} from "../basic.popup.service";
-import {
-  FormControlModel
-} from "../../../../models/formControlModels/formControl.model";
+import {FormControlModel} from "../../../../models/formControlModels/formControl.model";
 import {CheckboxFormControl} from "../../../../models/formControlModels/checkboxFormControl.model";
 import {FormControlType} from "../../../../models/formControlModels/formControlTypes.enum";
 
+export enum UpgradeFormControlNames {
+  RETAIN_VOLUME_GROUPS = 'retainVolumeGroups',
+  RETAIN_ASSIGNMENTS = 'retainAssignments',
+}
+
 @Injectable()
-export class VfModuleUpgradePopupService extends VfModulePopuopService {
+export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
   constructor(protected _basicControlGenerator: BasicControlGenerator,
               protected _vfModuleControlGenerator: VfModuleControlGenerator,
               protected _iframeService: IframeService,
@@ -33,26 +35,15 @@ export class VfModuleUpgradePopupService extends VfModulePopuopService {
   }
   node: ITreeNode;
 
-  getGenericFormPopupDetails(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, node: ITreeNode, uuidData: Object, isUpdateMode: boolean): FormPopupDetails {
-    return super.getGenericFormPopupDetails(serviceId, vnfStoreKey, vfModuleStoreKey, node, uuidData, isUpdateMode);
-  }
-
   getDynamicInputs = () => [];
 
-  getControls = () : FormControlModel[] => {
-    return [
-      new CheckboxFormControl({
-        type: FormControlType.CHECKBOX,
-        controlName: 'retainAssignments',
-        displayName: 'Retain Assignments',
-        dataTestId: 'retainAssignments',
-        value: true,
-        validations: []
-      })
-    ];
+  getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean)  {
+    let result: FormControlModel[] = [];
+    result.push(this.getRetainVolumeGroupsControl());
+    result.push(this.getRetainAssignmentsControl());
+    return result;
   };
 
-
   getTitle = (): string => 'Upgrade Module';
 
   onSubmit(that, form: FormGroup) {
@@ -61,10 +52,39 @@ export class VfModuleUpgradePopupService extends VfModulePopuopService {
 
     this._store.dispatch(upgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceInstanceId ,node.data.dynamicModelName));
     this._sharedTreeService.upgradeBottomUp(node, serviceInstanceId);
-    this._store.dispatch(updateVFModuleField(node.data.modelName,  node.parent.data.vnfStoreKey, serviceInstanceId ,node.data.dynamicModelName, 'retainAssignments', form.controls['retainAssignments'].value));
+
+    this.updateVFModuleField(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS,node, serviceInstanceId, form);
+    this.updateVFModuleField(UpgradeFormControlNames.RETAIN_ASSIGNMENTS,node, serviceInstanceId, form);
 
     this.postSubmitIframeMessage(that);
     this.onCancel(that, form);
   }
 
+  private updateVFModuleField(fieldName: string, node, serviceInstanceId: string, form: FormGroup) {
+    this._store.dispatch(updateVFModuleField(node.data.modelName, node.parent.data.vnfStoreKey, serviceInstanceId, node.data.dynamicModelName, fieldName, form.controls[fieldName].value));
+  }
+
+
+  getRetainVolumeGroupsControl = (): CheckboxFormControl => {
+    return new CheckboxFormControl({
+      type: FormControlType.CHECKBOX,
+      controlName: UpgradeFormControlNames.RETAIN_VOLUME_GROUPS,
+      displayName: 'Retain Volume Groups',
+      dataTestId: UpgradeFormControlNames.RETAIN_VOLUME_GROUPS,
+      value: true,
+      validations: []
+    })
+  };
+
+  getRetainAssignmentsControl = (): CheckboxFormControl => {
+    return new CheckboxFormControl({
+      type: FormControlType.CHECKBOX,
+      controlName: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
+      displayName: 'Retain Assignments',
+      dataTestId: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
+      value: true,
+      validations: []
+    })
+  };
+
 }