mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-29 09:35:38 -05:00
Notebook cell toolbar additions - move cell, convert cell (#11457)
* Notebook cell toolbar additions - move up and move down added. Stubbed out related actions. Cleaned up component code. * Added new more actions menu item: Convert cell. * add move cell support in model * Schema Compare cleanup (#11418) * cleanup async and await stuff * remove awaits * remove more awaits * fix (#11437) * Add some unit tests for PyPiClient. (#11442) * handle invalid character in kubectl version output (#11460) * Add tests for azdata extension (#11423) * Add tests for azdata extension * Fail on stderr * Skip test for not implemented logic * Move executeCommand stub * Add missing packages * let semver to parse the version (#11463) * let semver to parse the version * check * Stop hardcoding python3 (#11464) * Add ConnectControllerDialog tests (#11443) * Automatically fix up arc controller URL * wip * Force tests to pass * Refactor * comment * adds role of button to all links that are buttons (#11465) * Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f * bump smoke extensions * bump node version in builds * bump smoke extensions * Add query-history and sql-assessment to recommended extensions (#11477) * First draft of outputProcessor tests (#11368) * First draft of outputProcessor tests * add return type for a function * pr feedback * comments and Spellings, getRandom ==> getRandomElement * pr feedback * pr feedback * Adds support for installing azdata on Linux (#11469) * Large cleanup of AzureCore - Introduction of getAccountSecurityToken and deprecation of getSecurityToken (#11446) * do a large cleanup of azurecore * Fix tests * Rework Device Code * Fix tests * Fix AE scenario * Fix firewall rule - clenaup logging * Shorthand syntax * Fix firewall tests * Start on tests for azureAuth * Add more tests * Address comments * Add a few more important tests * Don't throw error on old code * Fill in todo * Adding button plugin to table component (#10918) * Added delete plugin to table component * Arc - Remove Azure params from Postgres deployment (#11478) Co-authored-by: Brian Bergeron <brberger@microsoft.com> * tests for KernelsDropdown class (#11476) * add return type for a function * tests for KernelsDropdown class * remove inadvertent change * remove inadvertent change * formatting changes * pr feedback * pr feedback * implement review feedback (#11470) * fix sql proj sqlcmd table showing after loading profile when it shouldn't (#11479) * Feature/outer paths for project (#11445) * allow relative paths in project file outside of project folder * Adding some tests * Adding error string to loc strings * Fixed test * fix error message * PR comments and some more fixes * change userName to match what the azure account display name is (#11484) * change userName to match what the azure account display name is * Handle undefined value * Merge from vscode 8c426f9f3b6b18935cc6c2ec8aa6d45ccd88021e * recomment out integration tests * Fix/open book error (#11379) * add isNotebook param and showPreview option * showPreview changes * update OpenNotebookFolder to open a specific path * added test for showPreviewFile * test name typo * remove isNotebook from openBook * Add test coverage for dacpac wizard import flow (#11483) * Adding importConfig onPageEnter() test * Removing redundancy from dacpac wizard pages * promisifying file selection so it can be awaited in the test * removing debug prints * PR feedback * Remove all accounts regardless of failure in one account (#11431) * distro (#11487) * distro * distro * distro * distro * Adding icons to Database Projects' tree view (#11488) * Add images * Splitting to light and dark mode icons * Hooks up icons to treeItems * updating package.json with new icon and vbump * move icon loader before tree view created * Update Arc extension version and fix Controller connectivity status names (#11498) * Update connectivity mode names (cherry picked from commit f0aabcfa86d178cdf74470f9fdeded19718bcea2) * Bump package version (cherry picked from commit e08370539006c638d6e25c2f4f23fa2754a3377d) * deploy to single existing device (#11494) * deploy to single existing device * comments * Add versioning for accounts (#11497) * Add versioning for accounts * deletion value * Changes to getAccountSecurityToken (#11502) * Hook up convert cell * Fix tests * Add convert cell tests Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Kim Santiago <31145923+kisantia@users.noreply.github.com> Co-authored-by: Maddy <12754347+MaddyDev@users.noreply.github.com> Co-authored-by: Cory Rivera <corivera@microsoft.com> Co-authored-by: Alan Ren <alanren@microsoft.com> Co-authored-by: Charles Gagnon <chgagnon@microsoft.com> Co-authored-by: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Co-authored-by: v-bbrady <60623315+v-bbrady@users.noreply.github.com> Co-authored-by: ADS Merger <andresse@microsoft.com> Co-authored-by: Arvind Ranasaria <ranasaria@outlook.com> Co-authored-by: Amir Omidi <amomidi@microsoft.com> Co-authored-by: Leila Lali <llali@microsoft.com> Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com> Co-authored-by: Brian Bergeron <brberger@microsoft.com> Co-authored-by: Udeesha Gautam <46980425+udeeshagautam@users.noreply.github.com> Co-authored-by: Benjin Dubishar <benjin.dubishar@gmail.com>
This commit is contained in:
@@ -10,7 +10,7 @@ import { localize } from 'vs/nls';
|
||||
import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
|
||||
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { DeleteCellAction, EditCellAction, CellToggleMoreActions } from 'sql/workbench/contrib/notebook/browser/cellToolbarActions';
|
||||
import { DeleteCellAction, EditCellAction, CellToggleMoreActions, MoveCellAction } from 'sql/workbench/contrib/notebook/browser/cellToolbarActions';
|
||||
import { AddCellAction } from 'sql/workbench/contrib/notebook/browser/notebookActions';
|
||||
import { CellTypes } from 'sql/workbench/services/notebook/common/contracts';
|
||||
import { DropdownMenuActionViewItem } from 'sql/base/browser/ui/buttonMenu/buttonMenu';
|
||||
@@ -27,10 +27,12 @@ export const CELL_TOOLBAR_SELECTOR: string = 'cell-toolbar-component';
|
||||
export class CellToolbarComponent {
|
||||
@ViewChild('celltoolbar', { read: ElementRef }) private celltoolbar: ElementRef;
|
||||
|
||||
public buttonEdit = localize('buttonEdit', "Edit");
|
||||
public buttonClose = localize('buttonClose', "Close");
|
||||
public buttonAdd = localize('buttonAdd', "Add new cell");
|
||||
public buttonDelete = localize('buttonDelete', "Delete cell");
|
||||
public buttonAdd = localize('buttonAdd', "Add cell");
|
||||
public optionCodeCell = localize('optionCodeCell', "Code cell");
|
||||
public optionTextCell = localize('optionTextCell', "Text cell");
|
||||
public buttonMoveDown = localize('buttonMoveDown', "Move cell down");
|
||||
public buttonMoveUp = localize('buttonMoveUp', "Move cell up");
|
||||
public buttonDelete = localize('buttonDelete', "Delete");
|
||||
|
||||
@Input() cellModel: ICellModel;
|
||||
@Input() model: NotebookModel;
|
||||
@@ -64,17 +66,20 @@ export class CellToolbarComponent {
|
||||
let addTextCellButton = this.instantiationService.createInstance(AddCellAction, 'notebook.AddTextCell', localize('textPreview', "Text cell"), 'notebook-button masked-pseudo markdown');
|
||||
addTextCellButton.cellType = CellTypes.Markdown;
|
||||
|
||||
let deleteButton = this.instantiationService.createInstance(DeleteCellAction, 'delete', 'codicon masked-icon delete', localize('delete', "Delete"));
|
||||
let moveCellDownButton = this.instantiationService.createInstance(MoveCellAction, 'notebook.MoveCellDown', 'masked-icon move-down', this.buttonMoveDown);
|
||||
let moveCellUpButton = this.instantiationService.createInstance(MoveCellAction, 'notebook.MoveCellUp', 'masked-icon move-up', this.buttonMoveUp);
|
||||
|
||||
let deleteButton = this.instantiationService.createInstance(DeleteCellAction, 'notebook.DeleteCell', 'masked-icon delete', this.buttonDelete);
|
||||
|
||||
let moreActionsContainer = DOM.$('li.action-item');
|
||||
this._cellToggleMoreActions = this.instantiationService.createInstance(CellToggleMoreActions);
|
||||
this._cellToggleMoreActions.onInit(moreActionsContainer, context);
|
||||
|
||||
this._editCellAction = this.instantiationService.createInstance(EditCellAction, 'notebook.editCell', true, this.cellModel.isEditMode);
|
||||
this._editCellAction = this.instantiationService.createInstance(EditCellAction, 'notebook.EditCell', true, this.cellModel.isEditMode);
|
||||
this._editCellAction.enabled = true;
|
||||
|
||||
let buttonDropdownContainer = DOM.$('li.action-item');
|
||||
buttonDropdownContainer.setAttribute('role', 'presentation');
|
||||
let addCellDropdownContainer = DOM.$('li.action-item');
|
||||
addCellDropdownContainer.setAttribute('role', 'presentation');
|
||||
let dropdownMenuActionViewItem = new DropdownMenuActionViewItem(
|
||||
addCellsButton,
|
||||
[addCodeCellButton, addTextCellButton],
|
||||
@@ -86,14 +91,17 @@ export class CellToolbarComponent {
|
||||
'',
|
||||
undefined
|
||||
);
|
||||
dropdownMenuActionViewItem.render(buttonDropdownContainer);
|
||||
dropdownMenuActionViewItem.render(addCellDropdownContainer);
|
||||
dropdownMenuActionViewItem.setActionContext(context);
|
||||
|
||||
let taskbarContent: ITaskbarContent[] = [];
|
||||
if (this.cellModel?.cellType === CellTypes.Markdown) {
|
||||
taskbarContent.push({ action: this._editCellAction });
|
||||
}
|
||||
taskbarContent.push({ element: buttonDropdownContainer },
|
||||
taskbarContent.push(
|
||||
{ element: addCellDropdownContainer },
|
||||
{ action: moveCellDownButton },
|
||||
{ action: moveCellUpButton },
|
||||
{ action: deleteButton },
|
||||
{ element: moreActionsContainer });
|
||||
|
||||
|
||||
Reference in New Issue
Block a user