From 8c956cdb792ae6aa906894659eccdeaa8de6a488 Mon Sep 17 00:00:00 2001
From: Kim Santiago <31145923+kisantia@users.noreply.github.com>
Date: Thu, 29 Oct 2020 13:19:59 -0700
Subject: [PATCH] Update sqlcmd table to use dataValues instead of deprecated
 data (#13121)

* Update sqlcmd table to use dataValues instead of deprecated data

* fix in declarativeTableComponent
---
 .../src/dialogs/publishDatabaseDialog.ts                  | 5 ++---
 .../browser/modelComponents/declarativeTable.component.ts | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
index 71fe2e31b2..648b858b37 100644
--- a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
+++ b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
@@ -460,8 +460,7 @@ export class PublishDatabaseDialog {
 
 			const data = this.convertSqlCmdVarsToTableFormat(this.sqlCmdVars!);
 			(<azdata.DeclarativeTableComponent>this.sqlCmdVariablesTable)!.updateProperties({
-				dataValues: data,
-				data: [] // data is deprecated, but the table gets updated incorrectly if this isn't set to an empty array
+				dataValues: data
 			});
 
 			this.tryEnableGenerateScriptAndOkButtons();
@@ -569,7 +568,7 @@ export class PublishDatabaseDialog {
 
 				const data = this.convertSqlCmdVarsToTableFormat(this.getSqlCmdVariablesForPublish());
 				await (<azdata.DeclarativeTableComponent>this.sqlCmdVariablesTable).updateProperties({
-					data: data
+					dataValues: data
 				});
 
 				if (Object.keys(result.sqlCmdVariables).length) {
diff --git a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
index 86bf77f264..635f0b8754 100644
--- a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
+++ b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
@@ -139,7 +139,13 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
 
 	private onCellDataChanged(newValue: string | number | boolean | any, rowIdx: number, colIdx: number): void {
 		this.data[rowIdx][colIdx].value = newValue;
-		this.setPropertyFromUI<any[][]>((props, value) => props.data = value, this.data);
+
+		if (this.properties.data) {
+			this.setPropertyFromUI<any[][]>((props, value) => props.data = value, this.data);
+		} else {
+			this.setPropertyFromUI<any[][]>((props, value) => props.dataValues = value, this.data);
+		}
+
 		let newCellData: azdata.TableCell = {
 			row: rowIdx,
 			column: colIdx,