Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) preserve row removals in diffs more reliably

Browse Source 
Summary:
This updates the logic for skipping unchanged rows to take removed
rows into account.

Test Plan: added test

Reviewers: dsagal

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D2732
This commit is contained in:
Paul Fitzpatrick 2021-02-11 11:05:23 -05:00
parent 02528128f8
commit 422560504e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/client/models/DataTableModelWithDiff.ts
View File

@ -154,6 +154,8 @@ export class TableDataWithDiff {
public dataLoadedEmitter: any; public dataLoadedEmitter: any;
public tableActionEmitter: any; public tableActionEmitter: any;
private _leftRemovals: Set<number>;
private _rightRemovals: Set<number>;
private _updates: Set<number>; private _updates: Set<number>;
constructor(public core: TableData, public leftTableDelta: TableDelta, public rightTableDelta: TableDelta) { constructor(public core: TableData, public leftTableDelta: TableDelta, public rightTableDelta: TableDelta) {
@ -161,11 +163,11 @@ export class TableDataWithDiff {
this.tableActionEmitter = core.tableActionEmitter; this.tableActionEmitter = core.tableActionEmitter;
// Construct the set of all rows updated in either left/local or right/remote. // Construct the set of all rows updated in either left/local or right/remote.
// Omit any rows that were deleted in the other version, for simplicity. // Omit any rows that were deleted in the other version, for simplicity.
const leftRemovals = new Set(leftTableDelta.removeRows); this._leftRemovals = new Set(leftTableDelta.removeRows);
const rightRemovals = new Set(rightTableDelta.removeRows); this._rightRemovals = new Set(rightTableDelta.removeRows);
this._updates = new Set([ this._updates = new Set([
...leftTableDelta.updateRows.filter(r => !rightRemovals.has(r)), ...leftTableDelta.updateRows.filter(r => !this._rightRemovals.has(r)),
...rightTableDelta.updateRows.filter(r => !leftRemovals.has(r)) ...rightTableDelta.updateRows.filter(r => !this._leftRemovals.has(r))
]); ]);
} }
@ -198,7 +200,8 @@ export class TableDataWithDiff {
public getKeepFunc(): undefined | ((rowId: number|"new") => boolean) { public getKeepFunc(): undefined | ((rowId: number|"new") => boolean) {
return (rowId: number|'new') => { return (rowId: number|'new') => {
return rowId === 'new' || this._updates.has(rowId) || rowId < 0; return rowId === 'new' || this._updates.has(rowId) || rowId < 0 ||
this._leftRemovals.has(rowId) || this._rightRemovals.has(rowId);
}; };
} }