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) Enable Record Cards

Browse Source 
Summary:
Adds remaining functionality, fixes, and polish to Record Cards and
removes their feature flag, enabling them by default.

Test Plan: Tests deferred; will be included in a follow-up diff.

Reviewers: jarek, paulfitz

Reviewed By: jarek

Subscribers: paulfitz, jarek

Differential Revision: https://phab.getgrist.com/D4121
This commit is contained in:
George Gevoian
2023-11-21 15:16:38 -05:00
parent 84329404a4
commit 707a8c7b32
15 changed files with 227 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/nbrowser/ReferenceList.ts
View File

@@ -5,7 +5,6 @@ import {Session} from 'test/nbrowser/gristUtils';
describe('ReferenceList', function() {
this.timeout(60000);
setupTestSuite();
let session: Session;
const cleanup = setupTestSuite({team: true});
@@ -79,6 +78,7 @@ describe('ReferenceList', function() {
await gu.sendKeys(Key.ARROW_DOWN, Key.ENTER, 'The Avengers', Key.ENTER, Key.ENTER);
// Check that the cells are rendered correctly.
await gu.resizeColumn({col: 'Favorite Film'}, 100);
assert.deepEqual(await gu.getVisibleGridCells('Favorite Film', [1, 2, 3, 4, 5, 6]),
[
'Forrest Gump\nAlien',
@@ -273,6 +273,7 @@ describe('ReferenceList', function() {
await driver.find('.test-fbuilder-ref-col-select').click();
await driver.findContent('.test-select-row', /Name/).click();
await gu.waitForServer();
await gu.resizeColumn({col: 'A'}, 100);
assert.deepEqual(await gu.getVisibleGridCells(3, [1, 2, 3, 4, 5, 6]),
['Roger\nTom', 'Tom', 'Sydney\nBill\nEvan', '', '', '']);
@@ -311,7 +312,7 @@ describe('ReferenceList', function() {
const cell = gu.getCell({col: 'A', rowNum: 1});
await server.pauseUntil(async () => {
assert.equal(await cell.getText(), 'Friends[1]\nFriends[2]');
await cell.click();
await gu.clickReferenceListCell(cell);
await gu.sendKeys('5');
// Check that the autocomplete has no items yet.
assert.isEmpty(await driver.findAll('.test-autocomplete .test-ref-editor-new-item'));
@@ -324,7 +325,7 @@ describe('ReferenceList', function() {
assert.equal(await cell.getText(), 'Friends[1]\nFriends[2]');
// Once server is responsive, a valid value should not offer a "new item".
await cell.click();
await gu.clickReferenceListCell(cell);
await gu.sendKeys('5');
await driver.findWait('.test-ref-editor-item', 500);
assert.isFalse(await driver.find('.test-ref-editor-new-item').isPresent());
@@ -750,7 +751,8 @@ describe('ReferenceList', function() {
});
it('should update choices as user types into textbox', async function() {
let cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 1}).doClick();
let cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 1});
await gu.clickReferenceListCell(cell);
assert.equal(await cell.getText(), 'TECHNOLOGY, ARTS AND SCIENCES STUDIO');
await driver.sendKeys('TECHNOLOGY, ARTS AND SCIENCES STUDIO');
assert.deepEqual(await getACOptions(3), [
@@ -759,7 +761,8 @@ describe('ReferenceList', function() {
'SCHOOL OF SCIENCE AND TECHNOLOGY',
]);
await driver.sendKeys(Key.ESCAPE);
cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 2}).doClick();
cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 2});
await gu.clickReferenceListCell(cell);
await driver.sendKeys('stuy');
assert.deepEqual(await getACOptions(3), [
'STUYVESANT HIGH SCHOOL',
@@ -790,7 +793,8 @@ describe('ReferenceList', function() {
it('should highlight matching parts of items', async function() {
await driver.sendKeys(Key.HOME);
let cell = await gu.getCell({section: 'References', col: 'Colors', rowNum: 2}).doClick();
let cell = await gu.getCell({section: 'References', col: 'Colors', rowNum: 2});
await gu.clickReferenceListCell(cell);
assert.equal(await cell.getText(), 'Red');
await driver.sendKeys(Key.ENTER, 'Red');
await driver.findWait('.test-ref-editor-item', 1000);
@@ -802,7 +806,8 @@ describe('ReferenceList', function() {
['Re']);
await driver.sendKeys(Key.ESCAPE);
cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 1}).doClick();
cell = await gu.getCell({section: 'References', col: 'Schools', rowNum: 1});
await gu.clickReferenceListCell(cell);
await driver.sendKeys('br tech');
assert.deepEqual(
await driver.findContentWait('.test-ref-editor-item', /BROOKLYN TECH/, 1000).findAll('span', e => e.getText()),
@@ -819,19 +824,20 @@ describe('ReferenceList', function() {
it('should reflect changes to the target column', async function() {
await driver.sendKeys(Key.HOME);
const cell = await gu.getCell({section: 'References', col: 'Colors', rowNum: 4}).doClick();
const cell = await gu.getCell({section: 'References', col: 'Colors', rowNum: 4});
await gu.clickReferenceListCell(cell);
assert.equal(await cell.getText(), '');
await driver.sendKeys(Key.ENTER);
assert.deepEqual(await getACOptions(2), ['Alice Blue', 'Añil']);
await driver.sendKeys(Key.ESCAPE);
// Change a color
await gu.getCell({section: 'Colors', col: 'Color Name', rowNum: 1}).doClick();
await driver.sendKeys('HAZELNUT', Key.ENTER);
await gu.clickReferenceListCell(await gu.getCell({section: 'Colors', col: 'Color Name', rowNum: 1}));
await driver.sendKeys('HAZELNUT', Key.ENTER, Key.ENTER);
await gu.waitForServer();
// See that the old value is gone from the autocomplete, and the new one is present.
await cell.click();
await gu.clickReferenceListCell(cell);
await driver.sendKeys(Key.ENTER);
assert.deepEqual(await getACOptions(2), ['Añil', 'Aqua']);
await driver.sendKeys('H');
@@ -839,11 +845,11 @@ describe('ReferenceList', function() {
await driver.sendKeys(Key.ESCAPE);
// Delete a row.
await gu.getCell({section: 'Colors', col: 'Color Name', rowNum: 1}).doClick();
await gu.clickReferenceListCell(await gu.getCell({section: 'Colors', col: 'Color Name', rowNum: 1}));
await gu.removeRow(1);
// See that the value is gone from the autocomplete.
await cell.click();
await gu.clickReferenceListCell(cell);
await driver.sendKeys('H');
assert.deepEqual(await getACOptions(2), ['Honeydew', 'Hot Pink']);
await driver.sendKeys(Key.ESCAPE);
@@ -856,7 +862,7 @@ describe('ReferenceList', function() {
await gu.waitForServer();
// See that the new value is visible in the autocomplete.
await cell.click();
await gu.clickReferenceListCell(cell);
await driver.sendKeys('H');
assert.deepEqual(await getACOptions(2), ['HELIOTROPE', 'Honeydew']);
await driver.sendKeys(Key.BACK_SPACE);
@@ -866,7 +872,7 @@ describe('ReferenceList', function() {
// Undo all the changes.
await gu.undo(4);
await cell.click();
await gu.clickReferenceListCell(cell);
await driver.sendKeys('H');
assert.deepEqual(await getACOptions(2), ['Honeydew', 'Hot Pink']);
await driver.sendKeys(Key.BACK_SPACE);

14
test/nbrowser/SelectByRefList.ts
View File

@@ -183,7 +183,12 @@ async function checkSelectingRecords(selectBy: string, sourceData: string[][], n
await gu.waitForServer();
const selectByTable = selectBy.split(' ')[0];
await gu.getCell({section: selectByTable, col: 0, rowNum: 3}).click();
const cell = await gu.getCell({section: selectByTable, col: 0, rowNum: 3});
if (selectByTable === 'REFLISTS') {
await gu.clickReferenceListCell(cell);
} else {
await cell.click();
}
let numSourceRows = 0;
@@ -207,7 +212,12 @@ async function checkSelectingRecords(selectBy: string, sourceData: string[][], n
}
for (let i = 0; i < sourceData.length; i++) {
await gu.getCell({section: selectByTable, col: 0, rowNum: i + 1}).click();
const cell = await gu.getCell({section: selectByTable, col: 0, rowNum: i + 1});
if (selectByTable === 'REFLISTS') {
await gu.clickReferenceListCell(cell);
} else {
await cell.click();
}
await checkSourceGroup(i);
}

13
test/nbrowser/gristUtils.ts
View File

@@ -572,6 +572,19 @@ export async function rightClick(cell: WebElement) {
await driver.withActions((actions) => actions.contextClick(cell));
}
/**
* Clicks a Reference List cell, taking care not to click the icon (which can
* cause an unexpected Record Card popup to appear).
*/
export async function clickReferenceListCell(cell: WebElement) {
const tokens = await cell.findAll('.test-ref-list-cell-token-label');
if (tokens.length > 0) {
await tokens[0].click();
} else {
await cell.click();
}
}
/**
* Gets the selector position in the Grid view section (or null if not present).
* Selector is the black box around the row number.