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) Barely working reference lists in frontend

Browse Source 
Summary:
This makes it possible to set the type of a column to ReferenceList, but the UI is terrible

ReferenceList.ts is a mishmash of ChoiceList and Reference that sort of works but something about the CSS is clearly broken

ReferenceListEditor is just a text editor, you have to type in a JSON array of row IDs. Ignore the value that's present when you start editing. I can maybe try mashing together ReferenceEditor and ChoiceListEditor but it doesn't seem wise.
I think @georgegevoian should take over here. Reviewing the diff as it is to check for obvious issues is probably good but I don't think it's worth trying to land/merge anything.

Test Plan: none

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: georgegevoian

Differential Revision: https://phab.getgrist.com/D2914
This commit is contained in:
Alex Hall
2021-07-23 17:29:35 +02:00
parent 8d68c1c567
commit 04e5d90f86
17 changed files with 228 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/server/lib/DocStorage.ts
View File

@@ -26,6 +26,7 @@ import * as _ from 'underscore';
import * as util from 'util';
import * as uuidv4 from "uuid/v4";
import { ISQLiteDB, MigrationHooks, OpenMode, quoteIdent, ResultRow, SchemaInfo, SQLiteDB} from './SQLiteDB';
import {isList} from "app/common/gristTypes";
// Run with environment variable NODE_DEBUG=db (may include additional comma-separated sections)
@@ -449,7 +450,11 @@ export class DocStorage implements ISQLiteDB {
if (gristType == 'ChoiceList') {
// See also app/plugin/objtype.ts for decodeObject(). Here we manually check and decode
// the "List" object type.
if (Array.isArray(val) && val[0] === 'L' && val.every(tok => (typeof(tok) === 'string'))) {
if (isList(val) && val.every(tok => (typeof(tok) === 'string'))) {
return JSON.stringify(val.slice(1));
}
} else if (gristType?.startsWith('RefList:')) {
if (isList(val) && val.slice(1).every((tok: any) => (typeof(tok) === 'number'))) {
return JSON.stringify(val.slice(1));
}
}
@@ -515,7 +520,7 @@ export class DocStorage implements ISQLiteDB {
return Boolean(val);
}
}
if (gristType === 'ChoiceList') {
if (gristType === 'ChoiceList' || gristType?.startsWith('RefList:')) {
if (typeof val === 'string' && val.startsWith('[')) {
try {
return ['L', ...JSON.parse(val)];
@@ -557,6 +562,8 @@ export class DocStorage implements ISQLiteDB {
case 'Text':
return 'TEXT';
case 'ChoiceList':
case 'RefList':
case 'ReferenceList':
return 'TEXT'; // To be encoded as a JSON array of strings.
case 'Date':
return 'DATE';
@@ -572,7 +579,14 @@ export class DocStorage implements ISQLiteDB {
case 'PositionNumber':
return 'NUMERIC';
}
if (colType && colType.startsWith('Ref:')) { return 'INTEGER'; }
if (colType) {
if (colType.startsWith('Ref:')) {
return 'INTEGER';
}
if (colType.startsWith('RefList:')) {
return 'TEXT'; // To be encoded as a JSON array of strings.
}
}
return 'BLOB';
}