Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Include linking rowIds into remembered cursor position and anchor links.

Browse Source 
Summary:
When linking using a Reference List column, there may be multiple source
records that show the same target record. With this change, we remember those
(rather than just pick one that shows the target record).

Test Plan: Added a browser test.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D4140
This commit is contained in:
Dmitry S
2023-12-29 00:17:50 -05:00
parent a311b8b3e5
commit 527e9670ef
8 changed files with 291 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/common/gristUrls.ts
View File

@@ -313,7 +313,11 @@ export function encodeUrl(gristConfig: Partial<GristLoadConfig>,
hashParts.push('a1');
}
for (const key of ['sectionId', 'rowId', 'colRef'] as Array<keyof HashLink>) {
const partValue = hash[key];
let enhancedRowId: string|undefined;
if (key === 'rowId' && hash.linkingRowIds?.length) {
enhancedRowId = [hash.rowId, ...hash.linkingRowIds].join("-");
}
const partValue = enhancedRowId ?? hash[key];
if (partValue) {
const partKey = key === 'rowId' && state.hash?.rickRow ? 'rr' : key[0];
hashParts.push(`${partKey}${partValue}`);
@@ -512,7 +516,7 @@ export function decodeUrl(gristConfig: Partial<GristLoadConfig>, location: Locat
'sectionId',
'rowId',
'colRef',
] as Array<Exclude<keyof HashLink, 'popup' | 'rickRow' | 'recordCard'>>;
] as Array<'sectionId'|'rowId'|'colRef'>;
for (const key of keys) {
let ch: string;
if (key === 'rowId' && hashMap.has('rr')) {
@@ -525,6 +529,10 @@ export function decodeUrl(gristConfig: Partial<GristLoadConfig>, location: Locat
const value = hashMap.get(ch);
if (key === 'rowId' && value === 'new') {
link[key] = 'new';
} else if (key === 'rowId' && value && value.includes("-")) {
const rowIdParts = value.split("-").map(p => (p === 'new' ? p : parseInt(p, 10)));
link[key] = rowIdParts[0];
link.linkingRowIds = rowIdParts.slice(1);
} else {
link[key] = parseInt(value!, 10);
}
@@ -1005,6 +1013,7 @@ export interface HashLink {
popup?: boolean;
rickRow?: boolean;
recordCard?: boolean;
linkingRowIds?: UIRowId[];
}
// Check whether a urlId is a prefix of the docId, and adequately long to be