Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"@elastic/ecs": "^8.11.5",
"@elastic/elasticsearch": "^8.17.1",
"@elastic/ems-client": "8.6.3",
"@elastic/eui": "101.3.0-classic.0",
"@elastic/eui": "101.4.0-amsterdam.0",
"@elastic/filesaver": "1.1.2",
"@elastic/node-crypto": "^1.2.3",
"@elastic/numeral": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const LICENSE_OVERRIDES = {
'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
'@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
'@elastic/ems-client@8.6.3': ['Elastic License 2.0'],
'@elastic/eui@101.2.0-classic.1': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'],
'@elastic/eui@101.4.0-amsterdam.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'],
'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary
'@bufbuild/protobuf@1.2.1': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/platform/test/functional/services/data_grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ export class DataGridService extends FtrService {
}

public async getCurrentPageNumber() {
const currentPage = await this.find.byCssSelector('.euiPaginationButton[aria-current="true"]');
const currentPage = await this.find.byCssSelector('.euiPaginationButton[aria-current="page"]');
return await currentPage.getVisibleText();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,15 @@ describe('DatatableComponent', () => {
expect(screen.queryByTestId('tablePaginationPopoverButton')).toBeInTheDocument();
expect(screen.getByRole('button', { name: `Page 1 of ${numberOfPages}` })).toHaveAttribute(
'aria-current',
'true'
'page'
);
const newIndex = 3;
await userEvent.click(
screen.getByRole('link', { name: `Page ${newIndex} of ${numberOfPages}` })
);
expect(
screen.getByRole('button', { name: `Page ${newIndex} of ${numberOfPages}` })
).toHaveAttribute('aria-current', 'true');
).toHaveAttribute('aria-current', 'page');
});
it('dynamically toggles pagination', async () => {
const argsWithoutPagination = copyData(args);
Expand Down Expand Up @@ -599,7 +599,7 @@ describe('DatatableComponent', () => {
);
expect(
screen.getByRole('button', { name: `Page ${newIndex} of ${numberOfPages}` })
).toHaveAttribute('aria-current', 'true');
).toHaveAttribute('aria-current', 'page');

await act(async () => {
rerender({
Expand All @@ -614,7 +614,7 @@ describe('DatatableComponent', () => {
// keeps existing page if more data is added
expect(
screen.getByRole('button', { name: `Page ${newIndex} of ${newNumberOfPages}` })
).toHaveAttribute('aria-current', 'true');
).toHaveAttribute('aria-current', 'page');
});

it('resets page position if rows change so page will be empty', async () => {
Expand All @@ -639,7 +639,7 @@ describe('DatatableComponent', () => {
);
expect(
screen.getByRole('button', { name: `Page ${newIndex} of ${numberOfPages}` })
).toHaveAttribute('aria-current', 'true');
).toHaveAttribute('aria-current', 'page');

await act(async () => {
rerender({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ describe('AlertsGrouping', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
});

await userEvent.click(screen.getAllByTestId('group-selector-dropdown')[0]);
Expand All @@ -254,7 +254,7 @@ describe('AlertsGrouping', () => {
].forEach((pagination) => {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual(null);
Expand Down Expand Up @@ -307,7 +307,7 @@ describe('AlertsGrouping', () => {
].forEach((pagination) => {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual(null);
Expand Down Expand Up @@ -366,15 +366,15 @@ describe('AlertsGrouping', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
});

// level 2 pagination is reset
expect(
within(screen.getByTestId('grouping-level-2-pagination'))
.getByTestId('pagination-button-0')
.getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(screen.getByTestId('grouping-level-2-pagination'))
.getByTestId('pagination-button-1')
Expand Down Expand Up @@ -429,11 +429,11 @@ describe('AlertsGrouping', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
} else {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
}
});
Expand Down Expand Up @@ -484,11 +484,11 @@ describe('AlertsGrouping', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
} else {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
}
});
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ describe('GroupedAlertsTable', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
});

fireEvent.click(getAllByTestId('group-selector-dropdown')[0]);
Expand All @@ -333,7 +333,7 @@ describe('GroupedAlertsTable', () => {
].forEach((pagination) => {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual(null);
Expand Down Expand Up @@ -381,7 +381,7 @@ describe('GroupedAlertsTable', () => {
].forEach((pagination) => {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual(null);
Expand Down Expand Up @@ -430,15 +430,15 @@ describe('GroupedAlertsTable', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
});

// level 2 pagination is reset
expect(
within(getByTestId('grouping-level-2-pagination'))
.getByTestId('pagination-button-0')
.getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(
within(getByTestId('grouping-level-2-pagination'))
.getByTestId('pagination-button-1')
Expand Down Expand Up @@ -484,11 +484,11 @@ describe('GroupedAlertsTable', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
} else {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
}
});
Expand Down Expand Up @@ -533,11 +533,11 @@ describe('GroupedAlertsTable', () => {
).toEqual(null);
expect(
within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
} else {
expect(
within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
).toEqual('true');
).toEqual('page');
expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('EntitiesList', () => {

await waitFor(() => {
const firstPageButton = screen.getByTestId('pagination-button-0');
expect(firstPageButton).toHaveAttribute('aria-current', 'true');
expect(firstPageButton).toHaveAttribute('aria-current', 'page');
});
});

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Paginated Table Component', () => {
expect(screen.getByTestId('numberedPagination')).toBeInTheDocument();

const firstButton = screen.getByTestId('pagination-button-0');
expect(firstButton).toHaveAttribute('aria-current', 'true');
expect(firstButton).toHaveAttribute('aria-current', 'page');
expect(firstButton).toHaveAttribute('aria-label', 'Page 1 of 10');
});

Expand Down Expand Up @@ -177,7 +177,7 @@ describe('Paginated Table Component', () => {
test('should update the page when the activePage is changed from redux', async () => {
const { rerender } = renderComponent({ activePage: 3 });
const beforeActiveButton = screen.getByTestId('pagination-button-3');
expect(beforeActiveButton).toHaveAttribute('aria-current', 'true');
expect(beforeActiveButton).toHaveAttribute('aria-current', 'page');
expect(beforeActiveButton).toHaveAttribute('aria-label', 'Page 4 of 10');

rerender(
Expand All @@ -188,7 +188,7 @@ describe('Paginated Table Component', () => {

await waitFor(() => {
const afterActiveButton = screen.getByTestId('pagination-button-0');
expect(afterActiveButton).toHaveAttribute('aria-current', 'true');
expect(afterActiveButton).toHaveAttribute('aria-current', 'page');
expect(afterActiveButton).toHaveAttribute('aria-label', 'Page 1 of 10');
});
});
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading