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
3 changes: 2 additions & 1 deletion src/platform/plugins/shared/discover/kibana.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
"kibanaReact",
"unifiedSearch",
"savedObjects",
"presentationPanel"
"presentationPanel",
"esql"
],
"extraPublicDirs": ["common"]
}
Expand Down
1 change: 1 addition & 0 deletions src/platform/plugins/shared/discover/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ dependsOn:
- '@kbn/shared-ux-error-boundary'
- '@kbn/core-chrome-app-menu'
- '@kbn/es-query-constants'
- '@kbn/esql'
tags:
- plugin
- prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
prepareDataViewForEditing,
} from '@kbn/discover-utils';
import type { ESQLEditorRestorableState } from '@kbn/esql-editor';
import { useESQLQueryStats } from '@kbn/esql/public';
import {
type Filter,
type Query,
Expand All @@ -41,7 +42,6 @@ import {
useInternalStateSelector,
} from '../../state_management/redux';
import { DiscoverTopNavMenu } from './discover_topnav_menu';
import { useESQLQueryStats } from './use_esql_query_stats';
import { ESQLToDataViewTransitionModal } from './esql_dataview_transition';
import { onSaveDiscoverSession } from './save_discover_session';
import { useDiscoverTopNav } from './use_discover_topnav';
Expand Down
1 change: 1 addition & 0 deletions src/platform/plugins/shared/discover/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"@kbn/shared-ux-error-boundary",
"@kbn/core-chrome-app-menu",
"@kbn/es-query-constants",
"@kbn/esql",
],
"exclude": ["target/**/*"]
}
1 change: 1 addition & 0 deletions src/platform/plugins/shared/esql/moon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ dependsOn:
- '@kbn/file-upload-plugin'
- '@kbn/discover-utils'
- '@kbn/kql'
- '@kbn/inspector-plugin'
tags:
- plugin
- prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function useESQLQueryStats(
durationInMs: stats.queryTime?.value,
totalDocumentsProcessed: stats.documentsProcessed?.value,
};
setQueryStats((currentStats) => {
setQueryStats((currentStats: ESQLQueryStats | undefined) => {
if (!isEqual(currentStats, updatedStats)) {
return updatedStats;
}
Expand Down
1 change: 1 addition & 0 deletions src/platform/plugins/shared/esql/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import type { PluginInitializerContext } from '@kbn/core/public';
import { EsqlPlugin, type EsqlPluginStart } from './plugin';

export { ESQLLangEditor } from './create_editor';
export { useESQLQueryStats } from './hooks/use_esql_query_stats';
export type { ESQLEditorProps, DataErrorsControl } from '@kbn/esql-editor';
export type { EsqlPluginStart };

Expand Down
1 change: 1 addition & 0 deletions src/platform/plugins/shared/esql/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@kbn/file-upload-plugin",
"@kbn/discover-utils",
"@kbn/kql",
"@kbn/inspector-plugin",
],
"exclude": [
"target/**/*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import type { CoreStart, IUiSettingsClient } from '@kbn/core/public';
import { isEqual } from 'lodash';
import type { MutableRefObject } from 'react';
import { useCallback, useEffect, useRef, useState } from 'react';
import { ESQLLangEditor } from '@kbn/esql/public';
import { type ESQLControlVariable } from '@kbn/esql-types';
import { ESQLLangEditor, useESQLQueryStats } from '@kbn/esql/public';
import { type ESQLControlVariable, type ESQLQueryStats } from '@kbn/esql-types';
import { i18n } from '@kbn/i18n';
import React from 'react';
import type { DataViewSpec } from '@kbn/data-views-plugin/common';
Expand Down Expand Up @@ -116,6 +116,7 @@ export function ESQLEditor({
const previousAdapters = useRef<Partial<DefaultInspectorAdapters> | undefined>(lensAdapters);

const { esqlVariables } = useFetchContext({ uuid: panelId, parentApi });
const esqlQueryStats = useESQLQueryStats(isTextBasedLanguage, lensAdapters?.requests);

const dispatch = useLensDispatch();

Expand Down Expand Up @@ -213,6 +214,7 @@ export function ESQLEditor({
isVisualizationLoading={isVisualizationLoading}
setIsVisualizationLoading={setIsVisualizationLoading}
esqlVariables={esqlVariables}
queryStats={esqlQueryStats}
closeFlyout={closeFlyout}
panelId={panelId}
attributes={attributes}
Expand Down Expand Up @@ -260,6 +262,7 @@ type InnerEditorProps = Simplify<
suggestsLimitedColumns: boolean;
adHocDataViews: DataViewSpec[];
esqlVariables: ESQLControlVariable[] | undefined;
queryStats?: ESQLQueryStats;
} & Pick<LayerPanelProps, 'attributes' | 'parentApi' | 'panelId' | 'closeFlyout'>
>;

Expand All @@ -278,6 +281,7 @@ function InnerESQLEditor({
prevQuery,
runQuery,
esqlVariables,
queryStats,
}: InnerEditorProps) {
const { euiTheme } = useEuiTheme();
const { onSaveControl, onCancelControl } = useESQLVariables({
Expand Down Expand Up @@ -325,6 +329,7 @@ function InnerESQLEditor({
onCancelControl,
}}
esqlVariables={esqlVariables}
queryStats={queryStats}
/>
</div>
</EuiFlexItem>
Expand Down
Loading