ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-04 17:23:45 -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/resource-deployment/src/ui/notebookWizard/notebookWizardAutoSummaryPage.ts
View File

@@ -25,7 +25,7 @@ export class NotebookWizardAutoSummaryPage extends NotebookWizardPage {
);
}
public initialize(): void {
public override initialize(): void {
this.pageObject.registerContent((view: azdata.ModelView) => {
this.view = view;
this.form = view.modelBuilder.formContainer();
@@ -33,11 +33,11 @@ export class NotebookWizardAutoSummaryPage extends NotebookWizardPage {
});
}
public async onLeave(): Promise<void> {
public override async onLeave(): Promise<void> {
this.wizard.wizardObject.message = { text: '' };
}
public async onEnter(): Promise<void> {
public override async onEnter(): Promise<void> {
this.formItems.forEach(item => {
this.form!.removeFormItem(item);
});

2
extensions/resource-deployment/src/ui/notebookWizard/notebookWizardModel.ts
View File

@@ -58,7 +58,7 @@ export class NotebookWizardModel extends ResourceTypeModel {
/**
* Generates the notebook and returns true if generation was done and so the wizard should be closed.
**/
public async onGenerateScript(): Promise<boolean> {
public override async onGenerateScript(): Promise<boolean> {
const lastPage = this.wizard.lastPage! as NotebookWizardPage;
if (lastPage.validatePage()) {
let notebook: Notebook | undefined;

4
extensions/resource-deployment/src/ui/notebookWizard/notebookWizardPage.ts
View File

@@ -73,14 +73,14 @@ export class NotebookWizardPage extends ResourceTypePage {
});
}
public async onLeave(): Promise<void> {
public override async onLeave(): Promise<void> {
// The following callback registration clears previous navigation validators.
this.wizard.wizardObject.registerNavigationValidator((pcInfo) => {
return true;
});
}
public async onEnter(pageInfo: WizardPageInfo): Promise<void> {
public override async onEnter(pageInfo: WizardPageInfo): Promise<void> {
if (pageInfo.isLastPage) {
// on the last page either one or both of done button and generateScript button are visible depending on configuration of 'runNotebook' in wizard info
this.wizard.wizardObject.doneButton.hidden = !this.isDoneButtonVisible;