From dcd1a175e4debe01244592a31d6936e63de5afe2 Mon Sep 17 00:00:00 2001 From: Monica Gupta Date: Thu, 6 Aug 2020 17:37:15 -0700 Subject: [PATCH] Fix for reading "options" property from backend in manage dashboard (#11701) Co-authored-by: Monica Gupta --- .../widgets/properties/propertiesWidget.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts index 56dbab187e..cecb0c4581 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts @@ -132,10 +132,11 @@ export class PropertiesWidgetComponent extends DashboardWidget implements IDashb }); } - private getValueOrDefault(infoObject: ServerInfo | {}, propertyValue: string, defaultVal?: any): T { + private getValueOrDefault(infoObject: ServerInfo | {}, propertyName: string, defaultVal?: any): T { let val: T = undefined; - if (infoObject) { - val = infoObject[propertyValue]; + let obj = propertyName in infoObject ? infoObject : ('options' in infoObject && propertyName in infoObject.options ? infoObject.options : undefined); + if (obj) { + val = obj[propertyName]; } if (types.isUndefinedOrNull(val)) { val = defaultVal;