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

Alex/fixforqueryrefresh (#9032)

Browse Source 
* added some checks

* Added return undefined

* added handling for multiple loads

* added more error handling

* minor space change

* added explanation message

* simplification

* added changes from create new row

* added some checks

* Added return undefined

* added handling for multiple loads

* added more error handling

* minor space change

* added explanation message

* simplification

* editDataGridPanel corrected

* updated to most recent master version

* removed space at end

* added newline

* added another try catch

* changed message

* added check and message

* added clarifying message

* removed redundant try catch loop

* grid data is now backed up

* wording change
This commit is contained in:
Alex Ma
2020-05-14 14:06:26 -07:00
committed by GitHub
parent 8eb67d58b3
commit e3218ade02
1 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ export class EditDataGridPanel extends GridParentComponent {
//main dataset to work on. //main dataset to work on.
private dataSet: IGridDataSet; private dataSet: IGridDataSet;
private oldDataRows: VirtualizedCollection<any>; private oldDataRows: VirtualizedCollection<any>;
private oldGridData: {}[];
private firstRender = true; private firstRender = true;
private firstLoad = true; private firstLoad = true;
private enableEditing = true; private enableEditing = true;
@@ -158,6 +159,7 @@ export class EditDataGridPanel extends GridParentComponent {
handleStart(self: EditDataGridPanel, event: any): void { handleStart(self: EditDataGridPanel, event: any): void {
self.dataSet = undefined; self.dataSet = undefined;
self.oldDataRows = undefined; self.oldDataRows = undefined;
self.oldGridData = undefined;
self.placeHolderDataSets = []; self.placeHolderDataSets = [];
self.renderedDataSets = self.placeHolderDataSets; self.renderedDataSets = self.placeHolderDataSets;
@@ -220,30 +222,38 @@ export class EditDataGridPanel extends GridParentComponent {
// Setup a function for generating a promise to lookup result subsets // Setup a function for generating a promise to lookup result subsets
this.loadDataFunction = (offset: number, count: number): Promise<{}[]> => { this.loadDataFunction = (offset: number, count: number): Promise<{}[]> => {
return self.dataService.getEditRows(offset, count).then(result => { return self.dataService.getEditRows(offset, count).then(result => {
let gridData = result.subset.map(r => { if (this.dataSet) {
let dataWithSchema = {}; let gridData = result.subset.map(r => {
// skip the first column since its a number column let dataWithSchema = {};
for (let i = 1; i < this.dataSet.columnDefinitions.length; i++) { // skip the first column since its a number column
dataWithSchema[this.dataSet.columnDefinitions[i].field] = { for (let i = 1; i < this.dataSet.columnDefinitions.length; i++) {
displayValue: r.cells[i - 1].displayValue, dataWithSchema[this.dataSet.columnDefinitions[i].field] = {
ariaLabel: escape(r.cells[i - 1].displayValue), displayValue: r.cells[i - 1].displayValue,
isNull: r.cells[i - 1].isNull ariaLabel: escape(r.cells[i - 1].displayValue),
}; isNull: r.cells[i - 1].isNull
} };
return dataWithSchema;
});
// should add null row?
if (offset + count > this.dataSet.totalRows - 1) {
gridData.push(this.dataSet.columnDefinitions.reduce((p, c) => {
if (c.id !== 'rowNumber') {
p[c.field] = { displayValue: 'NULL', ariaLabel: 'NULL', isNull: true };
} }
return p; return dataWithSchema;
}, {})); });
}
return gridData; // should add null row?
if (offset + count > this.dataSet.totalRows - 1) {
gridData.push(this.dataSet.columnDefinitions.reduce((p, c) => {
if (c.id !== 'rowNumber') {
p[c.field] = { displayValue: 'NULL', ariaLabel: 'NULL', isNull: true };
}
return p;
}, {}));
}
if (gridData && gridData !== this.oldGridData) {
this.oldGridData = gridData;
}
return gridData;
}
else {
this.logService.error('Grid data is nonexistent, using last known good grid');
return this.oldGridData;
}
}); });
}; };
} }
@@ -431,16 +441,21 @@ export class EditDataGridPanel extends GridParentComponent {
clearTimeout(this.refreshGridTimeoutHandle); clearTimeout(this.refreshGridTimeoutHandle);
this.refreshGridTimeoutHandle = setTimeout(() => { this.refreshGridTimeoutHandle = setTimeout(() => {
try {
if (this.dataSet) {
this.placeHolderDataSets[0].dataRows = this.dataSet.dataRows;
this.onResize();
}
if (this.dataSet) {
this.placeHolderDataSets[0].dataRows = this.dataSet.dataRows; if (this.placeHolderDataSets[0].dataRows && this.oldDataRows !== this.placeHolderDataSets[0].dataRows) {
this.onResize(); this.detectChange();
this.oldDataRows = this.placeHolderDataSets[0].dataRows;
}
} }
catch {
this.logService.error('data set is empty, refresh cancelled.');
if (this.oldDataRows !== this.placeHolderDataSets[0].dataRows) { reject();
this.detectChange();
this.oldDataRows = this.placeHolderDataSets[0].dataRows;
} }
if (this.firstRender) { if (this.firstRender) {
@@ -583,7 +598,10 @@ export class EditDataGridPanel extends GridParentComponent {
// Checks if input row is our NULL new row // Checks if input row is our NULL new row
private isNullRow(row: number): boolean { private isNullRow(row: number): boolean {
// Null row is always at index (totalRows - 1) // Null row is always at index (totalRows - 1)
return (row === this.dataSet.totalRows - 1); if (this.dataSet) {
return (row === this.dataSet.totalRows - 1);
}
return false;
} }
// Adds CSS classes to slickgrid cells to indicate a dirty state // Adds CSS classes to slickgrid cells to indicate a dirty state