Skip to content

Commit bb14c52

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ska-tests/apis-part-5
2 parents 973c680 + dccd491 commit bb14c52

File tree

73 files changed

+959
-571
lines changed

Some content is hidden

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

73 files changed

+959
-571
lines changed

.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424

2525
- label: ":ship: Fleet serverless smoke tests for ${ENVIRONMENT}"
2626
trigger: fleet-smoke-tests # https://buildkite.com/elastic/fleet-smoke-tests
27+
soft_fail: true
2728
build:
2829
env:
2930
ENVIRONMENT: ${ENVIRONMENT}

.github/CODEOWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,13 +2131,13 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21312131
# Management Experience - Deployment Management
21322132
/src/platform/test/functional/fixtures/kbn_archiver/management.json @elastic/kibana-management @elastic/kibana-data-discovery # Assigned per 2 uses: test/functional/apps/management/_import_objects.ts && test/functional/apps/management/data_views/_scripted_fields_filter.ts
21332133
/x-pack/test/functional/fixtures/kbn_archiver/home/feature_controls/security/security.json @elastic/kibana-management
2134-
/x-pack/test/functional/es_archives/upgrade_assistant @elastic/kibana-core
2134+
/x-pack/test/functional/es_archives/upgrade_assistant @elastic/kibana-management
21352135
/x-pack/test/functional/services/ace_editor.js @elastic/kibana-management
21362136
/x-pack/test/functional/page_objects/remote_clusters_page.ts @elastic/kibana-management
21372137
/x-pack/test/stack_functional_integration/apps/ccs @elastic/kibana-management
21382138
/x-pack/test/functional/services/data_stream.ts @elastic/kibana-management
21392139
/x-pack/test/functional/page_objects/watcher_page.ts @elastic/kibana-management
2140-
/x-pack/test/functional/page_objects/upgrade_assistant_page.ts @elastic/kibana-core
2140+
/x-pack/test/functional/page_objects/upgrade_assistant_page.ts @elastic/kibana-management
21412141
/x-pack/test/functional/page_objects/snapshot_restore_page.ts @elastic/kibana-management
21422142
/x-pack/test/functional/page_objects/rollup_page.ts @elastic/kibana-management
21432143
/x-pack/test/functional/page_objects/ingest_pipelines_page.ts @elastic/kibana-management
@@ -2157,10 +2157,10 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21572157
/x-pack/test/functional/apps/license_management @elastic/kibana-management
21582158
/x-pack/test/functional/apps/management @elastic/kibana-management
21592159
/x-pack/test/functional/apps/remote_clusters @elastic/kibana-management
2160-
/x-pack/test/functional/apps/upgrade_assistant @elastic/kibana-core
2160+
/x-pack/test/functional/apps/upgrade_assistant @elastic/kibana-management
21612161
/x-pack/test/functional/apps/dev_tools @elastic/kibana-management
21622162
/src/platform/test/plugin_functional/test_suites/management @elastic/kibana-management
2163-
/x-pack/test/upgrade_assistant_integration @elastic/kibana-core
2163+
/x-pack/test/upgrade_assistant_integration @elastic/kibana-management
21642164
/src/platform/test/plugin_functional/plugins/management_test_plugin @elastic/kibana-management
21652165
/src/platform/test/functional/page_objects/management/*.ts @elastic/kibana-management
21662166
/src/platform/test/functional/page_objects/embedded_console.ts @elastic/kibana-management
@@ -2181,7 +2181,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21812181
/x-pack/test/api_integration/services/ingest_pipelines @elastic/kibana-management
21822182
/x-pack/test/functional/apps/watcher @elastic/kibana-management
21832183
/x-pack/platform/test/api_integration/apis/watcher @elastic/kibana-management
2184-
/x-pack/platform/test/api_integration/apis/upgrade_assistant @elastic/kibana-core
2184+
/x-pack/platform/test/api_integration/apis/upgrade_assistant @elastic/kibana-management
21852185
/x-pack/platform/test/api_integration/apis/searchprofiler @elastic/kibana-management
21862186
/x-pack/platform/test/api_integration/apis/console @elastic/kibana-management
21872187
/x-pack/test_serverless/**/test_suites/common/index_management/ @elastic/kibana-management

.github/workflows/trigger-chromium-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
export PATH=$PATH:mdsh
2626
- name: Extract version bump configuration
2727
id: extract_version_bump_config
28+
env:
29+
ISSUE_BODY: ${{ github.event.issue.body }}
2830
run: |
2931
# mdsh-* functions are informed from https://github.com/bashup/mdsh/blob/master/mdsh.md
3032
@@ -85,7 +87,7 @@ jobs:
8587
8688
# attempt extracting puppeteer version bump config from the issue body,
8789
# single quote is very much intentional here so it's not escaped by bash
88-
echo '${{ github.event.issue.body }}' | extract_code_blocks
90+
echo "$ISSUE_BODY" | extract_code_blocks
8991
- name: Report multiple puppeteer_version properties
9092
if: ${{ steps.extract_version_bump_config.outputs.multiple_puppeteer_version_properties == 'true' }}
9193
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@
13111311
"rxjs": "^7.8.2",
13121312
"safe-squel": "^5.12.5",
13131313
"seedrandom": "^3.0.5",
1314-
"semver": "^7.7.1",
1314+
"semver": "^7.7.2",
13151315
"set-value": "^4.1.0",
13161316
"snakecase-keys": "^8.0.1",
13171317
"source-map-support": "^0.5.19",

src/core/public/_mixins.scss

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

src/core/public/cssUtils.ts renamed to src/core/public/css_utils.ts

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99

1010
// This file replaces scss core/public/_mixins.scss
1111

12-
import { css, keyframes } from '@emotion/react';
13-
import { COLOR_MODES_STANDARD, UseEuiTheme, euiCanAnimate } from '@elastic/eui';
12+
import { Interpolation, Theme, css, keyframes } from '@emotion/react';
13+
import { COLOR_MODES_STANDARD, UseEuiTheme, euiCanAnimate, useEuiTheme } from '@elastic/eui';
14+
import { useMemo } from 'react';
1415
import bg_top_branded from './styles/core_app/images/bg_top_branded.svg';
1516
import bg_top_branded_dark from './styles/core_app/images/bg_top_branded_dark.svg';
1617
import bg_bottom_branded from './styles/core_app/images/bg_bottom_branded.svg';
@@ -19,11 +20,10 @@ import bg_bottom_branded_dark from './styles/core_app/images/bg_bottom_branded_d
1920
// The `--kbnAppHeadersOffset` CSS variable is automatically updated by
2021
// styles/rendering/_base.scss, based on whether the Kibana chrome has a
2122
// header banner, app menu, and is visible or hidden
22-
export const kibanaFullBodyHeightCss = (additionalOffset = 0) => css`
23-
height: calc(
24-
100vh - var(--kbnAppHeadersOffset, var(--euiFixedHeadersOffset, 0)) - ${additionalOffset}px
25-
);
26-
`;
23+
export const kibanaFullBodyHeightCss = (additionalOffset = '0px') =>
24+
css({
25+
height: `calc(100vh - var(--kbnAppHeadersOffset, var(--euiFixedHeadersOffset, 0)) - ${additionalOffset})`,
26+
});
2727

2828
export const fullScreenGraphicsMixinStyles = (euiZLevel: number, euiTheme: UseEuiTheme) => {
2929
const lightOrDarkTheme = (lightSvg: any, darkSvg: any) => {
@@ -79,3 +79,40 @@ export const fullScreenGraphicsMixinStyles = (euiZLevel: number, euiTheme: UseEu
7979
},
8080
});
8181
};
82+
83+
type StyleMap = Record<
84+
string,
85+
Interpolation<Theme> | ((theme: UseEuiTheme) => Interpolation<Theme>)
86+
>;
87+
88+
type StaticStyleMap = Record<string, Interpolation<Theme>>;
89+
90+
/**
91+
* Custom hook to reduce boilerplate when working with Emotion styles that may depend on
92+
* the EUI theme.
93+
*
94+
* Accepts a map of styles where each entry is either a static Emotion style (via `css`)
95+
* or a function that returns styles based on the current `euiTheme`.
96+
*
97+
* It returns a memoized version of the style map with all values resolved to static
98+
* Emotion styles, allowing components to use a clean and unified object for styling.
99+
*
100+
* This helps simplify component code by centralizing theme-aware style logic.
101+
*
102+
* Example usage:
103+
* const componentStyles = {
104+
* container: css({ overflow: hidden }),
105+
* leftPane: ({ euiTheme }) => css({ paddingTop: euiTheme.size.m }),
106+
* }
107+
* const styles = useMemoizedStyles(componentStyles);
108+
*/
109+
export const useMemoizedStyles = (styleMap: StyleMap) => {
110+
const euiThemeContext = useEuiTheme();
111+
const outputStyles = useMemo(() => {
112+
return Object.entries(styleMap).reduce<StaticStyleMap>((acc, [key, value]) => {
113+
acc[key] = typeof value === 'function' ? value(euiThemeContext) : value;
114+
return acc;
115+
}, {});
116+
}, [euiThemeContext, styleMap]);
117+
return outputStyles;
118+
};

src/core/public/index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
@import './css_variables';
2-
@import './mixins';
32
@import './styles/index';

src/core/public/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,8 @@ export type { CoreSystem } from '@kbn/core-root-browser-internal';
309309

310310
export { __kbnBootstrap__ } from '@kbn/core-root-browser-internal';
311311

312-
export { kibanaFullBodyHeightCss, fullScreenGraphicsMixinStyles } from './cssUtils';
312+
export {
313+
kibanaFullBodyHeightCss,
314+
fullScreenGraphicsMixinStyles,
315+
useMemoizedStyles,
316+
} from './css_utils';

src/platform/packages/private/kbn-journeys/services/synthtrace.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ async function initApmSynthtraceClient(options: SynthtraceClientOptions) {
8484
logger,
8585
refreshAfterIndex: true,
8686
version: packageVersion,
87+
pipeline: {
88+
includeSerialization: false,
89+
},
8790
});
8891

89-
synthEsClient.pipeline(synthEsClient.getDefaultPipeline({ includeSerialization: false }));
90-
9192
return synthEsClient;
9293
}

src/platform/packages/shared/kbn-apm-synthtrace/src/cli/run_synthtrace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function getBuiltinScenarios() {
2323

2424
function options(y: Argv) {
2525
return y
26-
.usage('$0 <file>')
27-
.positional('file', {
26+
.usage('$0 <files ...>')
27+
.positional('files', {
2828
describe: 'Name of scenario',
2929
demandOption: true,
3030
string: true,

0 commit comments

Comments
 (0)