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 @@ -125,7 +125,7 @@
"@elastic/ecs": "^9.0.0",
"@elastic/elasticsearch": "9.1.1",
"@elastic/ems-client": "8.6.3",
"@elastic/eui": "106.4.0",
"@elastic/eui": "106.5.0",
"@elastic/eui-theme-borealis": "3.3.2",
"@elastic/filesaver": "1.1.2",
"@elastic/kibana-d3-color": "npm:@elastic/kibana-d3-color@2.0.1",
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 @@ -973,6 +973,10 @@ export const getEuiContextMapping = (): EuiTokensObject => {
'euiModal.closeModal': i18n.translate('core.euiModal.closeModal', {
defaultMessage: 'Closes this modal window',
}),
'euiModal.screenReaderModalDialog': i18n.translate('core.euiModal.screenReaderModalDialog', {
defaultMessage:
'You are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close.',
}),
'euiErrorBoundary.error': i18n.translate('core.euiErrorBoundary.error', {
defaultMessage: 'Error',
description: 'Error boundary for uncaught exceptions when rendering part of the application',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ const userProfileMock = userProfileServiceMock.createStart();

const MODAL_CONTENT = 'Modal content 1';
const MODAL_CONTENT_TWO = 'Modal content 2';
const MODAL_SCREEN_READER_TEXT =
'You are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close.';
const SOME_CONFIRM = 'Some confirm';

beforeEach(() => {
Expand Down Expand Up @@ -62,7 +64,9 @@ describe('ModalService', () => {
});
expect(mockReactDomRender.mock.calls[0][0].props.children.type.name).toEqual('EuiModal');
const modalContent = mount(mockReactDomRender.mock.calls[0][0]);
expect(modalContent.find('div.euiModal').text()).toEqual(MODAL_CONTENT);
expect(modalContent.find('div.euiModal').text()).toEqual(
`${MODAL_CONTENT}${MODAL_SCREEN_READER_TEXT}`
);
});

describe('with a currently active modal', () => {
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 @@ -89,7 +89,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@106.4.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'],
'@elastic/eui@106.5.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'],
'@elastic/eui-theme-borealis@3.3.2': ['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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ describe(
// Verify that an error modal is displayed
cy.get('[data-test-subj="bulkActionRejectModal"]').should(
'have.text',
`Unable to schedule gap fills for a disabled ruleEnable the rule to schedule gap fills.Close`
`Unable to schedule gap fills for a disabled ruleEnable the rule to schedule gap fills.CloseYou are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close.`
);

cy.get(MODAL_CONFIRMATION_BTN).click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ export const scheduleManualRuleRunForSelectedRules = (
if (disabledCount > 0) {
cy.get(BULK_MANUAL_RULE_RUN_WARNING_MODAL).should(
'have.text',
`This action can only be applied to ${enabledCount} rulesThis action can't be applied to the following rules in your selection:${disabledCount} rules (Cannot schedule manual rule run for disabled rules)CancelSchedule ${enabledCount} rules`
`This action can only be applied to ${enabledCount} rulesThis action can't be applied to the following rules in your selection:${disabledCount} rules (Cannot schedule manual rule run for disabled rules)CancelSchedule ${enabledCount} rulesYou are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close.`
);
cy.get(CONFIRM_MANUAL_RULE_RUN_WARNING_BTN).click();
}
Expand All @@ -511,7 +511,7 @@ export const scheduleBulkFillGapsForSelectedRules = (
if (disabledCount > 0) {
cy.get(BULK_FILL_RULE_GAPS_WARNING_MODAL).should(
'have.text',
`This action can only be applied to ${enabledCount} rulesThis action can't be applied to the following rules in your selection:${disabledCount} rules (Cannot fill gaps for disabled rules)CancelSchedule gap fills`
`This action can only be applied to ${enabledCount} rulesThis action can't be applied to the following rules in your selection:${disabledCount} rules (Cannot fill gaps for disabled rules)CancelSchedule gap fillsYou are in a modal dialog. Press Escape or tap/click outside the dialog on the shadowed overlay to close.`
);
cy.get(CONFIRM_FILL_RULE_GAPS_WARNING_BTN).click();
}
Expand Down
15 changes: 10 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2217,10 +2217,10 @@
chroma-js "^2.4.2"
lodash "^4.17.21"

"@elastic/eui@106.4.0":
version "106.4.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-106.4.0.tgz#a974ebfa7ea5636235edd64022e9f2122ac44d40"
integrity sha512-LCNImIS3+ZN1SrsppqICkm/1DH5uTe1YptyVPctsogViPVm6CxEeo+SyFz1PDKE5wKbmSvCHcVGVUf2xjH7RgA==
"@elastic/eui@106.5.0":
version "106.5.0"
resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-106.5.0.tgz#a37d0839545c41a023aa366e37ac1287cf262586"
integrity sha512-RIEETOUwx475vmF8NPao6em0yU2RlyGNflrMtmGQ04Ka3vZzs/AUIpdGcLJclOCyDj94gq4dltlXPuXkc1aMYw==
dependencies:
"@elastic/eui-theme-common" "4.0.0"
"@elastic/prismjs-esql" "^1.1.0"
Expand Down Expand Up @@ -2263,7 +2263,7 @@
resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a"
integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ==

"@elastic/kibana-d3-color@npm:@elastic/kibana-d3-color@2.0.1", "d3-color@1 - 2", "d3-color@npm:@elastic/kibana-d3-color@2.0.1":
"@elastic/kibana-d3-color@npm:@elastic/kibana-d3-color@2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@elastic/kibana-d3-color/-/kibana-d3-color-2.0.1.tgz#f83b9c2fea09273a918659de04d5e8098c82f65c"
integrity sha512-YZ8hV2bWNyYi833Yj3UWczmTxdHzmo/Xc2IVkNXr/ZqtkrTDlTLysCyJm7SfAt9iBy6EVRGWTn8cPz8QOY6Ixw==
Expand Down Expand Up @@ -17543,6 +17543,11 @@ d3-collection@^1.0.7:
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==

"d3-color@1 - 2", "d3-color@npm:@elastic/kibana-d3-color@2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@elastic/kibana-d3-color/-/kibana-d3-color-2.0.1.tgz#f83b9c2fea09273a918659de04d5e8098c82f65c"
integrity sha512-YZ8hV2bWNyYi833Yj3UWczmTxdHzmo/Xc2IVkNXr/ZqtkrTDlTLysCyJm7SfAt9iBy6EVRGWTn8cPz8QOY6Ixw==

"d3-color@1 - 3", d3-color@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
Expand Down