ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6771: Dacfx wizard summary page has wrong page number (#6778)

Browse Source 
* fix summary page number for deploy new db

* also fix page number for upgrade

* add enum for page names
This commit is contained in:
Kim Santiago
2019-08-16 11:25:07 -07:00
committed by GitHub
parent 447f1ec616
commit bae87a0a24
3 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
View File

@@ -66,6 +66,16 @@ export enum ExportOperationPath {
summary summary
} }
export enum PageName {
selectOperation = 'selectOperation',
deployConfig = 'deployConfig',
deployPlan = 'deployPlan',
extractConfig = 'extractConfig',
importConfig = 'importConfig',
exportConfig = 'exportConfig',
summary = 'summary'
}
export class DataTierApplicationWizard { export class DataTierApplicationWizard {
public wizard: azdata.window.Wizard; public wizard: azdata.window.Wizard;
private connection: azdata.connection.ConnectionProfile; private connection: azdata.connection.ConnectionProfile;
@@ -107,13 +117,13 @@ export class DataTierApplicationWizard {
let importConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings')); let importConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings'));
let exportConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.exportConfigPageName', 'Select Export Bacpac Settings')); let exportConfigWizardPage = azdata.window.createWizardPage(localize('dacFx.exportConfigPageName', 'Select Export Bacpac Settings'));
this.pages.set('selectOperation', new Page(selectOperationWizardPage)); this.pages.set(PageName.selectOperation, new Page(selectOperationWizardPage));
this.pages.set('deployConfig', new Page(deployConfigWizardPage)); this.pages.set(PageName.deployConfig, new Page(deployConfigWizardPage));
this.pages.set('deployPlan', new Page(deployPlanWizardPage)); this.pages.set(PageName.deployPlan, new Page(deployPlanWizardPage));
this.pages.set('extractConfig', new Page(extractConfigWizardPage)); this.pages.set(PageName.extractConfig, new Page(extractConfigWizardPage));
this.pages.set('importConfig', new Page(importConfigWizardPage)); this.pages.set(PageName.importConfig, new Page(importConfigWizardPage));
this.pages.set('exportConfig', new Page(exportConfigWizardPage)); this.pages.set(PageName.exportConfig, new Page(exportConfigWizardPage));
this.pages.set('summary', new Page(summaryWizardPage)); this.pages.set(PageName.summary, new Page(summaryWizardPage));
selectOperationWizardPage.registerContent(async (view) => { selectOperationWizardPage.registerContent(async (view) => {
let selectOperationDacFxPage = new SelectOperationPage(this, selectOperationWizardPage, this.model, view); let selectOperationDacFxPage = new SelectOperationPage(this, selectOperationWizardPage, this.model, view);
@@ -126,37 +136,37 @@ export class DataTierApplicationWizard {
deployConfigWizardPage.registerContent(async (view) => { deployConfigWizardPage.registerContent(async (view) => {
let deployConfigDacFxPage = new DeployConfigPage(this, deployConfigWizardPage, this.model, view); let deployConfigDacFxPage = new DeployConfigPage(this, deployConfigWizardPage, this.model, view);
this.pages.get('deployConfig').dacFxPage = deployConfigDacFxPage; this.pages.get(PageName.deployConfig).dacFxPage = deployConfigDacFxPage;
await deployConfigDacFxPage.start(); await deployConfigDacFxPage.start();
}); });
deployPlanWizardPage.registerContent(async (view) => { deployPlanWizardPage.registerContent(async (view) => {
let deployPlanDacFxPage = new DeployPlanPage(this, deployPlanWizardPage, this.model, view); let deployPlanDacFxPage = new DeployPlanPage(this, deployPlanWizardPage, this.model, view);
this.pages.get('deployPlan').dacFxPage = deployPlanDacFxPage; this.pages.get(PageName.deployPlan).dacFxPage = deployPlanDacFxPage;
await deployPlanDacFxPage.start(); await deployPlanDacFxPage.start();
}); });
extractConfigWizardPage.registerContent(async (view) => { extractConfigWizardPage.registerContent(async (view) => {
let extractConfigDacFxPage = new ExtractConfigPage(this, extractConfigWizardPage, this.model, view); let extractConfigDacFxPage = new ExtractConfigPage(this, extractConfigWizardPage, this.model, view);
this.pages.get('extractConfig').dacFxPage = extractConfigDacFxPage; this.pages.get(PageName.extractConfig).dacFxPage = extractConfigDacFxPage;
await extractConfigDacFxPage.start(); await extractConfigDacFxPage.start();
}); });
importConfigWizardPage.registerContent(async (view) => { importConfigWizardPage.registerContent(async (view) => {
let importConfigDacFxPage = new ImportConfigPage(this, importConfigWizardPage, this.model, view); let importConfigDacFxPage = new ImportConfigPage(this, importConfigWizardPage, this.model, view);
this.pages.get('importConfig').dacFxPage = importConfigDacFxPage; this.pages.get(PageName.importConfig).dacFxPage = importConfigDacFxPage;
await importConfigDacFxPage.start(); await importConfigDacFxPage.start();
}); });
exportConfigWizardPage.registerContent(async (view) => { exportConfigWizardPage.registerContent(async (view) => {
let exportConfigDacFxPage = new ExportConfigPage(this, exportConfigWizardPage, this.model, view); let exportConfigDacFxPage = new ExportConfigPage(this, exportConfigWizardPage, this.model, view);
this.pages.get('exportConfig').dacFxPage = exportConfigDacFxPage; this.pages.get(PageName.exportConfig).dacFxPage = exportConfigDacFxPage;
await exportConfigDacFxPage.start(); await exportConfigDacFxPage.start();
}); });
summaryWizardPage.registerContent(async (view) => { summaryWizardPage.registerContent(async (view) => {
let summaryDacFxPage = new DacFxSummaryPage(this, summaryWizardPage, this.model, view); let summaryDacFxPage = new DacFxSummaryPage(this, summaryWizardPage, this.model, view);
this.pages.get('summary').dacFxPage = summaryDacFxPage; this.pages.get(PageName.summary).dacFxPage = summaryDacFxPage;
await summaryDacFxPage.start(); await summaryDacFxPage.start();
}); });
@@ -312,26 +322,26 @@ export class DataTierApplicationWizard {
if (idx === 1) { if (idx === 1) {
switch (this.selectedOperation) { switch (this.selectedOperation) {
case Operation.deploy: { case Operation.deploy: {
page = this.pages.get('deployConfig'); page = this.pages.get(PageName.deployConfig);
break; break;
} }
case Operation.extract: { case Operation.extract: {
page = this.pages.get('extractConfig'); page = this.pages.get(PageName.extractConfig);
break; break;
} }
case Operation.import: { case Operation.import: {
page = this.pages.get('importConfig'); page = this.pages.get(PageName.importConfig);
break; break;
} }
case Operation.export: { case Operation.export: {
page = this.pages.get('exportConfig'); page = this.pages.get(PageName.exportConfig);
break; break;
} }
} }
} else if (this.isSummaryPage(idx)) { } else if (this.isSummaryPage(idx)) {
page = this.pages.get('summary'); page = this.pages.get(PageName.summary);
} else if ((this.selectedOperation === Operation.deploy || this.selectedOperation === Operation.generateDeployScript) && idx === DeployOperationPath.deployPlan) { } else if ((this.selectedOperation === Operation.deploy || this.selectedOperation === Operation.generateDeployScript) && idx === DeployOperationPath.deployPlan) {
page = this.pages.get('deployPlan'); page = this.pages.get(PageName.deployPlan);
} }
return page; return page;

15
extensions/dacpac/src/wizard/pages/deployConfigPage.ts
View File

@@ -10,8 +10,9 @@ import * as vscode from 'vscode';
import * as path from 'path'; import * as path from 'path';
import * as os from 'os'; import * as os from 'os';
import { DacFxDataModel } from '../api/models'; import { DacFxDataModel } from '../api/models';
import { DataTierApplicationWizard, DeployOperationPath, Operation } from '../dataTierApplicationWizard'; import { DataTierApplicationWizard, DeployOperationPath, Operation, DeployNewOperationPath, PageName } from '../dataTierApplicationWizard';
import { DacFxConfigPage } from '../api/dacFxConfigPage'; import { DacFxConfigPage } from '../api/dacFxConfigPage';
import { DacFxSummaryPage } from './dacFxSummaryPage';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
@@ -123,9 +124,12 @@ export class DeployConfigPage extends DacFxConfigPage {
this.formBuilder.addFormItem(this.databaseDropdownComponent, { horizontal: true, componentWidth: 400 }); this.formBuilder.addFormItem(this.databaseDropdownComponent, { horizontal: true, componentWidth: 400 });
this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name; this.model.database = (<azdata.CategoryValue>this.databaseDropdown.value).name;
// add deploy plan page // add deploy plan page and remove and re-add summary page so that it has the correct page number
let deployPlanPage = this.instance.pages.get('deployPlan'); this.instance.wizard.removePage(DeployNewOperationPath.summary);
let deployPlanPage = this.instance.pages.get(PageName.deployPlan);
let summaryPage = this.instance.pages.get(PageName.summary);
this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan); this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan);
this.instance.wizard.addPage(summaryPage.wizardPage, DeployOperationPath.summary);
}); });
newRadioButton.onDidClick(() => { newRadioButton.onDidClick(() => {
@@ -135,8 +139,11 @@ export class DeployConfigPage extends DacFxConfigPage {
this.model.database = this.databaseTextBox.value; this.model.database = this.databaseTextBox.value;
this.instance.setDoneButton(Operation.deploy); this.instance.setDoneButton(Operation.deploy);
// remove deploy plan page // remove deploy plan page and readd summary page so that it has the correct page number
this.instance.wizard.removePage(DeployOperationPath.summary);
this.instance.wizard.removePage(DeployOperationPath.deployPlan); this.instance.wizard.removePage(DeployOperationPath.deployPlan);
let summaryPage = this.instance.pages.get(PageName.summary);
this.instance.wizard.addPage(summaryPage.wizardPage, DeployNewOperationPath.summary);
}); });
//Initialize with upgrade existing true //Initialize with upgrade existing true

14
extensions/dacpac/src/wizard/pages/selectOperationpage.ts
View File

@@ -7,7 +7,7 @@
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as nls from 'vscode-nls'; import * as nls from 'vscode-nls';
import { DacFxDataModel } from '../api/models'; import { DacFxDataModel } from '../api/models';
import { DataTierApplicationWizard, Operation, DeployOperationPath, ExtractOperationPath, ImportOperationPath, ExportOperationPath } from '../dataTierApplicationWizard'; import { DataTierApplicationWizard, Operation, DeployOperationPath, ExtractOperationPath, ImportOperationPath, ExportOperationPath, PageName } from '../dataTierApplicationWizard';
import { BasePage } from '../api/basePage'; import { BasePage } from '../api/basePage';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
@@ -72,9 +72,9 @@ export class SelectOperationPage extends BasePage {
this.removePages(); this.removePages();
//add deploy pages //add deploy pages
let configPage = this.instance.pages.get('deployConfig'); let configPage = this.instance.pages.get(PageName.deployConfig);
this.instance.wizard.addPage(configPage.wizardPage, DeployOperationPath.deployOptions); this.instance.wizard.addPage(configPage.wizardPage, DeployOperationPath.deployOptions);
let deployPlanPage = this.instance.pages.get('deployPlan'); let deployPlanPage = this.instance.pages.get(PageName.deployPlan);
this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan); this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan);
this.addSummaryPage(DeployOperationPath.summary); this.addSummaryPage(DeployOperationPath.summary);
@@ -99,7 +99,7 @@ export class SelectOperationPage extends BasePage {
this.removePages(); this.removePages();
// add the extract page // add the extract page
let page = this.instance.pages.get('extractConfig'); let page = this.instance.pages.get(PageName.extractConfig);
this.instance.wizard.addPage(page.wizardPage, ExtractOperationPath.options); this.instance.wizard.addPage(page.wizardPage, ExtractOperationPath.options);
this.addSummaryPage(ExtractOperationPath.summary); this.addSummaryPage(ExtractOperationPath.summary);
@@ -124,7 +124,7 @@ export class SelectOperationPage extends BasePage {
this.removePages(); this.removePages();
// add the import page // add the import page
let page = this.instance.pages.get('importConfig'); let page = this.instance.pages.get(PageName.importConfig);
this.instance.wizard.addPage(page.wizardPage, ImportOperationPath.options); this.instance.wizard.addPage(page.wizardPage, ImportOperationPath.options);
this.addSummaryPage(ImportOperationPath.summary); this.addSummaryPage(ImportOperationPath.summary);
@@ -149,7 +149,7 @@ export class SelectOperationPage extends BasePage {
this.removePages(); this.removePages();
// add the export pages // add the export pages
let page = this.instance.pages.get('exportConfig'); let page = this.instance.pages.get(PageName.exportConfig);
this.instance.wizard.addPage(page.wizardPage, ExportOperationPath.options); this.instance.wizard.addPage(page.wizardPage, ExportOperationPath.options);
this.addSummaryPage(ExportOperationPath.summary); this.addSummaryPage(ExportOperationPath.summary);
@@ -171,7 +171,7 @@ export class SelectOperationPage extends BasePage {
} }
private addSummaryPage(index: number) { private addSummaryPage(index: number) {
let summaryPage = this.instance.pages.get('summary'); let summaryPage = this.instance.pages.get(PageName.summary);
this.instance.wizard.addPage(summaryPage.wizardPage, index); this.instance.wizard.addPage(summaryPage.wizardPage, index);
} }