Change-Id: I57c9623cb22fcdd3980b7e5a5b4a606c30b4aa7c
Issue-ID: VID-925
Signed-off-by: krutbhat@att.com
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) {
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;
}