ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stop using deprecated declarative table data in publish dialog (#12782)

Browse Source 
* stop using deprecated declarative table data in publish dialog

* fix reloading values from project
This commit is contained in:
Kim Santiago
2020-10-07 13:50:46 -07:00
committed by GitHub
parent 280a9d20f9
commit acc58a0d1c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts
View File

@@ -80,7 +80,6 @@ export class PublishDatabaseDialog {
private initializePublishTab(): void { private initializePublishTab(): void {
this.publishTab.registerContent(async view => { this.publishTab.registerContent(async view => {
// TODO : enable using this when data source creation is enabled // TODO : enable using this when data source creation is enabled
this.createRadioButtons(view); this.createRadioButtons(view);
@@ -408,7 +407,7 @@ export class PublishDatabaseDialog {
const table = view.modelBuilder.declarativeTable().withProperties<azdata.DeclarativeTableProperties>({ const table = view.modelBuilder.declarativeTable().withProperties<azdata.DeclarativeTableProperties>({
ariaLabel: constants.sqlCmdTableLabel, ariaLabel: constants.sqlCmdTableLabel,
data: this.convertSqlCmdVarsToTableFormat(this.sqlCmdVars), dataValues: this.convertSqlCmdVarsToTableFormat(this.sqlCmdVars),
columns: [ columns: [
{ {
displayName: constants.sqlCmdVariableColumn, displayName: constants.sqlCmdVariableColumn,
@@ -431,8 +430,8 @@ export class PublishDatabaseDialog {
table.onDataChanged(() => { table.onDataChanged(() => {
this.sqlCmdVars = {}; this.sqlCmdVars = {};
table.data?.forEach((row) => { table.dataValues?.forEach((row) => {
(<Record<string, string>>this.sqlCmdVars)[row[0]] = row[1]; (<Record<string, string>>this.sqlCmdVars)[<string>row[0].value] = <string>row[1].value;
}); });
this.tryEnableGenerateScriptAndOkButtons(); this.tryEnableGenerateScriptAndOkButtons();
@@ -455,9 +454,10 @@ export class PublishDatabaseDialog {
loadSqlCmdVarsButton.onDidClick(async () => { loadSqlCmdVarsButton.onDidClick(async () => {
this.sqlCmdVars = { ...this.project.sqlCmdVariables }; this.sqlCmdVars = { ...this.project.sqlCmdVariables };
const data = this.convertSqlCmdVarsToTableFormat(this.getSqlCmdVariablesForPublish()); const data = this.convertSqlCmdVarsToTableFormat(this.sqlCmdVars!);
await (<azdata.DeclarativeTableComponent>this.sqlCmdVariablesTable).updateProperties({ (<azdata.DeclarativeTableComponent>this.sqlCmdVariablesTable)!.updateProperties({
data: data dataValues: data,
data: [] // data is deprecated, but the table gets updated incorrectly if this isn't set to an empty array
}); });
this.tryEnableGenerateScriptAndOkButtons(); this.tryEnableGenerateScriptAndOkButtons();
@@ -586,10 +586,10 @@ export class PublishDatabaseDialog {
return loadProfileButton; return loadProfileButton;
} }
private convertSqlCmdVarsToTableFormat(sqlCmdVars: Record<string, string>): string[][] { private convertSqlCmdVarsToTableFormat(sqlCmdVars: Record<string, string>): azdata.DeclarativeTableCellValue[][] {
let data = []; let data = [];
for (let key in sqlCmdVars) { for (let key in sqlCmdVars) {
data.push([key, sqlCmdVars[key]]); data.push([{ value: key }, { value: sqlCmdVars[key] }]);
} }
return data; return data;