CoreSetup<DataStartDependencies, DataPublicPluginStart> | |
-| { expressions, uiActions, usageCollection } | DataSetupDependencies | |
+| { bfetch, expressions, uiActions, usageCollection } | DataSetupDependencies | |
Returns:
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md
index 1c8b6eb41a72e..b5ac4a4e53887 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md
@@ -7,7 +7,7 @@
Signature:
```typescript
-protected handleSearchError(e: any, request: IKibanaSearchRequest, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
+protected handleSearchError(e: any, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
```
## Parameters
@@ -15,7 +15,6 @@ protected handleSearchError(e: any, request: IKibanaSearchRequest, timeoutSignal
| Parameter | Type | Description |
| --- | --- | --- |
| e | any | |
-| request | IKibanaSearchRequest | |
| timeoutSignal | AbortSignal | |
| options | ISearchOptions | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
index 40c7055e4c059..5f266e7d8bd8c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.md
@@ -27,7 +27,7 @@ export declare class SearchInterceptor
| Method | Modifiers | Description |
| --- | --- | --- |
| [getTimeoutMode()](./kibana-plugin-plugins-data-public.searchinterceptor.gettimeoutmode.md) | | |
-| [handleSearchError(e, request, timeoutSignal, options)](./kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md) | | |
+| [handleSearchError(e, timeoutSignal, options)](./kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md) | | |
| [search(request, options)](./kibana-plugin-plugins-data-public.searchinterceptor.search.md) | | Searches using the given search method. Overrides the AbortSignal with one that will abort either when cancelPending is called, when the request times out, or when the original AbortSignal is aborted. Updates pendingCount$ when the request is started/finalized. |
| [showError(e)](./kibana-plugin-plugins-data-public.searchinterceptor.showerror.md) | | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.bfetch.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.bfetch.md
new file mode 100644
index 0000000000000..5b7c635c71529
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.bfetch.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchInterceptorDeps](./kibana-plugin-plugins-data-public.searchinterceptordeps.md) > [bfetch](./kibana-plugin-plugins-data-public.searchinterceptordeps.bfetch.md)
+
+## SearchInterceptorDeps.bfetch property
+
+Signature:
+
+```typescript
+bfetch: BfetchPublicSetup;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.md
index 3653394d28b92..543566b783c23 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptordeps.md
@@ -14,6 +14,7 @@ export interface SearchInterceptorDeps
| Property | Type | Description |
| --- | --- | --- |
+| [bfetch](./kibana-plugin-plugins-data-public.searchinterceptordeps.bfetch.md) | BfetchPublicSetup | |
| [http](./kibana-plugin-plugins-data-public.searchinterceptordeps.http.md) | CoreSetup['http'] | |
| [session](./kibana-plugin-plugins-data-public.searchinterceptordeps.session.md) | ISessionService | |
| [startServices](./kibana-plugin-plugins-data-public.searchinterceptordeps.startservices.md) | Promise<[CoreStart, any, unknown]> | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md
index 548fa66e6e518..df302e9f3b0d3 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.md
@@ -41,6 +41,7 @@ export declare class SearchSource
| [getSearchRequestBody()](./kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md) | | Returns body contents of the search request, often referred as query DSL. |
| [getSerializedFields()](./kibana-plugin-plugins-data-public.searchsource.getserializedfields.md) | | serializes search source fields (which can later be passed to [ISearchStartSearchSource](./kibana-plugin-plugins-data-public.isearchstartsearchsource.md)) |
| [onRequestStart(handler)](./kibana-plugin-plugins-data-public.searchsource.onrequeststart.md) | | Add a handler that will be notified whenever requests start |
+| [removeField(field)](./kibana-plugin-plugins-data-public.searchsource.removefield.md) | | remove field |
| [serialize()](./kibana-plugin-plugins-data-public.searchsource.serialize.md) | | Serializes the instance to a JSON string and a set of referenced objects. Use this method to get a representation of the search source which can be stored in a saved object.The references returned by this function can be mixed with other references in the same object, however make sure there are no name-collisions. The references will be named kibanaSavedObjectMeta.searchSourceJSON.index and kibanaSavedObjectMeta.searchSourceJSON.filter[<number>].meta.index.Using createSearchSource, the instance can be re-created. |
| [setField(field, value)](./kibana-plugin-plugins-data-public.searchsource.setfield.md) | | sets value to a single search source field |
| [setFields(newFields)](./kibana-plugin-plugins-data-public.searchsource.setfields.md) | | Internal, do not use. Overrides all search source fields with the new field array. |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.removefield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.removefield.md
new file mode 100644
index 0000000000000..1e6b63be997ff
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.removefield.md
@@ -0,0 +1,24 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [removeField](./kibana-plugin-plugins-data-public.searchsource.removefield.md)
+
+## SearchSource.removeField() method
+
+remove field
+
+Signature:
+
+```typescript
+removeFieldK | |
+
+Returns:
+
+`this`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.getdefaultsearchparams.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.getdefaultsearchparams.md
index 3d9191196aaf0..19a4bbbbef86c 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.getdefaultsearchparams.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.getdefaultsearchparams.md
@@ -7,11 +7,7 @@
Signature:
```typescript
-export declare function getDefaultSearchParams(uiSettingsClient: IUiSettingsClient): Promise<{
- maxConcurrentShardRequests: number | undefined;
- ignoreUnavailable: boolean;
- trackTotalHits: boolean;
-}>;
+export declare function getDefaultSearchParams(uiSettingsClient: IUiSettingsClient): Promisestring | |
-| [is\_partial](./kibana-plugin-plugins-data-server.iesrawsearchresponse.is_partial.md) | boolean | |
-| [is\_running](./kibana-plugin-plugins-data-server.iesrawsearchresponse.is_running.md) | boolean | |
-
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index d9f14950be0e8..c85f294d162bc 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -34,6 +34,7 @@
| [getTime(indexPattern, timeRange, options)](./kibana-plugin-plugins-data-server.gettime.md) | |
| [parseInterval(interval)](./kibana-plugin-plugins-data-server.parseinterval.md) | |
| [plugin(initializerContext)](./kibana-plugin-plugins-data-server.plugin.md) | Static code to be shared externally |
+| [searchUsageObserver(logger, usage)](./kibana-plugin-plugins-data-server.searchusageobserver.md) | Rxjs observer for easily doing tap(searchUsageObserver(logger, usage)) in an rxjs chain. |
| [shouldReadFieldFromDocValues(aggregatable, esType)](./kibana-plugin-plugins-data-server.shouldreadfieldfromdocvalues.md) | |
| [usageProvider(core)](./kibana-plugin-plugins-data-server.usageprovider.md) | |
@@ -45,7 +46,6 @@
| [EsQueryConfig](./kibana-plugin-plugins-data-server.esqueryconfig.md) | |
| [FieldDescriptor](./kibana-plugin-plugins-data-server.fielddescriptor.md) | |
| [FieldFormatConfig](./kibana-plugin-plugins-data-server.fieldformatconfig.md) | |
-| [IEsRawSearchResponse](./kibana-plugin-plugins-data-server.iesrawsearchresponse.md) | |
| [IEsSearchRequest](./kibana-plugin-plugins-data-server.iessearchrequest.md) | |
| [IFieldSubType](./kibana-plugin-plugins-data-server.ifieldsubtype.md) | |
| [IFieldType](./kibana-plugin-plugins-data-server.ifieldtype.md) | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
index 43129891c5412..b90018c3d9cdd 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
@@ -7,7 +7,7 @@
Signature:
```typescript
-setup(core: CoreSetupCoreSetup<DataPluginStartDependencies, DataPluginStart> | |
-| { expressions, usageCollection } | DataPluginSetupDependencies | |
+| { bfetch, expressions, usageCollection } | DataPluginSetupDependencies | |
Returns:
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.search.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.search.md
index e2a71a7badd4d..4f8a0beefa421 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.search.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.search.md
@@ -8,24 +8,6 @@
```typescript
search: {
- esSearch: {
- utils: {
- doSearch: Logger | |
+| usage | SearchUsage | |
+
+Returns:
+
+`{
+ next(response: IEsSearchResponse): void;
+ error(): void;
+}`
+
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md
index fb6ba7ee2621c..fcccd3f6b9618 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `ExpressionRenderHandler` class
Signature:
```typescript
-constructor(element: HTMLElement, { onRenderError }?: PartialPartial<ExpressionRenderHandlerParams> | |
+| { onRenderError, renderMode } | Partial<ExpressionRenderHandlerParams> | |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler.md
index 7f7d5792ba684..12c663273bd8c 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderhandler.md
@@ -14,7 +14,7 @@ export declare class ExpressionRenderHandler
| Constructor | Modifiers | Description |
| --- | --- | --- |
-| [(constructor)(element, { onRenderError })](./kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md) | | Constructs a new instance of the ExpressionRenderHandler class |
+| [(constructor)(element, { onRenderError, renderMode })](./kibana-plugin-plugins-expressions-public.expressionrenderhandler._constructor_.md) | | Constructs a new instance of the ExpressionRenderHandler class |
## Properties
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
index 2dfc67d2af5fa..54eecad0deb50 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md
@@ -21,6 +21,7 @@ export interface IExpressionLoaderParams
| [disableCaching](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.disablecaching.md) | boolean | |
| [inspectorAdapters](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.inspectoradapters.md) | Adapters | |
| [onRenderError](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.onrendererror.md) | RenderErrorHandlerFnType | |
+| [renderMode](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.rendermode.md) | RenderMode | |
| [searchContext](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchcontext.md) | SerializableState | |
| [searchSessionId](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.searchsessionid.md) | string | |
| [uiState](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.uistate.md) | unknown | |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.rendermode.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.rendermode.md
new file mode 100644
index 0000000000000..2986b81fc67c5
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.rendermode.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [IExpressionLoaderParams](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md) > [renderMode](./kibana-plugin-plugins-expressions-public.iexpressionloaderparams.rendermode.md)
+
+## IExpressionLoaderParams.renderMode property
+
+Signature:
+
+```typescript
+renderMode?: RenderMode;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.getrendermode.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.getrendermode.md
new file mode 100644
index 0000000000000..8cddec1a5359c
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.getrendermode.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [IInterpreterRenderHandlers](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.md) > [getRenderMode](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.getrendermode.md)
+
+## IInterpreterRenderHandlers.getRenderMode property
+
+Signature:
+
+```typescript
+getRenderMode: () => RenderMode;
+```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.md
index ab0273be71402..a65e025451636 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.md
@@ -16,6 +16,7 @@ export interface IInterpreterRenderHandlers
| --- | --- | --- |
| [done](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.done.md) | () => void | Done increments the number of rendering successes |
| [event](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.event.md) | (event: any) => void | |
+| [getRenderMode](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.getrendermode.md) | () => RenderMode | |
| [onDestroy](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.ondestroy.md) | (fn: () => void) => void | |
| [reload](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.reload.md) | () => void | |
| [uiState](./kibana-plugin-plugins-expressions-public.iinterpreterrenderhandlers.uistate.md) | PersistedState | |
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.getrendermode.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.getrendermode.md
new file mode 100644
index 0000000000000..16db25ab244f6
--- /dev/null
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.getrendermode.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-expressions-server](./kibana-plugin-plugins-expressions-server.md) > [IInterpreterRenderHandlers](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.md) > [getRenderMode](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.getrendermode.md)
+
+## IInterpreterRenderHandlers.getRenderMode property
+
+Signature:
+
+```typescript
+getRenderMode: () => RenderMode;
+```
diff --git a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.md b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.md
index ccf6271f712b9..b1496386944fa 100644
--- a/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.md
+++ b/docs/development/plugins/expressions/server/kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.md
@@ -16,6 +16,7 @@ export interface IInterpreterRenderHandlers
| --- | --- | --- |
| [done](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.done.md) | () => void | Done increments the number of rendering successes |
| [event](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.event.md) | (event: any) => void | |
+| [getRenderMode](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.getrendermode.md) | () => RenderMode | |
| [onDestroy](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.ondestroy.md) | (fn: () => void) => void | |
| [reload](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.reload.md) | () => void | |
| [uiState](./kibana-plugin-plugins-expressions-server.iinterpreterrenderhandlers.uistate.md) | PersistedState | |
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index efc7a1b930932..c22d4466ee09e 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -214,10 +214,12 @@ Please use the `defaultRoute` advanced setting instead.
The default application to load. *Default: `"home"`*
|[[kibana-index]] `kibana.index:`
- | {kib} uses an index in {es} to store saved searches, visualizations, and
+ | *deprecated* This setting is deprecated and will be removed in 8.0. Multitenancy by changing
+`kibana.index` will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy[8.0 Breaking Changes]
+for more details. {kib} uses an index in {es} to store saved searches, visualizations, and
dashboards. {kib} creates a new index if the index doesn’t already exist.
If you configure a custom index, the name must be lowercase, and conform to the
-{es} {ref}/indices-create-index.html[index name limitations].
+{es} {ref}/indices-create-index.html[index name limitations].
*Default: `".kibana"`*
| `kibana.autocompleteTimeout:` {ess-icon}
diff --git a/package.json b/package.json
index 39149c801da46..1febfc2380b7a 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,6 @@
"apollo-server-core": "^1.3.6",
"apollo-server-errors": "^2.0.2",
"apollo-server-hapi": "^1.3.6",
- "apollo-server-module-graphiql": "^1.3.4",
"archiver": "^3.1.1",
"axios": "^0.19.2",
"bluebird": "3.5.5",
@@ -243,7 +242,7 @@
"moment": "^2.24.0",
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.27",
- "monaco-editor": "~0.17.0",
+ "monaco-editor": "^0.17.0",
"mustache": "^2.3.2",
"ngreact": "^0.5.1",
"nock": "12.0.3",
@@ -261,7 +260,6 @@
"pdfmake": "^0.1.65",
"pegjs": "0.10.0",
"pngjs": "^3.4.0",
- "podium": "^3.1.2",
"prop-types": "^15.7.2",
"proper-lockfile": "^3.2.0",
"proxy-from-env": "1.0.0",
@@ -590,7 +588,7 @@
"babel-loader": "^8.0.6",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-plugin-istanbul": "^6.0.0",
- "babel-plugin-require-context-hook": "npm:babel-plugin-require-context-hook-babel7@1.0.0",
+ "babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^1.10.7",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "5.6.0",
@@ -654,7 +652,7 @@
"file-loader": "^4.2.0",
"file-saver": "^1.3.8",
"formsy-react": "^1.1.5",
- "geckodriver": "^1.20.0",
+ "geckodriver": "^1.21.0",
"glob-watcher": "5.0.3",
"graphql-code-generator": "^0.18.2",
"graphql-codegen-add": "^0.18.2",
@@ -776,7 +774,7 @@
"react-fast-compare": "^2.0.4",
"react-grid-layout": "^0.16.2",
"react-markdown": "^4.3.1",
- "react-monaco-editor": "~0.27.0",
+ "react-monaco-editor": "^0.27.0",
"react-popper-tooltip": "^2.10.1",
"react-resize-detector": "^4.2.0",
"react-reverse-portal": "^1.0.4",
diff --git a/packages/kbn-config/src/__mocks__/env.ts b/packages/kbn-config/src/__mocks__/env.ts
index e0f6f6add1686..8b7475680ecf5 100644
--- a/packages/kbn-config/src/__mocks__/env.ts
+++ b/packages/kbn-config/src/__mocks__/env.ts
@@ -42,7 +42,6 @@ export function getEnvOptions(options: DeepPartialIn the future, this algorithm could enable (2.6) "read-only functionality during the downtime window" but this is outside of the scope of this RFC.
@@ -303,12 +340,9 @@ To rollback to a previous version of Kibana without a snapshot: (Assumes the migration to 7.11.0 failed) 1. Shutdown all Kibana nodes. 2. Remove the index created by the failed Kibana migration by using the version-specific alias e.g. `DELETE /.kibana_7.11.0` -3. Identify the rollback index: - 1. If rolling back to a Kibana version < 7.10.0 use `.kibana` - 2. If rolling back to a Kibana version >= 7.10.0 use the version alias of the Kibana version you wish to rollback to e.g. `.kibana_7.10.0` -4. Point the `.kibana_current` alias to the rollback index. -5. Remove the write block from the rollback index. -6. Start the rollback Kibana nodes. All running Kibana nodes should be on the same rollback version, have the same plugins enabled and use the same configuration. +3. Remove the write block from the rollback index using the `.kibana` alias + `PUT /.kibana/_settings {"index.blocks.write": false}` +4. Start the rollback Kibana nodes. All running Kibana nodes should be on the same rollback version, have the same plugins enabled and use the same configuration. ### 4.2.1.4 Handling documents that belong to a disabled plugin It is possible for a plugin to create documents in one version of Kibana, but then when upgrading Kibana to a newer version, that plugin is disabled. Because the plugin is disabled it cannot register it's Saved Objects type including the mappings or any migration transformation functions. These "orphan" documents could cause future problems: @@ -378,7 +412,7 @@ There are several approaches we could take to dealing with these orphan document deterministically perform the delete and re-clone operation without coordination. -5. Transform outdated documents (step 7) on every startup +5. Transform outdated documents (step 8) on every startup Advantages: - Outdated documents belonging to disabled plugins will be upgraded as soon as the plugin is enabled again. diff --git a/src/apm.js b/src/apm.js index bde37fa006c61..4f5fe29cbb5fa 100644 --- a/src/apm.js +++ b/src/apm.js @@ -30,10 +30,6 @@ let apmConfig; const isKibanaDistributable = Boolean(build && build.distributable === true); module.exports = function (serviceName = name) { - if (process.env.kbnWorkerType === 'optmzr') { - return; - } - apmConfig = loadConfiguration(process.argv, ROOT_DIR, isKibanaDistributable); const conf = apmConfig.getConfig(serviceName); const apm = require('elastic-apm-node'); diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts index f427c8750912b..b0f7cded938dd 100644 --- a/src/cli/cluster/cluster_manager.ts +++ b/src/cli/cluster/cluster_manager.ts @@ -33,8 +33,6 @@ import { BasePathProxyServer } from '../../core/server/http'; import { Log } from './log'; import { Worker } from './worker'; -process.env.kbnWorkerType = 'managr'; - export type SomeCliArgs = Pick< CliArgs, | 'quiet' @@ -75,6 +73,19 @@ export class ClusterManager { this.inReplMode = !!opts.repl; this.basePathProxy = basePathProxy; + if (!this.basePathProxy) { + this.log.warn( + '====================================================================================================' + ); + this.log.warn( + 'no-base-path', + 'Running Kibana in dev mode with --no-base-path disables several useful features and is not recommended' + ); + this.log.warn( + '====================================================================================================' + ); + } + // run @kbn/optimizer and write it's state to kbnOptimizerReady$ if (opts.disableOptimizer) { this.kbnOptimizerReady$.next(true); diff --git a/src/cli/cluster/worker.ts b/src/cli/cluster/worker.ts index d28065765070b..26b2a643e5373 100644 --- a/src/cli/cluster/worker.ts +++ b/src/cli/cluster/worker.ts @@ -56,7 +56,6 @@ export class Worker extends EventEmitter { private readonly clusterBinder: BinderFor; private readonly processBinder: BinderFor; - private type: string; private title: string; private log: any; private forkBinder: BinderFor | null = null; @@ -76,7 +75,6 @@ export class Worker extends EventEmitter { super(); this.log = opts.log; - this.type = opts.type; this.title = opts.title || opts.type; this.watch = opts.watch !== false; this.startCount = 0; @@ -88,7 +86,7 @@ export class Worker extends EventEmitter { this.env = { NODE_OPTIONS: process.env.NODE_OPTIONS || '', - kbnWorkerType: this.type, + isDevCliChild: 'true', kbnWorkerArgv: JSON.stringify([...(opts.baseArgv || baseArgv), ...(opts.argv || [])]), ELASTIC_APM_SERVICE_NAME: opts.apmServiceName || '', }; diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 2fa24cc7f3791..61f880d80633d 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -43,7 +43,7 @@ function canRequire(path) { } const CLUSTER_MANAGER_PATH = resolve(__dirname, '../cluster/cluster_manager'); -const CAN_CLUSTER = canRequire(CLUSTER_MANAGER_PATH); +const DEV_MODE_SUPPORTED = canRequire(CLUSTER_MANAGER_PATH); const REPL_PATH = resolve(__dirname, '../repl'); const CAN_REPL = canRequire(REPL_PATH); @@ -189,7 +189,7 @@ export default function (program) { ); } - if (CAN_CLUSTER) { + if (DEV_MODE_SUPPORTED) { command .option('--dev', 'Run the server with development mode defaults') .option('--ssl', 'Run the dev server using HTTPS') @@ -240,7 +240,7 @@ export default function (program) { dist: !!opts.dist, }, features: { - isClusterModeSupported: CAN_CLUSTER, + isCliDevModeSupported: DEV_MODE_SUPPORTED, isReplModeSupported: CAN_REPL, }, applyConfigOverrides: (rawConfig) => applyConfigOverrides(rawConfig, opts, unknownOptions), diff --git a/src/core/server/bootstrap.ts b/src/core/server/bootstrap.ts index ff1a5c0340c46..6711a8b8987e5 100644 --- a/src/core/server/bootstrap.ts +++ b/src/core/server/bootstrap.ts @@ -18,16 +18,15 @@ */ import chalk from 'chalk'; -import { isMaster } from 'cluster'; import { CliArgs, Env, RawConfigService } from './config'; import { Root } from './root'; import { CriticalError } from './errors'; interface KibanaFeatures { - // Indicates whether we can run Kibana in a so called cluster mode in which - // Kibana is run as a "worker" process together with optimizer "worker" process - // that are orchestrated by the "master" process (dev mode only feature). - isClusterModeSupported: boolean; + // Indicates whether we can run Kibana in dev mode in which Kibana is run as + // a child process together with optimizer "worker" processes that are + // orchestrated by a parent process (dev mode only feature). + isCliDevModeSupported: boolean; // Indicates whether we can run Kibana in REPL mode (dev mode only feature). isReplModeSupported: boolean; @@ -71,7 +70,7 @@ export async function bootstrap({ const env = Env.createDefault(REPO_ROOT, { configs, cliArgs, - isDevClusterMaster: isMaster && cliArgs.dev && features.isClusterModeSupported, + isDevCliParent: cliArgs.dev && features.isCliDevModeSupported && !process.env.isDevCliChild, }); const rawConfigService = new RawConfigService(env.configs, applyConfigOverrides); diff --git a/src/core/server/http/http_service.test.ts b/src/core/server/http/http_service.test.ts index 11cea88fa0dd2..3d55322461288 100644 --- a/src/core/server/http/http_service.test.ts +++ b/src/core/server/http/http_service.test.ts @@ -264,7 +264,7 @@ test('does not start http server if process is dev cluster master', async () => const service = new HttpService({ coreId, configService, - env: Env.createDefault(REPO_ROOT, getEnvOptions({ isDevClusterMaster: true })), + env: Env.createDefault(REPO_ROOT, getEnvOptions({ isDevCliParent: true })), logger, }); diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts index 0127a6493e7fd..171a20160d26d 100644 --- a/src/core/server/http/http_service.ts +++ b/src/core/server/http/http_service.ts @@ -158,7 +158,7 @@ export class HttpService * @internal * */ private shouldListen(config: HttpConfig) { - return !this.coreContext.env.isDevClusterMaster && config.autoListen; + return !this.coreContext.env.isDevCliParent && config.autoListen; } public async stop() { diff --git a/src/core/server/kibana_config.test.ts b/src/core/server/kibana_config.test.ts new file mode 100644 index 0000000000000..804c02ae99e4b --- /dev/null +++ b/src/core/server/kibana_config.test.ts @@ -0,0 +1,66 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { config } from './kibana_config'; +import { applyDeprecations, configDeprecationFactory } from '@kbn/config'; + +const CONFIG_PATH = 'kibana'; + +const applyKibanaDeprecations = (settings: Record
+ = (props) => {
const { config } = useValues(KibanaLogic);
@@ -37,6 +41,10 @@ export const WorkplaceSearchConfigured: React.FC = (props) => {
const { pathname } = useLocation();
+ // We don't want so show the subnavs on the container root pages.
+ const showSourcesSubnav = pathname !== SOURCES_PATH && pathname !== PERSONAL_SOURCES_PATH;
+ const showGroupsSubnav = pathname !== GROUPS_PATH;
+
/**
* Personal dashboard urls begin with /p/
* EX: http://localhost:5601/app/enterprise_search/workplace_search/p/sources
@@ -45,6 +53,7 @@ export const WorkplaceSearchConfigured: React.FC = (props) => {
// TODO: Once auth is figured out, we need to have a check for the equivilent of `isAdmin`.
const isOrganization = !pathname.match(personalSourceUrlRegex);
+ setContext(isOrganization);
useEffect(() => {
if (!hasInitialized) {
@@ -53,10 +62,6 @@ export const WorkplaceSearchConfigured: React.FC = (props) => {
}
}, [hasInitialized]);
- useEffect(() => {
- setContext(isOrganization);
- }, [isOrganization]);
-
return (
@@ -65,19 +70,32 @@ export const WorkplaceSearchConfigured: React.FC = (props) => {
{errorConnecting ?
+
+
+
+
-
-
-
-
-
+
+
)}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
index d03c0abb441b9..3fddcf3b77fe4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
@@ -12,7 +12,7 @@ import { EuiLink } from '@elastic/eui';
import {
getContentSourcePath,
SOURCES_PATH,
- ORG_SOURCES_PATH,
+ PERSONAL_SOURCES_PATH,
SOURCE_DETAILS_PATH,
} from './routes';
@@ -26,13 +26,13 @@ describe('getContentSourcePath', () => {
const wrapper = shallow( = ({
{sources.map(({ name, serviceType, addPath, connected, accountContextOnly }, i) => (
-
))}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
index ad183181b4eca..f9123ab4e1cca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/connect_instance.tsx
@@ -240,13 +240,13 @@ export const ConnectInstance: React.FC = ({
gutterSize="xl"
responsive={false}
>
-
+
{header}
{featureBadgeGroup()}
{descriptionBlock}
{formFields}
-
+
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/custom_source_icon.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/custom_source_icon.tsx
new file mode 100644
index 0000000000000..16129324b56d1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/custom_source_icon.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+const BLACK_RGB = '#000';
+
+interface CustomSourceIconProps {
+ color?: string;
+}
+
+export const CustomSourceIcon: React.FC = ({ color = BLACK_RGB }) => (
+
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.scss b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.scss
new file mode 100644
index 0000000000000..27935104f4ef6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.scss
@@ -0,0 +1,206 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// --------------------------------------------------
+// Custom Source display settings
+// --------------------------------------------------
+
+@mixin source_name {
+ font-size: .6875em;
+ text-transform: uppercase;
+ font-weight: 600;
+ letter-spacing: 0.06em;
+}
+
+@mixin example_result_box_shadow {
+ box-shadow:
+ 0 1px 3px rgba(black, 0.1),
+ 0 0 20px $euiColorLightestShade;
+}
+
+// Wrapper
+.custom-source-display-settings {
+ font-size: 16px;
+}
+
+// Example result content
+.example-result-content {
+ & > * {
+ line-height: 1.5em;
+ }
+
+ &__title {
+ font-size: 1em;
+ font-weight: 600;
+ color: $euiColorPrimary;
+
+ .example-result-detail-card & {
+ font-size: 20px;
+ }
+ }
+
+ &__subtitle,
+ &__description {
+ font-size: .875;
+ }
+
+ &__subtitle {
+ color: $euiColorDarkestShade;
+ }
+
+ &__description {
+ padding: .1rem 0 .125rem .35rem;
+ border-left: 3px solid $euiColorLightShade;
+ color: $euiColorDarkShade;
+ line-height: 1.8;
+ word-break: break-word;
+
+ @supports (display: -webkit-box) {
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 3;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+
+ &__url {
+ .example-result-detail-card & {
+ color: $euiColorDarkShade;
+ }
+ }
+}
+
+.example-result-content-placeholder {
+ color: $euiColorMediumShade;
+}
+
+// Example standout result
+.example-standout-result {
+ border-radius: 4px;
+ overflow: hidden;
+ @include example_result_box_shadow;
+
+ &__header,
+ &__content {
+ padding-left: 1em;
+ padding-right: 1em;
+ }
+
+ &__content {
+ padding-top: 1em;
+ padding-bottom: 1em;
+ }
+
+ &__source-name {
+ line-height: 34px;
+ @include source_name;
+ }
+}
+
+// Example result group
+.example-result-group {
+ &__header {
+ padding: 0 .5em;
+ border-radius: 4px;
+ display: inline-flex;
+ align-items: center;
+
+ .euiIcon {
+ margin-right: .25rem;
+ }
+ }
+
+ &__source-name {
+ line-height: 1.75em;
+ @include source_name;
+ }
+
+ &__content {
+ display: flex;
+ align-items: stretch;
+ padding: .75em 0;
+ }
+
+ &__border {
+ width: 4px;
+ border-radius: 2px;
+ flex-shrink: 0;
+ margin-left: .875rem;
+ }
+
+ &__results {
+ flex: 1;
+ max-width: 100%;
+ }
+}
+
+.example-grouped-result {
+ padding: 1em;
+}
+
+.example-result-field-hover {
+ background: lighten($euiColorVis1_behindText, 30%);
+ position: relative;
+
+ &:before,
+ &:after {
+ content: '';
+ position: absolute;
+ height: 100%;
+ width: 4px;
+ background: lighten($euiColorVis1_behindText, 30%);
+ }
+
+ &:before {
+ right: 100%;
+ border-radius: 2px 0 0 2px;
+ }
+
+ &:after {
+ left: 100%;
+ border-radius: 0 2px 2px 0;
+ }
+
+ .example-result-content-placeholder {
+ color: $euiColorFullShade;
+ }
+}
+
+.example-result-detail-card {
+ @include example_result_box_shadow;
+
+ &__header {
+ position: relative;
+ padding: 1.25em 1em 0;
+ }
+
+ &__border {
+ height: 4px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ }
+
+ &__source-name {
+ margin-bottom: 1em;
+ font-weight: 500;
+ }
+
+ &__field {
+ padding: 1em;
+
+ & + & {
+ border-top: 1px solid $euiColorLightShade;
+ }
+ }
+}
+
+.visible-fields-container {
+ background: $euiColorLightestShade;
+ border-color: transparent;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx
new file mode 100644
index 0000000000000..e34728beef5e5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.tsx
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FormEvent, useEffect } from 'react';
+
+import { History } from 'history';
+import { useActions, useValues } from 'kea';
+import { useHistory } from 'react-router-dom';
+
+import './display_settings.scss';
+
+import {
+ EuiButton,
+ EuiEmptyPrompt,
+ EuiTabbedContent,
+ EuiPanel,
+ EuiTabbedContentTab,
+} from '@elastic/eui';
+
+import {
+ DISPLAY_SETTINGS_RESULT_DETAIL_PATH,
+ DISPLAY_SETTINGS_SEARCH_RESULT_PATH,
+ getContentSourcePath,
+} from '../../../../routes';
+
+import { AppLogic } from '../../../../app_logic';
+
+import { Loading } from '../../../../../shared/loading';
+import { ViewContentHeader } from '../../../../components/shared/view_content_header';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+import { FieldEditorModal } from './field_editor_modal';
+import { ResultDetail } from './result_detail';
+import { SearchResults } from './search_results';
+
+const UNSAVED_MESSAGE =
+ 'Your display settings have not been saved. Are you sure you want to leave?';
+
+interface DisplaySettingsProps {
+ tabId: number;
+}
+
+export const DisplaySettings: React.FC = ({ tabId }) => {
+ const history = useHistory() as History;
+ const { initializeDisplaySettings, setServerData, resetDisplaySettingsState } = useActions(
+ DisplaySettingsLogic
+ );
+
+ const {
+ dataLoading,
+ sourceId,
+ addFieldModalVisible,
+ unsavedChanges,
+ exampleDocuments,
+ } = useValues(DisplaySettingsLogic);
+
+ const { isOrganization } = useValues(AppLogic);
+
+ const hasDocuments = exampleDocuments.length > 0;
+
+ useEffect(() => {
+ initializeDisplaySettings();
+ return resetDisplaySettingsState;
+ }, []);
+
+ useEffect(() => {
+ window.onbeforeunload = hasDocuments && unsavedChanges ? () => UNSAVED_MESSAGE : null;
+ return () => {
+ window.onbeforeunload = null;
+ };
+ }, [unsavedChanges]);
+
+ if (dataLoading) return
+>({
+ actions: {
+ onInitializeDisplaySettings: (displaySettingsProps: DisplaySettingsInitialData) =>
+ displaySettingsProps,
+ setServerResponseData: (displaySettingsProps: DisplaySettingsResponseProps) =>
+ displaySettingsProps,
+ setTitleField: (titleField: string) => titleField,
+ setUrlField: (urlField: string) => urlField,
+ setSubtitleField: (subtitleField: string | null) => subtitleField,
+ setDescriptionField: (descriptionField: string) => descriptionField,
+ setColorField: (hex: string) => hex,
+ setDetailFields: (result: DropResult) => ({ result }),
+ openEditDetailField: (editFieldIndex: number | null) => editFieldIndex,
+ removeDetailField: (index: number) => index,
+ addDetailField: (newField: DetailField) => newField,
+ updateDetailField: (updatedField: DetailField, index: number) => ({ updatedField, index }),
+ toggleFieldEditorModal: () => true,
+ toggleTitleFieldHover: () => true,
+ toggleSubtitleFieldHover: () => true,
+ toggleDescriptionFieldHover: () => true,
+ toggleUrlFieldHover: () => true,
+ resetDisplaySettingsState: () => true,
+ initializeDisplaySettings: () => true,
+ setServerData: () => true,
+ },
+ reducers: {
+ sourceName: [
+ '',
+ {
+ onInitializeDisplaySettings: (_, { sourceName }) => sourceName,
+ },
+ ],
+ sourceId: [
+ '',
+ {
+ onInitializeDisplaySettings: (_, { sourceId }) => sourceId,
+ },
+ ],
+ schemaFields: [
+ {},
+ {
+ onInitializeDisplaySettings: (_, { schemaFields }) => schemaFields,
+ },
+ ],
+ exampleDocuments: [
+ [],
+ {
+ onInitializeDisplaySettings: (_, { exampleDocuments }) => exampleDocuments,
+ },
+ ],
+ serverSearchResultConfig: [
+ defaultSearchResultConfig,
+ {
+ onInitializeDisplaySettings: (_, { searchResultConfig }) =>
+ setDefaultColor(searchResultConfig),
+ setServerResponseData: (_, { searchResultConfig }) => searchResultConfig,
+ },
+ ],
+ searchResultConfig: [
+ defaultSearchResultConfig,
+ {
+ onInitializeDisplaySettings: (_, { searchResultConfig }) =>
+ setDefaultColor(searchResultConfig),
+ setServerResponseData: (_, { searchResultConfig }) => searchResultConfig,
+ setTitleField: (searchResultConfig, titleField) => ({ ...searchResultConfig, titleField }),
+ setSubtitleField: (searchResultConfig, subtitleField) => ({
+ ...searchResultConfig,
+ subtitleField,
+ }),
+ setUrlField: (searchResultConfig, urlField) => ({ ...searchResultConfig, urlField }),
+ setDescriptionField: (searchResultConfig, descriptionField) => ({
+ ...searchResultConfig,
+ descriptionField,
+ }),
+ setColorField: (searchResultConfig, color) => ({ ...searchResultConfig, color }),
+ setDetailFields: (searchResultConfig, { result: { destination, source } }) => {
+ const detailFields = cloneDeep(searchResultConfig.detailFields);
+ const element = detailFields[source.index];
+ detailFields.splice(source.index, 1);
+ detailFields.splice(destination!.index, 0, element);
+ return {
+ ...searchResultConfig,
+ detailFields,
+ };
+ },
+ addDetailField: (searchResultConfig, newfield) => {
+ const detailFields = cloneDeep(searchResultConfig.detailFields);
+ detailFields.push(newfield);
+ return {
+ ...searchResultConfig,
+ detailFields,
+ };
+ },
+ removeDetailField: (searchResultConfig, index) => {
+ const detailFields = cloneDeep(searchResultConfig.detailFields);
+ detailFields.splice(index, 1);
+ return {
+ ...searchResultConfig,
+ detailFields,
+ };
+ },
+ updateDetailField: (searchResultConfig, { updatedField, index }) => {
+ const detailFields = cloneDeep(searchResultConfig.detailFields);
+ detailFields[index] = updatedField;
+ return {
+ ...searchResultConfig,
+ detailFields,
+ };
+ },
+ },
+ ],
+ serverRoute: [
+ '',
+ {
+ onInitializeDisplaySettings: (_, { serverRoute }) => serverRoute,
+ },
+ ],
+ editFieldIndex: [
+ null,
+ {
+ openEditDetailField: (_, openEditDetailField) => openEditDetailField,
+ toggleFieldEditorModal: () => null,
+ },
+ ],
+ dataLoading: [
+ true,
+ {
+ onInitializeDisplaySettings: () => false,
+ },
+ ],
+ addFieldModalVisible: [
+ false,
+ {
+ toggleFieldEditorModal: (addFieldModalVisible) => !addFieldModalVisible,
+ openEditDetailField: () => true,
+ updateDetailField: () => false,
+ addDetailField: () => false,
+ },
+ ],
+ titleFieldHover: [
+ false,
+ {
+ toggleTitleFieldHover: (titleFieldHover) => !titleFieldHover,
+ },
+ ],
+ urlFieldHover: [
+ false,
+ {
+ toggleUrlFieldHover: (urlFieldHover) => !urlFieldHover,
+ },
+ ],
+ subtitleFieldHover: [
+ false,
+ {
+ toggleSubtitleFieldHover: (subtitleFieldHover) => !subtitleFieldHover,
+ },
+ ],
+ descriptionFieldHover: [
+ false,
+ {
+ toggleDescriptionFieldHover: (addFieldModalVisible) => !addFieldModalVisible,
+ },
+ ],
+ },
+ selectors: ({ selectors }) => ({
+ fieldOptions: [
+ () => [selectors.schemaFields],
+ (schemaFields) => Object.keys(schemaFields).map(euiSelectObjectFromValue),
+ ],
+ optionalFieldOptions: [
+ () => [selectors.fieldOptions],
+ (fieldOptions) => {
+ const optionalFieldOptions = cloneDeep(fieldOptions);
+ optionalFieldOptions.unshift({ value: '', text: '' });
+ return optionalFieldOptions;
+ },
+ ],
+ // We don't want to let the user add a duplicate detailField.
+ availableFieldOptions: [
+ () => [selectors.fieldOptions, selectors.searchResultConfig],
+ (fieldOptions, { detailFields }) => {
+ const usedFields = detailFields.map((usedField: DetailField) =>
+ euiSelectObjectFromValue(usedField.fieldName)
+ );
+ return differenceBy(fieldOptions, usedFields, 'value');
+ },
+ ],
+ unsavedChanges: [
+ () => [selectors.searchResultConfig, selectors.serverSearchResultConfig],
+ (uiConfig, serverConfig) => !isEqual(uiConfig, serverConfig),
+ ],
+ }),
+ listeners: ({ actions, values }) => ({
+ initializeDisplaySettings: async () => {
+ const { isOrganization } = AppLogic.values;
+ const {
+ contentSource: { id: sourceId },
+ } = SourceLogic.values;
+
+ const route = isOrganization
+ ? `/api/workplace_search/org/sources/${sourceId}/display_settings/config`
+ : `/api/workplace_search/account/sources/${sourceId}/display_settings/config`;
+
+ try {
+ const response = await HttpLogic.values.http.get(route);
+ actions.onInitializeDisplaySettings({
+ isOrganization,
+ sourceId,
+ serverRoute: route,
+ ...response,
+ });
+ } catch (e) {
+ flashAPIErrors(e);
+ }
+ },
+ setServerData: async () => {
+ const { searchResultConfig, serverRoute } = values;
+
+ try {
+ const response = await HttpLogic.values.http.post(serverRoute, {
+ body: JSON.stringify({ ...searchResultConfig }),
+ });
+ actions.setServerResponseData(response);
+ } catch (e) {
+ flashAPIErrors(e);
+ }
+ },
+ setServerResponseData: () => {
+ setSuccessMessage(SUCCESS_MESSAGE);
+ },
+ toggleFieldEditorModal: () => {
+ FlashMessagesLogic.actions.clearFlashMessages();
+ },
+ resetDisplaySettingsState: () => {
+ FlashMessagesLogic.actions.clearFlashMessages();
+ },
+ }),
+});
+
+const euiSelectObjectFromValue = (value: string) => ({ text: value, value });
+
+// By default, the color is `null` on the server. The color is a required field and the
+// EuiColorPicker components doesn't allow the field to be required so the form can be
+// submitted with no color and this results in a server error. The default should be black
+// and this allows the `searchResultConfig` and the `serverSearchResultConfig` reducers to
+// stay synced on initialization.
+const setDefaultColor = (searchResultConfig: SearchResultConfig) => ({
+ ...searchResultConfig,
+ color: searchResultConfig.color || '#000000',
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.tsx
index 5cebaad95e3a8..01ac93735b8a8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.tsx
@@ -6,4 +6,33 @@
import React from 'react';
-export const DisplaySettingsRouter: React.FC = () => <>Display Settings Placeholder;
+import { useValues } from 'kea';
+import { Route, Switch } from 'react-router-dom';
+
+import { AppLogic } from '../../../../app_logic';
+
+import {
+ DISPLAY_SETTINGS_RESULT_DETAIL_PATH,
+ DISPLAY_SETTINGS_SEARCH_RESULT_PATH,
+ getSourcesPath,
+} from '../../../../routes';
+
+import { DisplaySettings } from './display_settings';
+
+export const DisplaySettingsRouter: React.FC = () => {
+ const { isOrganization } = useValues(AppLogic);
+ return (
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx
new file mode 100644
index 0000000000000..468f7d2f7ad05
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.tsx
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import classNames from 'classnames';
+import { useValues } from 'kea';
+
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+import { CustomSourceIcon } from './custom_source_icon';
+import { TitleField } from './title_field';
+
+export const ExampleResultDetailCard: React.FC = () => {
+ const {
+ sourceName,
+ searchResultConfig: { titleField, urlField, color, detailFields },
+ titleFieldHover,
+ urlFieldHover,
+ exampleDocuments,
+ } = useValues(DisplaySettingsLogic);
+
+ const result = exampleDocuments[0];
+
+ return (
+
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx
new file mode 100644
index 0000000000000..cb65d8ef671e6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.tsx
@@ -0,0 +1,146 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import {
+ EuiButtonEmpty,
+ EuiButtonIcon,
+ EuiDragDropContext,
+ EuiDraggable,
+ EuiDroppable,
+ EuiFlexGrid,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiForm,
+ EuiFormRow,
+ EuiIcon,
+ EuiPanel,
+ EuiSpacer,
+ EuiTextColor,
+ EuiTitle,
+} from '@elastic/eui';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+import { ExampleResultDetailCard } from './example_result_detail_card';
+
+export const ResultDetail: React.FC = () => {
+ const {
+ toggleFieldEditorModal,
+ setDetailFields,
+ openEditDetailField,
+ removeDetailField,
+ } = useActions(DisplaySettingsLogic);
+
+ const {
+ searchResultConfig: { detailFields },
+ availableFieldOptions,
+ } = useValues(DisplaySettingsLogic);
+
+ return (
+ <>
+
+
+
+
+ <>
+
+
+
+
{icon}
) : (
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
index 1846115d73900..327ee7b30582b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
@@ -25,15 +25,27 @@ export const NAV = {
'xpack.enterpriseSearch.workplaceSearch.nav.groups.sourcePrioritization',
{ defaultMessage: 'Source Prioritization' }
),
+ CONTENT: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.content', {
+ defaultMessage: 'Content',
+ }),
ROLE_MAPPINGS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.roleMappings', {
defaultMessage: 'Role Mappings',
}),
SECURITY: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.security', {
defaultMessage: 'Security',
}),
+ SCHEMA: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.schema', {
+ defaultMessage: 'Schema',
+ }),
+ DISPLAY_SETTINGS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.displaySettings', {
+ defaultMessage: 'Display Settings',
+ }),
SETTINGS: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.settings', {
defaultMessage: 'Settings',
}),
+ ADD_SOURCE: i18n.translate('xpack.enterpriseSearch.workplaceSearch.nav.addSource', {
+ defaultMessage: 'Add Source',
+ }),
PERSONAL_DASHBOARD: i18n.translate(
'xpack.enterpriseSearch.workplaceSearch.nav.personalDashboard',
{
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index 5f1e2dd18d3b6..20b15bcfc45ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -57,7 +57,7 @@ describe('WorkplaceSearchConfigured', () => {
it('renders layout and header actions', () => {
const wrapper = shallow(
+
= ({
)}
-
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx
new file mode 100644
index 0000000000000..14239b1654308
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { isColorDark, hexToRgb } from '@elastic/eui';
+import classNames from 'classnames';
+import { useValues } from 'kea';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+import { CustomSourceIcon } from './custom_source_icon';
+import { SubtitleField } from './subtitle_field';
+import { TitleField } from './title_field';
+
+export const ExampleSearchResultGroup: React.FC = () => {
+ const {
+ sourceName,
+ searchResultConfig: { titleField, subtitleField, descriptionField, color },
+ titleFieldHover,
+ subtitleFieldHover,
+ descriptionFieldHover,
+ exampleDocuments,
+ } = useValues(DisplaySettingsLogic);
+
+ return (
+
+
+
+
+
+
+
+ {sourceName}
+
+
+
+
+
+ {urlField ? (
+
+ {result[urlField]}
+ ) : (
+ URL
+ )}
+
+ {detailFields.length > 0 ? (
+ detailFields.map(({ fieldName, label }, index) => (
+
+
+
+
+
+
+
+ ))
+ ) : (
+ {label}
+{result[fieldName]}
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx
new file mode 100644
index 0000000000000..4ef3b1fe14b93
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import classNames from 'classnames';
+import { useValues } from 'kea';
+
+import { isColorDark, hexToRgb } from '@elastic/eui';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+import { CustomSourceIcon } from './custom_source_icon';
+import { SubtitleField } from './subtitle_field';
+import { TitleField } from './title_field';
+
+export const ExampleStandoutResult: React.FC = () => {
+ const {
+ sourceName,
+ searchResultConfig: { titleField, subtitleField, descriptionField, color },
+ titleFieldHover,
+ subtitleFieldHover,
+ descriptionFieldHover,
+ exampleDocuments,
+ } = useValues(DisplaySettingsLogic);
+
+ const result = exampleDocuments[0];
+
+ return (
+
+
+
+
+
+
+ {exampleDocuments.map((result, id) => (
+
+
+
+ ))}
+
+
+
+ {descriptionField ? (
+
+ {result[descriptionField]}
+ ) : (
+ Description
+ )}
+
+
+ );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx
new file mode 100644
index 0000000000000..587916a741d66
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.tsx
@@ -0,0 +1,101 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FormEvent, useState } from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import {
+ EuiButton,
+ EuiButtonEmpty,
+ EuiFieldText,
+ EuiForm,
+ EuiFormRow,
+ EuiModal,
+ EuiModalBody,
+ EuiModalFooter,
+ EuiModalHeader,
+ EuiModalHeaderTitle,
+ EuiOverlayMask,
+ EuiSelect,
+} from '@elastic/eui';
+
+import { DisplaySettingsLogic } from './display_settings_logic';
+
+const emptyField = { fieldName: '', label: '' };
+
+export const FieldEditorModal: React.FC = () => {
+ const { toggleFieldEditorModal, addDetailField, updateDetailField } = useActions(
+ DisplaySettingsLogic
+ );
+
+ const {
+ searchResultConfig: { detailFields },
+ availableFieldOptions,
+ fieldOptions,
+ editFieldIndex,
+ } = useValues(DisplaySettingsLogic);
+
+ const isEditing = editFieldIndex || editFieldIndex === 0;
+ const field = isEditing ? detailFields[editFieldIndex || 0] : emptyField;
+ const [fieldName, setName] = useState(field.fieldName || '');
+ const [label, setLabel] = useState(field.label || '');
+
+ const handleSubmit = (e: FormEvent) => {
+ e.preventDefault();
+ if (isEditing) {
+ updateDetailField({ fieldName, label }, editFieldIndex);
+ } else {
+ addDetailField({ fieldName, label });
+ }
+ };
+
+ const ACTION_LABEL = isEditing ? 'Update' : 'Add';
+
+ return (
+
+
+
+
+
+
+
+ {descriptionField ? (
+ {result[descriptionField]}
+ ) : (
+ Description
+ )}
+
+