From 32af6479c686d217204de3a86940ac1256da4b9f Mon Sep 17 00:00:00 2001 From: ikram Date: Fri, 7 Aug 2020 15:49:11 -0400 Subject: Visualization of the VF Module Sequencing Issue-ID: VID-860 More scenarios covered in VID-860 for vf-module sequencing. Signed-off-by: ikram Change-Id: Ie138ba2616961fba7856eaaf5f17b5dc63a08e6e --- .../available-models-tree.component.ts | 15 ++- .../dragAndDrop/dragAndDrop.service.spec.ts | 112 ++++++++++++++++++++- .../dragAndDrop/dragAndDrop.service.ts | 41 +++++++- .../drawing-board-tree.component.ts | 9 +- .../drawing-board-tree/drawing-board-tree.html | 2 +- .../models/vfModule/vfModule.model.info.ts | 43 +++++++- .../objectsToTree/shared.tree.service.ts | 4 + 7 files changed, 213 insertions(+), 13 deletions(-) (limited to 'vid-webpack-master/src/app/drawingBoard') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts index 2014be99d..8790afa56 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts @@ -168,8 +168,19 @@ export class AvailableModelsTreeComponent { DrawingBoardTreeService.triggerCheckIsDirty.next(this.serviceModelId); } else { let vfModule = this._defaultDataGeneratorService.generateVFModule(this.serviceHierarchy.vnfs[node.parent.data.name].vfModules[node.data.name], dynamicInputs, isEcompGeneratedNaming, isAlaCarte); + let positionOfNextInstance = null; + if(this._sharedTreeService.isAddPositionFlagTrue()) { + let baseModule = this.serviceHierarchy.vnfs[node.parent.data.name].vfModules[node.data.name].properties.baseModule; + if(baseModule) { + //Assign Position of 1 for the instance being created & update the positions(existing position +1) for remaining instances + positionOfNextInstance = 1; + this._defaultDataGeneratorService.updatePositionForRemainingVfModules(this.serviceModelId); + } else { + positionOfNextInstance = this._defaultDataGeneratorService.calculatePositionOfVfmodule(this.serviceModelId); + } + } if (this._sharedTreeService.selectedVNF) { - this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, null, this._sharedTreeService.selectedVNF)); + this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, positionOfNextInstance, this._sharedTreeService.selectedVNF)); DrawingBoardTreeService.triggerCheckIsDirty.next(this.serviceModelId); } else if (this._availableModelsTreeService.getOptionalVNFs(this.serviceModelId, node.parent.data.modelUniqueId).length === 1) { let existVnf = this._store.getState().service.serviceInstance[this.serviceModelId].vnfs; @@ -177,7 +188,7 @@ export class AvailableModelsTreeComponent { for(let vnfKey in existVnf){ const modelUniqueId = this._sharedTreeService.modelUniqueId(existVnf[vnfKey]); if(modelUniqueId === node.parent.data.id){ - this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, null, vnfKey)); + this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, positionOfNextInstance, vnfKey)); DrawingBoardTreeService.triggerCheckIsDirty.next(this.serviceModelId); } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts index 425568b68..2053e6df1 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.spec.ts @@ -13,10 +13,22 @@ class MockAppStore { return { global: { flags: { - "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": true + "FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE": true, + "FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE":true } }, service: { + serviceHierarchy:{ + "serviceInstanceId":{ + vfModules: { + "vfModulesName":{ + properties:{ + baseModule:true + } + } + } + } + }, serviceInstance: { "serviceInstanceId": { vnfs: { @@ -123,6 +135,7 @@ describe('Drag and drop service', () => { index: 0, data: { instanceName: 'puwesovabe', + modelName: 'vocggrapitesting0..VocgGrapiTesting..ocgmgr..module-1' }, parent: { data: { @@ -167,6 +180,7 @@ describe('Drag and drop service', () => { index: 0, data: { instanceName: '2017-488_PASQUALE-vPE', + modelName: 'vocggrapitesting0..VocgGrapiTesting..ocgmgr..module-1' }, parent: {} }; @@ -207,4 +221,100 @@ describe('Drag and drop service', () => { expect(arr[1]).toMatchObject({instanceName: "puwesovabe", position: 2}); }); + + test('drag shouldnt execute isAllowDrop when the to index is 0 & the drop node is a base module', () => { + + let from = { + id: "04686zg11ur2", + index: 1, + data: { + instanceName: 'puwesovabe', + modelName: 'vocggrapitesting0..VocgGrapiTesting..ocgmgr..module-1' + }, + parent: { + data: { + type: 'VF', + index: 0, + trackById: 'ckfqe3sb3y8', + vnfStoreKey: '2017-488_PASQUALE-vPE 0', + } + } + }; + + let to = { + parent: { + id: "4637423092446", + index: 0, + data: { + instanceName: 'bnmgtrx', + }, + parent: { + data: { + type: 'VF', + trackById: 'ckfqe3sb3y8', + vnfStoreKey: '2017-488_PASQUALE-vPE 0', + } + } + } + }; + + + jest.spyOn(service, 'isAllowDrop'); + + service.drop(store, "serviceInstanceId", nodes, {from, to}); + + jest.clearAllMocks(); + + expect(service.isAllowDrop).not.toHaveBeenCalled(); + + }); + + test('drag shouldnt execute isAllowDrop when the from node is base module', () => { + + let from = { + id: "04686zg11ur2", + index: 0, + data: { + instanceName: 'puwesovabe', + modelName: 'vocggrapitesting0..VocgGrapiTesting..ocgmgr..module-1' + }, + parent: { + data: { + type: 'VF', + index: 0, + trackById: 'ckfqe3sb3y8', + vnfStoreKey: '2017-488_PASQUALE-vPE 0', + } + } + }; + + let to = { + parent: { + id: "4637423092446", + index: 1, + data: { + instanceName: 'bnmgtrx', + }, + parent: { + data: { + type: 'VF', + trackById: 'ckfqe3sb3y8', + vnfStoreKey: '2017-488_PASQUALE-vPE 0', + } + } + } + }; + + + jest.spyOn(service, 'isAllowDrop'); + + service.drop(store, "serviceInstanceId", nodes, {from, to}); + + jest.clearAllMocks(); + + expect(service.isAllowDrop).not.toHaveBeenCalled(); + + }); + + }); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts index 2daaaaf71..2f86b0aa8 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/dragAndDrop/dragAndDrop.service.ts @@ -9,16 +9,30 @@ export class DragAndDropService { constructor(private store: NgRedux) { } - isFlagOn(): boolean { - return FeatureFlagsService.getFlagState(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, this.store); + checkFeatureFlag(flagValue):boolean { + let featureFlag :boolean; + featureFlag = FeatureFlagsService.getFlagState(flagValue, this.store); + return featureFlag; + } + + /*********************************************************************************************** + if the dragged node is a base module instance + ***********************************************************************************************/ + isBaseModule(serviceInstanceId, from): boolean { + try { + let baseModuleFlag = this.store.getState().service.serviceHierarchy[serviceInstanceId].vnfs[from.parent.data.vnfStoreKey].vfModules[from.data.modelName].properties.baseModule; + return (baseModuleFlag != 'undefined' ? baseModuleFlag : false); + }catch(e) { + return false; + } } /*********************************************************************************************** - if the falg is ON and nodes have same parent + if the flag is ON and nodes have same parent ***********************************************************************************************/ isAllowDrop(from: any, to: any): boolean { - return this.isFlagOn() && this.isSameParent(from, to); + return this.checkFeatureFlag(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE) && this.isSameParent(from, to); } private isSameParent(from: any, to: any): boolean { @@ -40,7 +54,11 @@ export class DragAndDropService { drop(store, instanceId: string, nodes, {from, to}): void { - if (!this.isFlagOn()) return; + if (!this.checkFeatureFlag(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE)) return; + + if(this.checkFeatureFlag(Features.FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE)) { + if ((to.parent.index == 0 && this.isBaseModule(instanceId, to.parent)) || this.isBaseModule(instanceId, from )) return; + } if (this.isAllowDrop(from, to)) { let vfModules = nodes.find((parent) => { @@ -101,4 +119,17 @@ export class DragAndDropService { return arr; }; + + drag(store, serviceModelId: string, fromObj): boolean { + if(!this.checkFeatureFlag(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE)) { + return; + } else{ + if (this.checkFeatureFlag(Features.FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE)) { + if(this.isBaseModule(serviceModelId,fromObj)) { + return; + } + } + } + + } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts index 837471395..7526970d3 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts @@ -126,11 +126,14 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit { nodes = []; serviceModelId: string; options = { - allowDrag: this._dragAndDropService.isFlagOn(), + allowDrag: this._dragAndDropService.checkFeatureFlag(Features.FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE), actionMapping: { mouse: { drop: (tree:TreeModel, node:TreeNode, $event:any, {from, to}) => { this._dragAndDropService.drop(this.store, this.serviceModelId, this.nodes, {from, to}); + }, + drag:(tree: TreeModel, node:TreeNode, $event:any) => { + this._dragAndDropService.drag(this.store,this.serviceModelId, node); } } }, @@ -256,6 +259,10 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit { } return optionLabel; } + + isAddPositionFlagTrue() { + return this._sharedTreeService.isAddPositionFlagTrue(); + } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html index 59905bd75..a1ef96a62 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html @@ -36,7 +36,7 @@
Failed
-
+
{{node?.data?.position}}
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 33ec0804f..80b2a4b52 100644 --- 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 @@ -348,7 +348,9 @@ export class VFModuleModelInfo implements ILevelNodeInfo { enable: (node) => this._sharedTreeService.shouldShowAuditInfo(node) }, remove: { - method: (node, serviceModelId) => this._store.dispatch(removeVfModuleInstance(node.data.modelName, serviceModelId, node.parent.data.modelName, node.parent.data.vnfStoreKey, node.data.dynamicModelName)), + method: (node, serviceModelId) => { + this.removeVFM(serviceModelId,node); + }, visible: (node) => this._sharedTreeService.shouldShowRemoveAndEdit(node), enable: (node) => this._sharedTreeService.shouldShowRemoveAndEdit(node), }, @@ -431,8 +433,8 @@ export class VFModuleModelInfo implements ILevelNodeInfo { } } - updatePosition(that, node, instanceId, parentStoreKey): void { - this._store.dispatch(updateVFModulePosition(node, instanceId, parentStoreKey)); + updatePosition(that, node,instanceId, parentStoreKey): void { + that.store.dispatch(updateVFModulePosition(node.modelName,node.dynamicModelName, node.position,instanceId, parentStoreKey)); } @@ -452,4 +454,39 @@ export class VFModuleModelInfo implements ILevelNodeInfo { const result = [modelInformation, instanceInfo]; return _.uniq(_.flatten(result)); } + + private removeVFM(serviceModelId, node) { + if (FeatureFlagsService.getFlagState(Features.FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER, this._store)) { + let nodeArray = node.parent.children; + let totalNumOfNodes = nodeArray.length; + let removedNodeIndex = node.index; + let remainingNodes = totalNumOfNodes - (removedNodeIndex+1); + if(!_.isNull(remainingNodes)) { + if(remainingNodes !== 0 && remainingNodes >0) { + for(let i= 0;i { + if (item.position !== index + 1) { + item.position = index + 1; + this._store.dispatch(updateVFModulePosition(item.data.modelName,item.data.dynamicModelName, item.position,serviceModelId, item.parent.data.vnfStoreKey)); + } + }); + + + }else{ + this._store.dispatch(removeVfModuleInstance(node.data.modelName, serviceModelId, node.parent.data.modelName, node.parent.data.vnfStoreKey, node.data.dynamicModelName)); + + } + } + } else { + this._store.dispatch(removeVfModuleInstance(node.data.modelName, serviceModelId, node.parent.data.modelName, node.parent.data.vnfStoreKey, node.data.dynamicModelName)); + } + } } diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts index 3b00e64c3..51fcf52a1 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts @@ -551,4 +551,8 @@ export class SharedTreeService { !_.isNil(model.max) ? String(model.max) : Constants.ModelInfo.UNLIMITED_DEFAULT ); } + + isAddPositionFlagTrue():boolean{ + return FeatureFlagsService.getFlagState(Features.FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER, this._store); + } } -- cgit 1.2.3-korg