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

use setContent instead of addElement (#17386)

Browse Source
This commit is contained in:
Lucy Zhang
2021-10-18 18:32:05 -07:00
committed by GitHub
parent a8ee26ed89
commit 9a05d81215
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sql/workbench/contrib/notebook/browser/notebook.component.ts
View File

@@ -476,6 +476,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
viewsDropdownMenuActionViewItem.setActionContext(this._notebookParams.notebookUri); viewsDropdownMenuActionViewItem.setActionContext(this._notebookParams.notebookUri);
} }
if (this._showToolbarActions) {
this._actionBar.setContent([ this._actionBar.setContent([
{ element: buttonDropdownContainer }, { element: buttonDropdownContainer },
{ action: this._runAllCellsAction }, { action: this._runAllCellsAction },
@@ -483,14 +484,20 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
{ element: kernelContainer }, { element: kernelContainer },
{ element: attachToContainer }, { element: attachToContainer },
{ element: spacerElement }, { element: spacerElement },
{ element: viewsDropdownContainer },
{ action: collapseCellsAction },
{ action: clearResultsButton },
{ action: this._trustedAction },
{ action: runParametersAction },
]);
} else {
this._actionBar.setContent([
{ element: buttonDropdownContainer },
{ action: this._runAllCellsAction },
{ element: Taskbar.createTaskbarSeparator() },
{ element: kernelContainer },
{ element: attachToContainer },
]); ]);
if (this._showToolbarActions) {
this._actionBar.addElement(viewsDropdownContainer);
this._actionBar.addAction(collapseCellsAction);
this._actionBar.addAction(clearResultsButton);
this._actionBar.addAction(this._trustedAction);
this._actionBar.addAction(runParametersAction);
} }
} else { } else {
let kernelContainer = document.createElement('div'); let kernelContainer = document.createElement('div');
@@ -523,6 +530,18 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
this._actionBar = new Taskbar(taskbar, { actionViewItemProvider: action => this.actionItemProvider(action as Action) }); this._actionBar = new Taskbar(taskbar, { actionViewItemProvider: action => this.actionItemProvider(action as Action) });
this._actionBar.context = this._notebookParams.notebookUri; this._actionBar.context = this._notebookParams.notebookUri;
if (this._showToolbarActions) {
this._actionBar.setContent([
{ action: addCodeCellButton },
{ action: addTextCellButton },
{ element: kernelContainer },
{ element: attachToContainer },
{ action: this._trustedAction },
{ action: this._runAllCellsAction },
{ action: clearResultsButton },
{ action: collapseCellsAction },
]);
} else {
this._actionBar.setContent([ this._actionBar.setContent([
{ action: addCodeCellButton }, { action: addCodeCellButton },
{ action: addTextCellButton }, { action: addTextCellButton },
@@ -530,11 +549,6 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
{ element: attachToContainer }, { element: attachToContainer },
{ action: this._runAllCellsAction }, { action: this._runAllCellsAction },
]); ]);
if (this._showToolbarActions) {
this._actionBar.addAction(this._trustedAction);
this._actionBar.addAction(clearResultsButton);
this._actionBar.addAction(collapseCellsAction);
} }
} }
} }