Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-09-28 22:40:56 +00:00
Code Issues Projects Releases Wiki Activity

(core) show differences in card views when comparing documents

Browse Source 
Summary:
This makes a small tweak to show cell and row changes in card views
and card list views, and adds a test for it.

Test Plan: added tests

Reviewers: dsagal

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D2660
This commit is contained in:
Paul Fitzpatrick 2020-11-11 12:11:06 -05:00
parent c67966775b
commit 5a9fe0ea27
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/components/DetailView.js
View File

@ -370,6 +370,10 @@ DetailView.prototype.makeRecord = function(record) {
return dom( return dom(
this.recordLayout.buildLayoutDom(record), this.recordLayout.buildLayoutDom(record),
kd.cssClass(() => 'detail_theme_record_' + this.viewSection.themeDef()), kd.cssClass(() => 'detail_theme_record_' + this.viewSection.themeDef()),
this.comparison ? kd.cssClass(() => {
const rowType = this.extraRows.getRowType(record.id());
return rowType && `diff-${rowType}` || '';
}) : null,
kd.toggleClass('active', () => (this.cursor.rowIndex() === record._index() && this.viewSection.hasFocus())), kd.toggleClass('active', () => (this.cursor.rowIndex() === record._index() && this.viewSection.hasFocus())),
// 'detailview_record_single' or 'detailview_record_detail' doesn't need to be an observable, // 'detailview_record_single' or 'detailview_record_detail' doesn't need to be an observable,
// since a change to parentKey would cause a separate call to makeRecord. // since a change to parentKey would cause a separate call to makeRecord.

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

@ -111,7 +111,7 @@ export class DataTableModelWithDiff extends DisposableWithEvents implements Data
} }
public createFloatingRowModel(optRowModelClass: any): BaseRowModel { public createFloatingRowModel(optRowModelClass: any): BaseRowModel {
return this.core.createFloatingRowModel(optRowModelClass); return this._wrappedModel.createFloatingRowModel(optRowModelClass);
} }
public fetch(force?: boolean): Promise<void> { public fetch(force?: boolean): Promise<void> {