ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Create new row upon focus on last row (#9046)" (#10039)

Browse Source 
This reverts commit 6b9184aa15.
This commit is contained in:
Amir Omidi
2020-04-20 14:26:17 -07:00
committed by GitHub
parent c11cb420cd
commit 15e592647e
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts
View File

@@ -292,11 +292,6 @@ export class EditDataGridPanel extends GridParentComponent {
return; return;
} }
if (this.isNullRow(row)) {
self.addRow(row);
self.refreshGrid();
}
let cellSelectTasks: Promise<void> = this.submitCurrentCellChange( let cellSelectTasks: Promise<void> = this.submitCurrentCellChange(
(result: EditUpdateCellResult) => { (result: EditUpdateCellResult) => {
// Cell update was successful, update the flags // Cell update was successful, update the flags
@@ -549,7 +544,15 @@ export class EditDataGridPanel extends GridParentComponent {
private submitCurrentCellChange(resultHandler, errorHandler): Promise<void> { private submitCurrentCellChange(resultHandler, errorHandler): Promise<void> {
let self = this; let self = this;
let updateCellPromise: Promise<void> = Promise.resolve(); let updateCellPromise: Promise<void> = Promise.resolve();
let refreshGrid = false;
if (this.currentCell && this.currentCell.isEditable && this.currentEditCellValue !== undefined && !this.removingNewRow) { if (this.currentCell && this.currentCell.isEditable && this.currentEditCellValue !== undefined && !this.removingNewRow) {
if (this.isNullRow(this.currentCell.row)) {
refreshGrid = true;
// We've entered the "new row", so we need to add a row and jump to it
updateCellPromise = updateCellPromise.then(() => {
return self.addRow(this.currentCell.row);
});
}
// We're exiting a read/write cell after having changed the value, update the cell value in the service // We're exiting a read/write cell after having changed the value, update the cell value in the service
updateCellPromise = updateCellPromise.then(() => { updateCellPromise = updateCellPromise.then(() => {
// Use the mapped row ID if we're on that row // Use the mapped row ID if we're on that row
@@ -562,6 +565,9 @@ export class EditDataGridPanel extends GridParentComponent {
result => { result => {
self.currentEditCellValue = undefined; self.currentEditCellValue = undefined;
let refreshPromise: Thenable<void> = Promise.resolve(); let refreshPromise: Thenable<void> = Promise.resolve();
if (refreshGrid) {
refreshPromise = self.refreshGrid();
}
return refreshPromise.then(() => { return refreshPromise.then(() => {
return resultHandler(result); return resultHandler(result);
}); });