>;
// @public
export interface ICspConfig {
@@ -1840,26 +1870,14 @@ export interface RegisterDeprecationsConfig {
export type RequestHandler = (context: Context, request: KibanaRequest, response: ResponseFactory) => IKibanaResponse | Promise>;
// @public
-export interface RequestHandlerContext {
+export interface RequestHandlerContext extends RequestHandlerContextBase {
// (undocumented)
- core: {
- savedObjects: {
- client: SavedObjectsClientContract;
- typeRegistry: ISavedObjectTypeRegistry;
- getClient: (options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
- getExporter: (client: SavedObjectsClientContract) => ISavedObjectsExporter;
- getImporter: (client: SavedObjectsClientContract) => ISavedObjectsImporter;
- };
- elasticsearch: {
- client: IScopedClusterClient;
- };
- uiSettings: {
- client: IUiSettingsClient;
- };
- deprecations: {
- client: DeprecationsClient;
- };
- };
+ core: Promise;
+}
+
+// @public (undocumented)
+export interface RequestHandlerContextBase {
+ resolve: >(parts: T[]) => Promise>>;
}
// @public
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index fc215d905581..c73e98f4bb6c 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -42,7 +42,6 @@ import { config as uiSettingsConfig } from './ui_settings';
import { config as statusConfig } from './status';
import { config as i18nConfig } from './i18n';
import { ContextService } from './context';
-import { RequestHandlerContext } from '.';
import {
InternalCorePreboot,
InternalCoreSetup,
@@ -372,13 +371,9 @@ export class Server {
}
private registerCoreContext(coreSetup: InternalCoreSetup) {
- coreSetup.http.registerRouteHandlerContext(
- coreId,
- 'core',
- (context, req, res): RequestHandlerContext['core'] => {
- return new CoreRouteHandlerContext(this.coreStart!, req);
- }
- );
+ coreSetup.http.registerRouteHandlerContext(coreId, 'core', async (context, req, res) => {
+ return new CoreRouteHandlerContext(this.coreStart!, req);
+ });
}
public setupCoreConfig() {
diff --git a/src/core/server/ui_settings/routes/delete.ts b/src/core/server/ui_settings/routes/delete.ts
index f8ab4d5d0c2c..87c6edf38642 100644
--- a/src/core/server/ui_settings/routes/delete.ts
+++ b/src/core/server/ui_settings/routes/delete.ts
@@ -23,7 +23,7 @@ export function registerDeleteRoute(router: IRouter) {
{ path: '/api/kibana/settings/{key}', validate },
async (context, request, response) => {
try {
- const uiSettingsClient = context.core.uiSettings.client;
+ const uiSettingsClient = (await context.core).uiSettings.client;
await uiSettingsClient.remove(request.params.key);
diff --git a/src/core/server/ui_settings/routes/get.ts b/src/core/server/ui_settings/routes/get.ts
index 051d562c3980..0929330cf023 100644
--- a/src/core/server/ui_settings/routes/get.ts
+++ b/src/core/server/ui_settings/routes/get.ts
@@ -14,7 +14,7 @@ export function registerGetRoute(router: IRouter) {
{ path: '/api/kibana/settings', validate: false },
async (context, request, response) => {
try {
- const uiSettingsClient = context.core.uiSettings.client;
+ const uiSettingsClient = (await context.core).uiSettings.client;
return response.ok({
body: {
settings: await uiSettingsClient.getUserProvided(),
diff --git a/src/core/server/ui_settings/routes/set.ts b/src/core/server/ui_settings/routes/set.ts
index 7de287f4ebe6..91518fb6f347 100644
--- a/src/core/server/ui_settings/routes/set.ts
+++ b/src/core/server/ui_settings/routes/set.ts
@@ -26,7 +26,7 @@ export function registerSetRoute(router: IRouter) {
{ path: '/api/kibana/settings/{key}', validate },
async (context, request, response) => {
try {
- const uiSettingsClient = context.core.uiSettings.client;
+ const uiSettingsClient = (await context.core).uiSettings.client;
const { key } = request.params;
const { value } = request.body;
diff --git a/src/core/server/ui_settings/routes/set_many.ts b/src/core/server/ui_settings/routes/set_many.ts
index c4053dd3e7ee..f4f3f509bf92 100644
--- a/src/core/server/ui_settings/routes/set_many.ts
+++ b/src/core/server/ui_settings/routes/set_many.ts
@@ -21,7 +21,7 @@ const validate = {
export function registerSetManyRoute(router: IRouter) {
router.post({ path: '/api/kibana/settings', validate }, async (context, request, response) => {
try {
- const uiSettingsClient = context.core.uiSettings.client;
+ const uiSettingsClient = (await context.core).uiSettings.client;
const { changes } = request.body;
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index fbf6d64170ee..ca81383ba639 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -40,6 +40,11 @@ kibana_vars=(
csp.report_to
data.autocomplete.valueSuggestions.terminateAfter
data.autocomplete.valueSuggestions.timeout
+ unifiedSearch.autocomplete.valueSuggestions.terminateAfter
+ unifiedSearch.autocomplete.valueSuggestions.timeout
+ unifiedSearch.autocomplete.querySuggestions.enabled
+ unifiedSearch.autocomplete.valueSuggestions.enabled
+ unifiedSearch.autocomplete.valueSuggestions.tiers
elasticsearch.customHeaders
elasticsearch.hosts
elasticsearch.logQueries
diff --git a/src/plugins/console/common/constants/api.ts b/src/plugins/console/common/constants/api.ts
index aa0fad1fe442..3c5aa1151935 100644
--- a/src/plugins/console/common/constants/api.ts
+++ b/src/plugins/console/common/constants/api.ts
@@ -7,3 +7,4 @@
*/
export const API_BASE_PATH = '/api/console';
+export const KIBANA_API_PREFIX = 'kbn:';
diff --git a/src/plugins/console/common/constants/index.ts b/src/plugins/console/common/constants/index.ts
index d8768af8fc8d..756a79883cbd 100644
--- a/src/plugins/console/common/constants/index.ts
+++ b/src/plugins/console/common/constants/index.ts
@@ -7,4 +7,4 @@
*/
export { MAJOR_VERSION } from './plugin';
-export { API_BASE_PATH } from './api';
+export { API_BASE_PATH, KIBANA_API_PREFIX } from './api';
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
index dfed86a64362..b410e240151d 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
@@ -39,8 +39,8 @@ jest.mock('../../../../models/sense_editor', () => {
};
});
-jest.mock('../../../../hooks/use_send_current_request_to_es/send_request_to_es', () => ({
- sendRequestToES: jest.fn(),
+jest.mock('../../../../hooks/use_send_current_request/send_request', () => ({
+ sendRequest: jest.fn(),
}));
jest.mock('../../../../../lib/autocomplete/get_endpoint_from_position', () => ({
getEndpointFromPosition: jest.fn(),
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
index b942a6d83021..ba5f1e78d5f0 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -25,7 +25,7 @@ import {
} from '../../../../contexts';
// Mocked functions
-import { sendRequestToES } from '../../../../hooks/use_send_current_request_to_es/send_request_to_es';
+import { sendRequest } from '../../../../hooks/use_send_current_request/send_request';
import { getEndpointFromPosition } from '../../../../../lib/autocomplete/get_endpoint_from_position';
import type { DevToolsSettings } from '../../../../../services';
import * as consoleMenuActions from '../console_menu_actions';
@@ -58,15 +58,15 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
sandbox.restore();
});
- it('calls send current request to ES', async () => {
+ it('calls send current request', async () => {
(getEndpointFromPosition as jest.Mock).mockReturnValue({ patterns: [] });
- (sendRequestToES as jest.Mock).mockRejectedValue({});
+ (sendRequest as jest.Mock).mockRejectedValue({});
const editor = doMount();
act(() => {
editor.find('button[data-test-subj~="sendRequestButton"]').simulate('click');
});
await nextTick();
- expect(sendRequestToES).toBeCalledTimes(1);
+ expect(sendRequest).toBeCalledTimes(1);
});
it('opens docs', () => {
diff --git a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
index bafe9ee6ca15..d01a40bdd44b 100644
--- a/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
@@ -26,7 +26,7 @@ import { ConsoleMenu } from '../../../../components';
import { useEditorReadContext, useServicesContext } from '../../../../contexts';
import {
useSaveCurrentTextObject,
- useSendCurrentRequestToES,
+ useSendCurrentRequest,
useSetInputEditor,
} from '../../../../hooks';
import * as senseEditor from '../../../../models/sense_editor';
@@ -72,7 +72,7 @@ function EditorUI({ initialTextValue, setEditorInstance }: EditorProps) {
const { settings } = useEditorReadContext();
const setInputEditor = useSetInputEditor();
- const sendCurrentRequestToES = useSendCurrentRequestToES();
+ const sendCurrentRequest = useSendCurrentRequest();
const saveCurrentTextObject = useSaveCurrentTextObject();
const editorRef = useRef(null);
@@ -231,11 +231,11 @@ function EditorUI({ initialTextValue, setEditorInstance }: EditorProps) {
if (!isKeyboardShortcutsDisabled) {
registerCommands({
senseEditor: editorInstanceRef.current!,
- sendCurrentRequestToES,
+ sendCurrentRequest,
openDocumentation,
});
}
- }, [sendCurrentRequestToES, openDocumentation, settings]);
+ }, [openDocumentation, settings, sendCurrentRequest]);
useEffect(() => {
const { current: editor } = editorInstanceRef;
@@ -262,7 +262,7 @@ function EditorUI({ initialTextValue, setEditorInstance }: EditorProps) {
>
void;
+ sendCurrentRequest: () => void;
openDocumentation: () => void;
}
@@ -24,11 +24,7 @@ const COMMANDS = {
GO_TO_LINE: 'gotoline',
};
-export function registerCommands({
- senseEditor,
- sendCurrentRequestToES,
- openDocumentation,
-}: Actions) {
+export function registerCommands({ senseEditor, sendCurrentRequest, openDocumentation }: Actions) {
const throttledAutoIndent = throttle(() => senseEditor.autoIndent(), 500, {
leading: true,
trailing: true,
@@ -39,7 +35,7 @@ export function registerCommands({
keys: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
name: COMMANDS.SEND_TO_ELASTICSEARCH,
fn: () => {
- sendCurrentRequestToES();
+ sendCurrentRequest();
},
});
diff --git a/src/plugins/console/public/application/hooks/index.ts b/src/plugins/console/public/application/hooks/index.ts
index 1a9b4e5c472b..1996330bef66 100644
--- a/src/plugins/console/public/application/hooks/index.ts
+++ b/src/plugins/console/public/application/hooks/index.ts
@@ -8,6 +8,6 @@
export { useSetInputEditor } from './use_set_input_editor';
export { useRestoreRequestFromHistory } from './use_restore_request_from_history';
-export { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+export { useSendCurrentRequest } from './use_send_current_request';
export { useSaveCurrentTextObject } from './use_save_current_text_object';
export { useDataInit } from './use_data_init';
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts b/src/plugins/console/public/application/hooks/use_send_current_request/index.ts
similarity index 81%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/index.ts
index df2431f1f6f4..33bdbef87f2e 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/index.ts
@@ -6,4 +6,4 @@
* Side Public License, v 1.
*/
-export { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+export { useSendCurrentRequest } from './use_send_current_request';
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
similarity index 66%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
index 8578e271f37b..60ced085c689 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.test.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.test.ts
@@ -8,14 +8,14 @@
import type { ContextValue } from '../../contexts';
-jest.mock('./send_request_to_es', () => ({ sendRequestToES: jest.fn(() => Promise.resolve()) }));
+jest.mock('./send_request', () => ({ sendRequest: jest.fn(() => Promise.resolve()) }));
-import { sendRequestToES } from './send_request_to_es';
+import { sendRequest } from './send_request';
import { serviceContextMock } from '../../contexts/services_context.mock';
-const mockedSendRequestToES = sendRequestToES as jest.Mock;
+const mockedSendRequest = sendRequest as jest.Mock;
-describe('sendRequestToES', () => {
+describe('sendRequest', () => {
let mockContextValue: ContextValue;
beforeEach(() => {
@@ -26,8 +26,8 @@ describe('sendRequestToES', () => {
jest.resetAllMocks();
});
- it('should send request to ES', async () => {
- mockedSendRequestToES.mockResolvedValue([
+ it('should send request', async () => {
+ mockedSendRequest.mockResolvedValue([
{
response: {
statusCode: 200,
@@ -40,17 +40,17 @@ describe('sendRequestToES', () => {
http: mockContextValue.services.http,
requests: [{ method: 'PUT', url: 'test', data: [] }],
};
- const results = await sendRequestToES(args);
+ const results = await sendRequest(args);
const [request] = results;
expect(request.response.statusCode).toEqual(200);
expect(request.response.value).toContain('"acknowledged": true');
- expect(mockedSendRequestToES).toHaveBeenCalledWith(args);
- expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+ expect(mockedSendRequest).toHaveBeenCalledWith(args);
+ expect(mockedSendRequest).toHaveBeenCalledTimes(1);
});
- it('should send multiple requests to ES', async () => {
- mockedSendRequestToES.mockResolvedValue([
+ it('should send multiple requests', async () => {
+ mockedSendRequest.mockResolvedValue([
{
response: {
statusCode: 200,
@@ -70,17 +70,17 @@ describe('sendRequestToES', () => {
{ method: 'GET', url: 'test-2', data: [] },
],
};
- const results = await sendRequestToES(args);
+ const results = await sendRequest(args);
const [firstRequest, secondRequest] = results;
expect(firstRequest.response.statusCode).toEqual(200);
expect(secondRequest.response.statusCode).toEqual(200);
- expect(mockedSendRequestToES).toHaveBeenCalledWith(args);
- expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+ expect(mockedSendRequest).toHaveBeenCalledWith(args);
+ expect(mockedSendRequest).toHaveBeenCalledTimes(1);
});
it('should handle errors', async () => {
- mockedSendRequestToES.mockRejectedValue({
+ mockedSendRequest.mockRejectedValue({
response: {
statusCode: 500,
statusText: 'error',
@@ -88,45 +88,46 @@ describe('sendRequestToES', () => {
});
try {
- await sendRequestToES({
+ await sendRequest({
http: mockContextValue.services.http,
requests: [{ method: 'GET', url: 'test', data: [] }],
});
} catch (error) {
expect(error.response.statusCode).toEqual(500);
expect(error.response.statusText).toEqual('error');
- expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+ expect(mockedSendRequest).toHaveBeenCalledTimes(1);
}
});
+
describe('successful response value', () => {
describe('with text', () => {
it('should return value with lines separated', async () => {
- mockedSendRequestToES.mockResolvedValue('\ntest_index-1 [] \ntest_index-2 []\n');
- const response = await sendRequestToES({
+ mockedSendRequest.mockResolvedValue('\ntest_index-1 []\ntest_index-2 []\n');
+ const response = await sendRequest({
http: mockContextValue.services.http,
requests: [{ method: 'GET', url: 'test-1', data: [] }],
});
expect(response).toMatchInlineSnapshot(`
"
- test_index-1 []
+ test_index-1 []
test_index-2 []
"
`);
- expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+ expect(mockedSendRequest).toHaveBeenCalledTimes(1);
});
});
describe('with parsed json', () => {
it('should stringify value', async () => {
- mockedSendRequestToES.mockResolvedValue(JSON.stringify({ test: 'some value' }));
- const response = await sendRequestToES({
+ mockedSendRequest.mockResolvedValue(JSON.stringify({ test: 'some value' }));
+ const response = await sendRequest({
http: mockContextValue.services.http,
requests: [{ method: 'GET', url: 'test-2', data: [] }],
});
expect(typeof response).toBe('string');
- expect(mockedSendRequestToES).toHaveBeenCalledTimes(1);
+ expect(mockedSendRequest).toHaveBeenCalledTimes(1);
});
});
});
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
similarity index 69%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
index 451198aaf2d2..1247f3f78aa6 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/send_request.ts
@@ -15,12 +15,12 @@ import { BaseResponseType } from '../../../types';
const { collapseLiteralStrings } = XJson;
-export interface EsRequestArgs {
+export interface RequestArgs {
http: HttpSetup;
requests: Array<{ url: string; method: string; data: string[] }>;
}
-export interface ESResponseObject {
+export interface ResponseObject {
statusCode: number;
statusText: string;
timeMs: number;
@@ -28,17 +28,17 @@ export interface ESResponseObject {
value: V;
}
-export interface ESRequestResult {
+export interface RequestResult {
request: { data: string; method: string; path: string };
- response: ESResponseObject;
+ response: ResponseObject;
}
let CURRENT_REQ_ID = 0;
-export function sendRequestToES(args: EsRequestArgs): Promise {
+export function sendRequest(args: RequestArgs): Promise {
const requests = args.requests.slice();
return new Promise((resolve, reject) => {
const reqId = ++CURRENT_REQ_ID;
- const results: ESRequestResult[] = [];
+ const results: RequestResult[] = [];
if (reqId !== CURRENT_REQ_ID) {
return;
}
@@ -59,11 +59,11 @@ export function sendRequestToES(args: EsRequestArgs): Promise
return;
}
const req = requests.shift()!;
- const esPath = req.url;
- const esMethod = req.method;
- let esData = collapseLiteralStrings(req.data.join('\n'));
- if (esData) {
- esData += '\n';
+ const path = req.url;
+ const method = req.method;
+ let data = collapseLiteralStrings(req.data.join('\n'));
+ if (data) {
+ data += '\n';
} // append a new line for bulk requests.
const startTime = Date.now();
@@ -71,9 +71,9 @@ export function sendRequestToES(args: EsRequestArgs): Promise
try {
const { response, body } = await es.send({
http: args.http,
- method: esMethod,
- path: esPath,
- data: esData,
+ method,
+ path,
+ data,
asResponse: true,
});
@@ -115,9 +115,9 @@ export function sendRequestToES(args: EsRequestArgs): Promise
value,
},
request: {
- data: esData,
- method: esMethod,
- path: esPath,
+ data,
+ method,
+ path,
},
});
@@ -127,25 +127,19 @@ export function sendRequestToES(args: EsRequestArgs): Promise
}
} catch (error) {
let value;
- let contentType: string | null = '';
+ const { response, body } = error as IHttpFetchError;
+ const contentType = response?.headers.get('Content-Type') ?? '';
+ const statusCode = response?.status ?? 500;
+ const statusText = error?.response?.statusText ?? 'error';
- const { response, body = {} } = error as IHttpFetchError;
- if (response) {
- const { status, headers } = response;
- if (body) {
- value = JSON.stringify(body, null, 2); // ES error should be shown
- contentType = headers.get('Content-Type');
- } else {
- value = 'Request failed to get to the server (status code: ' + status + ')';
- contentType = headers.get('Content-Type');
- }
-
- if (isMultiRequest) {
- value = '# ' + req.method + ' ' + req.url + '\n' + value;
- }
+ if (body) {
+ value = JSON.stringify(body, null, 2);
} else {
- value =
- "\n\nFailed to connect to Console's backend.\nPlease check the Kibana server is up and running";
+ value = 'Request failed to get to the server (status code: ' + statusCode + ')';
+ }
+
+ if (isMultiRequest) {
+ value = '# ' + req.method + ' ' + req.url + '\n' + value;
}
reject({
@@ -153,13 +147,13 @@ export function sendRequestToES(args: EsRequestArgs): Promise
value,
contentType,
timeMs: Date.now() - startTime,
- statusCode: error?.response?.status ?? 500,
- statusText: error?.response?.statusText ?? 'error',
+ statusCode,
+ statusText,
},
request: {
- data: esData,
- method: esMethod,
- path: esPath,
+ data,
+ method,
+ path,
},
});
}
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts b/src/plugins/console/public/application/hooks/use_send_current_request/track.ts
similarity index 100%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/track.ts
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
similarity index 80%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx
rename to src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
index e0131dc116a3..d16dc3f832d3 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.test.tsx
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.test.tsx
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-jest.mock('./send_request_to_es', () => ({ sendRequestToES: jest.fn() }));
+jest.mock('./send_request', () => ({ sendRequest: jest.fn() }));
jest.mock('../../contexts/editor_context/editor_registry', () => ({
instance: { getInputEditor: jest.fn() },
}));
@@ -21,10 +21,10 @@ import { serviceContextMock } from '../../contexts/services_context.mock';
import { useRequestActionContext } from '../../contexts/request_context';
import { instance as editorRegistry } from '../../contexts/editor_context/editor_registry';
-import { sendRequestToES } from './send_request_to_es';
-import { useSendCurrentRequestToES } from './use_send_current_request_to_es';
+import { sendRequest } from './send_request';
+import { useSendCurrentRequest } from './use_send_current_request';
-describe('useSendCurrentRequestToES', () => {
+describe('useSendCurrentRequest', () => {
let mockContextValue: ContextValue;
let dispatch: (...args: unknown[]) => void;
const contexts = ({ children }: { children: JSX.Element }) => (
@@ -41,18 +41,18 @@ describe('useSendCurrentRequestToES', () => {
jest.resetAllMocks();
});
- it('calls send request to ES', async () => {
+ it('calls send request', async () => {
// Set up mocks
(mockContextValue.services.settings.toJSON as jest.Mock).mockReturnValue({});
// This request should succeed
- (sendRequestToES as jest.Mock).mockResolvedValue([]);
+ (sendRequest as jest.Mock).mockResolvedValue([]);
(editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
getRequestsInRange: () => ['test'],
}));
- const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+ const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
await act(() => result.current());
- expect(sendRequestToES).toHaveBeenCalledWith({
+ expect(sendRequest).toHaveBeenCalledWith({
http: mockContextValue.services.http,
requests: ['test'],
});
@@ -64,12 +64,12 @@ describe('useSendCurrentRequestToES', () => {
it('handles known errors', async () => {
// Set up mocks
- (sendRequestToES as jest.Mock).mockRejectedValue({ response: 'nada' });
+ (sendRequest as jest.Mock).mockRejectedValue({ response: 'nada' });
(editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
getRequestsInRange: () => ['test'],
}));
- const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+ const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
await act(() => result.current());
// Second call should be the request failure
const [, [requestFailedCall]] = (dispatch as jest.Mock).mock.calls;
@@ -80,12 +80,12 @@ describe('useSendCurrentRequestToES', () => {
it('handles unknown errors', async () => {
// Set up mocks
- (sendRequestToES as jest.Mock).mockRejectedValue(NaN /* unexpected error value */);
+ (sendRequest as jest.Mock).mockRejectedValue(NaN /* unexpected error value */);
(editorRegistry.getInputEditor as jest.Mock).mockImplementation(() => ({
getRequestsInRange: () => ['test'],
}));
- const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+ const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
await act(() => result.current());
// Second call should be the request failure
const [, [requestFailedCall]] = (dispatch as jest.Mock).mock.calls;
@@ -100,7 +100,7 @@ describe('useSendCurrentRequestToES', () => {
it('notifies the user about save to history errors once only', async () => {
// Set up mocks
- (sendRequestToES as jest.Mock).mockReturnValue(
+ (sendRequest as jest.Mock).mockReturnValue(
[{ request: {} }, { request: {} }] /* two responses to save history */
);
(mockContextValue.services.settings.toJSON as jest.Mock).mockReturnValue({});
@@ -112,7 +112,7 @@ describe('useSendCurrentRequestToES', () => {
getRequestsInRange: () => ['test', 'test'],
}));
- const { result } = renderHook(() => useSendCurrentRequestToES(), { wrapper: contexts });
+ const { result } = renderHook(() => useSendCurrentRequest(), { wrapper: contexts });
await act(() => result.current());
expect(dispatch).toHaveBeenCalledTimes(2);
diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
similarity index 96%
rename from src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
index e7c436c9806b..ed08304d8d66 100644
--- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
+++ b/src/plugins/console/public/application/hooks/use_send_current_request/use_send_current_request.ts
@@ -16,10 +16,10 @@ import { retrieveAutoCompleteInfo } from '../../../lib/mappings/mappings';
import { instance as registry } from '../../contexts/editor_context/editor_registry';
import { useRequestActionContext, useServicesContext } from '../../contexts';
import { StorageQuotaError } from '../../components/storage_quota_error';
-import { sendRequestToES } from './send_request_to_es';
+import { sendRequest } from './send_request';
import { track } from './track';
-export const useSendCurrentRequestToES = () => {
+export const useSendCurrentRequest = () => {
const {
services: { history, settings, notifications, trackUiMetric, http },
theme$,
@@ -46,7 +46,7 @@ export const useSendCurrentRequestToES = () => {
// Fire and forget
setTimeout(() => track(requests, editor, trackUiMetric), 0);
- const results = await sendRequestToES({ http, requests });
+ const results = await sendRequest({ http, requests });
let saveToHistoryError: undefined | Error;
const { isHistoryDisabled } = settings.toJSON();
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
index 0889b98c6938..ff9d245f6127 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.js
@@ -455,11 +455,11 @@ describe('Editor', () => {
editorInput1,
{ start: { lineNumber: 7 }, end: { lineNumber: 14 } },
`
-curl -XGET "http://localhost:9200/_stats?level=shards"
+curl -XGET "http://localhost:9200/_stats?level=shards" -H "kbn-xsrf: reporting"
#in between comment
-curl -XPUT "http://localhost:9200/index_1/type1/1" -H 'Content-Type: application/json' -d'
+curl -XPUT "http://localhost:9200/index_1/type1/1" -H "kbn-xsrf: reporting" -H "Content-Type: application/json" -d'
{
"f": 1
}'`.trim()
@@ -470,7 +470,7 @@ curl -XPUT "http://localhost:9200/index_1/type1/1" -H 'Content-Type: application
editorInput1,
{ start: { lineNumber: 29 }, end: { lineNumber: 33 } },
`
-curl -XPOST "http://localhost:9200/_sql?format=txt" -H 'Content-Type: application/json' -d'
+curl -XPOST "http://localhost:9200/_sql?format=txt" -H "kbn-xsrf: reporting" -H "Content-Type: application/json" -d'
{
"query": "SELECT prenom FROM claude_index WHERE prenom = '\\''claude'\\'' ",
"fetch_size": 1
diff --git a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
index 5e8ca35f287b..ac65afce2c18 100644
--- a/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
+++ b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
@@ -14,7 +14,7 @@ import RowParser from '../../../lib/row_parser';
import * as utils from '../../../lib/utils';
// @ts-ignore
-import * as es from '../../../lib/es/es';
+import { constructUrl } from '../../../lib/es/es';
import { CoreEditor, Position, Range } from '../../../types';
import { createTokenIterator } from '../../factories';
@@ -467,21 +467,22 @@ export class SenseEditor {
return req;
}
- const esPath = req.url;
- const esMethod = req.method;
- const esData = req.data;
+ const path = req.url;
+ const method = req.method;
+ const data = req.data;
// this is the first url defined in elasticsearch.hosts
- const url = es.constructESUrl(elasticsearchBaseUrl, esPath);
+ const url = constructUrl(elasticsearchBaseUrl, path);
- let ret = 'curl -X' + esMethod + ' "' + url + '"';
- if (esData && esData.length) {
- ret += " -H 'Content-Type: application/json' -d'\n";
- const dataAsString = collapseLiteralStrings(esData.join('\n'));
+ // Append 'kbn-xsrf' header to bypass (XSRF/CSRF) protections
+ let ret = `curl -X${method.toUpperCase()} "${url}" -H "kbn-xsrf: reporting"`;
+ if (data && data.length) {
+ ret += ` -H "Content-Type: application/json" -d'\n`;
+ const dataAsString = collapseLiteralStrings(data.join('\n'));
// We escape single quoted strings that that are wrapped in single quoted strings
ret += dataAsString.replace(/'/g, "'\\''");
- if (esData.length > 1) {
+ if (data.length > 1) {
ret += '\n';
} // end with a new line
ret += "'";
diff --git a/src/plugins/console/public/application/stores/request.ts b/src/plugins/console/public/application/stores/request.ts
index 099ab24326d3..8056ab5a7987 100644
--- a/src/plugins/console/public/application/stores/request.ts
+++ b/src/plugins/console/public/application/stores/request.ts
@@ -10,18 +10,18 @@ import { Reducer } from 'react';
import { produce } from 'immer';
import { identity } from 'fp-ts/lib/function';
import { BaseResponseType } from '../../types/common';
-import { ESRequestResult } from '../hooks/use_send_current_request_to_es/send_request_to_es';
+import { RequestResult } from '../hooks/use_send_current_request/send_request';
export type Actions =
| { type: 'sendRequest'; payload: undefined }
- | { type: 'requestSuccess'; payload: { data: ESRequestResult[] } }
- | { type: 'requestFail'; payload: ESRequestResult | undefined };
+ | { type: 'requestSuccess'; payload: { data: RequestResult[] } }
+ | { type: 'requestFail'; payload: RequestResult | undefined };
export interface Store {
requestInFlight: boolean;
lastResult: {
- data: ESRequestResult[] | null;
- error?: ESRequestResult;
+ data: RequestResult[] | null;
+ error?: RequestResult;
};
}
diff --git a/src/plugins/console/public/lib/es/es.ts b/src/plugins/console/public/lib/es/es.ts
index 2a4059d664e6..10d0ad95b049 100644
--- a/src/plugins/console/public/lib/es/es.ts
+++ b/src/plugins/console/public/lib/es/es.ts
@@ -6,8 +6,9 @@
* Side Public License, v 1.
*/
-import type { HttpFetchOptions, HttpResponse, HttpSetup } from '@kbn/core/public';
-import { API_BASE_PATH } from '../../../common/constants';
+import type { HttpResponse, HttpSetup } from '@kbn/core/public';
+import { trimStart } from 'lodash';
+import { API_BASE_PATH, KIBANA_API_PREFIX } from '../../../common/constants';
const esVersion: string[] = [];
@@ -20,7 +21,7 @@ export function getContentType(body: unknown) {
return 'application/json';
}
-interface SendProps {
+interface SendConfig {
http: HttpSetup;
method: string;
path: string;
@@ -30,6 +31,8 @@ interface SendProps {
asResponse?: boolean;
}
+type Method = 'get' | 'post' | 'delete' | 'put' | 'patch' | 'head';
+
export async function send({
http,
method,
@@ -38,18 +41,48 @@ export async function send({
asSystemRequest = false,
withProductOrigin = false,
asResponse = false,
-}: SendProps) {
- const options: HttpFetchOptions = {
+}: SendConfig) {
+ const kibanaRequestUrl = getKibanaRequestUrl(path);
+
+ if (kibanaRequestUrl) {
+ const httpMethod = method.toLowerCase() as Method;
+ const url = new URL(kibanaRequestUrl);
+ const { pathname, searchParams } = url;
+ const query = Object.fromEntries(searchParams.entries());
+ const body = ['post', 'put', 'patch'].includes(httpMethod) ? data : null;
+
+ return await http[httpMethod](pathname, {
+ body,
+ query,
+ asResponse,
+ asSystemRequest,
+ });
+ }
+
+ return await http.post(`${API_BASE_PATH}/proxy`, {
query: { path, method, ...(withProductOrigin && { withProductOrigin }) },
body: data,
asResponse,
asSystemRequest,
- };
+ });
+}
+
+function getKibanaRequestUrl(path: string) {
+ const isKibanaApiRequest = path.startsWith(KIBANA_API_PREFIX);
+ const kibanaBasePath = window.location.origin;
- return await http.post(`${API_BASE_PATH}/proxy`, options);
+ if (isKibanaApiRequest) {
+ // window.location.origin is used as a Kibana public base path for sending requests in cURL commands. E.g. "Copy as cURL".
+ return `${kibanaBasePath}/${trimStart(path.replace(KIBANA_API_PREFIX, ''), '/')}`;
+ }
}
-export function constructESUrl(baseUri: string, path: string) {
+export function constructUrl(baseUri: string, path: string) {
+ const kibanaRequestUrl = getKibanaRequestUrl(path);
+
+ if (kibanaRequestUrl) {
+ return kibanaRequestUrl;
+ }
baseUri = baseUri.replace(/\/+$/, '');
path = path.replace(/^\/+/, '');
return baseUri + '/' + path;
diff --git a/src/plugins/console/public/lib/es/index.ts b/src/plugins/console/public/lib/es/index.ts
index 61d34ba96ec0..f83893e93713 100644
--- a/src/plugins/console/public/lib/es/index.ts
+++ b/src/plugins/console/public/lib/es/index.ts
@@ -6,4 +6,4 @@
* Side Public License, v 1.
*/
-export { send, constructESUrl, getContentType, getVersion } from './es';
+export { send, constructUrl, getContentType, getVersion } from './es';
diff --git a/src/plugins/controls/common/control_types/options_list/types.ts b/src/plugins/controls/common/control_types/options_list/types.ts
index 9c051e4ca623..0f889bed7bac 100644
--- a/src/plugins/controls/common/control_types/options_list/types.ts
+++ b/src/plugins/controls/common/control_types/options_list/types.ts
@@ -8,14 +8,11 @@
import { BoolQuery } from '@kbn/es-query';
import { FieldSpec } from '@kbn/data-views-plugin/common';
-import { ControlInput } from '../../types';
+import { DataControlInput } from '../../types';
export const OPTIONS_LIST_CONTROL = 'optionsListControl';
-export interface OptionsListEmbeddableInput extends ControlInput {
- fieldName: string;
- dataViewId: string;
-
+export interface OptionsListEmbeddableInput extends DataControlInput {
selectedOptions?: string[];
singleSelect?: boolean;
loading?: boolean;
diff --git a/src/plugins/controls/common/control_types/range_slider/types.ts b/src/plugins/controls/common/control_types/range_slider/types.ts
index e63ec0337a57..a975fdd27ac3 100644
--- a/src/plugins/controls/common/control_types/range_slider/types.ts
+++ b/src/plugins/controls/common/control_types/range_slider/types.ts
@@ -6,14 +6,12 @@
* Side Public License, v 1.
*/
-import { ControlInput } from '../../types';
+import { DataControlInput } from '../../types';
export const RANGE_SLIDER_CONTROL = 'rangeSliderControl';
export type RangeValue = [string, string];
-export interface RangeSliderEmbeddableInput extends ControlInput {
- fieldName: string;
- dataViewId: string;
+export interface RangeSliderEmbeddableInput extends DataControlInput {
value: RangeValue;
}
diff --git a/src/plugins/controls/common/control_types/time_slider/types.ts b/src/plugins/controls/common/control_types/time_slider/types.ts
index 73d364da80ca..31272380becd 100644
--- a/src/plugins/controls/common/control_types/time_slider/types.ts
+++ b/src/plugins/controls/common/control_types/time_slider/types.ts
@@ -6,12 +6,10 @@
* Side Public License, v 1.
*/
-import { ControlInput } from '../../types';
+import { DataControlInput } from '../../types';
export const TIME_SLIDER_CONTROL = 'timeSlider';
-export interface TimeSliderControlEmbeddableInput extends ControlInput {
- fieldName: string;
- dataViewId: string;
+export interface TimeSliderControlEmbeddableInput extends DataControlInput {
value?: [number | null, number | null];
}
diff --git a/src/plugins/controls/common/types.ts b/src/plugins/controls/common/types.ts
index 3715198d7cfe..abb24299e818 100644
--- a/src/plugins/controls/common/types.ts
+++ b/src/plugins/controls/common/types.ts
@@ -27,3 +27,8 @@ export type ControlInput = EmbeddableInput & {
controlStyle?: ControlStyle;
ignoreParentSettings?: ParentIgnoreSettings;
};
+
+export type DataControlInput = ControlInput & {
+ fieldName: string;
+ dataViewId: string;
+};
diff --git a/src/plugins/controls/kibana.json b/src/plugins/controls/kibana.json
index 20afd63505a7..e87af3f517af 100644
--- a/src/plugins/controls/kibana.json
+++ b/src/plugins/controls/kibana.json
@@ -17,7 +17,8 @@
"expressions",
"embeddable",
"dataViews",
- "data"
+ "data",
+ "unifiedSearch"
],
"optionalPlugins": []
}
diff --git a/src/plugins/controls/public/__stories__/controls.stories.tsx b/src/plugins/controls/public/__stories__/controls.stories.tsx
index 74d0d3e9de6a..481016af72a3 100644
--- a/src/plugins/controls/public/__stories__/controls.stories.tsx
+++ b/src/plugins/controls/public/__stories__/controls.stories.tsx
@@ -31,7 +31,7 @@ import { decorators } from './decorators';
import { ControlsPanels } from '../control_group/types';
import { ControlGroupContainer } from '../control_group';
import { pluginServices, registry } from '../services/storybook';
-import { replaceValueSuggestionMethod } from '../services/storybook/data';
+import { replaceValueSuggestionMethod } from '../services/storybook/unified_search';
import { injectStorybookDataView } from '../services/storybook/data_views';
import { populateStorybookControlFactories } from './storybook_control_factories';
import { OptionsListRequest } from '../services/options_list';
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
index f1002290eab3..259b6bd7f66a 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import React, { FC, useCallback, useState } from 'react';
+import React, { FC, useCallback } from 'react';
import { BehaviorSubject } from 'rxjs';
import { DataViewField } from '@kbn/data-views-plugin/public';
@@ -45,16 +45,13 @@ export const RangeSliderComponent: FC = ({ componentStateSubject }) => {
componentStateSubject.getValue()
);
- const { value = ['', ''], id, title } = useEmbeddableSelector((state) => state);
-
- const [selectedValue, setSelectedValue] = useState(value || ['', '']);
+ const { value, id, title } = useEmbeddableSelector((state) => state);
const onChangeComplete = useCallback(
(range: RangeValue) => {
dispatch(selectRange(range));
- setSelectedValue(range);
},
- [selectRange, setSelectedValue, dispatch]
+ [selectRange, dispatch]
);
return (
@@ -64,7 +61,7 @@ export const RangeSliderComponent: FC = ({ componentStateSubject }) => {
min={min}
max={max}
title={title}
- value={selectedValue}
+ value={value ?? ['', '']}
onChange={onChangeComplete}
fieldFormatter={fieldFormatter}
/>
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
index 2777f45d026b..1ad34fd361ac 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable.tsx
@@ -311,7 +311,7 @@ export class RangeSliderEmbeddable extends Embeddable {
+ public reload = () => {
this.fetchMinMax();
};
diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
index 74bb2d23dbd8..bd8b8a394988 100644
--- a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
@@ -37,8 +37,8 @@ export class RangeSliderEmbeddableFactory
) => {
if (
embeddable &&
- (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
- !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+ ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+ (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
) {
// if the field name or data view id has changed in this editing session, selected values are invalid, so reset them.
newInput.value = ['', ''];
diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
index 61a47d8779a1..d25d4f145a99 100644
--- a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
+++ b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import React, { FC, useCallback, useState, useMemo } from 'react';
+import React, { FC, useCallback, useMemo } from 'react';
import { BehaviorSubject } from 'rxjs';
import { debounce } from 'lodash';
import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
@@ -59,10 +59,6 @@ export const TimeSlider: FC = ({
const { value } = useEmbeddableSelector((state) => state);
- const [selectedValue, setSelectedValue] = useState<[number | null, number | null]>(
- value || [null, null]
- );
-
const dispatchChange = useCallback(
(range: [number | null, number | null]) => {
dispatch(selectRange(range));
@@ -75,15 +71,14 @@ export const TimeSlider: FC = ({
const onChangeComplete = useCallback(
(range: [number | null, number | null]) => {
debouncedDispatchChange(range);
- setSelectedValue(range);
},
- [setSelectedValue, debouncedDispatchChange]
+ [debouncedDispatchChange]
);
return (
{
if (
embeddable &&
- (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
- !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+ ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+ (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
) {
// if the field name or data view id has changed in this editing session, selected options are invalid, so reset them.
newInput.value = undefined;
diff --git a/src/plugins/controls/public/services/data.ts b/src/plugins/controls/public/services/data.ts
index 74c30a1f6d70..4e9db3b68e90 100644
--- a/src/plugins/controls/public/services/data.ts
+++ b/src/plugins/controls/public/services/data.ts
@@ -24,7 +24,6 @@ export interface ControlsDataService {
) => Observable<{ min?: number; max?: number }>;
getDataView: DataPublicPluginStart['dataViews']['get'];
getDataView$: (id: string) => Observable;
- autocomplete: DataPublicPluginStart['autocomplete'];
query: DataPublicPluginStart['query'];
searchSource: DataPublicPluginStart['search']['searchSource'];
timefilter: DataPublicPluginStart['query']['timefilter']['timefilter'];
diff --git a/src/plugins/controls/public/services/index.ts b/src/plugins/controls/public/services/index.ts
index cf358dac8b48..ac2e8374ad06 100644
--- a/src/plugins/controls/public/services/index.ts
+++ b/src/plugins/controls/public/services/index.ts
@@ -12,6 +12,7 @@ import { ControlsOverlaysService } from './overlays';
import { registry as stubRegistry } from './stub';
import { ControlsPluginStart } from '../types';
import { ControlsDataService } from './data';
+import { ControlsUnifiedSearchService } from './unified_search';
import { ControlsService } from './controls';
import { ControlsHTTPService } from './http';
import { ControlsOptionsListService } from './options_list';
@@ -22,6 +23,7 @@ export interface ControlsServices {
dataViews: ControlsDataViewsService;
overlays: ControlsOverlaysService;
data: ControlsDataService;
+ unifiedSearch: ControlsUnifiedSearchService;
http: ControlsHTTPService;
settings: ControlsSettingsService;
diff --git a/src/plugins/controls/public/services/kibana/data.ts b/src/plugins/controls/public/services/kibana/data.ts
index 3a36b929c7cb..29a96a98c7e7 100644
--- a/src/plugins/controls/public/services/kibana/data.ts
+++ b/src/plugins/controls/public/services/kibana/data.ts
@@ -43,7 +43,7 @@ const minMaxAgg = (field?: DataViewField) => {
export const dataServiceFactory: DataServiceFactory = ({ startPlugins }) => {
const {
- data: { query: queryPlugin, search, autocomplete },
+ data: { query: queryPlugin, search },
} = startPlugins;
const { data } = startPlugins;
@@ -95,7 +95,6 @@ export const dataServiceFactory: DataServiceFactory = ({ startPlugins }) => {
from(fetchFieldRange(dataView, fieldName, input)),
getDataView: data.dataViews.get,
getDataView$: (id: string) => from(data.dataViews.get(id)),
- autocomplete,
query: queryPlugin,
searchSource: search.searchSource,
timefilter: queryPlugin.timefilter.timefilter,
diff --git a/src/plugins/controls/public/services/kibana/index.ts b/src/plugins/controls/public/services/kibana/index.ts
index bed97091bed5..1bb8f600ecf8 100644
--- a/src/plugins/controls/public/services/kibana/index.ts
+++ b/src/plugins/controls/public/services/kibana/index.ts
@@ -22,6 +22,7 @@ import { dataServiceFactory } from './data';
import { httpServiceFactory } from './http';
import { optionsListServiceFactory } from './options_list';
import { settingsServiceFactory } from './settings';
+import { unifiedSearchServiceFactory } from './unified_search';
export const providers: PluginServiceProviders<
ControlsServices,
@@ -29,6 +30,7 @@ export const providers: PluginServiceProviders<
> = {
http: new PluginServiceProvider(httpServiceFactory),
data: new PluginServiceProvider(dataServiceFactory),
+ unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
overlays: new PluginServiceProvider(overlaysServiceFactory),
dataViews: new PluginServiceProvider(dataViewsServiceFactory),
settings: new PluginServiceProvider(settingsServiceFactory),
diff --git a/src/plugins/controls/public/services/kibana/unified_search.ts b/src/plugins/controls/public/services/kibana/unified_search.ts
new file mode 100644
index 000000000000..15cb3a02ca45
--- /dev/null
+++ b/src/plugins/controls/public/services/kibana/unified_search.ts
@@ -0,0 +1,26 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { ControlsUnifiedSearchService } from '../unified_search';
+import { ControlsPluginStartDeps } from '../../types';
+
+export type UnifiedSearchServiceFactory = KibanaPluginServiceFactory<
+ ControlsUnifiedSearchService,
+ ControlsPluginStartDeps
+>;
+
+export const unifiedSearchServiceFactory: UnifiedSearchServiceFactory = ({ startPlugins }) => {
+ const {
+ unifiedSearch: { autocomplete },
+ } = startPlugins;
+
+ return {
+ autocomplete,
+ };
+};
diff --git a/src/plugins/controls/public/services/storybook/data.ts b/src/plugins/controls/public/services/storybook/data.ts
index 38a8d01d8c7c..5d8cacad9b7b 100644
--- a/src/plugins/controls/public/services/storybook/data.ts
+++ b/src/plugins/controls/public/services/storybook/data.ts
@@ -9,20 +9,11 @@
import { of, Observable } from 'rxjs';
import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
import { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { DataViewField, DataView } from '@kbn/data-views-plugin/common';
+import { DataView } from '@kbn/data-views-plugin/common';
import { ControlsDataService } from '../data';
-let valueSuggestionMethod = ({ field, query }: { field: DataViewField; query: string }) =>
- Promise.resolve(['storybook', 'default', 'values']);
-export const replaceValueSuggestionMethod = (
- newMethod: ({ field, query }: { field: DataViewField; query: string }) => Promise
-) => (valueSuggestionMethod = newMethod);
-
export type DataServiceFactory = PluginServiceFactory;
export const dataServiceFactory: DataServiceFactory = () => ({
- autocomplete: {
- getValueSuggestions: valueSuggestionMethod,
- } as unknown as DataPublicPluginStart['autocomplete'],
query: {} as unknown as DataPublicPluginStart['query'],
searchSource: {
create: () => ({
diff --git a/src/plugins/controls/public/services/storybook/index.ts b/src/plugins/controls/public/services/storybook/index.ts
index f586063e5a33..751aaeefee9c 100644
--- a/src/plugins/controls/public/services/storybook/index.ts
+++ b/src/plugins/controls/public/services/storybook/index.ts
@@ -14,6 +14,7 @@ import {
} from '@kbn/presentation-util-plugin/public';
import { ControlsServices } from '..';
import { dataServiceFactory } from './data';
+import { unifiedSearchServiceFactory } from './unified_search';
import { overlaysServiceFactory } from './overlays';
import { dataViewsServiceFactory } from './data_views';
import { httpServiceFactory } from '../stub/http';
@@ -28,6 +29,7 @@ export const providers: PluginServiceProviders = {
dataViews: new PluginServiceProvider(dataViewsServiceFactory),
http: new PluginServiceProvider(httpServiceFactory),
data: new PluginServiceProvider(dataServiceFactory),
+ unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
overlays: new PluginServiceProvider(overlaysServiceFactory),
settings: new PluginServiceProvider(settingsServiceFactory),
diff --git a/src/plugins/controls/public/services/storybook/unified_search.ts b/src/plugins/controls/public/services/storybook/unified_search.ts
new file mode 100644
index 000000000000..cb7df1bd1e48
--- /dev/null
+++ b/src/plugins/controls/public/services/storybook/unified_search.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import { ControlsUnifiedSearchService } from '../unified_search';
+
+let valueSuggestionMethod = ({ field, query }: { field: DataViewField; query: string }) =>
+ Promise.resolve(['storybook', 'default', 'values']);
+export const replaceValueSuggestionMethod = (
+ newMethod: ({ field, query }: { field: DataViewField; query: string }) => Promise
+) => (valueSuggestionMethod = newMethod);
+
+export type UnifiedSearchServiceFactory = PluginServiceFactory;
+export const unifiedSearchServiceFactory: UnifiedSearchServiceFactory = () => ({
+ autocomplete: {
+ getValueSuggestions: valueSuggestionMethod,
+ } as unknown as UnifiedSearchPublicPluginStart['autocomplete'],
+});
diff --git a/src/plugins/controls/public/services/stub/index.ts b/src/plugins/controls/public/services/stub/index.ts
index 9b767496fa98..4cd138689452 100644
--- a/src/plugins/controls/public/services/stub/index.ts
+++ b/src/plugins/controls/public/services/stub/index.ts
@@ -20,6 +20,7 @@ import { dataServiceFactory } from '../storybook/data';
import { dataViewsServiceFactory } from '../storybook/data_views';
import { optionsListServiceFactory } from '../storybook/options_list';
import { settingsServiceFactory } from '../storybook/settings';
+import { unifiedSearchServiceFactory } from '../storybook/unified_search';
export const providers: PluginServiceProviders = {
http: new PluginServiceProvider(httpServiceFactory),
@@ -27,7 +28,7 @@ export const providers: PluginServiceProviders = {
overlays: new PluginServiceProvider(overlaysServiceFactory),
dataViews: new PluginServiceProvider(dataViewsServiceFactory),
settings: new PluginServiceProvider(settingsServiceFactory),
-
+ unifiedSearch: new PluginServiceProvider(unifiedSearchServiceFactory),
controls: new PluginServiceProvider(controlsServiceFactory),
optionsList: new PluginServiceProvider(optionsListServiceFactory),
};
diff --git a/src/plugins/controls/public/services/unified_search.ts b/src/plugins/controls/public/services/unified_search.ts
new file mode 100644
index 000000000000..2c69537b62d6
--- /dev/null
+++ b/src/plugins/controls/public/services/unified_search.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+
+export interface ControlsUnifiedSearchService {
+ autocomplete: UnifiedSearchPublicPluginStart['autocomplete'];
+}
diff --git a/src/plugins/controls/public/types.ts b/src/plugins/controls/public/types.ts
index e5915262223e..d7766eb8d478 100644
--- a/src/plugins/controls/public/types.ts
+++ b/src/plugins/controls/public/types.ts
@@ -17,6 +17,7 @@ import {
} from '@kbn/embeddable-plugin/public';
import { DataPublicPluginStart } from '@kbn/data-plugin/public';
import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
import { ControlInput } from '../common/types';
import { ControlsService } from './services/controls';
@@ -70,9 +71,10 @@ export interface ControlsPluginSetupDeps {
}
export interface ControlsPluginStartDeps {
data: DataPublicPluginStart;
+ unifiedSearch: UnifiedSearchPublicPluginStart;
embeddable: EmbeddableStart;
dataViews: DataViewsPublicPluginStart;
}
// re-export from common
-export type { ControlWidth, ControlInput, ControlStyle } from '../common/types';
+export type { ControlWidth, ControlInput, DataControlInput, ControlStyle } from '../common/types';
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
index 70c1db510c53..9af4800ca00f 100644
--- a/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
+++ b/src/plugins/controls/server/control_types/options_list/options_list_suggestions_route.ts
@@ -14,8 +14,8 @@ import { Observable } from 'rxjs';
import { CoreSetup, ElasticsearchClient } from '@kbn/core/server';
import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
-import { PluginSetup as DataPluginSetup } from '@kbn/data-plugin/server';
import { FieldSpec, getFieldSubtypeNested } from '@kbn/data-views-plugin/common';
+import { PluginSetup as UnifiedSearchPluginSetup } from '@kbn/unified-search-plugin/server';
import {
OptionsListRequestBody,
OptionsListResponse,
@@ -23,7 +23,7 @@ import {
export const setupOptionsListSuggestionsRoute = (
{ http }: CoreSetup,
- getAutocompleteSettings: DataPluginSetup['autocomplete']['getAutocompleteSettings']
+ getAutocompleteSettings: UnifiedSearchPluginSetup['autocomplete']['getAutocompleteSettings']
) => {
const router = http.createRouter();
@@ -53,7 +53,7 @@ export const setupOptionsListSuggestionsRoute = (
try {
const suggestionRequest: OptionsListRequestBody = request.body;
const { index } = request.params;
- const esClient = context.core.elasticsearch.client.asCurrentUser;
+ const esClient = (await context.core).elasticsearch.client.asCurrentUser;
const suggestionsResponse = await getOptionsListSuggestions({
abortedEvent$: request.events.aborted$,
request: suggestionRequest,
diff --git a/src/plugins/controls/server/plugin.ts b/src/plugins/controls/server/plugin.ts
index 8e391e5f1ac8..cbe9d3923436 100644
--- a/src/plugins/controls/server/plugin.ts
+++ b/src/plugins/controls/server/plugin.ts
@@ -10,6 +10,7 @@ import { CoreSetup, Plugin } from '@kbn/core/server';
import { EmbeddableSetup } from '@kbn/embeddable-plugin/server';
import { PluginSetup as DataSetup } from '@kbn/data-plugin/server';
+import { PluginSetup as UnifiedSearchSetup } from '@kbn/unified-search-plugin/server';
import { setupOptionsListSuggestionsRoute } from './control_types/options_list/options_list_suggestions_route';
import { controlGroupContainerPersistableStateServiceFactory } from './control_group/control_group_container_factory';
import { optionsListPersistableStateServiceFactory } from './control_types/options_list/options_list_embeddable_factory';
@@ -18,10 +19,11 @@ import { timeSliderPersistableStateServiceFactory } from './control_types/time_s
interface SetupDeps {
embeddable: EmbeddableSetup;
data: DataSetup;
+ unifiedSearch: UnifiedSearchSetup;
}
export class ControlsPlugin implements Plugin {
- public setup(core: CoreSetup, { embeddable, data }: SetupDeps) {
+ public setup(core: CoreSetup, { embeddable, unifiedSearch }: SetupDeps) {
embeddable.registerEmbeddableFactory(optionsListPersistableStateServiceFactory());
embeddable.registerEmbeddableFactory(timeSliderPersistableStateServiceFactory());
@@ -29,7 +31,7 @@ export class ControlsPlugin implements Plugin {
controlGroupContainerPersistableStateServiceFactory(embeddable)
);
- setupOptionsListSuggestionsRoute(core, data.autocomplete.getAutocompleteSettings);
+ setupOptionsListSuggestionsRoute(core, unifiedSearch.autocomplete.getAutocompleteSettings);
return {};
}
diff --git a/src/plugins/controls/tsconfig.json b/src/plugins/controls/tsconfig.json
index 10ec84fbd32f..5a17afc93134 100644
--- a/src/plugins/controls/tsconfig.json
+++ b/src/plugins/controls/tsconfig.json
@@ -23,6 +23,7 @@
{ "path": "../embeddable/tsconfig.json" },
{ "path": "../presentation_util/tsconfig.json" },
{ "path": "../kibana_react/tsconfig.json" },
- { "path": "../data/tsconfig.json" }
+ { "path": "../data/tsconfig.json" },
+ { "path": "../unified_search/tsconfig.json" }
]
}
diff --git a/src/plugins/data/config.ts b/src/plugins/data/config.ts
index 251284655410..c419683de986 100644
--- a/src/plugins/data/config.ts
+++ b/src/plugins/data/config.ts
@@ -9,28 +9,6 @@
import { schema, TypeOf } from '@kbn/config-schema';
export const configSchema = schema.object({
- autocomplete: schema.object({
- querySuggestions: schema.object({
- enabled: schema.boolean({ defaultValue: true }),
- }),
- valueSuggestions: schema.object({
- enabled: schema.boolean({ defaultValue: true }),
- tiers: schema.arrayOf(
- schema.oneOf([
- schema.literal('data_content'),
- schema.literal('data_hot'),
- schema.literal('data_warm'),
- schema.literal('data_cold'),
- schema.literal('data_frozen'),
- ]),
- {
- defaultValue: ['data_hot', 'data_warm', 'data_content', 'data_cold'],
- }
- ),
- terminateAfter: schema.duration({ defaultValue: 100000 }),
- timeout: schema.duration({ defaultValue: 1000 }),
- }),
- }),
search: schema.object({
aggs: schema.object({
shardDelay: schema.object({
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index e3369c2d571a..fa7453d4c5bd 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -4,7 +4,7 @@
"server": true,
"ui": true,
"requiredPlugins": ["bfetch", "expressions", "uiActions", "share", "inspector", "fieldFormats", "dataViews"],
- "serviceFolders": ["search", "query", "autocomplete", "ui"],
+ "serviceFolders": ["search", "query", "ui"],
"optionalPlugins": ["usageCollection", "taskManager", "security"],
"extraPublicDirs": ["common"],
"requiredBundles": ["kibanaUtils", "kibanaReact", "inspector"],
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 1f2b00313ddb..9f1bf02ec2cd 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -95,20 +95,6 @@ export {
DuplicateDataViewError,
} from '../common';
-/*
- * Autocomplete query suggestions:
- */
-
-export type {
- QuerySuggestion,
- QuerySuggestionGetFn,
- QuerySuggestionGetFnArgs,
- QuerySuggestionBasic,
- QuerySuggestionField,
- AutocompleteStart,
-} from './autocomplete';
-
-export { QuerySuggestionTypes } from './autocomplete';
/*
* Search:
*/
@@ -273,8 +259,12 @@ export {
TimeHistory,
getQueryLog,
mapAndFlattenFilters,
+ QueryService,
} from './query';
+export { NowProvider } from './now_provider';
+export type { NowProviderInternalContract } from './now_provider';
+
export type {
QueryState,
SavedQuery,
@@ -288,6 +278,7 @@ export type {
PersistedLog,
QueryStringContract,
QuerySetup,
+ TimefilterSetup,
} from './query';
export type { AggsStart } from './search/aggs';
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index af6fdedc3ed9..27e365ce0cb3 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -11,27 +11,14 @@ import { createDatatableUtilitiesMock } from '../common/mocks';
import { DataPlugin, DataViewsContract } from '.';
import { searchServiceMock } from './search/mocks';
import { queryServiceMock } from './query/mocks';
-import { AutocompleteStart, AutocompleteSetup } from './autocomplete';
import { createNowProviderMock } from './now_provider/mocks';
export type Setup = jest.Mocked>;
export type Start = jest.Mocked>;
-const autocompleteSetupMock: jest.Mocked = {
- getQuerySuggestions: jest.fn(),
- getAutocompleteSettings: jest.fn(),
-};
-
-const autocompleteStartMock: jest.Mocked = {
- getValueSuggestions: jest.fn(),
- getQuerySuggestions: jest.fn(),
- hasQuerySuggestions: jest.fn(),
-};
-
const createSetupContract = (): Setup => {
const querySetupMock = queryServiceMock.createSetupContract();
return {
- autocomplete: autocompleteSetupMock,
search: searchServiceMock.createSetupContract(),
query: querySetupMock,
};
@@ -58,7 +45,6 @@ const createStartContract = (): Start => {
createFiltersFromValueClickAction: jest.fn().mockResolvedValue(['yes']),
createFiltersFromRangeSelectAction: jest.fn(),
},
- autocomplete: autocompleteStartMock,
datatableUtilities: createDatatableUtilitiesMock(),
search: searchServiceMock.createStartContract(),
fieldFormats: fieldFormatsServiceMock.createStartContract(),
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index ed9ba5c00e49..175d05870b0c 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -21,7 +21,6 @@ import type {
DataSetupDependencies,
DataStartDependencies,
} from './types';
-import { AutocompleteService } from './autocomplete';
import { SearchService } from './search/search_service';
import { QueryService } from './query';
import {
@@ -52,7 +51,6 @@ export class DataPublicPlugin
DataStartDependencies
>
{
- private readonly autocomplete: AutocompleteService;
private readonly searchService: SearchService;
private readonly queryService: QueryService;
private readonly storage: IStorageWrapper;
@@ -62,7 +60,6 @@ export class DataPublicPlugin
this.searchService = new SearchService(initializerContext);
this.queryService = new QueryService();
- this.autocomplete = new AutocompleteService(initializerContext);
this.storage = new Storage(window.localStorage);
this.nowProvider = new NowProvider();
}
@@ -113,10 +110,6 @@ export class DataPublicPlugin
);
return {
- autocomplete: this.autocomplete.setup(core, {
- timefilter: queryService.timefilter,
- usageCollection,
- }),
search: searchService,
query: queryService,
};
@@ -161,7 +154,6 @@ export class DataPublicPlugin
createFiltersFromValueClickAction,
createFiltersFromRangeSelectAction,
},
- autocomplete: this.autocomplete.start(),
datatableUtilities,
fieldFormats,
indexPatterns: dataViews,
@@ -175,7 +167,6 @@ export class DataPublicPlugin
}
public stop() {
- this.autocomplete.clearProviders();
this.queryService.stop();
this.searchService.stop();
}
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 4f571559df8d..b596e02e7f2a 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -16,7 +16,6 @@ import { FieldFormatsSetup, FieldFormatsStart } from '@kbn/field-formats-plugin/
import { UsageCollectionSetup, UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
import { Setup as InspectorSetup } from '@kbn/inspector-plugin/public';
import { DatatableUtilitiesService } from '../common';
-import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
import { createFiltersFromRangeSelectAction, createFiltersFromValueClickAction } from './actions';
import type { ISearchSetup, ISearchStart } from './search';
import { QuerySetup, QueryStart } from './query';
@@ -42,7 +41,6 @@ export interface DataStartDependencies {
* Data plugin public Setup contract
*/
export interface DataPublicPluginSetup {
- autocomplete: AutocompleteSetup;
search: ISearchSetup;
query: QuerySetup;
}
@@ -64,11 +62,6 @@ export interface DataPublicPluginStart {
* {@link DataPublicPluginStartActions}
*/
actions: DataPublicPluginStartActions;
- /**
- * autocomplete service
- * {@link AutocompleteStart}
- */
- autocomplete: AutocompleteStart;
/**
* data views service
* {@link DataViewsContract}
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 83fcd58ba9a4..b970221c4339 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -16,6 +16,8 @@ import { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin';
export * from './deprecated';
export { getEsQueryConfig, DEFAULT_QUERY_LANGUAGE } from '../common';
+export { getRequestAbortedSignal } from './lib';
+
/**
* Exporters (CSV)
*/
@@ -68,7 +70,6 @@ import {
// tabify
calcAutoIntervalLessThan,
} from '../common';
-import { autocompleteConfigDeprecationProvider } from './config_deprecations';
export type {
ParsedInterval,
@@ -121,9 +122,7 @@ export type { DataPluginSetup as PluginSetup, DataPluginStart as PluginStart };
export { DataServerPlugin as Plugin };
export const config: PluginConfigDescriptor = {
- deprecations: autocompleteConfigDeprecationProvider,
exposeToBrowser: {
- autocomplete: true,
search: true,
},
schema: configSchema,
diff --git a/src/plugins/data/server/mocks.ts b/src/plugins/data/server/mocks.ts
index 477ccf312032..8df65f7e5b90 100644
--- a/src/plugins/data/server/mocks.ts
+++ b/src/plugins/data/server/mocks.ts
@@ -6,6 +6,7 @@
* Side Public License, v 1.
*/
+import { coreMock } from '@kbn/core/server/mocks';
import {
createFieldFormatsSetupMock,
createFieldFormatsStartMock,
@@ -17,17 +18,10 @@ import {
} from './search/mocks';
import { createIndexPatternsStartMock } from './data_views/mocks';
import { createDatatableUtilitiesMock } from './datatable_utilities/mock';
-import { DataRequestHandlerContext } from './search';
-import { AutocompleteSetup } from './autocomplete';
-
-const autocompleteSetupMock: jest.Mocked = {
- getAutocompleteSettings: jest.fn(),
-};
function createSetupContract() {
return {
search: createSearchSetupMock(),
- autocomplete: autocompleteSetupMock,
/**
* @deprecated - use directly from "fieldFormats" plugin instead
*/
@@ -49,8 +43,9 @@ function createStartContract() {
function createRequestHandlerContext() {
return {
+ core: coreMock.createRequestHandlerContext(),
search: createSearchRequestHandlerContext(),
- } as unknown as jest.Mocked;
+ };
}
export const dataPluginMock = {
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index dcf0baa188ea..d1beb335dd35 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -19,17 +19,14 @@ import { SearchService } from './search/search_service';
import { QueryService } from './query/query_service';
import { ScriptsService } from './scripts';
import { KqlTelemetryService } from './kql_telemetry';
-import { AutocompleteService } from './autocomplete';
import { getUiSettings } from './ui_settings';
import { QuerySetup } from './query';
-import { AutocompleteSetup } from './autocomplete/autocomplete_service';
interface DataEnhancements {
search: SearchEnhancements;
}
export interface DataPluginSetup {
- autocomplete: AutocompleteSetup;
search: ISearchSetup;
query: QuerySetup;
/**
@@ -81,7 +78,6 @@ export class DataServerPlugin
private readonly searchService: SearchService;
private readonly scriptsService: ScriptsService;
private readonly kqlTelemetryService: KqlTelemetryService;
- private readonly autocompleteService: AutocompleteService;
private readonly queryService = new QueryService();
private readonly logger: Logger;
@@ -90,7 +86,6 @@ export class DataServerPlugin
this.searchService = new SearchService(initializerContext, this.logger);
this.scriptsService = new ScriptsService();
this.kqlTelemetryService = new KqlTelemetryService(initializerContext);
- this.autocompleteService = new AutocompleteService(initializerContext);
}
public setup(
@@ -110,7 +105,6 @@ export class DataServerPlugin
});
return {
- autocomplete: this.autocompleteService.setup(core),
__enhance: (enhancements: DataEnhancements) => {
searchSetup.__enhance(enhancements.search);
},
diff --git a/src/plugins/data/server/query/route_handler_context.test.ts b/src/plugins/data/server/query/route_handler_context.test.ts
index 69908f9733f5..c0db432ce3fd 100644
--- a/src/plugins/data/server/query/route_handler_context.test.ts
+++ b/src/plugins/data/server/query/route_handler_context.test.ts
@@ -20,7 +20,6 @@ const {
savedObjects: { client: mockSavedObjectsClient },
},
} = mockContext;
-const context = registerSavedQueryRouteHandlerContext(mockContext);
const savedQueryAttributes: SavedQueryAttributes = {
title: 'foo',
@@ -73,7 +72,15 @@ const savedQueryReferences = [
];
describe('saved query route handler context', () => {
- beforeEach(() => {
+ let context: Awaited>;
+
+ beforeEach(async () => {
+ context = await registerSavedQueryRouteHandlerContext(
+ coreMock.createCustomRequestHandlerContext({
+ core: mockContext.core,
+ })
+ );
+
mockSavedObjectsClient.create.mockClear();
mockSavedObjectsClient.resolve.mockClear();
mockSavedObjectsClient.find.mockClear();
diff --git a/src/plugins/data/server/query/route_handler_context.ts b/src/plugins/data/server/query/route_handler_context.ts
index e72257fe185d..0af658d7692c 100644
--- a/src/plugins/data/server/query/route_handler_context.ts
+++ b/src/plugins/data/server/query/route_handler_context.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { RequestHandlerContext, SavedObject } from '@kbn/core/server';
+import { CustomRequestHandlerContext, RequestHandlerContext, SavedObject } from '@kbn/core/server';
import { isFilters } from '@kbn/es-query';
import { isQuery, SavedQueryAttributes } from '../../common';
import { extract, inject } from '../../common/query/persistable_state';
@@ -66,18 +66,16 @@ function verifySavedQuery({ title, query, filters = [] }: SavedQueryAttributes)
}
}
-export function registerSavedQueryRouteHandlerContext(context: RequestHandlerContext) {
+export async function registerSavedQueryRouteHandlerContext(context: RequestHandlerContext) {
+ const soClient = (await context.core).savedObjects.client;
+
const createSavedQuery = async (attrs: SavedQueryAttributes) => {
verifySavedQuery(attrs);
const { attributes, references } = extractReferences(attrs);
- const savedObject = await context.core.savedObjects.client.create(
- 'query',
- attributes,
- {
- references,
- }
- );
+ const savedObject = await soClient.create('query', attributes, {
+ references,
+ });
// TODO: Handle properly
if (savedObject.error) throw new Error(savedObject.error.message);
@@ -89,14 +87,9 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
verifySavedQuery(attrs);
const { attributes, references } = extractReferences(attrs);
- const savedObject = await context.core.savedObjects.client.update(
- 'query',
- id,
- attributes,
- {
- references,
- }
- );
+ const savedObject = await soClient.update('query', id, attributes, {
+ references,
+ });
// TODO: Handle properly
if (savedObject.error) throw new Error(savedObject.error.message);
@@ -105,8 +98,10 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
};
const getSavedQuery = async (id: string) => {
- const { saved_object: savedObject, outcome } =
- await context.core.savedObjects.client.resolve('query', id);
+ const { saved_object: savedObject, outcome } = await soClient.resolve(
+ 'query',
+ id
+ );
if (outcome === 'conflict') {
throw new Error(`Multiple saved queries found with ID: ${id} (legacy URL alias conflict)`);
} else if (savedObject.error) {
@@ -116,20 +111,19 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
};
const getSavedQueriesCount = async () => {
- const { total } = await context.core.savedObjects.client.find({
+ const { total } = await soClient.find({
type: 'query',
});
return total;
};
const findSavedQueries = async ({ page = 1, perPage = 50, search = '' } = {}) => {
- const { total, saved_objects: savedObjects } =
- await context.core.savedObjects.client.find({
- type: 'query',
- page,
- perPage,
- search,
- });
+ const { total, saved_objects: savedObjects } = await soClient.find({
+ type: 'query',
+ page,
+ perPage,
+ search,
+ });
const savedQueries = savedObjects.map(injectReferences);
@@ -137,7 +131,7 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
};
const getAllSavedQueries = async () => {
- const finder = context.core.savedObjects.client.createPointInTimeFinder({
+ const finder = soClient.createPointInTimeFinder({
type: 'query',
perPage: 100,
});
@@ -152,8 +146,8 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
return { total: savedQueries.length, savedQueries };
};
- const deleteSavedQuery = (id: string) => {
- return context.core.savedObjects.client.delete('query', id);
+ const deleteSavedQuery = async (id: string) => {
+ return await soClient.delete('query', id);
};
return {
@@ -167,6 +161,6 @@ export function registerSavedQueryRouteHandlerContext(context: RequestHandlerCon
};
}
-export interface SavedQueryRouteHandlerContext extends RequestHandlerContext {
- savedQuery: ReturnType;
-}
+export type SavedQueryRouteHandlerContext = CustomRequestHandlerContext<{
+ savedQuery: Promise>;
+}>;
diff --git a/src/plugins/data/server/query/routes.ts b/src/plugins/data/server/query/routes.ts
index d5997e93fa99..16f5d8f9955a 100644
--- a/src/plugins/data/server/query/routes.ts
+++ b/src/plugins/data/server/query/routes.ts
@@ -37,7 +37,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
},
async (context, request, response) => {
try {
- const body = await context.savedQuery.create(request.body);
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.create(request.body);
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
@@ -57,7 +58,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
async (context, request, response) => {
const { id } = request.params;
try {
- const body = await context.savedQuery.update(id, request.body);
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.update(id, request.body);
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
@@ -76,7 +78,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
async (context, request, response) => {
const { id } = request.params;
try {
- const body = await context.savedQuery.get(id);
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.get(id);
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
@@ -92,7 +95,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
},
async (context, request, response) => {
try {
- const count = await context.savedQuery.count();
+ const savedQuery = await context.savedQuery;
+ const count = await savedQuery.count();
return response.ok({ body: `${count}` });
} catch (e) {
// TODO: Handle properly
@@ -114,7 +118,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
},
async (context, request, response) => {
try {
- const body = await context.savedQuery.find(request.body);
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.find(request.body);
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
@@ -130,7 +135,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
},
async (context, request, response) => {
try {
- const body = await context.savedQuery.getAll();
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.getAll();
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
@@ -149,7 +155,8 @@ export function registerSavedQueryRoutes({ http }: CoreSetup): void {
async (context, request, response) => {
const { id } = request.params;
try {
- const body = await context.savedQuery.delete(id);
+ const savedQuery = await context.savedQuery;
+ const body = await savedQuery.delete(id);
return response.ok({ body });
} catch (e) {
// TODO: Handle properly
diff --git a/src/plugins/data/server/search/routes/search.ts b/src/plugins/data/server/search/routes/search.ts
index 6f48ba747a71..aa0f69b55816 100644
--- a/src/plugins/data/server/search/routes/search.ts
+++ b/src/plugins/data/server/search/routes/search.ts
@@ -47,8 +47,9 @@ export function registerSearchRoute(router: DataPluginRouter): void {
const abortSignal = getRequestAbortedSignal(request.events.aborted$);
try {
- const response = await context
- .search!.search(
+ const search = await context.search;
+ const response = await search
+ .search(
{ ...searchRequest, id },
{
abortSignal,
@@ -85,7 +86,8 @@ export function registerSearchRoute(router: DataPluginRouter): void {
const { strategy, id } = request.params;
try {
- await context.search!.cancel(id, { strategy });
+ const search = await context.search;
+ await search.cancel(id, { strategy });
return res.ok();
} catch (err) {
return reportServerError(res, err);
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 8c264889ebf2..c59893cdead9 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -143,7 +143,7 @@ export class SearchService implements Plugin {
core.http.registerRouteHandlerContext(
'search',
- async (context, request) => {
+ (context, request) => {
return this.asScoped(request);
}
);
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
index ef6a2f5f88fe..70e04e97ea16 100644
--- a/src/plugins/data/server/search/types.ts
+++ b/src/plugins/data/server/search/types.ts
@@ -13,7 +13,7 @@ import type {
IUiSettingsClient,
SavedObjectsClientContract,
KibanaRequest,
- RequestHandlerContext,
+ CustomRequestHandlerContext,
} from '@kbn/core/server';
import {
ISearchOptions,
@@ -126,8 +126,8 @@ export interface ISearchStart<
export type SearchRequestHandlerContext = IScopedSearchClient;
-export interface DataRequestHandlerContext extends RequestHandlerContext {
+export type DataRequestHandlerContext = CustomRequestHandlerContext<{
search: SearchRequestHandlerContext;
-}
+}>;
export type DataPluginRouter = IRouter;
diff --git a/src/plugins/data_view_field_editor/server/routes/field_preview.ts b/src/plugins/data_view_field_editor/server/routes/field_preview.ts
index 022cd92a4bb1..5595eeeaeddf 100644
--- a/src/plugins/data_view_field_editor/server/routes/field_preview.ts
+++ b/src/plugins/data_view_field_editor/server/routes/field_preview.ts
@@ -38,7 +38,7 @@ export const registerFieldPreviewRoute = ({ router }: RouteDependencies): void =
},
},
async (ctx, req, res) => {
- const { client } = ctx.core.elasticsearch;
+ const { client } = (await ctx.core).elasticsearch;
const type = req.body.context.split('_field')[0] as estypes.MappingRuntimeFieldType;
const body = {
diff --git a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
index aee953af1c29..3a19872150a8 100644
--- a/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
+++ b/src/plugins/data_view_management/server/routes/preview_scripted_field.ts
@@ -24,7 +24,7 @@ export function registerPreviewScriptedFieldRoute(router: IRouter): void {
},
},
async (context, request, res) => {
- const client = context.core.elasticsearch.client.asCurrentUser;
+ const client = (await context.core).elasticsearch.client.asCurrentUser;
const { index, name, script, query, additionalFields } = request.body;
try {
diff --git a/src/plugins/data_view_management/server/routes/resolve_index.ts b/src/plugins/data_view_management/server/routes/resolve_index.ts
index 85ad6ae8993a..820e6de1c9d7 100644
--- a/src/plugins/data_view_management/server/routes/resolve_index.ts
+++ b/src/plugins/data_view_management/server/routes/resolve_index.ts
@@ -31,7 +31,8 @@ export function registerResolveIndexRoute(router: IRouter): void {
},
},
async (context, req, res) => {
- const body = await context.core.elasticsearch.client.asCurrentUser.indices.resolveIndex({
+ const esClient = (await context.core).elasticsearch.client;
+ const body = await esClient.asCurrentUser.indices.resolveIndex({
name: req.params.query,
expand_wildcards: req.query.expand_wildcards || 'open',
});
diff --git a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
index 755ba5dcd86e..c35344f54c4f 100644
--- a/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/create_data_view.ts
@@ -94,8 +94,9 @@ const registerCreateDataViewRouteFactory =
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
index da89bbe95b69..7ce241176228 100644
--- a/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/default_data_view.ts
@@ -64,8 +64,9 @@ const manageDefaultIndexPatternRoutesFactory =
validate: {},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
@@ -103,8 +104,9 @@ const manageDefaultIndexPatternRoutesFactory =
},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
index 88370b5aea77..b3fd0b8a041c 100644
--- a/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/delete_data_view.ts
@@ -58,8 +58,9 @@ const deleteIndexPatternRouteFactory =
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
index 49e3d3fc0f1e..d99aa67c7f15 100644
--- a/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
+++ b/src/plugins/data_views/server/rest_api_routes/fields/update_fields.ts
@@ -134,8 +134,9 @@ const updateFieldsActionRouteFactory = (path: string, serviceKey: string) => {
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
index 63ef2701a306..86185fb0b277 100644
--- a/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/get_data_view.ts
@@ -63,8 +63,9 @@ const getDataViewRouteFactory =
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
index 5bbe7966ae26..1031a04456b4 100644
--- a/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/has_user_data_view.ts
@@ -45,8 +45,9 @@ const hasUserDataViewRouteFactory =
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
index 4ae100e1a79f..5c9faaf2c859 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/create_runtime_field.ts
@@ -92,8 +92,9 @@ const runtimeCreateFieldRouteFactory =
},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
index 94dde735c067..e7db34f43cf3 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/delete_runtime_field.ts
@@ -73,8 +73,9 @@ const deleteRuntimeFieldRouteFactory =
},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
index 4d9a5678392a..867766eec312 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/get_runtime_field.ts
@@ -80,8 +80,9 @@ const getRuntimeFieldRouteFactory =
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
index ed4f01d703f0..0f5399606dfd 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/put_runtime_field.ts
@@ -92,8 +92,9 @@ const putRuntimeFieldRouteFactory =
},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
index fe632f5533dc..1aaf1b112fee 100644
--- a/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/runtime_fields/update_runtime_field.ts
@@ -93,8 +93,9 @@ const updateRuntimeFieldRouteFactory =
},
},
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
index 4335fc6aea90..759627f92676 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/create_scripted_field.ts
@@ -42,8 +42,9 @@ export const registerCreateScriptedFieldRoute = (
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { indexPatternsServiceFactory }] = await getStartServices();
const indexPatternsService = await indexPatternsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
index 811c3e096ca1..7e3333820e4e 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/delete_scripted_field.ts
@@ -43,8 +43,9 @@ export const registerDeleteScriptedFieldRoute = (
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { indexPatternsServiceFactory }] = await getStartServices();
const indexPatternsService = await indexPatternsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
index 3b76d56070f1..befe30f8437f 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/get_scripted_field.ts
@@ -43,8 +43,9 @@ export const registerGetScriptedFieldRoute = (
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { indexPatternsServiceFactory }] = await getStartServices();
const indexPatternsService = await indexPatternsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
index 8989c1412769..93312dd6d3cf 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/put_scripted_field.ts
@@ -42,8 +42,9 @@ export const registerPutScriptedFieldRoute = (
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { indexPatternsServiceFactory }] = await getStartServices();
const indexPatternsService = await indexPatternsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
index 28f28064b2a1..ddc9d7ae552e 100644
--- a/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/scripted_fields/update_scripted_field.ts
@@ -63,8 +63,9 @@ export const registerUpdateScriptedFieldRoute = (
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { indexPatternsServiceFactory }] = await getStartServices();
const indexPatternsService = await indexPatternsServiceFactory(
savedObjectsClient,
diff --git a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
index c0f890fda9d8..424680f85b49 100644
--- a/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/update_data_view.ts
@@ -161,8 +161,9 @@ const updateDataViewRouteFactory =
},
router.handleLegacyErrors(
handleErrors(async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const [, , { dataViewsServiceFactory }] = await getStartServices();
const dataViewsService = await dataViewsServiceFactory(
diff --git a/src/plugins/data_views/server/routes.ts b/src/plugins/data_views/server/routes.ts
index 1a35b75b2a10..8f6299a58870 100644
--- a/src/plugins/data_views/server/routes.ts
+++ b/src/plugins/data_views/server/routes.ts
@@ -56,7 +56,7 @@ export function registerRoutes(
},
},
async (context, request, response) => {
- const { asCurrentUser } = context.core.elasticsearch.client;
+ const { asCurrentUser } = (await context.core).elasticsearch.client;
const indexPatterns = new IndexPatternsFetcher(asCurrentUser);
const { pattern, interval, look_back: lookBack, meta_fields: metaFields } = request.query;
diff --git a/src/plugins/data_views/server/routes/fields_for.ts b/src/plugins/data_views/server/routes/fields_for.ts
index cc71eb9258d4..3ad854ab0d6a 100644
--- a/src/plugins/data_views/server/routes/fields_for.ts
+++ b/src/plugins/data_views/server/routes/fields_for.ts
@@ -51,7 +51,7 @@ const validate: RouteValidatorFullConfig<{}, IQuery, IBody> = {
body: schema.maybe(schema.object({ index_filter: schema.any() })),
};
const handler: RequestHandler<{}, IQuery, IBody> = async (context, request, response) => {
- const { asCurrentUser } = context.core.elasticsearch.client;
+ const { asCurrentUser } = (await context.core).elasticsearch.client;
const indexPatterns = new IndexPatternsFetcher(asCurrentUser);
const {
pattern,
diff --git a/src/plugins/data_views/server/routes/has_data_views.ts b/src/plugins/data_views/server/routes/has_data_views.ts
index d74711e8c0d2..c4982311ce15 100644
--- a/src/plugins/data_views/server/routes/has_data_views.ts
+++ b/src/plugins/data_views/server/routes/has_data_views.ts
@@ -16,8 +16,9 @@ export const registerHasDataViewsRoute = (router: IRouter): void => {
validate: {},
},
async (ctx, req, res) => {
- const savedObjectsClient = ctx.core.savedObjects.client;
- const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+ const core = await ctx.core;
+ const savedObjectsClient = core.savedObjects.client;
+ const elasticsearchClient = core.elasticsearch.client.asCurrentUser;
const dataViews = await getIndexPattern({
esClient: elasticsearchClient,
soClient: savedObjectsClient,
diff --git a/src/plugins/home/server/routes/fetch_es_hits_status.ts b/src/plugins/home/server/routes/fetch_es_hits_status.ts
index 557f93f0425e..0ce090c6bfee 100644
--- a/src/plugins/home/server/routes/fetch_es_hits_status.ts
+++ b/src/plugins/home/server/routes/fetch_es_hits_status.ts
@@ -22,7 +22,7 @@ export const registerHitsStatusRoute = (router: IRouter) => {
},
router.handleLegacyErrors(async (context, req, res) => {
const { index, query } = req.body;
- const client = context.core.elasticsearch.client;
+ const client = (await context.core).elasticsearch.client;
try {
const body = await client.asCurrentUser.search({
diff --git a/src/plugins/home/server/services/sample_data/routes/install.ts b/src/plugins/home/server/services/sample_data/routes/install.ts
index 58604ec30ce0..f057e6861518 100644
--- a/src/plugins/home/server/services/sample_data/routes/install.ts
+++ b/src/plugins/home/server/services/sample_data/routes/install.ts
@@ -38,7 +38,7 @@ export function createInstallRoute(
// @ts-ignore Custom query validation used
const now = query.now ? new Date(query.now) : new Date();
- const sampleDataInstaller = getSampleDataInstaller({
+ const sampleDataInstaller = await getSampleDataInstaller({
datasetId: sampleDataset.id,
sampleDatasets,
logger,
diff --git a/src/plugins/home/server/services/sample_data/routes/list.ts b/src/plugins/home/server/services/sample_data/routes/list.ts
index 8f500b1c9550..39690b3944d0 100644
--- a/src/plugins/home/server/services/sample_data/routes/list.ts
+++ b/src/plugins/home/server/services/sample_data/routes/list.ts
@@ -78,7 +78,7 @@ async function findExistingSampleObjects(
.map(({ savedObjects }) => savedObjects.map(({ type, id }) => ({ type, id })))
.flat();
const objectTypes = getUniqueObjectTypes(objects);
- const client = getSavedObjectsClient(context, objectTypes);
+ const client = await getSavedObjectsClient(context, objectTypes);
const findSampleObjectsResult = await findSampleObjects({ client, logger, objects });
let objectCounter = 0;
@@ -101,18 +101,20 @@ async function getSampleDatasetStatus(
return { status: NOT_INSTALLED };
}
+ const { elasticsearch } = await context.core;
+
for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
const dataIndexConfig = sampleDataset.dataIndices[i];
const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
try {
- const indexExists = await context.core.elasticsearch.client.asCurrentUser.indices.exists({
+ const indexExists = await elasticsearch.client.asCurrentUser.indices.exists({
index,
});
if (!indexExists) {
return { status: NOT_INSTALLED };
}
- const count = await context.core.elasticsearch.client.asCurrentUser.count({
+ const count = await elasticsearch.client.asCurrentUser.count({
index,
});
if (count.count === 0) {
diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
index e6f4b9a07514..d2700b4985a7 100644
--- a/src/plugins/home/server/services/sample_data/routes/uninstall.ts
+++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
@@ -32,7 +32,7 @@ export function createUninstallRoute(
return response.notFound();
}
- const sampleDataInstaller = getSampleDataInstaller({
+ const sampleDataInstaller = await getSampleDataInstaller({
datasetId: sampleDataset.id,
sampleDatasets,
logger,
diff --git a/src/plugins/home/server/services/sample_data/routes/utils.ts b/src/plugins/home/server/services/sample_data/routes/utils.ts
index b784c50ff118..f4e99e4c04c9 100644
--- a/src/plugins/home/server/services/sample_data/routes/utils.ts
+++ b/src/plugins/home/server/services/sample_data/routes/utils.ts
@@ -11,7 +11,7 @@ import type { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
import { SampleDataInstaller } from '../sample_data_installer';
import { getUniqueObjectTypes } from '../lib/utils';
-export const getSampleDataInstaller = ({
+export const getSampleDataInstaller = async ({
datasetId,
context,
sampleDatasets,
@@ -22,14 +22,15 @@ export const getSampleDataInstaller = ({
sampleDatasets: SampleDatasetSchema[];
logger: Logger;
}) => {
+ const core = await context.core;
const sampleDataset = sampleDatasets.find(({ id }) => id === datasetId)!;
- const { getImporter, client: soClient } = context.core.savedObjects;
+ const { getImporter, client: soClient } = core.savedObjects;
const objectTypes = getUniqueObjectTypes(sampleDataset.savedObjects);
- const savedObjectsClient = getSavedObjectsClient(context, objectTypes);
+ const savedObjectsClient = await getSavedObjectsClient(context, objectTypes);
const soImporter = getImporter(savedObjectsClient);
return new SampleDataInstaller({
- esClient: context.core.elasticsearch.client,
+ esClient: core.elasticsearch.client,
soImporter,
soClient,
logger,
@@ -37,8 +38,11 @@ export const getSampleDataInstaller = ({
});
};
-export const getSavedObjectsClient = (context: RequestHandlerContext, objectTypes: string[]) => {
- const { getClient, typeRegistry } = context.core.savedObjects;
+export const getSavedObjectsClient = async (
+ context: RequestHandlerContext,
+ objectTypes: string[]
+) => {
+ const { getClient, typeRegistry } = (await context.core).savedObjects;
const includedHiddenTypes = objectTypes.filter((supportedType) =>
typeRegistry.isHidden(supportedType)
);
diff --git a/src/plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
index 73158e17882f..f1f3cf609d72 100644
--- a/src/plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -9,7 +9,10 @@
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
import { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import {
+ UnifiedSearchPublicPluginStart,
+ UnifiedSearchPluginSetup,
+} from '@kbn/unified-search-plugin/public';
import { Plugin as ExpressionsPublicPlugin } from '@kbn/expressions-plugin/public';
import { VisualizationsSetup, VisualizationsStart } from '@kbn/visualizations-plugin/public';
import { createInputControlVisFn } from './input_control_fn';
@@ -26,6 +29,7 @@ export interface InputControlSettings {
export interface InputControlVisDependencies {
core: InputControlVisCoreSetup;
data: DataPublicPluginSetup;
+ unifiedSearch: UnifiedSearchPluginSetup;
getSettings: () => Promise;
}
@@ -34,6 +38,7 @@ export interface InputControlVisPluginSetupDependencies {
expressions: ReturnType;
visualizations: VisualizationsSetup;
data: DataPublicPluginSetup;
+ unifiedSearch: UnifiedSearchPluginSetup;
}
/** @internal */
@@ -50,15 +55,16 @@ export class InputControlVisPlugin implements Plugin {
public setup(
core: InputControlVisCoreSetup,
- { expressions, visualizations, data }: InputControlVisPluginSetupDependencies
+ { expressions, visualizations, unifiedSearch, data }: InputControlVisPluginSetupDependencies
) {
const visualizationDependencies: Readonly = {
core,
- data,
+ unifiedSearch,
getSettings: async () => {
- const { timeout, terminateAfter } = data.autocomplete.getAutocompleteSettings();
+ const { timeout, terminateAfter } = unifiedSearch.autocomplete.getAutocompleteSettings();
return { autocompleteTimeout: timeout, autocompleteTerminateAfter: terminateAfter };
},
+ data,
};
expressions.registerFunction(createInputControlVisFn);
diff --git a/src/plugins/saved_objects_management/server/routes/bulk_get.ts b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
index fab25b51d922..9e31b1c24b0b 100644
--- a/src/plugins/saved_objects_management/server/routes/bulk_get.ts
+++ b/src/plugins/saved_objects_management/server/routes/bulk_get.ts
@@ -29,7 +29,7 @@ export const registerBulkGetRoute = (
},
router.handleLegacyErrors(async (context, req, res) => {
const managementService = await managementServicePromise;
- const { getClient, typeRegistry } = context.core.savedObjects;
+ const { getClient, typeRegistry } = (await context.core).savedObjects;
const objects = req.body;
const uniqueTypes = objects.reduce((acc, { type }) => acc.add(type), new Set());
diff --git a/src/plugins/saved_objects_management/server/routes/find.ts b/src/plugins/saved_objects_management/server/routes/find.ts
index 662ab6803115..05e69da5d320 100644
--- a/src/plugins/saved_objects_management/server/routes/find.ts
+++ b/src/plugins/saved_objects_management/server/routes/find.ts
@@ -47,7 +47,7 @@ export const registerFindRoute = (
router.handleLegacyErrors(async (context, req, res) => {
const { query } = req;
const managementService = await managementServicePromise;
- const { getClient, typeRegistry } = context.core.savedObjects;
+ const { getClient, typeRegistry } = (await context.core).savedObjects;
const searchTypes = Array.isArray(query.type) ? query.type : [query.type];
const includedFields = Array.isArray(query.fields) ? query.fields : [query.fields];
diff --git a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
index 3ad8130654a7..cdd6dc215d69 100644
--- a/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
+++ b/src/plugins/saved_objects_management/server/routes/get_allowed_types.ts
@@ -25,7 +25,7 @@ export const registerGetAllowedTypesRoute = (router: IRouter) => {
validate: false,
},
async (context, req, res) => {
- const allowedTypes = context.core.savedObjects.typeRegistry
+ const allowedTypes = (await context.core).savedObjects.typeRegistry
.getImportableAndExportableTypes()
.filter((type) => type.management!.visibleInManagement ?? true)
.map(convertType);
diff --git a/src/plugins/saved_objects_management/server/routes/relationships.ts b/src/plugins/saved_objects_management/server/routes/relationships.ts
index 875cf82488ab..8900987a645f 100644
--- a/src/plugins/saved_objects_management/server/routes/relationships.ts
+++ b/src/plugins/saved_objects_management/server/routes/relationships.ts
@@ -32,7 +32,7 @@ export const registerRelationshipsRoute = (
},
router.handleLegacyErrors(async (context, req, res) => {
const managementService = await managementServicePromise;
- const { getClient, typeRegistry } = context.core.savedObjects;
+ const { getClient, typeRegistry } = (await context.core).savedObjects;
const { type, id } = req.params;
const { size, savedObjectTypes: maybeArraySavedObjectTypes } = req.query;
const savedObjectTypes = Array.isArray(maybeArraySavedObjectTypes)
diff --git a/src/plugins/saved_objects_management/server/routes/scroll_count.ts b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
index 217153bbb86e..26dd1d57b4cf 100644
--- a/src/plugins/saved_objects_management/server/routes/scroll_count.ts
+++ b/src/plugins/saved_objects_management/server/routes/scroll_count.ts
@@ -31,7 +31,7 @@ export const registerScrollForCountRoute = (router: IRouter) => {
},
},
router.handleLegacyErrors(async (context, req, res) => {
- const { getClient, typeRegistry } = context.core.savedObjects;
+ const { getClient, typeRegistry } = (await context.core).savedObjects;
const { typesToInclude, searchString, references } = req.body;
const includedHiddenTypes = chain(typesToInclude)
diff --git a/src/plugins/screenshot_mode/server/types.ts b/src/plugins/screenshot_mode/server/types.ts
index 514bcb759428..08655d2f0118 100644
--- a/src/plugins/screenshot_mode/server/types.ts
+++ b/src/plugins/screenshot_mode/server/types.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import type { RequestHandlerContext, KibanaRequest } from '@kbn/core/server';
+import type { CustomRequestHandlerContext, KibanaRequest } from '@kbn/core/server';
export interface ScreenshotModePluginStart {
/**
@@ -32,8 +32,8 @@ export interface ScreenshotModePluginSetup extends ScreenshotModePluginStart {
setScreenshotModeEnabled(): void;
}
-export interface ScreenshotModeRequestHandlerContext extends RequestHandlerContext {
+export type ScreenshotModeRequestHandlerContext = CustomRequestHandlerContext<{
screenshotMode: {
isScreenshot: boolean;
};
-}
+}>;
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
index 972641d160e2..1208f6fda4d1 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_create_route.ts
@@ -34,7 +34,7 @@ export const registerCreateRoute = (router: IRouter, url: ServerUrlService) => {
},
},
router.handleLegacyErrors(async (ctx, req, res) => {
- const savedObjects = ctx.core.savedObjects.client;
+ const savedObjects = (await ctx.core).savedObjects.client;
const shortUrls = url.shortUrls.get({ savedObjects });
const { locatorId, params, slug, humanReadableSlug } = req.body;
const locator = url.locators.get(locatorId);
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
index 6e2b133ac3cf..ddc29117a3ac 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_delete_route.ts
@@ -25,7 +25,7 @@ export const registerDeleteRoute = (router: IRouter, url: ServerUrlService) => {
},
router.handleLegacyErrors(async (ctx, req, res) => {
const id = req.params.id;
- const savedObjects = ctx.core.savedObjects.client;
+ const savedObjects = (await ctx.core).savedObjects.client;
const shortUrls = url.shortUrls.get({ savedObjects });
await shortUrls.delete(id);
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
index 7ece9b1ef6c6..8e783b3fcfd3 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_get_route.ts
@@ -25,7 +25,7 @@ export const registerGetRoute = (router: IRouter, url: ServerUrlService) => {
},
router.handleLegacyErrors(async (ctx, req, res) => {
const id = req.params.id;
- const savedObjects = ctx.core.savedObjects.client;
+ const savedObjects = (await ctx.core).savedObjects.client;
const shortUrls = url.shortUrls.get({ savedObjects });
const shortUrl = await shortUrls.get(id);
diff --git a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
index b4c73780bdf7..47290d575454 100644
--- a/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
+++ b/src/plugins/share/server/url_service/http/short_urls/register_resolve_route.ts
@@ -26,7 +26,7 @@ export const registerResolveRoute = (router: IRouter, url: ServerUrlService) =>
},
router.handleLegacyErrors(async (ctx, req, res) => {
const slug = req.params.slug;
- const savedObjects = ctx.core.savedObjects.client;
+ const savedObjects = (await ctx.core).savedObjects.client;
try {
const shortUrls = url.shortUrls.get({ savedObjects });
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
index fff5df2dff10..06e443670518 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -48,12 +48,13 @@ export function registerTelemetryOptInRoutes({
},
async (context, req, res) => {
const newOptInStatus = req.body.enabled;
+ const soClient = (await context.core).savedObjects.client;
const attributes: TelemetrySavedObjectAttributes = {
enabled: newOptInStatus,
lastVersionChecked: currentKibanaVersion,
};
const config = await firstValueFrom(config$);
- const telemetrySavedObject = await getTelemetrySavedObject(context.core.savedObjects.client);
+ const telemetrySavedObject = await getTelemetrySavedObject(soClient);
if (telemetrySavedObject === false) {
// If we get false, we couldn't get the saved object due to lack of permissions
@@ -96,7 +97,7 @@ export function registerTelemetryOptInRoutes({
}
try {
- await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);
+ await updateTelemetrySavedObject(soClient, attributes);
} catch (e) {
if (SavedObjectsErrorHelpers.isForbiddenError(e)) {
return res.forbidden();
diff --git a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
index 686274dc4f5d..cb990b68fd9b 100644
--- a/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
@@ -21,7 +21,7 @@ export function registerTelemetryUserHasSeenNotice(router: IRouter) {
validate: false,
},
async (context, req, res) => {
- const internalRepository = context.core.savedObjects.client;
+ const internalRepository = (await context.core).savedObjects.client;
const telemetrySavedObject: TelemetrySavedObject = await getTelemetrySavedObject(
internalRepository
);
diff --git a/src/plugins/unified_search/config.ts b/src/plugins/unified_search/config.ts
index c0067771b680..4814dddea405 100644
--- a/src/plugins/unified_search/config.ts
+++ b/src/plugins/unified_search/config.ts
@@ -8,6 +8,29 @@
import { schema, TypeOf } from '@kbn/config-schema';
-export const configSchema = schema.object({});
+export const configSchema = schema.object({
+ autocomplete: schema.object({
+ querySuggestions: schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+ }),
+ valueSuggestions: schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+ tiers: schema.arrayOf(
+ schema.oneOf([
+ schema.literal('data_content'),
+ schema.literal('data_hot'),
+ schema.literal('data_warm'),
+ schema.literal('data_cold'),
+ schema.literal('data_frozen'),
+ ]),
+ {
+ defaultValue: ['data_hot', 'data_warm', 'data_content', 'data_cold'],
+ }
+ ),
+ terminateAfter: schema.duration({ defaultValue: 100000 }),
+ timeout: schema.duration({ defaultValue: 1000 }),
+ }),
+ }),
+});
export type ConfigSchema = TypeOf;
diff --git a/src/plugins/unified_search/kibana.json b/src/plugins/unified_search/kibana.json
index 8673c6ec783b..b947141a0c68 100755
--- a/src/plugins/unified_search/kibana.json
+++ b/src/plugins/unified_search/kibana.json
@@ -7,8 +7,10 @@
"name": "Unified Search",
"githubTeam": "kibana-app-services"
},
- "server": false,
+ "server": true,
"ui": true,
"requiredPlugins": ["dataViews", "data", "uiActions"],
- "requiredBundles": ["kibanaUtils", "kibanaReact", "data"]
+ "requiredBundles": ["kibanaUtils", "kibanaReact", "data"],
+ "serviceFolders": ["autocomplete"],
+ "configPath": ["unifiedSearch"]
}
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
similarity index 93%
rename from src/plugins/data/public/autocomplete/autocomplete_service.ts
rename to src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
index 95db8e31eb4d..97d128df5a78 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/unified_search/public/autocomplete/autocomplete_service.ts
@@ -8,8 +8,8 @@
import { CoreSetup, PluginInitializerContext } from '@kbn/core/public';
import moment from 'moment';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
-import type { TimefilterSetup } from '../query';
import { QuerySuggestionGetFn } from './providers/query_suggestion_provider';
import {
getEmptyValueSuggestions,
@@ -23,7 +23,7 @@ import {
KUERY_LANGUAGE_NAME,
setupKqlQuerySuggestionProvider,
} from './providers/kql_query_suggestion';
-import { DataPublicPluginStart, DataStartDependencies } from '../types';
+import { UnifiedSearchPublicPluginStart, UnifiedSearchStartDependencies } from '../types';
export class AutocompleteService {
autocompleteConfig: ConfigSchema['autocomplete'];
@@ -50,7 +50,7 @@ export class AutocompleteService {
/** @public **/
public setup(
- core: CoreSetup,
+ core: CoreSetup,
{
timefilter,
usageCollection,
diff --git a/src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts b/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/collectors/create_usage_collector.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
diff --git a/src/plugins/data/public/autocomplete/collectors/index.ts b/src/plugins/unified_search/public/autocomplete/collectors/index.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/collectors/index.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/index.ts
diff --git a/src/plugins/data/public/autocomplete/collectors/types.ts b/src/plugins/unified_search/public/autocomplete/collectors/types.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/collectors/types.ts
rename to src/plugins/unified_search/public/autocomplete/collectors/types.ts
diff --git a/src/plugins/data/public/autocomplete/index.ts b/src/plugins/unified_search/public/autocomplete/index.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/index.ts
rename to src/plugins/unified_search/public/autocomplete/index.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/README.md b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/README.md
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/README.md
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/README.md
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/__fixtures__/index_pattern_response.json
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
similarity index 95%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
index 68b0d123f0a9..24a27bcb99fb 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.test.ts
@@ -6,9 +6,10 @@
* Side Public License, v 1.
*/
-import { setupGetConjunctionSuggestions } from './conjunction';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
import { coreMock } from '@kbn/core/public/mocks';
+import { KueryNode } from '@kbn/data-plugin/public';
+import { setupGetConjunctionSuggestions } from './conjunction';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
const mockKueryNode = (kueryNode: Partial) => kueryNode as unknown as KueryNode;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
similarity index 69%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
index c11c54c2a6f3..ad757f5afbf9 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/conjunction.tsx
@@ -10,21 +10,21 @@ import React from 'react';
import { $Keys } from 'utility-types';
import { FormattedMessage } from '@kbn/i18n-react';
import { KqlQuerySuggestionProvider } from './types';
-import { QuerySuggestion, QuerySuggestionTypes } from '../../..';
+import { QuerySuggestion, QuerySuggestionTypes } from '../query_suggestion_provider';
const bothArgumentsText = (
);
const oneOrMoreArgumentsText = (
);
@@ -32,20 +32,20 @@ const conjunctions: Record = {
and: (
{bothArgumentsText},
}}
description="Full text: ' Requires both arguments to be true'. See
- 'data.kueryAutocomplete.andOperatorDescription.bothArgumentsText' for 'both arguments' part."
+ 'unifiedSearch.kueryAutocomplete.andOperatorDescription.bothArgumentsText' for 'both arguments' part."
/>
),
or: (
= {
),
}}
description="Full text: 'Requires one or more arguments to be true'. See
- 'data.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText' for 'one or more arguments' part."
+ 'unifiedSearch.kueryAutocomplete.orOperatorDescription.oneOrMoreArgumentsText' for 'one or more arguments' part."
/>
),
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
index 7e1633a2cd5e..4446fcf685bd 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.test.ts
@@ -8,8 +8,9 @@
import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+import { indexPatterns as indexPatternsUtils, KueryNode } from '@kbn/data-plugin/public';
import { setupGetFieldSuggestions } from './field';
-import { indexPatterns as indexPatternsUtils, QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
import { coreMock } from '@kbn/core/public/mocks';
const mockKueryNode = (kueryNode: Partial) => kueryNode as unknown as KueryNode;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
similarity index 93%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
index 9664353515c6..139405f6af9f 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx
@@ -6,15 +6,11 @@
* Side Public License, v 1.
*/
+import { IFieldType, indexPatterns as indexPatternsUtils } from '@kbn/data-plugin/public';
import { flatten } from 'lodash';
import { escapeKuery } from './lib/escape_kuery';
import { sortPrefixFirst } from './sort_prefix_first';
-import {
- IFieldType,
- indexPatterns as indexPatternsUtils,
- QuerySuggestionField,
- QuerySuggestionTypes,
-} from '../../..';
+import { QuerySuggestionField, QuerySuggestionTypes } from '../query_suggestion_provider';
import { KqlQuerySuggestionProvider } from './types';
const keywordComparator = (first: IFieldType, second: IFieldType) => {
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
similarity index 93%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
index 6ddf518933af..1002863fec7f 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/index.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/index.ts
@@ -14,12 +14,12 @@ import { setupGetFieldSuggestions } from './field';
import { setupGetValueSuggestions } from './value';
import { setupGetOperatorSuggestions } from './operator';
import { setupGetConjunctionSuggestions } from './conjunction';
+import { UnifiedSearchPublicPluginStart } from '../../../types';
import {
QuerySuggestion,
QuerySuggestionGetFnArgs,
QuerySuggestionGetFn,
- DataPublicPluginStart,
-} from '../../..';
+} from '../query_suggestion_provider';
const cursorSymbol = '@kuery-cursor@';
@@ -29,7 +29,7 @@ const dedup = (suggestions: QuerySuggestion[]): QuerySuggestion[] =>
export const KUERY_LANGUAGE_NAME = 'kuery';
export const setupKqlQuerySuggestionProvider = (
- core: CoreSetup
+ core: CoreSetup
): QuerySuggestionGetFn => {
const providers = {
field: setupGetFieldSuggestions(core),
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.test.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
index 6a2411cc5ccb..a40678ad4ac1 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.test.ts
@@ -9,7 +9,8 @@
import indexPatternResponse from './__fixtures__/index_pattern_response.json';
import { setupGetOperatorSuggestions } from './operator';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { KueryNode } from '@kbn/data-plugin/public';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
import { coreMock } from '@kbn/core/public/mocks';
const mockKueryNode = (kueryNode: Partial) => kueryNode as unknown as KueryNode;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
similarity index 65%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
index f6517f67218d..ee53d5cb3d39 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/operator.tsx
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/operator.tsx
@@ -12,48 +12,48 @@ import { $Keys } from 'utility-types';
import { flatten } from 'lodash';
import { KqlQuerySuggestionProvider } from './types';
-import { QuerySuggestionTypes } from '../../..';
+import { QuerySuggestionTypes } from '../query_suggestion_provider';
const equalsText = (
);
const lessThanOrEqualToText = (
);
const greaterThanOrEqualToText = (
);
const lessThanText = (
);
const greaterThanText = (
);
const existsText = (
);
@@ -61,11 +61,11 @@ const operators = {
':': {
description: (
{equalsText} }}
description="Full text: 'equals some value'. See
- 'data.kueryAutocomplete.equalOperatorDescription.equalsText' for 'equals' part."
+ 'unifiedSearch.kueryAutocomplete.equalOperatorDescription.equalsText' for 'equals' part."
/>
),
fieldTypes: [
@@ -84,7 +84,7 @@ const operators = {
'<=': {
description: (
),
fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -100,7 +100,7 @@ const operators = {
'>=': {
description: (
),
fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -116,11 +116,11 @@ const operators = {
'<': {
description: (
{lessThanText} }}
description="Full text: 'is less than some value'. See
- 'data.kueryAutocomplete.lessThanOperatorDescription.lessThanText' for 'less than' part."
+ 'unifiedSearch.kueryAutocomplete.lessThanOperatorDescription.lessThanText' for 'less than' part."
/>
),
fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -128,13 +128,13 @@ const operators = {
'>': {
description: (
{greaterThanText},
}}
description="Full text: 'is greater than some value'. See
- 'data.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText' for 'greater than' part."
+ 'unifiedSearch.kueryAutocomplete.greaterThanOperatorDescription.greaterThanText' for 'greater than' part."
/>
),
fieldTypes: ['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'],
@@ -142,11 +142,11 @@ const operators = {
': *': {
description: (
{existsText} }}
description="Full text: 'exists in any form'. See
- 'data.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
+ 'unifiedSearch.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
/>
),
fieldTypes: undefined,
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.test.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
similarity index 100%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/sort_prefix_first.ts
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
similarity index 73%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
index b39f942b1f76..e9ca34e546f0 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/types.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/types.ts
@@ -6,10 +6,11 @@
* Side Public License, v 1.
*/
-import { KueryNode } from '@kbn/es-query';
import { CoreSetup } from '@kbn/core/public';
-import { DataPublicPluginStart, QuerySuggestionBasic, QuerySuggestionGetFnArgs } from '../../..';
+import { KueryNode } from '@kbn/es-query';
+import type { UnifiedSearchPublicPluginStart } from '../../../types';
+import { QuerySuggestionBasic, QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
export type KqlQuerySuggestionProvider = (
- core: CoreSetup
+ core: CoreSetup
) => (querySuggestionsGetFnArgs: QuerySuggestionGetFnArgs, kueryNode: KueryNode) => Promise;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
index 224865449a5a..3405d26824a2 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.test.ts
@@ -8,8 +8,10 @@
import { setupGetValueSuggestions } from './value';
import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+
import { coreMock } from '@kbn/core/public/mocks';
-import { QuerySuggestionGetFnArgs, KueryNode } from '../../..';
+import { KueryNode } from '@kbn/data-plugin/public';
+import { QuerySuggestionGetFnArgs } from '../query_suggestion_provider';
const mockKueryNode = (kueryNode: Partial) => kueryNode as unknown as KueryNode;
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
similarity index 89%
rename from src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
rename to src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
index b75cf9d09d27..06b0fc9639a3 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/value.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts
@@ -8,15 +8,11 @@
import { flatten } from 'lodash';
import { CoreSetup } from '@kbn/core/public';
+import { IFieldType, IIndexPattern } from '@kbn/data-plugin/public';
import { escapeQuotes } from './lib/escape_kuery';
import { KqlQuerySuggestionProvider } from './types';
-import {
- DataPublicPluginStart,
- IFieldType,
- IIndexPattern,
- QuerySuggestion,
- QuerySuggestionTypes,
-} from '../../..';
+import type { UnifiedSearchPublicPluginStart } from '../../../types';
+import { QuerySuggestion, QuerySuggestionTypes } from '../query_suggestion_provider';
const wrapAsSuggestions = (start: number, end: number, query: string, values: string[]) =>
values
@@ -29,7 +25,7 @@ const wrapAsSuggestions = (start: number, end: number, query: string, values: st
}));
export const setupGetValueSuggestions: KqlQuerySuggestionProvider = (
- core: CoreSetup
+ core: CoreSetup
) => {
const autoCompleteServicePromise = core
.getStartServices()
diff --git a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts b/src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
similarity index 90%
rename from src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
rename to src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
index 0cb229c9b41b..056fcb716054 100644
--- a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts
@@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
-import { ValueSuggestionsMethod } from '../../../common';
-import { IFieldType, IIndexPattern } from '../../../common';
+import { ValueSuggestionsMethod } from '@kbn/data-plugin/common';
+import { IFieldType, IIndexPattern } from '@kbn/data-plugin/common';
export enum QuerySuggestionTypes {
Field = 'field',
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
similarity index 97%
rename from src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
rename to src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
index bf80438da08a..a17172a2b607 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.test.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts
@@ -6,12 +6,12 @@
* Side Public License, v 1.
*/
-import { stubIndexPattern, stubFields } from '../../stubs';
-import type { TimefilterSetup } from '../../query';
+import { IUiSettingsClient, CoreSetup } from '@kbn/core/public';
+import { stubIndexPattern, stubFields } from '@kbn/data-plugin/public/stubs';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
import { setupValueSuggestionProvider } from './value_suggestion_provider';
import type { ValueSuggestionsGetFn } from './value_suggestion_provider';
-import { IUiSettingsClient, CoreSetup } from '@kbn/core/public';
-import { UI_SETTINGS } from '../../../common';
describe('FieldSuggestions', () => {
let getValueSuggestions: ValueSuggestionsGetFn;
diff --git a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
similarity index 95%
rename from src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
rename to src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
index 422c4e02d8e4..054a24306432 100644
--- a/src/plugins/data/public/autocomplete/providers/value_suggestion_provider.ts
+++ b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts
@@ -6,12 +6,17 @@
* Side Public License, v 1.
*/
+import { CoreSetup } from '@kbn/core/public';
import dateMath from '@kbn/datemath';
import { buildQueryFromFilters } from '@kbn/es-query';
import { memoize } from 'lodash';
-import { CoreSetup } from '@kbn/core/public';
-import { IIndexPattern, IFieldType, UI_SETTINGS, ValueSuggestionsMethod } from '../../../common';
-import type { TimefilterSetup } from '../../query';
+import {
+ IIndexPattern,
+ IFieldType,
+ UI_SETTINGS,
+ ValueSuggestionsMethod,
+} from '@kbn/data-plugin/common';
+import type { TimefilterSetup } from '@kbn/data-plugin/public';
import { AutocompleteUsageCollector } from '../collectors';
export type ValueSuggestionsGetFn = (args: ValueSuggestionsGetFnArgs) => Promise;
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
index 057a730e5cc4..50acadea2a99 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -7,12 +7,13 @@
*/
import React from 'react';
-import { debounce } from 'lodash';
-
import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
import { IFieldType, UI_SETTINGS } from '@kbn/data-plugin/common';
import { DataView } from '@kbn/data-views-plugin/common';
import { IDataPluginServices } from '@kbn/data-plugin/public';
+import { debounce } from 'lodash';
+
+import { getAutocomplete } from '../../services';
export interface PhraseSuggestorProps {
kibana: KibanaReactContextValue;
@@ -79,8 +80,7 @@ export class PhraseSuggestorUI extends React.Com
return;
}
this.setState({ isLoading: true });
-
- const suggestions = await this.services.data.autocomplete.getValueSuggestions({
+ const suggestions = await getAutocomplete().getValueSuggestions({
indexPattern,
field,
query,
diff --git a/src/plugins/unified_search/public/index.ts b/src/plugins/unified_search/public/index.ts
index ff020ef1e8f9..1200234a793a 100755
--- a/src/plugins/unified_search/public/index.ts
+++ b/src/plugins/unified_search/public/index.ts
@@ -7,19 +7,31 @@
*/
import { PluginInitializerContext } from '@kbn/core/public';
import { ConfigSchema } from '../config';
-import { UnifiedSearchPublicPlugin } from './plugin';
-
export type { IndexPatternSelectProps } from './index_pattern_select';
export type { QueryStringInputProps } from './query_string_input';
export { QueryStringInput } from './query_string_input';
export type { StatefulSearchBarProps, SearchBarProps } from './search_bar';
-export type { UnifiedSearchPublicPluginStart } from './types';
+export type { UnifiedSearchPublicPluginStart, UnifiedSearchPluginSetup } from './types';
export { SearchBar } from './search_bar';
export { FilterLabel, FilterItem } from './filter_bar';
export type { ApplyGlobalFilterActionContext } from './actions';
export { ACTION_GLOBAL_APPLY_FILTER } from './actions';
+/*
+ * Autocomplete query suggestions:
+ */
+export type {
+ QuerySuggestion,
+ QuerySuggestionGetFn,
+ QuerySuggestionGetFnArgs,
+ AutocompleteStart,
+} from './autocomplete';
+
+export { QuerySuggestionTypes } from './autocomplete';
+
+import { UnifiedSearchPublicPlugin } from './plugin';
+
// This exports static code and TypeScript types,
// as well as, Kibana Platform `plugin()` initializer.
export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/unified_search/public/mocks.ts b/src/plugins/unified_search/public/mocks.ts
index eacbb72cc55a..e119c58e89f3 100644
--- a/src/plugins/unified_search/public/mocks.ts
+++ b/src/plugins/unified_search/public/mocks.ts
@@ -7,12 +7,31 @@
*/
import { UnifiedSearchPublicPlugin } from './plugin';
+import { AutocompleteStart, AutocompleteSetup } from './autocomplete';
export type Setup = jest.Mocked>;
export type Start = jest.Mocked>;
+const autocompleteSetupMock: jest.Mocked = {
+ getQuerySuggestions: jest.fn(),
+ getAutocompleteSettings: jest.fn(),
+};
+
+const autocompleteStartMock: jest.Mocked = {
+ getValueSuggestions: jest.fn(),
+ getQuerySuggestions: jest.fn(),
+ hasQuerySuggestions: jest.fn(),
+};
+
+const createSetupContract = (): Setup => {
+ return {
+ autocomplete: autocompleteSetupMock,
+ };
+};
+
const createStartContract = (): Start => {
return {
+ autocomplete: autocompleteStartMock,
ui: {
IndexPatternSelect: jest.fn(),
SearchBar: jest.fn().mockReturnValue(null),
@@ -22,4 +41,5 @@ const createStartContract = (): Start => {
export const unifiedSearchPluginMock = {
createStartContract,
+ createSetupContract,
};
diff --git a/src/plugins/unified_search/public/plugin.ts b/src/plugins/unified_search/public/plugin.ts
index 6064d98ba554..93f1aaf19fae 100755
--- a/src/plugins/unified_search/public/plugin.ts
+++ b/src/plugins/unified_search/public/plugin.ts
@@ -13,11 +13,16 @@ import { Storage, IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
import { APPLY_FILTER_TRIGGER } from '@kbn/data-plugin/public';
import { ConfigSchema } from '../config';
-import { setIndexPatterns, setTheme, setOverlays } from './services';
+import { setIndexPatterns, setTheme, setOverlays, setAutocomplete } from './services';
+import { AutocompleteService } from './autocomplete';
import { createSearchBar } from './search_bar';
import { createIndexPatternSelect } from './index_pattern_select';
-import { UnifiedSearchPluginSetup, UnifiedSearchPublicPluginStart } from './types';
-import type { UnifiedSearchStartDependencies, UnifiedSearchSetupDependencies } from './types';
+import type {
+ UnifiedSearchStartDependencies,
+ UnifiedSearchSetupDependencies,
+ UnifiedSearchPluginSetup,
+ UnifiedSearchPublicPluginStart,
+} from './types';
import { createFilterAction } from './actions/apply_filter_action';
import { ACTION_GLOBAL_APPLY_FILTER } from './actions';
@@ -25,22 +30,30 @@ export class UnifiedSearchPublicPlugin
implements Plugin
{
private readonly storage: IStorageWrapper;
+ private readonly autocomplete: AutocompleteService;
private usageCollection: UsageCollectionSetup | undefined;
constructor(initializerContext: PluginInitializerContext) {
this.storage = new Storage(window.localStorage);
+
+ this.autocomplete = new AutocompleteService(initializerContext);
}
public setup(
- core: CoreSetup,
- { uiActions, data }: UnifiedSearchSetupDependencies
+ core: CoreSetup,
+ { uiActions, data, usageCollection }: UnifiedSearchSetupDependencies
): UnifiedSearchPluginSetup {
const { query } = data;
uiActions.registerAction(
createFilterAction(query.filterManager, query.timefilter.timefilter, core.theme)
);
- return {};
+ return {
+ autocomplete: this.autocomplete.setup(core, {
+ timefilter: query.timefilter,
+ usageCollection,
+ }),
+ };
}
public start(
@@ -50,6 +63,8 @@ export class UnifiedSearchPublicPlugin
setTheme(core.theme);
setOverlays(core.overlays);
setIndexPatterns(dataViews);
+ const autocompleteStart = this.autocomplete.start();
+ setAutocomplete(autocompleteStart);
const SearchBar = createSearchBar({
core,
@@ -68,8 +83,11 @@ export class UnifiedSearchPublicPlugin
IndexPatternSelect: createIndexPatternSelect(dataViews),
SearchBar,
},
+ autocomplete: autocompleteStart,
};
}
- public stop() {}
+ public stop() {
+ this.autocomplete.clearProviders();
+ }
}
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
index 373c8a55b9b6..189f12765ad1 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.test.tsx
@@ -20,6 +20,9 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
import { I18nProvider } from '@kbn/i18n-react';
import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import { setAutocomplete } from '../services';
+import { unifiedSearchPluginMock } from '../mocks';
+
const startMock = coreMock.createStart();
const mockTimeHistory = {
@@ -112,6 +115,11 @@ describe('QueryBarTopRowTopRow', () => {
jest.clearAllMocks();
});
+ beforeEach(() => {
+ const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+ setAutocomplete(autocompleteStart.autocomplete);
+ });
+
it('Should render query and time picker', () => {
const { getByText, getByTestId } = render(
wrapQueryBarTopRowInContext({
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
index 39d63a5c888c..b4eed13da7f5 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx
@@ -28,6 +28,9 @@ import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
import { stubIndexPattern } from '@kbn/data-plugin/public/stubs';
import { KibanaContextProvider, withKibana } from '@kbn/kibana-react-plugin/public';
+import { setAutocomplete } from '../services';
+import { unifiedSearchPluginMock } from '../mocks';
+
jest.useFakeTimers();
const startMock = coreMock.createStart();
@@ -92,6 +95,11 @@ describe('QueryStringInput', () => {
jest.clearAllMocks();
});
+ beforeEach(() => {
+ const autocompleteStart = unifiedSearchPluginMock.createStartContract();
+ setAutocomplete(autocompleteStart.autocomplete);
+ });
+
it('Should render the given query', async () => {
const { getByText } = render(
wrapQueryStringInputInContext({
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index f4b99b8e86fb..a9f4127809ab 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -28,13 +28,7 @@ import {
import { FormattedMessage } from '@kbn/i18n-react';
import { compact, debounce, isEqual, isFunction } from 'lodash';
import { Toast } from '@kbn/core/public';
-import {
- IDataPluginServices,
- Query,
- QuerySuggestion,
- QuerySuggestionTypes,
- getQueryLog,
-} from '@kbn/data-plugin/public';
+import { IDataPluginServices, Query, getQueryLog } from '@kbn/data-plugin/public';
import { DataView } from '@kbn/data-views-plugin/public';
import type { PersistedLog } from '@kbn/data-plugin/public';
import { getFieldSubtypeNested, KIBANA_USER_QUERY_LANGUAGE_KEY } from '@kbn/data-plugin/common';
@@ -47,7 +41,8 @@ import { QueryLanguageSwitcher } from './language_switcher';
import type { SuggestionsListSize } from '../typeahead/suggestions_component';
import { SuggestionsComponent } from '../typeahead';
import { onRaf } from '../utils';
-import { getTheme } from '../services';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
+import { getTheme, getAutocomplete } from '../services';
export interface QueryStringInputProps {
indexPatterns: Array;
@@ -201,7 +196,7 @@ export default class QueryStringInputUI extends PureComponent {
const queryString = this.getQueryString();
const recentSearchSuggestions = this.getRecentSearchSuggestions(queryString);
- const hasQuerySuggestions = this.services.data.autocomplete.hasQuerySuggestions(language);
+ const hasQuerySuggestions = getAutocomplete().hasQuerySuggestions(language);
if (
!hasQuerySuggestions ||
@@ -222,7 +217,7 @@ export default class QueryStringInputUI extends PureComponent {
if (this.abortController) this.abortController.abort();
this.abortController = new AbortController();
const suggestions =
- (await this.services.data.autocomplete.getQuerySuggestions({
+ (await getAutocomplete().getQuerySuggestions({
language,
indexPatterns,
query: queryString,
diff --git a/src/plugins/unified_search/public/services.ts b/src/plugins/unified_search/public/services.ts
index 4f8937baf8fd..f67801dd3773 100644
--- a/src/plugins/unified_search/public/services.ts
+++ b/src/plugins/unified_search/public/services.ts
@@ -9,6 +9,7 @@
import { ThemeServiceStart, OverlayStart } from '@kbn/core/public';
import { createGetterSetter } from '@kbn/kibana-utils-plugin/public';
import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { AutocompleteStart } from '.';
export const [getIndexPatterns, setIndexPatterns] =
createGetterSetter('IndexPatterns');
@@ -16,3 +17,6 @@ export const [getIndexPatterns, setIndexPatterns] =
export const [getTheme, setTheme] = createGetterSetter('Theme');
export const [getOverlays, setOverlays] = createGetterSetter('Overlays');
+
+export const [getAutocomplete, setAutocomplete] =
+ createGetterSetter('Autocomplete');
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
index d32ce1db3bdf..31c38ad94815 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.test.tsx
@@ -8,7 +8,7 @@
import { mount, shallow } from 'enzyme';
import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
import { SuggestionComponent } from './suggestion_component';
const noop = () => {
diff --git a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
index 9fd4f0ddb965..b8b3f2640c31 100644
--- a/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestion_component.tsx
@@ -9,7 +9,7 @@
import { EuiIcon } from '@elastic/eui';
import classNames from 'classnames';
import React, { useCallback } from 'react';
-import { QuerySuggestion } from '@kbn/data-plugin/public';
+import { QuerySuggestion } from '../autocomplete';
import { SuggestionOnClick, SuggestionOnMouseEnter } from './types';
function getEuiIconType(type: string) {
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
index 7f1715ed2d70..6a21041f6953 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.test.tsx
@@ -8,7 +8,7 @@
import { mount, shallow } from 'enzyme';
import React from 'react';
-import { QuerySuggestion, QuerySuggestionTypes } from '@kbn/data-plugin/public';
+import { QuerySuggestion, QuerySuggestionTypes } from '../autocomplete';
import { SuggestionComponent } from './suggestion_component';
import SuggestionsComponent from './suggestions_component';
diff --git a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
index e9d5d51050f9..75e446cf2d6e 100644
--- a/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
+++ b/src/plugins/unified_search/public/typeahead/suggestions_component.tsx
@@ -13,7 +13,7 @@ import classNames from 'classnames';
import styled from 'styled-components';
import useRafState from 'react-use/lib/useRafState';
-import { QuerySuggestion } from '@kbn/data-plugin/public';
+import { QuerySuggestion } from '../autocomplete';
import { SuggestionComponent } from './suggestion_component';
import {
SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE,
diff --git a/src/plugins/unified_search/public/typeahead/types.ts b/src/plugins/unified_search/public/typeahead/types.ts
index 0da396ae56d7..1a58c29d028e 100644
--- a/src/plugins/unified_search/public/typeahead/types.ts
+++ b/src/plugins/unified_search/public/typeahead/types.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-import { QuerySuggestion } from '@kbn/data-plugin/public';
+import { QuerySuggestion } from '../autocomplete';
export type SuggestionOnClick = (suggestion: QuerySuggestion, index: number) => void;
diff --git a/src/plugins/unified_search/public/types.ts b/src/plugins/unified_search/public/types.ts
index e113fd32f54e..29cf59f41a87 100755
--- a/src/plugins/unified_search/public/types.ts
+++ b/src/plugins/unified_search/public/types.ts
@@ -5,19 +5,24 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
+
import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
import type { UiActionsSetup, UiActionsStart } from '@kbn/ui-actions-plugin/public';
-import { IndexPatternSelectProps, StatefulSearchBarProps } from '.';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
+import type { IndexPatternSelectProps, StatefulSearchBarProps } from '.';
export interface UnifiedSearchSetupDependencies {
uiActions: UiActionsSetup;
data: DataPublicPluginStart;
+ usageCollection?: UsageCollectionSetup;
}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface UnifiedSearchPluginSetup {}
+export interface UnifiedSearchPluginSetup {
+ autocomplete: AutocompleteSetup;
+}
export interface UnifiedSearchStartDependencies {
dataViews: DataViewsPublicPluginStart;
@@ -38,6 +43,11 @@ export interface UnifiedSearchPublicPluginStartUi {
* Unified search plugin public Start contract
*/
export interface UnifiedSearchPublicPluginStart {
+ /**
+ * autocomplete service
+ * {@link AutocompleteStart}
+ */
+ autocomplete: AutocompleteStart;
/**
* prewired UI components
* {@link DataPublicPluginStartUi}
diff --git a/src/plugins/data/server/autocomplete/autocomplete_service.ts b/src/plugins/unified_search/server/autocomplete/autocomplete_service.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/autocomplete_service.ts
rename to src/plugins/unified_search/server/autocomplete/autocomplete_service.ts
diff --git a/src/plugins/data/server/autocomplete/index.ts b/src/plugins/unified_search/server/autocomplete/index.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/index.ts
rename to src/plugins/unified_search/server/autocomplete/index.ts
diff --git a/src/plugins/data/server/autocomplete/routes.ts b/src/plugins/unified_search/server/autocomplete/routes.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/routes.ts
rename to src/plugins/unified_search/server/autocomplete/routes.ts
diff --git a/src/plugins/data/server/autocomplete/terms_agg.test.ts b/src/plugins/unified_search/server/autocomplete/terms_agg.test.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/terms_agg.test.ts
rename to src/plugins/unified_search/server/autocomplete/terms_agg.test.ts
diff --git a/src/plugins/data/server/autocomplete/terms_agg.ts b/src/plugins/unified_search/server/autocomplete/terms_agg.ts
similarity index 97%
rename from src/plugins/data/server/autocomplete/terms_agg.ts
rename to src/plugins/unified_search/server/autocomplete/terms_agg.ts
index 7e48bc6ee21c..ffdaca8caad4 100644
--- a/src/plugins/data/server/autocomplete/terms_agg.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_agg.ts
@@ -9,8 +9,8 @@
import { get, map } from 'lodash';
import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { IFieldType, getFieldSubtypeNested } from '@kbn/data-plugin/common';
import { ConfigSchema } from '../../config';
-import { IFieldType, getFieldSubtypeNested } from '../../common';
import { findIndexPatternById, getFieldByName } from '../data_views';
export async function termsAggSuggestions(
diff --git a/src/plugins/data/server/autocomplete/terms_enum.test.ts b/src/plugins/unified_search/server/autocomplete/terms_enum.test.ts
similarity index 100%
rename from src/plugins/data/server/autocomplete/terms_enum.test.ts
rename to src/plugins/unified_search/server/autocomplete/terms_enum.test.ts
diff --git a/src/plugins/data/server/autocomplete/terms_enum.ts b/src/plugins/unified_search/server/autocomplete/terms_enum.ts
similarity index 95%
rename from src/plugins/data/server/autocomplete/terms_enum.ts
rename to src/plugins/unified_search/server/autocomplete/terms_enum.ts
index 77e8887f3fcb..924b5b3a1671 100644
--- a/src/plugins/data/server/autocomplete/terms_enum.ts
+++ b/src/plugins/unified_search/server/autocomplete/terms_enum.ts
@@ -8,7 +8,7 @@
import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { FieldSpec } from '../../common';
+import { IFieldType } from '@kbn/data-plugin/common';
import { findIndexPatternById, getFieldByName } from '../data_views';
import { ConfigSchema } from '../../config';
@@ -20,7 +20,7 @@ export async function termsEnumSuggestions(
fieldName: string,
query: string,
filters?: estypes.QueryDslQueryContainer[],
- field?: FieldSpec,
+ field?: IFieldType,
abortSignal?: AbortSignal
) {
const { tiers } = config.autocomplete.valueSuggestions;
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
similarity index 91%
rename from src/plugins/data/server/autocomplete/value_suggestions_route.ts
rename to src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
index 9c6c037a86a8..74a7e5202a54 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/unified_search/server/autocomplete/value_suggestions_route.ts
@@ -9,8 +9,8 @@
import { schema } from '@kbn/config-schema';
import { IRouter } from '@kbn/core/server';
import { firstValueFrom, Observable } from 'rxjs';
+import { getRequestAbortedSignal } from '@kbn/data-plugin/server';
import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
-import { getRequestAbortedSignal } from '../lib';
import type { ConfigSchema } from '../../config';
import { termsEnumSuggestions } from './terms_enum';
import { termsAggSuggestions } from './terms_agg';
@@ -45,13 +45,14 @@ export function registerValueSuggestionsRoute(router: IRouter, config$: Observab
const { field: fieldName, query, filters, fieldMeta, method } = request.body;
const { index } = request.params;
const abortSignal = getRequestAbortedSignal(request.events.aborted$);
+ const { savedObjects, elasticsearch } = await context.core;
try {
const fn = method === 'terms_agg' ? termsAggSuggestions : termsEnumSuggestions;
const body = await fn(
config,
- context.core.savedObjects.client,
- context.core.elasticsearch.client.asCurrentUser,
+ savedObjects.client,
+ elasticsearch.client.asCurrentUser,
index,
fieldName,
query,
diff --git a/src/plugins/unified_search/server/config_deprecations.test.ts b/src/plugins/unified_search/server/config_deprecations.test.ts
new file mode 100644
index 000000000000..8c65acfae629
--- /dev/null
+++ b/src/plugins/unified_search/server/config_deprecations.test.ts
@@ -0,0 +1,137 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { cloneDeep } from 'lodash';
+
+import { applyDeprecations, configDeprecationFactory } from '@kbn/config';
+import { configDeprecationsMock } from '@kbn/core/server/mocks';
+
+import { autocompleteConfigDeprecationProvider } from './config_deprecations';
+
+const deprecationContext = configDeprecationsMock.createContext();
+
+const applyConfigDeprecations = (settings: Record = {}) => {
+ const deprecations = autocompleteConfigDeprecationProvider(configDeprecationFactory);
+ const deprecationMessages: string[] = [];
+ const migrated = applyDeprecations(
+ settings,
+ deprecations.map((deprecation) => ({
+ deprecation,
+ path: '',
+ context: deprecationContext,
+ })),
+ () =>
+ ({ message }) =>
+ deprecationMessages.push(message)
+ );
+ return {
+ messages: deprecationMessages,
+ migrated: migrated.config,
+ };
+};
+
+describe('Config Deprecations', () => {
+ it('does not report deprecations for default configurationc', () => {
+ const configFirstStep = { data: { autocomplete: { valueSuggestions: {} } } };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(configFirstStep));
+ expect(migrated).toEqual(configFirstStep);
+ expect(messages).toHaveLength(0);
+ });
+
+ it('renames kibana.autocompleteTerminateAfter to unifiedSearch.autocomplete.valueSuggestions.terminateAfter', () => {
+ const config = {
+ kibana: {
+ autocompleteTerminateAfter: 123,
+ },
+ };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+ expect(migrated.kibana?.autocompleteTerminateAfter).not.toBeDefined();
+ expect(migrated.unifiedSearch.autocomplete.valueSuggestions.terminateAfter).toEqual(123);
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "Setting \\"kibana.autocompleteTerminateAfter\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.terminateAfter\\"",
+ ]
+ `);
+ });
+
+ it('renames kibana.autocompleteTimeout to unifiedSearch.autocomplete.valueSuggestions.timeout', () => {
+ const config = {
+ kibana: {
+ autocompleteTimeout: 123,
+ },
+ };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+ expect(migrated.kibana?.autocompleteTimeout).not.toBeDefined();
+ expect(migrated.unifiedSearch.autocomplete.valueSuggestions.timeout).toEqual(123);
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "Setting \\"kibana.autocompleteTimeout\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.timeout\\"",
+ ]
+ `);
+ });
+
+ it('renames data.autocomplete.querySuggestions.enabled to unifiedSearch.autocomplete.querySuggestions.enabled', () => {
+ const config = {
+ data: {
+ autocomplete: {
+ querySuggestions: {
+ enabled: false,
+ },
+ },
+ },
+ };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+ expect(migrated.data?.autocomplete.querySuggestions.enabled).not.toBeDefined();
+ expect(migrated.unifiedSearch.autocomplete.querySuggestions.enabled).toEqual(false);
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "Setting \\"data.autocomplete.querySuggestions.enabled\\" has been replaced by \\"unifiedSearch.autocomplete.querySuggestions.enabled\\"",
+ ]
+ `);
+ });
+
+ it('renames data.autocomplete.valueSuggestions.enabled to unifiedSearch.autocomplete.valueSuggestions.enabled', () => {
+ const config = {
+ data: {
+ autocomplete: {
+ valueSuggestions: {
+ enabled: false,
+ },
+ },
+ },
+ };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+ expect(migrated.data?.autocomplete.valueSuggestions.enabled).not.toBeDefined();
+ expect(migrated.unifiedSearch.autocomplete.valueSuggestions.enabled).toEqual(false);
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "Setting \\"data.autocomplete.valueSuggestions.enabled\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.enabled\\"",
+ ]
+ `);
+ });
+
+ it('renames data.autocomplete.valueSuggestions.tiers to unifiedSearch.autocomplete.valueSuggestions.tiers', () => {
+ const config = {
+ data: {
+ autocomplete: {
+ valueSuggestions: {
+ tiers: [],
+ },
+ },
+ },
+ };
+ const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+ expect(migrated.data?.autocomplete.valueSuggestions.tiers).not.toBeDefined();
+ expect(migrated.unifiedSearch.autocomplete.valueSuggestions.tiers).toEqual([]);
+ expect(messages).toMatchInlineSnapshot(`
+ Array [
+ "Setting \\"data.autocomplete.valueSuggestions.tiers\\" has been replaced by \\"unifiedSearch.autocomplete.valueSuggestions.tiers\\"",
+ ]
+ `);
+ });
+});
diff --git a/src/plugins/unified_search/server/config_deprecations.ts b/src/plugins/unified_search/server/config_deprecations.ts
new file mode 100644
index 000000000000..de083caffad0
--- /dev/null
+++ b/src/plugins/unified_search/server/config_deprecations.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ConfigDeprecationProvider } from '@kbn/core/server';
+
+export const autocompleteConfigDeprecationProvider: ConfigDeprecationProvider = ({
+ renameFromRoot,
+}) => [
+ renameFromRoot(
+ 'data.autocomplete.valueSuggestions.terminateAfter',
+ 'unifiedSearch.autocomplete.valueSuggestions.terminateAfter',
+ { level: 'warning' }
+ ),
+ renameFromRoot(
+ 'kibana.autocompleteTerminateAfter',
+ 'unifiedSearch.autocomplete.valueSuggestions.terminateAfter',
+ { level: 'warning' }
+ ),
+ renameFromRoot(
+ 'data.autocomplete.valueSuggestions.timeout',
+ 'unifiedSearch.autocomplete.valueSuggestions.timeout',
+ {
+ level: 'warning',
+ }
+ ),
+ renameFromRoot(
+ 'kibana.autocompleteTimeout',
+ 'unifiedSearch.autocomplete.valueSuggestions.timeout',
+ {
+ level: 'warning',
+ }
+ ),
+ renameFromRoot(
+ 'data.autocomplete.querySuggestions.enabled',
+ 'unifiedSearch.autocomplete.querySuggestions.enabled',
+ {
+ level: 'warning',
+ }
+ ),
+ renameFromRoot(
+ 'data.autocomplete.valueSuggestions.enabled',
+ 'unifiedSearch.autocomplete.valueSuggestions.enabled',
+ {
+ level: 'warning',
+ }
+ ),
+ renameFromRoot(
+ 'data.autocomplete.valueSuggestions.tiers',
+ 'unifiedSearch.autocomplete.valueSuggestions.tiers',
+ {
+ level: 'warning',
+ }
+ ),
+];
diff --git a/src/plugins/unified_search/server/data_views/index.ts b/src/plugins/unified_search/server/data_views/index.ts
new file mode 100644
index 000000000000..dfe03378f027
--- /dev/null
+++ b/src/plugins/unified_search/server/data_views/index.ts
@@ -0,0 +1,9 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from '@kbn/data-views-plugin/server';
diff --git a/src/plugins/unified_search/server/index.ts b/src/plugins/unified_search/server/index.ts
new file mode 100644
index 000000000000..d1948f32e2fe
--- /dev/null
+++ b/src/plugins/unified_search/server/index.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
+import { ConfigSchema, configSchema } from '../config';
+import {
+ UnifiedSearchServerPlugin,
+ UnifiedSearchServerPluginSetup,
+ UnifiedSearchServerPluginStart,
+} from './plugin';
+
+import { autocompleteConfigDeprecationProvider } from './config_deprecations';
+
+/**
+ * Static code to be shared externally
+ * @public
+ */
+
+export function plugin(initializerContext: PluginInitializerContext) {
+ return new UnifiedSearchServerPlugin(initializerContext);
+}
+
+export type {
+ UnifiedSearchServerPluginSetup as PluginSetup,
+ UnifiedSearchServerPluginStart as PluginStart,
+};
+export { UnifiedSearchServerPlugin as Plugin };
+
+export const config: PluginConfigDescriptor = {
+ deprecations: autocompleteConfigDeprecationProvider,
+ exposeToBrowser: {
+ autocomplete: true,
+ },
+ schema: configSchema,
+};
diff --git a/src/plugins/unified_search/server/mocks.ts b/src/plugins/unified_search/server/mocks.ts
new file mode 100644
index 000000000000..7f63abcdaae0
--- /dev/null
+++ b/src/plugins/unified_search/server/mocks.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { AutocompleteSetup } from './autocomplete';
+
+const autocompleteSetupMock: jest.Mocked = {
+ getAutocompleteSettings: jest.fn(),
+};
+
+function createSetupContract() {
+ return {
+ autocomplete: autocompleteSetupMock,
+ };
+}
+
+export const dataPluginMock = {
+ createSetupContract,
+};
diff --git a/src/plugins/unified_search/server/plugin.ts b/src/plugins/unified_search/server/plugin.ts
new file mode 100644
index 000000000000..6328eeba2f41
--- /dev/null
+++ b/src/plugins/unified_search/server/plugin.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 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 or the Server
+ * Side Public License, v 1.
+ */
+
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/core/server';
+import { ConfigSchema } from '../config';
+import { AutocompleteService } from './autocomplete';
+import { AutocompleteSetup } from './autocomplete/autocomplete_service';
+
+export interface UnifiedSearchServerPluginSetup {
+ autocomplete: AutocompleteSetup;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginStart {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginSetupDependencies {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface UnifiedSearchServerPluginStartDependencies {}
+
+export class UnifiedSearchServerPlugin implements Plugin {
+ private readonly autocompleteService: AutocompleteService;
+
+ constructor(initializerContext: PluginInitializerContext