Skip to content

Commit 2e085ee

Browse files
author
Sébastien Loix
committed
Merge remote-tracking branch 'upstream/main' into chrome-service/export-handler-toggle-sidenav
2 parents e9c4926 + ac07c21 commit 2e085ee

474 files changed

Lines changed: 9207 additions & 19312 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.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ enabled:
4444
- test/api_integration/config.js
4545
- test/examples/config.js
4646
- test/functional/apps/bundles/config.ts
47-
- test/functional/apps/console/monaco/config.ts
48-
- test/functional/apps/console/ace/config.ts
47+
- test/functional/apps/console/config.ts
4948
- test/functional/apps/context/config.ts
5049
- test/functional/apps/dashboard_elements/controls/common/config.ts
5150
- test/functional/apps/dashboard_elements/controls/options_list/config.ts

‎.buildkite/scripts/steps/storybooks/build_and_upload.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const STORYBOOKS = [
2222
'coloring',
2323
'chart_icons',
2424
'content_management_examples',
25-
'controls',
2625
'custom_integrations',
2726
'dashboard_enhanced',
2827
'dashboard',

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur
17591759
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
17601760

17611761
# Ent. Search design
1762-
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
1762+
/x-pack/plugins/enterprise_search/**/*.scss @elastic/search-design
17631763

17641764
# Security design
17651765
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design

‎examples/controls_example/public/app/control_group_renderer_examples/edit_example.tsx‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,32 @@
99

1010
import { pickBy } from 'lodash';
1111
import React, { useEffect, useState } from 'react';
12+
1213
import {
1314
EuiButton,
1415
EuiButtonEmpty,
1516
EuiButtonGroup,
1617
EuiFlexGroup,
1718
EuiFlexItem,
1819
EuiPanel,
20+
EuiSkeletonRectangle,
1921
EuiSpacer,
2022
EuiText,
2123
EuiTitle,
22-
EuiSkeletonRectangle,
2324
} from '@elastic/eui';
24-
import { ViewMode } from '@kbn/embeddable-plugin/public';
25-
import { OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
26-
import { ControlGroupRuntimeState, ControlStateTransform } from '@kbn/controls-plugin/public';
25+
import {
26+
OPTIONS_LIST_CONTROL,
27+
RANGE_SLIDER_CONTROL,
28+
type ControlGroupRuntimeState,
29+
} from '@kbn/controls-plugin/common';
2730
import {
2831
ACTION_DELETE_CONTROL,
2932
ACTION_EDIT_CONTROL,
3033
ControlGroupRenderer,
34+
ControlGroupRendererApi,
35+
type ControlStateTransform,
3136
} from '@kbn/controls-plugin/public';
32-
import { ControlGroupRendererApi } from '@kbn/controls-plugin/public';
37+
import { ViewMode } from '@kbn/embeddable-plugin/public';
3338

3439
const INPUT_KEY = 'kbnControls:saveExample:input';
3540

‎examples/controls_example/public/app/control_group_renderer_examples/search_example.tsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
*/
99

1010
import React, { useEffect, useState } from 'react';
11-
import { v4 as uuidv4 } from 'uuid';
1211
import { lastValueFrom } from 'rxjs';
13-
import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
14-
import type { DataView } from '@kbn/data-views-plugin/public';
15-
import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
16-
import type { Filter, Query, TimeRange } from '@kbn/es-query';
12+
import { v4 as uuidv4 } from 'uuid';
13+
1714
import {
1815
EuiCallOut,
1916
EuiLoadingSpinner,
@@ -23,6 +20,11 @@ import {
2320
EuiTitle,
2421
} from '@elastic/eui';
2522
import { ControlGroupRenderer, ControlGroupRendererApi } from '@kbn/controls-plugin/public';
23+
import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
24+
import type { DataView } from '@kbn/data-views-plugin/public';
25+
import type { Filter, Query, TimeRange } from '@kbn/es-query';
26+
import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
27+
2628
import { PLUGIN_ID } from '../../constants';
2729

2830
interface Props {

‎examples/controls_example/public/app/react_control_example/runtime_control_group_state.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import { ControlGroupRuntimeState } from '@kbn/controls-plugin/public';
10+
import { ControlGroupRuntimeState } from '@kbn/controls-plugin/common';
1111

1212
const RUNTIME_STATE_SESSION_STORAGE_KEY =
1313
'kibana.examples.controls.reactControlExample.controlGroupRuntimeState';

‎examples/controls_example/public/app/react_control_example/serialized_control_group_state.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import { SerializedPanelState } from '@kbn/presentation-containers';
11-
import { ControlGroupSerializedState } from '@kbn/controls-plugin/public';
10+
import type { SerializedPanelState } from '@kbn/presentation-containers';
11+
import type { ControlGroupSerializedState } from '@kbn/controls-plugin/common';
1212
import {
1313
OPTIONS_LIST_CONTROL,
1414
RANGE_SLIDER_CONTROL,

‎examples/discover_customization_examples/public/plugin.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import ReactDOM from 'react-dom';
2828
import useObservable from 'react-use/lib/useObservable';
2929
import { ControlGroupRendererApi, ControlGroupRenderer } from '@kbn/controls-plugin/public';
3030
import { css } from '@emotion/react';
31-
import type { ControlsPanels } from '@kbn/controls-plugin/common';
31+
import type { ControlPanelsState } from '@kbn/controls-plugin/common';
3232
import { Route, Router, Routes } from '@kbn/shared-ux-router';
3333
import { I18nProvider } from '@kbn/i18n-react';
3434
import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
@@ -357,7 +357,7 @@ export class DiscoverCustomizationExamplesPlugin implements Plugin {
357357
}
358358

359359
const stateSubscription = stateStorage
360-
.change$<ControlsPanels>('controlPanels')
360+
.change$<ControlPanelsState>('controlPanels')
361361
.subscribe((panels) =>
362362
controlGroupAPI.updateInput({ initialChildControlState: panels ?? undefined })
363363
);
@@ -410,7 +410,7 @@ export class DiscoverCustomizationExamplesPlugin implements Plugin {
410410
<ControlGroupRenderer
411411
onApiAvailable={setControlGroupAPI}
412412
getCreationOptions={async (initialState, builder) => {
413-
const panels = stateStorage.get<ControlsPanels>('controlPanels');
413+
const panels = stateStorage.get<ControlPanelsState>('controlPanels');
414414

415415
if (!panels) {
416416
builder.addOptionsListControl(initialState, {

‎packages/kbn-esql-ast/src/pretty_print/__tests__/fixtures.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
export const query1 = `
1111
from kibana_sample_data_logs
1212
| EVAL timestamp=DATE_TRUNC(3 hour, @timestamp), status = CASE( to_integer(response.keyword) >= 200 and to_integer(response.keyword) < 400, "HTTP 2xx and 3xx", to_integer(response.keyword) >= 400 and to_integer(response.keyword) < 500, "HTTP 4xx", "HTTP 5xx")
13-
| stats results = count(*) by \`Over time\` = BUCKET(timestamp, 50, ?t_start, ?t_end), status
13+
| stats results = count(*) by \`Over time\` = BUCKET(timestamp, 50, ?_tstart, ?_tend), status
1414
`;
1515

1616
export const query2 = `

‎packages/kbn-esql-ast/src/walker/walker.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ describe('Walker.params()', () => {
793793

794794
test('can collect all params from grouping functions', () => {
795795
const query =
796-
'ROW x=1, time=2024-07-10 | stats z = avg(x) by bucket(time, 20, ?t_start,?t_end)';
796+
'ROW x=1, time=2024-07-10 | stats z = avg(x) by bucket(time, 20, ?_tstart,?_tend)';
797797
const { ast } = getAstAndSyntaxErrors(query);
798798
const params = Walker.params(ast);
799799

@@ -802,13 +802,13 @@ describe('Walker.params()', () => {
802802
type: 'literal',
803803
literalType: 'param',
804804
paramType: 'named',
805-
value: 't_start',
805+
value: '_tstart',
806806
},
807807
{
808808
type: 'literal',
809809
literalType: 'param',
810810
paramType: 'named',
811-
value: 't_end',
811+
value: '_tend',
812812
},
813813
]);
814814
});

0 commit comments

Comments
 (0)