Skip to content

Commit 7f7fa39

Browse files
nikita-lavrovnikita-lavrov
authored
Merge branch 'main' into 214994-consolidate-and-improve-unflattenobject
2 parents 8b0ee9a + 9a654d5 commit 7f7fa39

156 files changed

Lines changed: 5171 additions & 3505 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.

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pageLoadAssetSize:
106106
logsDataAccess: 7900
107107
logsShared: 101273
108108
logstash: 15882
109-
maintenanceWindows: 3905
109+
maintenanceWindows: 8803
110110
management: 12951
111111
maps: 45917
112112
mapsEms: 6734

‎src/core/packages/chrome/navigation/src/__tests__/__snapshots__/both_modes.test.tsx.snap‎

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

‎src/core/packages/chrome/navigation/src/__tests__/__snapshots__/expanded_mode.test.tsx.snap‎

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

‎src/core/packages/chrome/navigation/src/components/menu_item/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export const MenuItem = forwardRef<HTMLAnchorElement | HTMLButtonElement, MenuIt
147147
`);
148148

149149
const textStyles = css`
150-
${euiFontSize(euiThemeContext, 'xxs', { unit: 'px' }).fontSize};
150+
${euiFontSize(euiThemeContext, 'xxs', { unit: 'px' })};
151151
font-weight: ${euiTheme.font.weight.semiBold};
152152
`;
153153

@@ -167,7 +167,7 @@ export const MenuItem = forwardRef<HTMLAnchorElement | HTMLButtonElement, MenuIt
167167
</Suspense>
168168
</div>
169169
{isLabelVisible ? (
170-
<EuiText size="xs" textAlign="center" css={labelStyles}>
170+
<EuiText textAlign="center" css={labelStyles}>
171171
{children}
172172
</EuiText>
173173
) : (

‎src/core/packages/chrome/navigation/src/hooks/use_layout_width.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import { useEffect } from 'react';
1111

1212
export const COLLAPSED_WIDTH = 48;
13-
export const EXPANDED_WIDTH = 100;
13+
export const EXPANDED_WIDTH = 92;
1414
export const SIDE_PANEL_WIDTH = 240;
1515

1616
interface UseLayoutWidthArgs {

‎src/platform/packages/shared/kbn-esql-ast/src/parser/__tests__/promql.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import { printAst } from '../../shared/debug/print_ast';
1212
import type { ESQLCommand, ESQLMap, ESQLMapEntry, ESQLParens } from '../../types';
1313
import { Walker } from '../../ast/walker';
1414

15-
describe('PROMQL <params>... ( <query> )', () => {
15+
// TODO: Commented out to merge the new grammar: https://github.com/elastic/kibana/pull/245489
16+
describe.skip('PROMQL <params>... ( <query> )', () => {
1617
describe('correctly formatted', () => {
1718
it('parses basic PROMQL command with single param', () => {
1819
const text = `FROM index | PROMQL start "2024-01-01" (up{job="prometheus"})`;

‎src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/esql_lexer.interp‎

Lines changed: 14 additions & 19 deletions
Large diffs are not rendered by default.

‎src/platform/packages/shared/kbn-esql-ast/src/parser/antlr/esql_lexer.tokens‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,25 +139,23 @@ ID_PATTERN=138
139139
PROJECT_LINE_COMMENT=139
140140
PROJECT_MULTILINE_COMMENT=140
141141
PROJECT_WS=141
142-
PROMQL_UNQUOTED_IDENTIFIER=142
143-
PROMQL_PARAMS_LINE_COMMENT=143
144-
PROMQL_PARAMS_MULTILINE_COMMENT=144
145-
PROMQL_PARAMS_WS=145
146-
PROMQL_QUERY_TEXT=146
147-
PROMQL_QUERY_LINE_COMMENT=147
148-
PROMQL_QUERY_MULTILINE_COMMENT=148
149-
PROMQL_QUERY_WS=149
150-
AS=150
151-
RENAME_LINE_COMMENT=151
152-
RENAME_MULTILINE_COMMENT=152
153-
RENAME_WS=153
154-
SET_LINE_COMMENT=154
155-
SET_MULTILINE_COMMENT=155
156-
SET_WS=156
157-
INFO=157
158-
SHOW_LINE_COMMENT=158
159-
SHOW_MULTILINE_COMMENT=159
160-
SHOW_WS=160
142+
PROMQL_PARAMS_LINE_COMMENT=142
143+
PROMQL_PARAMS_MULTILINE_COMMENT=143
144+
PROMQL_PARAMS_WS=144
145+
PROMQL_QUERY_COMMENT=145
146+
PROMQL_SINGLE_QUOTED_STRING=146
147+
PROMQL_OTHER_QUERY_CONTENT=147
148+
AS=148
149+
RENAME_LINE_COMMENT=149
150+
RENAME_MULTILINE_COMMENT=150
151+
RENAME_WS=151
152+
SET_LINE_COMMENT=152
153+
SET_MULTILINE_COMMENT=153
154+
SET_WS=154
155+
INFO=155
156+
SHOW_LINE_COMMENT=156
157+
SHOW_MULTILINE_COMMENT=157
158+
SHOW_WS=158
161159
'change_point'=4
162160
'enrich'=5
163161
'completion'=7
@@ -232,5 +230,5 @@ SHOW_WS=160
232230
'key'=116
233231
'join'=124
234232
'USING'=125
235-
'as'=150
236-
'info'=157
233+
'as'=148
234+
'info'=155

0 commit comments

Comments
 (0)