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

Databases order in schema compare dialog to be same as OE (#6162)

Browse Source 
* Database order to be same as OE

* changes to reset for source target buttons
This commit is contained in:
Udeesha Gautam
2019-06-26 12:16:51 -07:00
committed by GitHub
parent 97d36e2281
commit caba5c9d26
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -638,7 +638,7 @@ export class SchemaCompareDialog {
let idx = -1; let idx = -1;
let count = -1; let count = -1;
let values = (await azdata.connection.listDatabases(connectionId)).map(db => { let values = (await azdata.connection.listDatabases(connectionId)).sort((a, b) => a.localeCompare(b)).map(db => {
count++; count++;
// put currently selected db at the top of the dropdown if there is one // put currently selected db at the top of the dropdown if there is one

18
extensions/schema-compare/src/schemaCompareResult.ts
View File

@@ -30,6 +30,7 @@ enum ResetButtonState {
noSourceTarget, noSourceTarget,
beforeCompareStart, beforeCompareStart,
comparing, comparing,
afterCompareComplete
} }
export class SchemaCompareResult { export class SchemaCompareResult {
@@ -340,11 +341,7 @@ export class SchemaCompareResult {
this.flexModel.removeItem(this.loader); this.flexModel.removeItem(this.loader);
this.flexModel.removeItem(this.waitText); this.flexModel.removeItem(this.waitText);
this.switchButton.enabled = true; this.resetButtons(ResetButtonState.afterCompareComplete);
this.compareButton.enabled = true;
this.optionsButton.enabled = true;
this.openScmpButton.enabled = true;
this.cancelCompareButton.enabled = false;
if (this.comparisonResult.differences.length > 0) { if (this.comparisonResult.differences.length > 0) {
this.flexModel.addItem(this.splitView, { CSSStyles: { 'overflow': 'hidden' } }); this.flexModel.addItem(this.splitView, { CSSStyles: { 'overflow': 'hidden' } });
@@ -714,15 +711,21 @@ export class SchemaCompareResult {
this.switchButton.enabled = this.sourceEndpointInfo ? true : false; // allows switching if the source is set this.switchButton.enabled = this.sourceEndpointInfo ? true : false; // allows switching if the source is set
this.openScmpButton.enabled = true; this.openScmpButton.enabled = true;
this.cancelCompareButton.enabled = false; this.cancelCompareButton.enabled = false;
this.selectSourceButton.enabled = true;
this.selectTargetButton.enabled = true;
break; break;
} }
case (ResetButtonState.beforeCompareStart): { // Before start and after complete are same functionally. Adding two enum values for clarity.
case (ResetButtonState.beforeCompareStart):
case (ResetButtonState.afterCompareComplete): {
this.compareButton.enabled = true; this.compareButton.enabled = true;
this.optionsButton.enabled = true; this.optionsButton.enabled = true;
this.switchButton.enabled = true; this.switchButton.enabled = true;
this.openScmpButton.enabled = true; this.openScmpButton.enabled = true;
this.saveScmpButton.enabled = true; this.saveScmpButton.enabled = true;
this.cancelCompareButton.enabled = false; this.cancelCompareButton.enabled = false;
this.selectSourceButton.enabled = true;
this.selectTargetButton.enabled = true;
break; break;
} }
case (ResetButtonState.comparing): { case (ResetButtonState.comparing): {
@@ -731,10 +734,13 @@ export class SchemaCompareResult {
this.switchButton.enabled = false; this.switchButton.enabled = false;
this.openScmpButton.enabled = false; this.openScmpButton.enabled = false;
this.cancelCompareButton.enabled = true; this.cancelCompareButton.enabled = true;
this.selectSourceButton.enabled = false;
this.selectTargetButton.enabled = false;
break; break;
} }
} }
// Set generate script and apply to false because specific values depend on result and are set separately
this.generateScriptButton.enabled = false; this.generateScriptButton.enabled = false;
this.applyButton.enabled = false; this.applyButton.enabled = false;
this.generateScriptButton.title = generateScriptEnabledMessage; this.generateScriptButton.title = generateScriptEnabledMessage;