Skip to content

Commit 9a27354

Browse files
authored
Merge pull request #10597 from marmelab/datagrid-modern
Add DataTable component
2 parents d2f449e + 9974182 commit 9a27354

79 files changed

Lines changed: 6159 additions & 581 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cypress/e2e/list.cy.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ describe('List Page', () => {
254254
.should(el => expect(el).to.have.attr('aria-expanded', 'true'))
255255
.should(el => expect(el).to.have.attr('aria-label', 'Close'));
256256

257-
cy.get('#13-expand').should(el =>
257+
cy.get('#posts-13-expand').should(el =>
258258
expect(el).to.contain(
259259
'Curabitur eu odio ullamcorper, pretium sem at, blandit libero. Nulla sodales facilisis libero, eu gravida tellus ultrices nec. In ut gravida mi. Vivamus finibus tortor tempus egestas lacinia. Cras eu arcu nisl. Donec pretium dolor ipsum, eget feugiat urna iaculis ut.'
260260
)
@@ -269,7 +269,7 @@ describe('List Page', () => {
269269
.should(el => expect(el).to.have.attr('aria-expanded', 'true'))
270270
.should(el => expect(el).to.have.attr('aria-label', 'Close'));
271271

272-
cy.get('#13-expand').should(el => expect(el).to.exist);
272+
cy.get('#posts-13-expand').should(el => expect(el).to.exist);
273273
cy.wait(500); // Ensure animations are done
274274

275275
cy.get('[aria-label="Expand"]')
@@ -278,7 +278,7 @@ describe('List Page', () => {
278278
.should(el => expect(el).to.have.attr('aria-expanded', 'true'))
279279
.should(el => expect(el).to.have.attr('aria-label', 'Close'));
280280

281-
cy.get('#12-expand').should(el => expect(el).to.exist);
281+
cy.get('#posts-12-expand').should(el => expect(el).to.exist);
282282

283283
let all_labels = [13, 12, 11, 10, 9, 8, 7, 6, 4, 2];
284284

@@ -294,7 +294,9 @@ describe('List Page', () => {
294294
cy.get('[aria-label="Expand"]').eq(0).click();
295295

296296
all_labels.forEach(label => {
297-
cy.get(`#${label}-expand`).should(el => expect(el).to.exist);
297+
cy.get(`#posts-${label}-expand`).should(
298+
el => expect(el).to.exist
299+
);
298300
});
299301
});
300302
});

cypress/support/ListPage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export default url => ({
1313
nextPage: "button[aria-label='Go to next page']",
1414
previousPage: "button[aria-label='Go to previous page']",
1515
pageNumber: n => `button[aria-label='Go to page ${n}']`,
16-
recordRows: '.datagrid-body tr',
17-
viewsColumn: '.datagrid-body tr td:nth-child(8)',
16+
recordRows: '.datatable-body tr.RaDataTable-row',
17+
viewsColumn: '.datatable-body tr td:nth-child(8)',
1818
datagridHeaders: 'th',
1919
sortBy: name => `th span[data-field="${name}"]`,
2020
svg: (name, criteria = '') =>

0 commit comments

Comments
 (0)