ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 17:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cell toolbar More Actions menu -- remove duplicate separators (#10827)

Browse Source 
* Added code to remove multiple separators from more actions menu.

* Moved check for separators after list is deduped.

* Logic cleanup

* Added unit test for cell toolbar ellipses menu.

* Fix tests

Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
Hale Rankin
2020-06-26 13:45:53 -07:00
committed by GitHub
parent dbf9d3426c
commit 8d7b3ef6ec
2 changed files with 139 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/sql/workbench/contrib/notebook/browser/cellToolbarActions.ts
View File

@@ -118,37 +118,38 @@ export class CellToggleMoreActions {
}
public onInit(elementRef: HTMLElement, context: CellContext) {
this._moreActionsElement = <HTMLElement>elementRef;
this._moreActionsElement = elementRef;
if (this._moreActionsElement.childNodes.length > 0) {
this._moreActionsElement.removeChild(this._moreActionsElement.childNodes[0]);
}
this._moreActions = new ActionBar(this._moreActionsElement, { orientation: ActionsOrientation.VERTICAL });
this._moreActions.context = { target: this._moreActionsElement };
let validActions = this._actions.filter(a => a instanceof Separator || a instanceof CellActionBase && a.canRun(context));
this.removeDuplicatedAndStartingSeparators(validActions);
removeDuplicatedAndStartingSeparators(validActions);
this._moreActions.push(this.instantiationService.createInstance(ToggleMoreActions, validActions, context), { icon: true, label: false });
}
private removeDuplicatedAndStartingSeparators(actions: (Action | CellActionBase)[]): void {
let indexesToRemove: number[] = [];
for (let i = 0; i < actions.length; i++) {
// Never should have a separator at the beginning of the list
if (i === 0 && actions[i] instanceof Separator) {
indexesToRemove.push(0);
}
// Handle multiple separators in a row
if (i > 0 && actions[i] instanceof Separator && actions[i - 1] instanceof Separator) {
indexesToRemove.push(i);
}
}
if (indexesToRemove.length > 0) {
for (let i = indexesToRemove.length - 1; i >= 0; i--) {
actions.splice(indexesToRemove[i], 1);
}
}
}
}
export function removeDuplicatedAndStartingSeparators(actions: (Action | CellActionBase)[]): void {
let indexesToRemove: number[] = [];
for (let i = 0; i < actions.length; i++) {
// Handle multiple separators in a row
if (i > 0 && actions[i] instanceof Separator && actions[i - 1] instanceof Separator) {
indexesToRemove.push(i);
}
}
if (indexesToRemove.length > 0) {
for (let i = indexesToRemove.length - 1; i >= 0; i--) {
actions.splice(indexesToRemove[i], 1);
}
}
if (actions[0] instanceof Separator) {
actions.splice(0, 1);
}
if (actions[actions.length - 1] instanceof Separator) {
actions.splice(actions.length - 1, 1);
}
}
export class AddCellFromContextAction extends CellActionBase {
constructor(