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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/import/src/wizard/api/importPage.ts
View File

@@ -11,10 +11,10 @@ import { BasePage } from './basePage';
export abstract class ImportPage extends BasePage {
protected readonly wizardPage: azdata.window.WizardPage;
protected override readonly wizardPage: azdata.window.WizardPage;
protected readonly instance: FlatFileWizard;
protected readonly model: ImportDataModel;
protected readonly view: azdata.ModelView;
protected override readonly model: ImportDataModel;
protected override readonly view: azdata.ModelView;
protected readonly provider: FlatFileProvider;

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

@@ -117,12 +117,12 @@ export class FileConfigPage extends ImportPage {
return r1 && r2 && r3;
}
async onPageLeave(): Promise<boolean> {
override async onPageLeave(): Promise<boolean> {
delete this.model.serverId;
return true;
}
public async cleanup(): Promise<boolean> {
public override async cleanup(): Promise<boolean> {
delete this.model.filePath;
delete this.model.table;
@@ -409,7 +409,7 @@ export class FileConfigPage extends ImportPage {
return values;
}
protected deleteServerValues() {
protected override deleteServerValues() {
delete this.model.server;
delete this.model.serverId;
delete this.model.database;

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

@@ -135,12 +135,12 @@ export class ModifyColumnsPage extends ImportPage {
return true;
}
async onPageLeave(): Promise<boolean> {
override async onPageLeave(): Promise<boolean> {
this.instance.changeNextButtonLabel(constants.nextText);
return undefined;
}
async cleanup(): Promise<boolean> {
override async cleanup(): Promise<boolean> {
delete this.model.proseColumns;
this.instance.changeNextButtonLabel(constants.nextText);

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

@@ -134,12 +134,12 @@ export class ProsePreviewPage extends ImportPage {
}
}
async onPageLeave(): Promise<boolean> {
override async onPageLeave(): Promise<boolean> {
await this.emptyTable();
return true;
}
async cleanup(): Promise<boolean> {
override async cleanup(): Promise<boolean> {
delete this.model.proseDataPreview;
return true;
}

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

@@ -80,7 +80,7 @@ export class SummaryPage extends ImportPage {
return true;
}
async onPageLeave(): Promise<boolean> {
override async onPageLeave(): Promise<boolean> {
this.instance.setImportAnotherFileVisibility(false);
return true;