Skip to content

Commit b7f2e18

Browse files
szwarckonradszwarckonrad
authored
Merge branch 'main' into unskip-edr-workflows-flaky-tests
2 parents 0243ee2 + 4e5d5c2 commit b7f2e18

31 files changed

Lines changed: 389 additions & 400 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3082,6 +3082,13 @@ x-pack/solutions/security/test/security_solution_api_integration/test_suites/exp
30823082

30833083
/x-pack/solutions/security/packages/test-api-clients/supertest/entity_analytics.gen.ts @elastic/security-entity-analytics
30843084

3085+
## Security Solution sub teams - Entity Resolution (contextual-security-apps co-ownership)
3086+
x-pack/solutions/security/plugins/security_solution/public/entity_analytics/components/entity_resolution @elastic/contextual-security-apps @elastic/security-entity-analytics
3087+
x-pack/solutions/security/plugins/security_solution/public/entity_analytics/components/entity_resolution_file_uploader @elastic/contextual-security-apps @elastic/security-entity-analytics
3088+
x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/entity_resolution @elastic/contextual-security-apps @elastic/security-entity-analytics
3089+
x-pack/solutions/security/plugins/security_solution/common/entity_analytics/entity_store/resolution_csv_upload.ts @elastic/contextual-security-apps @elastic/security-entity-analytics
3090+
x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_resolution @elastic/contextual-security-apps @elastic/security-entity-analytics
3091+
30853092
## Security Solution sub teams - GenAI
30863093
x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai @elastic/security-generative-ai
30873094

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@
141141
"@elastic/elasticsearch": "9.3.4",
142142
"@elastic/ems-client": "8.6.3",
143143
"@elastic/esql": "1.7.0",
144-
"@elastic/eui": "113.3.0",
145-
"@elastic/eui-theme-borealis": "6.2.0",
144+
"@elastic/eui": "114.0.0",
145+
"@elastic/eui-theme-borealis": "7.0.0",
146146
"@elastic/filesaver": "1.1.2",
147147
"@elastic/kibana-d3-color": "npm:@elastic/kibana-d3-color@2.0.1",
148148
"@elastic/monaco-esql": "3.2.2",
@@ -1574,7 +1574,7 @@
15741574
"@cypress/debugging-proxy": "2.0.1",
15751575
"@cypress/grep": "5.1.0",
15761576
"@cypress/webpack-preprocessor": "6.0.2",
1577-
"@elastic/eslint-plugin-eui": "2.10.0",
1577+
"@elastic/eslint-plugin-eui": "2.11.0",
15781578
"@elastic/makelogs": "6.1.1",
15791579
"@emotion/babel-preset-css-prop": "11.11.0",
15801580
"@emotion/jest": "11.11.0",

‎src/core/packages/i18n/browser-internal/src/__snapshots__/i18n_service.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/packages/i18n/browser-internal/src/i18n_eui_mapping.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,10 @@ export const getEuiContextMapping = (): EuiTokensObject => {
213213
defaultMessage: 'Alpha channel (opacity) value',
214214
description: 'Label describing color alpha channel',
215215
}),
216+
'euiColorPicker.ariaLabel': i18n.translate('core.euiColorPicker.ariaLabel', {
217+
defaultMessage: 'Select a color',
218+
description: 'ARIA label for the color picker button',
219+
}),
216220
'euiColorPicker.colorLabel': i18n.translate('core.euiColorPicker.colorLabel', {
217221
defaultMessage: 'Color value',
218222
}),

‎src/platform/packages/private/kbn-ui-shared-deps-npm/version_dependencies.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
@elastic/apm-rum-core@5.25.1
1717
@elastic/charts@71.3.0
1818
@elastic/esql@1.7.0
19-
@elastic/eui-theme-borealis@6.2.0
20-
@elastic/eui-theme-common@8.1.0
21-
@elastic/eui@113.3.0
19+
@elastic/eui-theme-borealis@7.0.0
20+
@elastic/eui-theme-common@9.0.0
21+
@elastic/eui@114.0.0
2222
@elastic/numeral@2.5.1
2323
@elastic/prismjs-esql@1.1.2
2424
@emotion/babel-plugin@11.13.5

‎src/platform/plugins/shared/discover/test/scout/ui/fixtures/flyout_stability/constants.ts‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/platform/plugins/shared/discover/test/scout/ui/fixtures/flyout_stability/index.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/platform/plugins/shared/discover/test/scout/ui/fixtures/flyout_stability/kbn_archives/logstash_data_view.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/platform/plugins/shared/discover/test/scout/ui/fixtures/flyout_stability/setup.ts‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/platform/plugins/shared/discover/test/scout/ui/fixtures/traces_experience/page_objects/apm.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function createApmPage(page: ScoutPage): ApmPage {
4343
? page.testSubj.locator(tableTestSubj)
4444
: page.locator('table');
4545

46-
await container.getByText(linkText).click();
46+
await container.getByRole('link', { name: linkText }).click();
4747
},
4848

4949
async clickWaterfallItem(itemName: string) {

0 commit comments

Comments
 (0)