Blank context menu options issue

Change-Id: I57c9623cb22fcdd3980b7e5a5b4a606c30b4aa7c
Issue-ID: VID-925
Signed-off-by: krutbhat@att.com

2 files changed, 4 insertions, 3 deletions

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 ca54f5fc8..785203ba6 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 @@ export class ObjectToInstanceTreeService {
     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 84703170f..da4e5c943 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 @@ export class SharedTreeService {
 
   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;
     }