+
) : (
-
+
)
}
checked={language === 'kuery'}
diff --git a/src/plugins/data/public/query/lib/match_pairs.ts b/src/plugins/unified_search/public/query_string_input/match_pairs.ts
similarity index 100%
rename from src/plugins/data/public/query/lib/match_pairs.ts
rename to src/plugins/unified_search/public/query_string_input/match_pairs.ts
diff --git a/src/plugins/data/public/ui/query_string_input/no_data_popover.test.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
similarity index 100%
rename from src/plugins/data/public/ui/query_string_input/no_data_popover.test.tsx
rename to src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
diff --git a/src/plugins/data/public/ui/query_string_input/no_data_popover.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
similarity index 84%
rename from src/plugins/data/public/ui/query_string_input/no_data_popover.tsx
rename to src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
index 672d992dc7d79..e417f274fa557 100644
--- a/src/plugins/data/public/ui/query_string_input/no_data_popover.tsx
+++ b/src/plugins/unified_search/public/query_string_input/no_data_popover.tsx
@@ -6,11 +6,11 @@
* Side Public License, v 1.
*/
-import { ReactElement, useEffect, useState } from 'react';
import React from 'react';
-import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
-import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { ReactElement, useEffect, useState } from 'react';
import { i18n } from '@kbn/i18n';
+import { EuiButtonEmpty, EuiText, EuiTourStep } from '@elastic/eui';
+import { IStorageWrapper } from '../../../kibana_utils/public';
const NO_DATA_POPOVER_STORAGE_KEY = 'data.noDataPopover';
@@ -43,7 +43,7 @@ export function NoDataPopover({
content={
- {i18n.translate('data.noDataPopover.content', {
+ {i18n.translate('unifiedSearch.noDataPopover.content', {
defaultMessage:
"This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts.",
})}
@@ -56,8 +56,10 @@ export function NoDataPopover({
step={1}
stepsTotal={1}
isStepOpen={noDataPopoverVisible}
- subtitle={i18n.translate('data.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
- title={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Empty dataset' })}
+ subtitle={i18n.translate('unifiedSearch.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
+ title={i18n.translate('unifiedSearch.noDataPopover.title', {
+ defaultMessage: 'Empty dataset',
+ })}
footerAction={
- {i18n.translate('data.noDataPopover.dismissAction', {
+ {i18n.translate('unifiedSearch.noDataPopover.dismissAction', {
defaultMessage: "Don't show again",
})}
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
similarity index 95%
rename from src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx
rename to src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
index 9f99049d3e788..e8ca82782d11f 100644
--- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -14,12 +14,12 @@ import { render } from '@testing-library/react';
import { EMPTY } from 'rxjs';
import QueryBarTopRow from './query_bar_top_row';
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../mocks';
-import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { KibanaContextProvider } from '../../../kibana_react/public';
import { I18nProvider } from '@kbn/i18n-react';
-import { stubIndexPattern } from '../../stubs';
-import { UI_SETTINGS } from '../../../common';
+import { stubIndexPattern } from '../../../data/public/stubs';
+import { UI_SETTINGS } from '../../../data/common';
const startMock = coreMock.createStart();
const mockTimeHistory = {
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
similarity index 96%
rename from src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
rename to src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index 424347834c3db..ddba035b91fdd 100644
--- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -13,7 +13,6 @@ import deepEqual from 'fast-deep-equal';
import useObservable from 'react-use/lib/useObservable';
import { EMPTY } from 'rxjs';
import { map } from 'rxjs/operators';
-
import {
EuiFlexGroup,
EuiFlexItem,
@@ -24,14 +23,20 @@ import {
EuiSuperUpdateButton,
OnRefreshProps,
} from '@elastic/eui';
-import { IDataPluginServices, IIndexPattern, TimeRange, TimeHistoryContract, Query } from '../..';
-import { useKibana, withKibana } from '../../../../kibana_react/public';
+import {
+ IDataPluginServices,
+ IIndexPattern,
+ TimeRange,
+ TimeHistoryContract,
+ Query,
+ getQueryLog,
+} from '../../../data/public';
+import type { PersistedLog } from '../../../data/public';
+import { useKibana, withKibana } from '../../../kibana_react/public';
import QueryStringInputUI from './query_string_input';
-import { UI_SETTINGS } from '../../../common';
-import { getQueryLog } from '../../query';
-import type { PersistedLog } from '../../query';
+import { UI_SETTINGS } from '../../../data/common';
import { NoDataPopover } from './no_data_popover';
-import { shallowEqual } from '../../utils/shallow_equal';
+import { shallowEqual } from '../utils';
const SuperDatePicker = React.memo(
EuiSuperDatePicker as any
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
similarity index 89%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts
rename to src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
index 9e9498fa465c4..f8c80473d4f0a 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.test.mocks.ts
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.mocks.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { stubIndexPattern } from '../../stubs';
+import { stubIndexPattern } from '../../../data/public/stubs';
export const mockPersistedLog = {
add: jest.fn(),
@@ -21,7 +21,7 @@ export const mockFetchIndexPatterns = jest
.fn()
.mockReturnValue(Promise.resolve([stubIndexPattern]));
-jest.mock('../../query/persisted_log', () => ({
+jest.mock('../../../data/public/query/persisted_log', () => ({
PersistedLog: mockPersistedLogFactory,
}));
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
similarity index 97%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx
rename to src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
index 764ad45c78d3d..4a48b3cc42420 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
@@ -23,10 +23,10 @@ import { EuiTextArea, EuiIcon } from '@elastic/eui';
import { QueryLanguageSwitcher } from './language_switcher';
import QueryStringInputUI from './query_string_input';
-import { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../mocks';
-import { stubIndexPattern } from '../../stubs';
-import { KibanaContextProvider, withKibana } from 'src/plugins/kibana_react/public';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { stubIndexPattern } from '../../../data/public/stubs';
+import { KibanaContextProvider, withKibana } from '../../../kibana_react/public';
jest.useFakeTimers();
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
similarity index 95%
rename from src/plugins/data/public/ui/query_string_input/query_string_input.tsx
rename to src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index 6464f02dd7cb7..1a075812ac207 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -10,6 +10,7 @@ import React, { PureComponent } from 'react';
import { i18n } from '@kbn/i18n';
import classNames from 'classnames';
+import { METRIC_TYPE } from '@kbn/analytics';
import {
EuiButton,
@@ -26,21 +27,27 @@ import {
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { compact, debounce, isEqual, isFunction } from 'lodash';
-import { Toast } from 'src/core/public';
-import { METRIC_TYPE } from '@kbn/analytics';
-
-import { IDataPluginServices, IIndexPattern, Query } from '../..';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../autocomplete';
-import { KibanaReactContextValue, toMountPoint } from '../../../../kibana_react/public';
+import { Toast } from '../../../../core/public';
+import {
+ IDataPluginServices,
+ IIndexPattern,
+ Query,
+ QuerySuggestion,
+ QuerySuggestionTypes,
+ getQueryLog,
+} from '../../../data/public';
+import { matchPairs } from './match_pairs';
+import { toUser } from './to_user';
+import { fromUser } from './from_user';
+import type { PersistedLog } from '../../../data/public';
+import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../data/common';
+import { KibanaReactContextValue, toMountPoint } from '../../../kibana_react/public';
import { fetchIndexPatterns } from './fetch_index_patterns';
import { QueryLanguageSwitcher } from './language_switcher';
-import { getQueryLog, matchPairs, toUser, fromUser } from '../../query';
-import type { PersistedLog } from '../../query';
import type { SuggestionsListSize } from '../typeahead/suggestions_component';
-import { SuggestionsComponent } from '..';
-import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '../../../common';
+import { SuggestionsComponent } from '../typeahead';
import { onRaf } from '../utils';
-import { getTheme } from '../../services';
+import { getTheme } from '../services';
export interface QueryStringInputProps {
indexPatterns: Array;
@@ -455,14 +462,14 @@ export default class QueryStringInputUI extends PureComponent {
if (notifications && docLinks) {
const toast = notifications.toasts.add({
- title: i18n.translate('data.query.queryBar.KQLNestedQuerySyntaxInfoTitle', {
+ title: i18n.translate('unifiedSearch.query.queryBar.KQLNestedQuerySyntaxInfoTitle', {
defaultMessage: 'KQL nested query syntax',
}),
text: toMountPoint(
{
link: (
@@ -482,7 +489,7 @@ export default class QueryStringInputUI extends PureComponent {
onKQLNestedQuerySyntaxInfoOptOut(toast)}>
@@ -705,7 +712,7 @@ export default class QueryStringInputUI extends PureComponent {
{
{
inputRef={this.assignInputRef}
autoComplete="off"
spellCheck={false}
- aria-label={i18n.translate('data.query.queryBar.searchInputAriaLabel', {
+ aria-label={i18n.translate('unifiedSearch.query.queryBar.searchInputAriaLabel', {
defaultMessage: 'Start typing to search and filter the {pageType} page',
values: { pageType: this.services.appName },
})}
@@ -769,7 +776,7 @@ export default class QueryStringInputUI extends PureComponent {