diff --git a/src/platform/packages/shared/kbn-esql-utils/index.ts b/src/platform/packages/shared/kbn-esql-utils/index.ts index 33a6047a1c98c..92486790d4c94 100644 --- a/src/platform/packages/shared/kbn-esql-utils/index.ts +++ b/src/platform/packages/shared/kbn-esql-utils/index.ts @@ -34,7 +34,6 @@ export { isESQLColumnSortable, isESQLColumnGroupable, isESQLFieldGroupable, - TextBasedLanguages, sanitazeESQLInput, queryCannotBeSampled, mapVariableToColumn, diff --git a/src/platform/packages/shared/kbn-esql-utils/src/index.ts b/src/platform/packages/shared/kbn-esql-utils/src/index.ts index 0df4dabf455ca..3aba3dcf456ba 100644 --- a/src/platform/packages/shared/kbn-esql-utils/src/index.ts +++ b/src/platform/packages/shared/kbn-esql-utils/src/index.ts @@ -7,7 +7,6 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -export { TextBasedLanguages } from './types'; export { getESQLAdHocDataview, getIndexForESQLQuery } from './utils/get_esql_adhoc_dataview'; export { getInitialESQLQuery } from './utils/get_initial_esql_query'; export { getESQLWithSafeLimit } from './utils/get_esql_with_safe_limit'; diff --git a/src/platform/packages/shared/kbn-esql-utils/src/types.ts b/src/platform/packages/shared/kbn-esql-utils/src/types.ts deleted file mode 100644 index da5562af411b3..0000000000000 --- a/src/platform/packages/shared/kbn-esql-utils/src/types.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -export enum TextBasedLanguages { - ESQL = 'ESQL', -} diff --git a/src/platform/plugins/shared/discover/public/application/main/components/top_nav/discover_topnav.tsx b/src/platform/plugins/shared/discover/public/application/main/components/top_nav/discover_topnav.tsx index d7d1d607e24c8..b2b7a61debcf1 100644 --- a/src/platform/plugins/shared/discover/public/application/main/components/top_nav/discover_topnav.tsx +++ b/src/platform/plugins/shared/discover/public/application/main/components/top_nav/discover_topnav.tsx @@ -10,8 +10,6 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { DataViewType } from '@kbn/data-views-plugin/public'; import type { DataViewPickerProps } from '@kbn/unified-search-plugin/public'; -import { ENABLE_ESQL } from '@kbn/esql-utils'; -import { TextBasedLanguages } from '@kbn/esql-utils'; import { DiscoverFlyouts, dismissAllFlyoutsExceptFor } from '@kbn/discover-utils'; import { useSavedSearchInitial } from '../../state_management/discover_state_provider'; import { ESQL_TRANSITION_MODAL_KEY } from '../../../../../common/constants'; @@ -49,8 +47,7 @@ export const DiscoverTopNav = ({ onCancelClick, }: DiscoverTopNavProps) => { const services = useDiscoverServices(); - const { dataViewEditor, navigation, dataViewFieldEditor, data, uiSettings, setHeaderActionMenu } = - services; + const { dataViewEditor, navigation, dataViewFieldEditor, data, setHeaderActionMenu } = services; const query = useAppStateSelector((state) => state.query); const { savedDataViews, managedDataViews, adHocDataViews } = useInternalStateSelector(selectDataViewsForPicker); @@ -174,9 +171,6 @@ export const DiscoverTopNav = ({ ); const dataViewPickerProps: DataViewPickerProps = useMemo(() => { - const isESQLModeEnabled = uiSettings.get(ENABLE_ESQL); - const supportedTextBasedLanguages = isESQLModeEnabled ? [TextBasedLanguages.ESQL] : []; - return { trigger: { label: dataView?.getName() || '', @@ -188,7 +182,6 @@ export const DiscoverTopNav = ({ onDataViewCreated: createNewDataView, onCreateDefaultAdHocDataView: stateContainer.actions.createAndAppendAdHocDataView, onChangeDataView: stateContainer.actions.onChangeDataView, - textBasedLanguages: supportedTextBasedLanguages, adHocDataViews, managedDataViews, savedDataViews, @@ -202,7 +195,6 @@ export const DiscoverTopNav = ({ managedDataViews, savedDataViews, stateContainer, - uiSettings, ]); const onESQLDocsFlyoutVisibilityChanged = useCallback((isOpen: boolean) => { diff --git a/src/platform/plugins/shared/unified_search/public/__stories__/search_bar.stories.tsx b/src/platform/plugins/shared/unified_search/public/__stories__/search_bar.stories.tsx index 1d952d728b230..576d777d65e38 100644 --- a/src/platform/plugins/shared/unified_search/public/__stories__/search_bar.stories.tsx +++ b/src/platform/plugins/shared/unified_search/public/__stories__/search_bar.stories.tsx @@ -579,7 +579,6 @@ storiesOf('SearchBar', module) onChangeDataView: action('onChangeDataView'), onAddField: action('onAddField'), onDataViewCreated: action('onDataViewCreated'), - textBasedLanguages: ['ESQL'], }, } as SearchBarProps) ) @@ -595,7 +594,6 @@ storiesOf('SearchBar', module) onChangeDataView: action('onChangeDataView'), onAddField: action('onAddField'), onDataViewCreated: action('onDataViewCreated'), - textBasedLanguages: ['ESQL'], }, query: { esql: 'from dataview | project field1, field2' }, } as unknown as SearchBarProps) @@ -612,7 +610,6 @@ storiesOf('SearchBar', module) onChangeDataView: action('onChangeDataView'), onAddField: action('onAddField'), onDataViewCreated: action('onDataViewCreated'), - textBasedLanguages: ['ESQL'], }, query: { esql: 'from dataview | project field1, field2, field 3, field 4, field 5 | where field5 > 5 | stats var = avg(field3)', @@ -631,7 +628,6 @@ storiesOf('SearchBar', module) onChangeDataView: action('onChangeDataView'), onAddField: action('onAddField'), onDataViewCreated: action('onDataViewCreated'), - textBasedLanguages: ['ESQL'], }, textBasedLanguageModeErrors: [ new Error( diff --git a/src/platform/plugins/shared/unified_search/public/dataview_picker/data_view_picker.tsx b/src/platform/plugins/shared/unified_search/public/dataview_picker/data_view_picker.tsx index 9a77dad540783..85c30edc3b6e1 100644 --- a/src/platform/plugins/shared/unified_search/public/dataview_picker/data_view_picker.tsx +++ b/src/platform/plugins/shared/unified_search/public/dataview_picker/data_view_picker.tsx @@ -10,7 +10,6 @@ import React from 'react'; import type { EuiButtonProps, EuiSelectableProps } from '@elastic/eui'; import type { DataView, DataViewListItem, DataViewSpec } from '@kbn/data-views-plugin/public'; -import { TextBasedLanguages } from '@kbn/esql-utils'; import { ChangeDataView } from './change_dataview'; export type ChangeDataViewTriggerProps = EuiButtonProps & { @@ -69,12 +68,6 @@ export interface DataViewPickerProps { onDataViewCreated?: () => void; onCreateDefaultAdHocDataView?: (dataViewSpec: DataViewSpec) => void; - /** - * List of the supported text based languages (SQL, ESQL) etc. - * Defined per application, if not provided, no text based languages - * will be available. - */ - textBasedLanguages?: TextBasedLanguages[]; /** * Makes the picker disabled by disabling the popover trigger */ @@ -93,7 +86,6 @@ export const DataViewPicker = ({ onDataViewCreated, trigger, selectableProps, - textBasedLanguages, onCreateDefaultAdHocDataView, isDisabled, }: DataViewPickerProps) => { @@ -111,7 +103,6 @@ export const DataViewPicker = ({ managedDataViews={managedDataViews} savedDataViews={savedDataViews} selectableProps={selectableProps} - textBasedLanguages={textBasedLanguages} isDisabled={isDisabled} /> );