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

support $id in dropdown condition (#969)

Browse Source 
This adds support for $id in dropdown conditions, using the same
method used for supporting referencedColumn.id, and extends a test
to exercise the variable. Without this, the dropdown editor gives
an error if $id or rec.id is used, stating that the column is invalid.
This commit is contained in:
Paul Fitzpatrick 2024-05-07 17:52:51 -04:00 committed by GitHub
parent 9a89901042
commit 6299db6872
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/components/DropdownConditionConfig.ts
View File

@ -51,7 +51,7 @@ export class DropdownConditionConfig extends Disposable {
const {recColIds = [], choiceColIds = []} = properties; const {recColIds = [], choiceColIds = []} = properties;
const columns = use(this._columns); const columns = use(this._columns);
const validRecColIds = new Set(columns.map((({colId}) => use(colId)))); const validRecColIds = new Set(['id', ...columns.map((({colId}) => use(colId)))]);
const invalidRecColIds = recColIds.filter(colId => !validRecColIds.has(colId)); const invalidRecColIds = recColIds.filter(colId => !validRecColIds.has(colId));
if (invalidRecColIds.length > 0) { if (invalidRecColIds.length > 0) {
return t('Invalid columns: {{colIds}}', {colIds: invalidRecColIds.join(', ')}); return t('Invalid columns: {{colIds}}', {colIds: invalidRecColIds.join(', ')});

23
test/nbrowser/DropdownConditionEditor.ts
View File

@ -157,11 +157,11 @@ describe('DropdownConditionEditor', function () {
'choice\n.Supervisor\n ' 'choice\n.Supervisor\n '
]); ]);
}); });
await gu.sendKeys('.Role == "Supervisor" and $Role != "Supervisor"', Key.ENTER); await gu.sendKeys('.Role == "Supervisor" and $Role != "Supervisor" and $id != 2', Key.ENTER);
await gu.waitForServer(); await gu.waitForServer();
assert.equal( assert.equal(
await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'), await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'),
'choice.Role == "Supervisor" and $Role != "Supervisor"\n' 'choice.Role == "Supervisor" and $Role != "Supervisor" and $id != 2\n'
); );
// Check that autocomplete values are filtered. // Check that autocomplete values are filtered.
@ -171,6 +171,23 @@ describe('DropdownConditionEditor', function () {
'Marie Ziyad', 'Marie Ziyad',
]); ]);
await gu.sendKeys(Key.ESCAPE); await gu.sendKeys(Key.ESCAPE);
// Should be no options on row 2 because of $id != 2 part of condition.
await gu.getCell(2, 2).click();
await gu.sendKeys(Key.ENTER);
assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
]);
await gu.sendKeys(Key.ESCAPE);
// Row 3 should be like row 1.
await gu.getCell(2, 3).click();
await gu.sendKeys(Key.ENTER);
assert.deepEqual(await driver.findAll('.test-autocomplete li', (el) => el.getText()), [
'Pavan Madilyn',
'Marie Ziyad',
]);
await gu.sendKeys(Key.ESCAPE);
await gu.getCell(2, 4).click(); await gu.getCell(2, 4).click();
await gu.sendKeys(Key.ENTER); await gu.sendKeys(Key.ENTER);
assert.isEmpty(await driver.findAll('.test-autocomplete li', (el) => el.getText())); assert.isEmpty(await driver.findAll('.test-autocomplete li', (el) => el.getText()));
@ -187,7 +204,7 @@ describe('DropdownConditionEditor', function () {
await gu.setType('Reference List', {apply: true}); await gu.setType('Reference List', {apply: true});
assert.equal( assert.equal(
await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'), await driver.find('.test-field-dropdown-condition .ace_line').getAttribute('textContent'),
'choice.Role == "Supervisor" and $Role != "Supervisor"\n' 'choice.Role == "Supervisor" and $Role != "Supervisor" and $id != 2\n'
); );
await gu.getCell(2, 4).click(); await gu.getCell(2, 4).click();
await gu.sendKeys(Key.ENTER); await gu.sendKeys(Key.ENTER);