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:
Hale Rankin
2020-07-31 17:57:46 -07:00
committed by GitHub
parent 30845cbd6d
commit 68e7a293ad
9 changed files with 251 additions and 20 deletions

View File

@@ -225,6 +225,14 @@ export class CellModel extends Disposable implements ICellModel {
return this._cellType;
}
public set cellType(type: CellType) {
if (type !== this._cellType) {
this._cellType = type;
// Regardless, get rid of outputs; this matches Jupyter behavior
this._outputs = [];
}
}
public get source(): string | string[] {
return this._source;
}

View File

@@ -312,6 +312,11 @@ export interface INotebookModel {
*/
readonly onActiveCellChanged: Event<ICellModel>;
/**
* Event fired on cell type change
*/
readonly onCellTypeChanged: Event<ICellModel>;
/**
* The trusted mode of the Notebook
*/
@@ -343,6 +348,12 @@ export interface INotebookModel {
*/
addCell(cellType: CellType, index?: number): void;
/**
* Moves a cell up/down
*/
moveCell(cellModel: ICellModel, direction: MoveDirection): void;
/**
* Deletes a cell
*/
@@ -424,6 +435,11 @@ export enum CellExecutionState {
Error = 3
}
export enum MoveDirection {
Up,
Down
}
export interface IOutputChangedEvent {
outputs: ReadonlyArray<nb.ICellOutput>;
shouldScroll: boolean;

View File

@@ -9,7 +9,7 @@ import { localize } from 'vs/nls';
import { Event, Emitter } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { IClientSession, INotebookModel, INotebookModelOptions, ICellModel, NotebookContentChange } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
import { IClientSession, INotebookModel, INotebookModelOptions, ICellModel, NotebookContentChange, MoveDirection } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/services/notebook/common/contracts';
import { nbversion } from 'sql/workbench/services/notebook/common/notebookConstants';
import * as notebookUtils from 'sql/workbench/services/notebook/browser/models/notebookUtils';
@@ -59,6 +59,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _onProviderIdChanged = new Emitter<string>();
private _trustedMode: boolean;
private _onActiveCellChanged = new Emitter<ICellModel>();
private _onCellTypeChanged = new Emitter<ICellModel>();
private _cells: ICellModel[];
private _defaultLanguageInfo: nb.ILanguageInfo;
@@ -271,6 +272,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
return this._onActiveCellChanged.event;
}
public get onCellTypeChanged(): Event<ICellModel> {
return this._onCellTypeChanged.event;
}
public get standardKernels(): notebookUtils.IStandardKernelWithProvider[] {
return this._standardKernels;
}
@@ -387,6 +392,40 @@ export class NotebookModel extends Disposable implements INotebookModel {
return cell;
}
moveCell(cell: ICellModel, direction: MoveDirection): void {
if (this.inErrorState) {
return null;
}
let index = this.findCellIndex(cell);
if ((index === 0 && direction === MoveDirection.Up) || ((index === this._cells.length - 1 && direction === MoveDirection.Down))) {
// Nothing to do
return;
}
if (direction === MoveDirection.Down) {
this._cells.splice(index, 1);
if (index + 1 < this._cells.length) {
this._cells.splice(index + 1, 0, cell);
} else {
this._cells.push(cell);
}
} else {
this._cells.splice(index, 1);
this._cells.splice(index - 1, 0, cell);
}
index = this.findCellIndex(cell);
// Set newly created cell as active cell
this.updateActiveCell(cell);
this._contentChangedEmitter.fire({
changeType: NotebookChangeType.CellsModified,
cells: [cell],
cellIndex: index
});
}
public updateActiveCell(cell: ICellModel): void {
if (this._activeCell) {
this._activeCell.active = false;
@@ -398,6 +437,21 @@ export class NotebookModel extends Disposable implements INotebookModel {
this._onActiveCellChanged.fire(cell);
}
public convertCellType(cell: ICellModel): void {
if (cell) {
let index = this.findCellIndex(cell);
if (index > -1) {
cell.cellType = cell.cellType === CellTypes.Markdown ? CellTypes.Code : CellTypes.Markdown;
this._onCellTypeChanged.fire(cell);
this._contentChangedEmitter.fire({
changeType: NotebookChangeType.CellsModified,
cells: [cell],
cellIndex: index
});
}
}
}
private createCell(cellType: CellType): ICellModel {
let singleCell: nb.ICellContents = {
cell_type: cellType,