Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2025-06-13 20:53:59 +00:00
Code Issues Projects Releases Wiki Activity

limit exception more tightly to seed rules

Browse Source
This commit is contained in:
Paul Fitzpatrick 2024-10-10 13:29:36 -04:00
parent 7f7bf61b4b
commit bddd9df1fc
No known key found for this signature in database
GPG Key ID: 07F16BF3214888F6
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/client/aclui/AccessRules.ts
View File

@ -1084,6 +1084,16 @@ abstract class ObsRuleSet extends Disposable {
public getCustomRules(): ObsRulePart[] { public getCustomRules(): ObsRulePart[] {
return this._body.get().filter(rule => !rule.isBuiltInOrEmpty()); return this._body.get().filter(rule => !rule.isBuiltInOrEmpty());
} }
/**
* If the set applies to a special column, return its name.
*/
public getSpecialColumn(): string|undefined {
if (this._ruleSet?.tableId === SPECIAL_RULES_TABLE_ID &&
this._ruleSet.colIds.length === 1) {
return this._ruleSet.colIds[0];
}
}
} }
class ColumnObsRuleSet extends ObsRuleSet { class ColumnObsRuleSet extends ObsRuleSet {
@ -1817,9 +1827,12 @@ class ObsRulePart extends Disposable {
private _warnInvalidColIds(colIds?: string[]) { private _warnInvalidColIds(colIds?: string[]) {
if (!colIds || !colIds.length) { return false; } if (!colIds || !colIds.length) { return false; }
const allValid = new Set(this._ruleSet.getValidColIds()); const allValid = new Set(this._ruleSet.getValidColIds());
// Don't check column validity if we don't have any. const specialColumn = this._ruleSet.getSpecialColumn();
// For example, the seed rule has no columns. if (specialColumn === 'SeedRule') {
if (allValid.size === 0) { return false; } // We allow seed rules to refer to columns without checking
// them (until the seed rules are used).
return false;
}
const invalid = colIds.filter(c => !allValid.has(c)); const invalid = colIds.filter(c => !allValid.has(c));
if (invalid.length > 0) { if (invalid.length > 0) {
return `Invalid columns: ${invalid.join(', ')}`; return `Invalid columns: ${invalid.join(', ')}`;