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) When filter-linking by a reference column, update the filter-linking when the value in that column changes

Browse Source 
Test Plan: Added a test case for the fix.

Reviewers: paulfitz

Reviewed By: paulfitz

Differential Revision: https://phab.getgrist.com/D2724
This commit is contained in:
Dmitry S 2021-02-05 09:49:23 -05:00
parent fc56cc7231
commit 956e07e877
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/client/components/LinkingState.js
View File

@ -48,7 +48,8 @@ function isSummaryOf(summary, detail) {
function LinkingState(gristDoc, srcSection, srcColId, tgtSection, tgtColId, byAllShown) { function LinkingState(gristDoc, srcSection, srcColId, tgtSection, tgtColId, byAllShown) {
this._srcSection = srcSection; this._srcSection = srcSection;
let srcTableData = gristDoc.getTableModel(srcSection.table().tableId()).tableData; let srcTableModel = gristDoc.getTableModel(srcSection.table().tableId());
let srcTableData = srcTableModel.tableData;
// Function from srcRowId (i.e. srcSection.activeRowId()) to the source value. It is used for // Function from srcRowId (i.e. srcSection.activeRowId()) to the source value. It is used for
// filtering or for cursor positioning, depending on the setting of tgtCol. // filtering or for cursor positioning, depending on the setting of tgtCol.
@ -78,11 +79,22 @@ function LinkingState(gristDoc, srcSection, srcColId, tgtSection, tgtColId, byAl
} }
return {[tgtColId]: Array.from(srcValues)}; return {[tgtColId]: Array.from(srcValues)};
})); }));
} else if (srcColId) {
let srcRowModel = this.autoDispose(srcTableModel.createFloatingRowModel());
let srcCell = srcRowModel.cells[srcColId];
// If no srcCell, linking is broken; do nothing. This shouldn't happen, but may happen
// transiently while the separate linking-related observables get updated.
if (srcCell) {
this.filterColValues = this.autoDispose(ko.computed(() => {
const srcRowId = srcSection.activeRowId();
srcRowModel.assign(srcRowId);
return {[tgtColId]: [srcCell()]};
}));
}
} else { } else {
this.filterColValues = this.autoDispose(ko.computed(() => { this.filterColValues = this.autoDispose(ko.computed(() => {
const srcRowId = srcSection.activeRowId(); const srcRowId = srcSection.activeRowId();
const srcValue = srcValueFunc(srcRowId); return {[tgtColId]: [srcRowId]};
return {[tgtColId]: [srcValue]};
})); }));
} }
} else if (isSummaryOf(srcSection.table(), tgtSection.table())) { } else if (isSummaryOf(srcSection.table(), tgtSection.table())) {