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

Entry Point updates (#2222)

Browse Source 
* Entry point changes

* Navigator validation changes.

* Minor modifications to how the validator is called and setup
This commit is contained in:
Amir Ali Omidi
2018-08-14 13:18:07 -07:00
committed by GitHub
parent 2304c32453
commit b17b4ce880
6 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/import/src/wizard/pages/fileConfigPage.ts
View File

@@ -29,8 +29,8 @@ export class FileConfigPage extends ImportPage {
private tableNames: string[] = [];
public constructor(instance: FlatFileWizard, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, model, view, provider);
public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, wizardPage, model, view, provider);
}
async start(): Promise<boolean> {
@@ -39,7 +39,6 @@ export class FileConfigPage extends ImportPage {
let fileBrowserComponent = await this.createFileBrowser();
let databaseComponent = await this.createDatabaseDropdown();
let serverComponent = await this.createServerDropdown();
this.setupNavigationValidator();
this.form = this.view.modelBuilder.formContainer()
.withFormItems(
@@ -73,7 +72,7 @@ export class FileConfigPage extends ImportPage {
return true;
}
private setupNavigationValidator() {
public setupNavigationValidator() {
this.instance.registerNavigationValidator((info) => {
if (this.schemaLoader.loading || this.databaseLoader.loading) {
return false;

10
extensions/import/src/wizard/pages/modifyColumnsPage.ts
View File

@@ -56,10 +56,11 @@ export class ModifyColumnsPage extends ImportPage {
private text: sqlops.TextComponent;
private form: sqlops.FormContainer;
public constructor(instance: FlatFileWizard, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, model, view, provider);
public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, wizardPage, model, view, provider);
}
private static convertMetadata(column: ColumnMetadata): any[] {
return [column.columnName, column.dataType, false, column.nullable];
}
@@ -121,6 +122,11 @@ export class ModifyColumnsPage extends ImportPage {
return true;
}
public setupNavigationValidator() {
this.instance.registerNavigationValidator((info) => {
return !this.loading.loading;
});
}
private async populateTable() {
let data: any[][] = [];

13
extensions/import/src/wizard/pages/prosePreviewPage.ts
View File

@@ -20,9 +20,8 @@ export class ProsePreviewPage extends ImportPage {
private form: sqlops.FormContainer;
private refresh: sqlops.ButtonComponent;
public constructor(instance: FlatFileWizard, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, model, view, provider);
public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, wizardPage, model, view, provider);
}
async start(): Promise<boolean> {
@@ -37,7 +36,6 @@ export class ProsePreviewPage extends ImportPage {
});
this.loading = this.view.modelBuilder.loadingComponent().component();
this.setupNavigationValidator();
this.form = this.view.modelBuilder.formContainer().withFormItems([
{
@@ -73,12 +71,9 @@ export class ProsePreviewPage extends ImportPage {
return true;
}
private setupNavigationValidator() {
public setupNavigationValidator() {
this.instance.registerNavigationValidator((info) => {
if (this.loading.loading) {
return false;
}
return true;
return !this.loading.loading;
});
}

10
extensions/import/src/wizard/pages/summaryPage.ts
View File

@@ -22,8 +22,8 @@ export class SummaryPage extends ImportPage {
private loading: sqlops.LoadingComponent;
private form: sqlops.FormContainer;
public constructor(instance: FlatFileWizard, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, model, view, provider);
public constructor(instance: FlatFileWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
super(instance, wizardPage, model, view, provider);
}
async start(): Promise<boolean> {
@@ -63,7 +63,11 @@ export class SummaryPage extends ImportPage {
return true;
}
public setupNavigationValidator() {
this.instance.registerNavigationValidator((info) => {
return !this.loading.loading;
});
}
private populateTable() {
this.table.updateProperties({
data: [