Can't delete the second vfModule in drawing board - fix.

[vid.git] / vid-webpack-master / src / app / drawingBoard / service-planning / objectsToTree / models / vfModule / vfModule.model.info.ts

diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
index 9886176..b1a67a5 100644 (file)
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
@@ -74,14 +74,12 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
 
   /***********************************************************
    * return vfModule model
-   * @param vfModuleModelId - current Model id
-   * @param instance
-   * @param serviceHierarchy - serviceHierarchy
+   * @param instanceModel - The model of the instance (usually extracted from
+   *        serviceHierarchy store)
    ************************************************************/
-  getModel = (vfModuleModelId: string, instance, serviceHierarchy): Partial<VfModule> => {
-    const model = this._sharedTreeService.modelByIdentifier(serviceHierarchy, this.name, vfModuleModelId);
-    if (!_.isNil(model)) {
-      return new VfModule(model, this._featureFlagsService.getAllFlags());
+  getModel = (instanceModel: any): Partial<VfModule> => {
+    if (!_.isNil(instanceModel)) {
+      return new VfModule(instanceModel, this._featureFlagsService.getAllFlags());
     }
     return {};
   };
@@ -353,7 +351,7 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
       },
       delete: {
         method: (node, serviceModelId) => {
-          this._store.dispatch(deleteActionVfModuleInstance(node.data.dynamicModelName, node.parent.data.vnfStoreKey, serviceModelId))
+          this._store.dispatch(deleteActionVfModuleInstance(node.data.dynamicModelName, node.parent.data.vnfStoreKey, serviceModelId, node.data.modelName))
         },
         visible: (node) => this._sharedTreeService.shouldShowDelete(node, serviceModelId),
         enable: (node) => this._sharedTreeService.shouldShowDelete(node, serviceModelId)