From d031211693713bed5af2913a16bade7dbb0f4248 Mon Sep 17 00:00:00 2001
From: Rachel Kim <rackim@microsoft.com>
Date: Wed, 21 Jul 2021 16:39:21 -0700
Subject: [PATCH] Add 'hidden' optional property to DeclarativeTableColumn
 (#16386)

* add setHideColumns to DeclarativeTableComponent

* fixing tests using declarative table

* replace setHiddenColumns on DeclarativeTableComponent with 'hidden' optional property on DeclarativeTableColumn

* remove unnecessary changes
---
 src/sql/azdata.proposed.d.ts                                | 1 +
 .../browser/modelComponents/declarativeTable.component.html | 6 ++++--
 .../browser/modelComponents/declarativeTable.component.ts   | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/sql/azdata.proposed.d.ts b/src/sql/azdata.proposed.d.ts
index e47bbcc0bc..c285acb3ca 100644
--- a/src/sql/azdata.proposed.d.ts
+++ b/src/sql/azdata.proposed.d.ts
@@ -269,6 +269,7 @@ declare module 'azdata' {
 		rowCssStyles?: CssStyles;
 		ariaLabel?: string;
 		showCheckAll?: boolean;
+		hidden?: boolean;
 	}
 
 
diff --git a/src/sql/workbench/browser/modelComponents/declarativeTable.component.html b/src/sql/workbench/browser/modelComponents/declarativeTable.component.html
index fa6b7d33df..52f58909b3 100644
--- a/src/sql/workbench/browser/modelComponents/declarativeTable.component.html
+++ b/src/sql/workbench/browser/modelComponents/declarativeTable.component.html
@@ -5,7 +5,8 @@
 			<ng-container *ngFor="let column of columns; let c = index;">
 				<th class="declarative-table-header" aria-sort="none" [style.width]="getColumnWidth(column)"
 					[ngClass]="{'declarative-table-cell-checkbox' : isCheckBox(c)}"
-					[ngStyle]="column.headerCssStyles" [attr.aria-label]="getHeaderAriaLabel(c)">
+					[ngStyle]="column.headerCssStyles" [attr.aria-label]="getHeaderAriaLabel(c)"
+					*ngIf="showColumn(column)">
 					{{column.displayName}}
 					<checkbox *ngIf="headerCheckboxVisible(c)" [checked]="isHeaderChecked(c)"
 						[aria-label]="getCheckAllColumnAriaLabel(c)" (onChange)="onHeaderCheckBoxChanged($event,c)"
@@ -22,7 +23,8 @@
 						<td class="declarative-table-cell" [style.width]="getColumnWidth(c)"
 							[attr.aria-label]="getAriaLabel(r, c)"
 							[ngClass]="{'declarative-table-cell-checkbox' : isCheckBox(c)}"
-							[ngStyle]="mergeCss(columns[c].rowCssStyles, cellData.style)" role="gridcell">
+							[ngStyle]="mergeCss(columns[c].rowCssStyles, cellData.style)" role="gridcell"
+							*ngIf="showColumn(columns[c])">
 							<checkbox *ngIf="isCheckBox(c)" label="" (onChange)="onCheckBoxChanged($event,r,c)"
 								[enabled]="isControlEnabled(r, c)" [checked]="isChecked(r,c)"
 								[ngStyle]="mergeCss(columns[c].rowCssStyles, cellData.style)">
diff --git a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
index 73b656aea6..f469fd99eb 100644
--- a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
+++ b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
@@ -466,4 +466,8 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
 			this.setPropertyFromUI<number>((properties, value) => { properties.selectedRow = value; }, row);
 		}
 	}
+
+	public showColumn(column: azdata.DeclarativeTableColumn): boolean {
+		return column.hidden === undefined || !column.hidden;
+	}
 }