| commit | 4d757af2fba0371ba44b0c83cb665d77379da17f | [log] [tgz] |
|---|---|---|
| author | Kruthi Bhat <krutbhat@att.com> | Tue Dec 08 03:03:06 2020 +0530 |
| committer | Kruthi Bhat <krutbhat@att.com> | Tue Dec 08 03:03:34 2020 +0530 |
| tree | 27b776687d44501fa0fba7589e7c81c2c1238099 | |
| parent | 164596ffc56c1f9a4418a2f3b8f3941896b124f7 [diff] |
Blank context menu options issue Change-Id: I57c9623cb22fcdd3980b7e5a5b4a606c30b4aa7c Issue-ID: VID-925 Signed-off-by: krutbhat@att.com
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts index ca54f5f..785203b 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.ts
@@ -36,7 +36,8 @@ this.numberOfFailed = 0; this.numberOfElements = 0; let _this = this; - const serviceModelId:string = serviceInstance.modelInfo.modelVersionId; + //const serviceModelId:string = serviceInstance.modelInfo.modelVersionId; + const serviceModelId:string = serviceHierarchy.service.uuid; const firstLevelOptions: ILevelNodeInfo[] = _this._objectToTreeService.getFirstLevelOptions(serviceInstance.isALaCarte); for (let option of firstLevelOptions) { _.forOwn(serviceInstance[option.name], function (instance, modelName) {
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 8470317..da4e5c9 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
@@ -325,8 +325,8 @@ shouldShowButtonGeneric(node, method, serviceModelId) { const mode = this._store.getState().global.drawingBoardStatus; - const isMacro = !(this.getServiceInstance(serviceModelId).isALaCarte); - + const isMacro = this.getServiceInstance(serviceModelId) ? !(this.getServiceInstance(serviceModelId).isALaCarte) : false; + // const isMacro = !(this.getServiceInstance(serviceModelId).isALaCarte); if (isMacro) { //if macro action allowed only for service level return false; }