mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-21 01:25:37 -05:00
Notebook: Re-Enable Attach to Dropdown Functionality (#3250)
* first attach to working * Transfer changes from sqlopsstudioextensions PR 448 * Transfer changes from sqlopsstudioextensions PR 447 * Transfer changes from sqlopsstudioextensions PR 456 * Transfer changes from sqlopsstudioextensions PR 465 * Transfer changes from sqlopsstudioextensions PR 463 * Transfer changes from sqlopsstudioextensions PR 482 * Transfer changes from sqlopsstudioextensions PR 485 * Session and Kernel implementation except executeRequest * Attach to port compiling * Further tweaks to attach to dropdown, re-enable opening connection dialog * Revert "Merge remote-tracking branch 'origin/Notebook/sessionExtension' into feature/workingAttachTo" This reverts commit 94703db87c85416c4ae36762afc1094d6e71166a, reversing changes made to e4dc25331036d259e9c762cfe8741f957bb5c590. * Fix code formatting * Fix for new Add new connection issue
This commit is contained in:
@@ -20,7 +20,7 @@ import { AngularDisposable } from 'sql/base/common/lifecycle';
|
||||
|
||||
import { CellTypes, CellType, NotebookChangeType } from 'sql/parts/notebook/models/contracts';
|
||||
import { ICellModel, IModelFactory } from 'sql/parts/notebook/models/modelInterfaces';
|
||||
import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
|
||||
import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement';
|
||||
import { INotebookService, INotebookParams, INotebookManager } from 'sql/services/notebook/notebookService';
|
||||
import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
|
||||
import { NotebookModel, ErrorInfo, MessageLevel, NotebookContentChange } from 'sql/parts/notebook/models/notebookModel';
|
||||
@@ -66,7 +66,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit {
|
||||
@Inject(IBootstrapParams) private notebookParams: INotebookParams,
|
||||
@Inject(IInstantiationService) private instantiationService: IInstantiationService,
|
||||
@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
|
||||
@Inject(IContextViewService) private contextViewService: IContextViewService
|
||||
@Inject(IContextViewService) private contextViewService: IContextViewService,
|
||||
@Inject(IConnectionDialogService) private connectionDialogService: IConnectionDialogService
|
||||
) {
|
||||
super();
|
||||
this.profile = this.notebookParams!.profile;
|
||||
@@ -83,7 +84,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit {
|
||||
public get model(): NotebookModel {
|
||||
return this._model;
|
||||
}
|
||||
|
||||
|
||||
public get modelRegistered(): Promise<NotebookModel> {
|
||||
return this._modelRegisteredDeferred.promise;
|
||||
}
|
||||
@@ -227,7 +228,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit {
|
||||
attachSelectBoxStyler(kernelDropdown, this.themeService);
|
||||
|
||||
let attachToContainer = document.createElement('div');
|
||||
let attachTodropdwon = new AttachToDropdown(attachToContainer, this.contextViewService);
|
||||
let attachTodropdwon = new AttachToDropdown(attachToContainer, this.contextViewService, this.modelRegistered,
|
||||
this.connectionManagementService, this.connectionDialogService, this.notificationService);
|
||||
attachTodropdwon.render(attachToContainer);
|
||||
attachSelectBoxStyler(attachTodropdwon, this.themeService);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user