| LegacyRequest, requestSpecificBasePath: string) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
index 23674200680644..238424b1df1d52 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
@@ -1,13 +1,13 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [IRouter](./kibana-plugin-server.irouter.md) > [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md)
-
-## IRouter.handleLegacyErrors property
-
-Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
-
-Signature:
-
-```typescript
-handleLegacyErrors: (handler: RequestHandler
) => RequestHandler
;
-```
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [IRouter](./kibana-plugin-server.irouter.md) > [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md)
+
+## IRouter.handleLegacyErrors property
+
+Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
+
+Signature:
+
+```typescript
+
(handler: RequestHandler
) => RequestHandler
;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.md b/docs/development/core/server/kibana-plugin-server.irouter.md
index 73e96191e02e71..a6536d2ed67634 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.md
@@ -18,7 +18,7 @@ export interface IRouter
| --- | --- | --- |
| [delete](./kibana-plugin-server.irouter.delete.md) | RouteRegistrar<'delete'>
| Register a route handler for DELETE
request. |
| [get](./kibana-plugin-server.irouter.get.md) | RouteRegistrar<'get'>
| Register a route handler for GET
request. |
-| [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>
| Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
+| [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <P, Q, B>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>
| Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
| [patch](./kibana-plugin-server.irouter.patch.md) | RouteRegistrar<'patch'>
| Register a route handler for PATCH
request. |
| [post](./kibana-plugin-server.irouter.post.md) | RouteRegistrar<'post'>
| Register a route handler for POST
request. |
| [put](./kibana-plugin-server.irouter.put.md) | RouteRegistrar<'put'>
| Register a route handler for PUT
request. |
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index a39c27a758f9d7..9c8aafb158bfdf 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -21,6 +21,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [CspConfig](./kibana-plugin-server.cspconfig.md) | CSP configuration for use in Kibana. |
| [ElasticsearchErrorHelpers](./kibana-plugin-server.elasticsearcherrorhelpers.md) | Helpers for working with errors returned from the Elasticsearch service.Since the internal data of errors are subject to change, consumers of the Elasticsearch service should always use these helpers to classify errors instead of checking error internals such as body.error.header[WWW-Authenticate]
|
| [KibanaRequest](./kibana-plugin-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
+| [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) | Error to return when the validation is not successful. |
| [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) | |
| [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) | |
| [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) | |
@@ -94,7 +95,9 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
| [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
| [RouteConfigOptionsBody](./kibana-plugin-server.routeconfigoptionsbody.md) | Additional body options for a route |
-| [RouteSchemas](./kibana-plugin-server.routeschemas.md) | RouteSchemas contains the schemas for validating the different parts of a request. |
+| [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) | Validation result factory to be used in the custom validation function to return the valid data or validation errorsSee [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md). |
+| [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) | The configuration object to the RouteValidator class. Set params
, query
and/or body
to specify the validation logic to follow for that property. |
+| [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) | Additional options for the RouteValidator class to modify its default behaviour. |
| [SavedObject](./kibana-plugin-server.savedobject.md) | |
| [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the attributes
property. |
| [SavedObjectReference](./kibana-plugin-server.savedobjectreference.md) | A reference to another saved object. |
@@ -200,6 +203,9 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [RouteContentType](./kibana-plugin-server.routecontenttype.md) | The set of supported parseable Content-Types |
| [RouteMethod](./kibana-plugin-server.routemethod.md) | The set of common HTTP methods supported by Kibana routing. |
| [RouteRegistrar](./kibana-plugin-server.routeregistrar.md) | Route handler common definition |
+| [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) | The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements. |
+| [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md) | Allowed property validation options: either @kbn/config-schema validations or custom validation functionsSee [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation. |
+| [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md) | Route validations config and options merged into one object |
| [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
| [SavedObjectAttributeSingle](./kibana-plugin-server.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) |
| [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.\#\# SavedObjectsClient errorsSince the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the isXYZError()
helpers exposed at SavedObjectsErrorHelpers
should be used to understand and manage error responses from the SavedObjectsClient
.Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for error.body.error.type
or doing substring checks on error.body.error.reason
, just use the helpers to understand the meaning of the error:\`\`\`js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }// always rethrow the error unless you handle it throw error; \`\`\`\#\#\# 404s from missing indexFrom the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.\#\#\# 503s from missing indexUnlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's action.auto_create_index
setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.See [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandler.md b/docs/development/core/server/kibana-plugin-server.requesthandler.md
index 79abfd4293e9fe..9fc183ffc334b1 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandler.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandler.md
@@ -9,7 +9,7 @@ A function executed when route path matched requested resource path. Request han
Signature:
```typescript
-export declare type RequestHandler
| Type, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest, TypeOf, TypeOf, Method>, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
+export declare type RequestHandler = (context: RequestHandlerContext, request: KibanaRequest
, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
```
## Example
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.md b/docs/development/core/server/kibana-plugin-server.routeconfig.md
index 1970b23c7ec099..4beb12f0d056e5 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.md
@@ -9,7 +9,7 @@ Route specific configuration.
Signature:
```typescript
-export interface RouteConfig | Type, Method extends RouteMethod>
+export interface RouteConfig
```
## Properties
@@ -18,5 +18,5 @@ export interface RouteConfig
RouteConfigOptions<Method> | Additional route options [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md). |
| [path](./kibana-plugin-server.routeconfig.path.md) | string
| The endpoint \_within\_ the router path to register the route. |
-| [validate](./kibana-plugin-server.routeconfig.validate.md) | RouteSchemas<P, Q, B> | false
| A schema created with @kbn/config-schema
that every request will be validated against. |
+| [validate](./kibana-plugin-server.routeconfig.validate.md) | RouteValidatorFullConfig<P, Q, B> | false
| A schema created with @kbn/config-schema
that every request will be validated against. |
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
index e1ec743ae71cc7..4fbcf0981f1140 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
@@ -1,62 +1,62 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteConfig](./kibana-plugin-server.routeconfig.md) > [validate](./kibana-plugin-server.routeconfig.validate.md)
-
-## RouteConfig.validate property
-
-A schema created with `@kbn/config-schema` that every request will be validated against.
-
-Signature:
-
-```typescript
-validate: RouteSchemas
| false;
-```
-
-## Remarks
-
-You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify `validate: false`. In this case request params, query, and body will be \*\*empty\*\* objects and have no access to raw values. In some cases you may want to use another validation library. To do this, you need to instruct the `@kbn/config-schema` library to output \*\*non-validated values\*\* with setting schema as `schema.object({}, { allowUnknowns: true })`;
-
-## Example
-
-
-```ts
- import { schema } from '@kbn/config-schema';
- router.get({
- path: 'path/{id}',
- validate: {
- params: schema.object({
- id: schema.string(),
- }),
- query: schema.object({...}),
- body: schema.object({...}),
- },
-},
-(context, req, res,) {
- req.params; // type Readonly<{id: string}>
- console.log(req.params.id); // value
-});
-
-router.get({
- path: 'path/{id}',
- validate: false, // handler has no access to params, query, body values.
-},
-(context, req, res,) {
- req.params; // type Readonly<{}>;
- console.log(req.params.id); // undefined
-});
-
-router.get({
- path: 'path/{id}',
- validate: {
- // handler has access to raw non-validated params in runtime
- params: schema.object({}, { allowUnknowns: true })
- },
-},
-(context, req, res,) {
- req.params; // type Readonly<{}>;
- console.log(req.params.id); // value
- myValidationLibrary.validate({ params: req.params });
-});
-
-```
-
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteConfig](./kibana-plugin-server.routeconfig.md) > [validate](./kibana-plugin-server.routeconfig.validate.md)
+
+## RouteConfig.validate property
+
+A schema created with `@kbn/config-schema` that every request will be validated against.
+
+Signature:
+
+```typescript
+RouteValidatorFullConfig
| false;
+```
+
+## Remarks
+
+You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify `validate: false`. In this case request params, query, and body will be \*\*empty\*\* objects and have no access to raw values. In some cases you may want to use another validation library. To do this, you need to instruct the `@kbn/config-schema` library to output \*\*non-validated values\*\* with setting schema as `schema.object({}, { allowUnknowns: true })`;
+
+## Example
+
+
+```ts
+ import { schema } from '@kbn/config-schema';
+ router.get({
+ path: 'path/{id}',
+ validate: {
+ params: schema.object({
+ id: schema.string(),
+ }),
+ query: schema.object({...}),
+ body: schema.object({...}),
+ },
+},
+(context, req, res,) {
+ req.params; // type Readonly<{id: string}>
+ console.log(req.params.id); // value
+});
+
+router.get({
+ path: 'path/{id}',
+ validate: false, // handler has no access to params, query, body values.
+},
+(context, req, res,) {
+ req.params; // type Readonly<{}>;
+ console.log(req.params.id); // undefined
+});
+
+router.get({
+ path: 'path/{id}',
+ validate: {
+ // handler has access to raw non-validated params in runtime
+ params: schema.object({}, { allowUnknowns: true })
+ },
+},
+(context, req, res,) {
+ req.params; // type Readonly<{}>;
+ console.log(req.params.id); // value
+ myValidationLibrary.validate({ params: req.params });
+});
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routeregistrar.md b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
index 0f5f49636fdd5e..901d260fee21da 100644
--- a/docs/development/core/server/kibana-plugin-server.routeregistrar.md
+++ b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
@@ -9,5 +9,5 @@ Route handler common definition
Signature:
```typescript
-export declare type RouteRegistrar = | Type>(route: RouteConfig, handler: RequestHandler
) => void;
+export declare type RouteRegistrar = (route: RouteConfig
, handler: RequestHandler
) => void;
```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md b/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
deleted file mode 100644
index 78a9d25c25d9d6..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [body](./kibana-plugin-server.routeschemas.body.md)
-
-## RouteSchemas.body property
-
-Signature:
-
-```typescript
-body?: B;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.md b/docs/development/core/server/kibana-plugin-server.routeschemas.md
deleted file mode 100644
index 77b980551a8ffe..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md)
-
-## RouteSchemas interface
-
-RouteSchemas contains the schemas for validating the different parts of a request.
-
-Signature:
-
-```typescript
-export interface RouteSchemas
| Type>
-```
-
-## Properties
-
-| Property | Type | Description |
-| --- | --- | --- |
-| [body](./kibana-plugin-server.routeschemas.body.md) | B
| |
-| [params](./kibana-plugin-server.routeschemas.params.md) | P
| |
-| [query](./kibana-plugin-server.routeschemas.query.md) | Q
| |
-
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md b/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
deleted file mode 100644
index 3dbf9fed94dc09..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [params](./kibana-plugin-server.routeschemas.params.md)
-
-## RouteSchemas.params property
-
-Signature:
-
-```typescript
-params?: P;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md b/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
deleted file mode 100644
index 5be5830cb4bc87..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [query](./kibana-plugin-server.routeschemas.query.md)
-
-## RouteSchemas.query property
-
-Signature:
-
-```typescript
-query?: Q;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md
new file mode 100644
index 00000000000000..31dc6ceb919952
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md
@@ -0,0 +1,21 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) > [(constructor)](./kibana-plugin-server.routevalidationerror._constructor_.md)
+
+## RouteValidationError.(constructor)
+
+Constructs a new instance of the `RouteValidationError` class
+
+Signature:
+
+```typescript
+constructor(error;: Error | string, path?: string[];)
+```
+
+## Parameters
+
+| Parameter | Type | Description |
+| --- | --- | --- |
+| error | Error | string
| |
+| path | string[]
| |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
new file mode 100644
index 00000000000000..71bd72dca2eaba
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
@@ -0,0 +1,20 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationError](./kibana-plugin-server.routevalidationerror.md)
+
+## RouteValidationError class
+
+Error to return when the validation is not successful.
+
+Signature:
+
+```typescript
+export declare class RouteValidationError extends SchemaTypeError
+```
+
+## Constructors
+
+| Constructor | Modifiers | Description |
+| --- | --- | --- |
+| [(constructor)(error, path)](./kibana-plugin-server.routevalidationerror._constructor_.md) | | Constructs a new instance of the RouteValidationError
class |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
new file mode 100644
index 00000000000000..34fa096aaae785
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
@@ -0,0 +1,42 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md)
+
+## RouteValidationFunction type
+
+The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements.
+
+Signature:
+
+```typescript
+export declare type RouteValidationFunction = (data: any, validationResult: RouteValidationResultFactory) => {
+ value: T;
+ error?: never;
+} | {
+ value?: never;
+ error: RouteValidationError;
+};
+```
+
+## Example
+
+The validation should look something like:
+
+```typescript
+interface MyExpectedBody {
+ bar: string;
+ baz: number;
+}
+
+const myBodyValidation: RouteValidationFunction = (data, validationResult) => {
+ const { ok, badRequest } = validationResult;
+ const { bar, baz } = data || {};
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+}
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md
new file mode 100644
index 00000000000000..2462ae17943bee
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) > [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md)
+
+## RouteValidationResultFactory.badRequest property
+
+Signature:
+
+```typescript
+(error: Error | string, path?: string[]) => {
+ RouteValidationError;
+ };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
new file mode 100644
index 00000000000000..5f44b490e9a17a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
@@ -0,0 +1,23 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md)
+
+## RouteValidationResultFactory interface
+
+Validation result factory to be used in the custom validation function to return the valid data or validation errors
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md).
+
+Signature:
+
+```typescript
+export interface RouteValidationResultFactory
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md) | (error: Error | string, path?: string[]) => {
error: RouteValidationError;
}
| |
+| [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md) | <T>(value: T) => {
value: T;
}
| |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md
new file mode 100644
index 00000000000000..c86ef616de1030
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) > [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md)
+
+## RouteValidationResultFactory.ok property
+
+Signature:
+
+```typescript
+(value: T) => {
+ T;
+ };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationspec.md b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
new file mode 100644
index 00000000000000..f5fc06544043f2
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
@@ -0,0 +1,15 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md)
+
+## RouteValidationSpec type
+
+Allowed property validation options: either @kbn/config-schema validations or custom validation functions
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation.
+
+Signature:
+
+```typescript
+export declare type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md
new file mode 100644
index 00000000000000..8b5d2c04130871
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [body](./kibana-plugin-server.routevalidatorconfig.body.md)
+
+## RouteValidatorConfig.body property
+
+Validation logic for the body payload
+
+Signature:
+
+```typescript
+body?: RouteValidationSpec;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
new file mode 100644
index 00000000000000..4637da7741d806
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
@@ -0,0 +1,22 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md)
+
+## RouteValidatorConfig interface
+
+The configuration object to the RouteValidator class. Set `params`, `query` and/or `body` to specify the validation logic to follow for that property.
+
+Signature:
+
+```typescript
+export interface RouteValidatorConfig
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [body](./kibana-plugin-server.routevalidatorconfig.body.md) | RouteValidationSpec<B>
| Validation logic for the body payload |
+| [params](./kibana-plugin-server.routevalidatorconfig.params.md) | RouteValidationSpec<P>
| Validation logic for the URL params |
+| [query](./kibana-plugin-server.routevalidatorconfig.query.md) | RouteValidationSpec<Q>
| Validation logic for the Query params |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md
new file mode 100644
index 00000000000000..11de25ff3b19f6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [params](./kibana-plugin-server.routevalidatorconfig.params.md)
+
+## RouteValidatorConfig.params property
+
+Validation logic for the URL params
+
+Signature:
+
+```typescript
+params?: RouteValidationSpec
;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md
new file mode 100644
index 00000000000000..510325c2dfff76
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [query](./kibana-plugin-server.routevalidatorconfig.query.md)
+
+## RouteValidatorConfig.query property
+
+Validation logic for the Query params
+
+Signature:
+
+```typescript
+query?: RouteValidationSpec;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md
new file mode 100644
index 00000000000000..0f3785b954a3a9
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md)
+
+## RouteValidatorFullConfig type
+
+Route validations config and options merged into one object
+
+Signature:
+
+```typescript
+export declare type RouteValidatorFullConfig = RouteValidatorConfig
& RouteValidatorOptions;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
new file mode 100644
index 00000000000000..00b029d9928e3c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
@@ -0,0 +1,20 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md)
+
+## RouteValidatorOptions interface
+
+Additional options for the RouteValidator class to modify its default behaviour.
+
+Signature:
+
+```typescript
+export interface RouteValidatorOptions
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md) | {
params?: boolean;
query?: boolean;
body?: boolean;
}
| Set the unsafe
config to avoid running some additional internal \*safe\* validations on top of your custom validation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
new file mode 100644
index 00000000000000..b1c75e6dbdf67c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
@@ -0,0 +1,18 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) > [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md)
+
+## RouteValidatorOptions.unsafe property
+
+Set the `unsafe` config to avoid running some additional internal \*safe\* validations on top of your custom validation
+
+Signature:
+
+```typescript
+unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ }
+
+```
diff --git a/docs/limitations.asciidoc b/docs/limitations.asciidoc
index 0b26a3cdcf71a3..9bcba3b65d6605 100644
--- a/docs/limitations.asciidoc
+++ b/docs/limitations.asciidoc
@@ -12,7 +12,7 @@
These {stack} features also have limitations that affect {kib}:
* {ref}/watcher-limitations.html[Alerting]
-* {stack-ov}/ml-limitations.html[Machine learning]
+* {ml-docs}/ml-limitations.html[Machine learning]
* {ref}/security-limitations.html[Security]
--
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index a2c23aad98d5be..cca0dc5e4530fe 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -50,8 +50,8 @@ pane:
image::user/ml/images/ml-job-management.jpg[Job Management]
You can use the *Settings* pane to create and edit
-{stack-ov}/ml-calendars.html[calendars] and the filters that are used in
-{stack-ov}/ml-rules.html[custom rules]:
+{ml-docs}/ml-calendars.html[calendars] and the filters that are used in
+{ml-docs}/ml-rules.html[custom rules]:
[role="screenshot"]
image::user/ml/images/ml-settings.jpg[Calendar Management]
@@ -73,7 +73,7 @@ image::user/ml/images/ml-annotations-list.jpg[Single Metric Viewer with annotati
In some circumstances, annotations are also added automatically. For example, if
the {anomaly-job} detects that there is missing data, it annotates the affected
time period. For more information, see
-{stack-ov}/ml-delayed-data-detection.html[Handling delayed data]. The
+{ml-docs}/ml-delayed-data-detection.html[Handling delayed data]. The
*Job Management* pane shows the full list of annotations for each job.
NOTE: The {kib} {ml-features} use pop-ups. You must configure your web
@@ -82,7 +82,7 @@ browser so that it does not block pop-up windows or create an exception for your
For more information about the {anomaly-detect} feature, see
https://www.elastic.co/what-is/elastic-stack-machine-learning[{ml-cap} in the {stack}]
-and {stack-ov}/xpack-ml.html[{ml-cap} {anomaly-detect}].
+and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
[[xpack-ml-dfanalytics]]
== {dfanalytics-cap}
@@ -99,4 +99,4 @@ in {kib}. For example:
image::user/ml/images/outliers.jpg[{oldetection-cap} results in {kib}]
For more information about the {dfanalytics} feature, see
-{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
+{ml-docs}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
diff --git a/packages/kbn-config-schema/src/index.ts b/packages/kbn-config-schema/src/index.ts
index 56b3096433c247..fc3e3c541846ab 100644
--- a/packages/kbn-config-schema/src/index.ts
+++ b/packages/kbn-config-schema/src/index.ts
@@ -59,6 +59,7 @@ import {
export { ObjectType, TypeOf, Type };
export { ByteSizeValue } from './byte_size_value';
+export { SchemaTypeError, ValidationError } from './errors';
function any(options?: TypeOptions) {
return new AnyType(options);
diff --git a/src/core/server/http/http_server.mocks.ts b/src/core/server/http/http_server.mocks.ts
index 8469a1d23a44b8..ba742292e9e836 100644
--- a/src/core/server/http/http_server.mocks.ts
+++ b/src/core/server/http/http_server.mocks.ts
@@ -77,7 +77,7 @@ function createKibanaRequestMock({
body: schema.object({}, { allowUnknowns: true }),
query: schema.object({}, { allowUnknowns: true }),
}
- ) as KibanaRequest, Readonly<{}>, Readonly<{}>>;
+ );
}
type DeepPartial = T extends any[]
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 27d9f530050bea..df357aeaf2731d 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -27,10 +27,18 @@ import supertest from 'supertest';
import { ByteSizeValue, schema } from '@kbn/config-schema';
import { HttpConfig } from './http_config';
-import { Router } from './router';
+import {
+ Router,
+ KibanaRequest,
+ KibanaResponseFactory,
+ RequestHandler,
+ RouteValidationResultFactory,
+ RouteValidationFunction,
+} from './router';
import { loggingServiceMock } from '../logging/logging_service.mock';
import { HttpServer } from './http_server';
import { Readable } from 'stream';
+import { RequestHandlerContext } from 'kibana/server';
const cookieOptions = {
name: 'sid',
@@ -288,6 +296,229 @@ test('valid body', async () => {
});
});
+test('valid body with validate function', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+test('not inline validation - specifying params', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const bodyValidation = (
+ { bar, baz }: any = {},
+ { ok, badRequest }: RouteValidationResultFactory
+ ) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: bodyValidation,
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+test('not inline validation - specifying validation handler', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const bodyValidation: RouteValidationFunction<{ bar: string; baz: number }> = (
+ { bar, baz } = {},
+ { ok, badRequest }
+ ) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: bodyValidation,
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+// https://github.com/elastic/kibana/issues/47047
+test('not inline handler - KibanaRequest', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const handler = (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ) => {
+ const body = {
+ bar: req.body.bar.toUpperCase(),
+ baz: req.body.baz.toString(),
+ };
+
+ return res.ok({ body });
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ handler
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+ });
+});
+
+test('not inline handler - RequestHandler', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const handler: RequestHandler = (
+ context,
+ req,
+ res
+ ) => {
+ const body = {
+ bar: req.body.bar.toUpperCase(),
+ baz: req.body.baz.toString(),
+ };
+
+ return res.ok({ body });
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ handler
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+ });
+});
+
test('invalid body', async () => {
const router = new Router('/foo', logger, enhanceWithContext);
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index 21de3945f10447..55ba813484268e 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -47,10 +47,16 @@ export {
RouteMethod,
RouteRegistrar,
RouteConfigOptions,
- RouteSchemas,
RouteConfigOptionsBody,
RouteContentType,
validBodyOutput,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidationError,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
} from './router';
export { BasePathProxyServer } from './base_path_proxy_server';
export { OnPreAuthHandler, OnPreAuthToolkit } from './lifecycle/on_pre_auth';
diff --git a/src/core/server/http/integration_tests/router.test.ts b/src/core/server/http/integration_tests/router.test.ts
index 6117190c57ba89..c3b9b20d848657 100644
--- a/src/core/server/http/integration_tests/router.test.ts
+++ b/src/core/server/http/integration_tests/router.test.ts
@@ -642,6 +642,116 @@ describe('Response factory', () => {
});
});
+ it('validate function in body', async () => {
+ const { server: innerServer, createRouter } = await server.setup(setupDeps);
+ const router = createRouter('/foo');
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: '123',
+ })
+ .expect(400)
+ .then(res => {
+ expect(res.body).toEqual({
+ error: 'Bad Request',
+ message: '[request body.body]: Wrong payload',
+ statusCode: 400,
+ });
+ });
+ });
+
+ it('@kbn/config-schema validation in body', async () => {
+ const { server: innerServer, createRouter } = await server.setup(setupDeps);
+ const router = createRouter('/foo');
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: schema.object({
+ bar: schema.string(),
+ baz: schema.number(),
+ }),
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: '123', // Automatic casting happens
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 'test', // Can't cast it into number
+ })
+ .expect(400)
+ .then(res => {
+ expect(res.body).toEqual({
+ error: 'Bad Request',
+ message: '[request body.baz]: expected value of type [number] but got [string]',
+ statusCode: 400,
+ });
+ });
+ });
+
it('401 Unauthorized', async () => {
const { server: innerServer, createRouter } = await server.setup(setupDeps);
const router = createRouter('/');
diff --git a/src/core/server/http/router/error_wrapper.ts b/src/core/server/http/router/error_wrapper.ts
index c4b4d3840d1b95..8f895753c38c32 100644
--- a/src/core/server/http/router/error_wrapper.ts
+++ b/src/core/server/http/router/error_wrapper.ts
@@ -18,19 +18,18 @@
*/
import Boom from 'boom';
-import { ObjectType, TypeOf } from '@kbn/config-schema';
import { KibanaRequest } from './request';
import { KibanaResponseFactory } from './response';
import { RequestHandler } from './router';
import { RequestHandlerContext } from '../../../server';
import { RouteMethod } from './route';
-export const wrapErrors = (
+export const wrapErrors =
(
handler: RequestHandler
): RequestHandler
=> {
return async (
context: RequestHandlerContext,
- request: KibanaRequest, TypeOf, TypeOf, RouteMethod>,
+ request: KibanaRequest,
response: KibanaResponseFactory
) => {
try {
diff --git a/src/core/server/http/router/index.ts b/src/core/server/http/router/index.ts
index 35bfb3ba9c33ad..084d30d6944744 100644
--- a/src/core/server/http/router/index.ts
+++ b/src/core/server/http/router/index.ts
@@ -31,7 +31,6 @@ export {
RouteMethod,
RouteConfig,
RouteConfigOptions,
- RouteSchemas,
RouteContentType,
RouteConfigOptionsBody,
validBodyOutput,
@@ -55,3 +54,13 @@ export {
} from './response';
export { IKibanaSocket } from './socket';
+
+export {
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidationError,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+} from './validator';
diff --git a/src/core/server/http/router/request.test.ts b/src/core/server/http/router/request.test.ts
index ebb7ffa7a6fc92..51162a2c258e91 100644
--- a/src/core/server/http/router/request.test.ts
+++ b/src/core/server/http/router/request.test.ts
@@ -18,6 +18,7 @@
*/
import { KibanaRequest } from './request';
import { httpServerMock } from '../http_server.mocks';
+import { schema } from '@kbn/config-schema';
describe('KibanaRequest', () => {
describe('get all headers', () => {
@@ -64,4 +65,56 @@ describe('KibanaRequest', () => {
});
});
});
+
+ describe('RouteSchema type inferring', () => {
+ it('should work with config-schema', () => {
+ const body = Buffer.from('body!');
+ const request = {
+ ...httpServerMock.createRawRequest({
+ params: { id: 'params' },
+ query: { search: 'query' },
+ }),
+ payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+ } as any;
+ const kibanaRequest = KibanaRequest.from(request, {
+ params: schema.object({ id: schema.string() }),
+ query: schema.object({ search: schema.string() }),
+ body: schema.buffer(),
+ });
+ expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+ expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+ expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+ expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+ expect(kibanaRequest.body).toEqual(body);
+ expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+ });
+
+ it('should work with ValidationFunction', () => {
+ const body = Buffer.from('body!');
+ const request = {
+ ...httpServerMock.createRawRequest({
+ params: { id: 'params' },
+ query: { search: 'query' },
+ }),
+ payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+ } as any;
+ const kibanaRequest = KibanaRequest.from(request, {
+ params: schema.object({ id: schema.string() }),
+ query: schema.object({ search: schema.string() }),
+ body: (data, { ok, badRequest }) => {
+ if (Buffer.isBuffer(data)) {
+ return ok(data);
+ } else {
+ return badRequest('It should be a Buffer', []);
+ }
+ },
+ });
+ expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+ expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+ expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+ expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+ expect(kibanaRequest.body).toEqual(body);
+ expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+ });
+ });
});
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index b132899910569e..47b001700b0154 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -20,13 +20,11 @@
import { Url } from 'url';
import { Request } from 'hapi';
-import { ObjectType, Type, TypeOf } from '@kbn/config-schema';
-
-import { Stream } from 'stream';
import { deepFreeze, RecursiveReadonly } from '../../../utils';
import { Headers } from './headers';
-import { RouteMethod, RouteSchemas, RouteConfigOptions, validBodyOutput } from './route';
+import { RouteMethod, RouteConfigOptions, validBodyOutput } from './route';
import { KibanaSocket, IKibanaSocket } from './socket';
+import { RouteValidator, RouteValidatorFullConfig } from './validator';
const requestSymbol = Symbol('request');
@@ -70,12 +68,13 @@ export class KibanaRequest<
* instance of a KibanaRequest.
* @internal
*/
- public static from<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(req: Request, routeSchemas?: RouteSchemas, withoutSecretHeaders: boolean = true) {
- const requestParts = KibanaRequest.validate(req, routeSchemas);
+ public static from
(
+ req: Request,
+ routeSchemas: RouteValidator
| RouteValidatorFullConfig
= {},
+ withoutSecretHeaders: boolean = true
+ ) {
+ const routeValidator = RouteValidator.from
(routeSchemas);
+ const requestParts = KibanaRequest.validate(req, routeValidator);
return new KibanaRequest(
req,
requestParts.params,
@@ -91,40 +90,17 @@ export class KibanaRequest<
* received in the route handler.
* @internal
*/
- private static validate<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(
+ private static validate(
req: Request,
- routeSchemas: RouteSchemas
| undefined
+ routeValidator: RouteValidator
): {
- params: TypeOf
;
- query: TypeOf;
- body: TypeOf;
+ params: P;
+ query: Q;
+ body: B;
} {
- if (routeSchemas === undefined) {
- return {
- body: {},
- params: {},
- query: {},
- };
- }
-
- const params =
- routeSchemas.params === undefined
- ? {}
- : routeSchemas.params.validate(req.params, {}, 'request params');
-
- const query =
- routeSchemas.query === undefined
- ? {}
- : routeSchemas.query.validate(req.query, {}, 'request query');
-
- const body =
- routeSchemas.body === undefined
- ? {}
- : routeSchemas.body.validate(req.payload, {}, 'request body');
+ const params = routeValidator.getParams(req.params, 'request params');
+ const query = routeValidator.getQuery(req.query, 'request query');
+ const body = routeValidator.getBody(req.payload, 'request body');
return { query, params, body };
}
diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts
index 129cf4c922ffd3..4439a80b1eac71 100644
--- a/src/core/server/http/router/route.ts
+++ b/src/core/server/http/router/route.ts
@@ -17,8 +17,7 @@
* under the License.
*/
-import { ObjectType, Type } from '@kbn/config-schema';
-import { Stream } from 'stream';
+import { RouteValidatorFullConfig } from './validator';
/**
* The set of common HTTP methods supported by Kibana routing.
@@ -124,12 +123,7 @@ export interface RouteConfigOptions {
* Route specific configuration.
* @public
*/
-export interface RouteConfig<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
- Method extends RouteMethod
-> {
+export interface RouteConfig {
/**
* The endpoint _within_ the router path to register the route.
*
@@ -201,25 +195,10 @@ export interface RouteConfig<
* });
* ```
*/
- validate: RouteSchemas
| false;
+ validate: RouteValidatorFullConfig
| false;
/**
* Additional route options {@link RouteConfigOptions}.
*/
options?: RouteConfigOptions;
}
-
-/**
- * RouteSchemas contains the schemas for validating the different parts of a
- * request.
- * @public
- */
-export interface RouteSchemas<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
-> {
- params?: P;
- query?: Q;
- body?: B;
-}
diff --git a/src/core/server/http/router/router.test.ts b/src/core/server/http/router/router.test.ts
index f5469a95b51069..a936da6a40a9f1 100644
--- a/src/core/server/http/router/router.test.ts
+++ b/src/core/server/http/router/router.test.ts
@@ -20,6 +20,7 @@
import { Router } from './router';
import { loggingServiceMock } from '../../logging/logging_service.mock';
import { schema } from '@kbn/config-schema';
+
const logger = loggingServiceMock.create().get();
const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
@@ -38,12 +39,15 @@ describe('Router', () => {
const router = new Router('', logger, enhanceWithContext);
expect(() =>
router.get(
- // we use 'any' because validate requires @kbn/config-schema usage
- { path: '/', validate: { params: { validate: () => 'error' } } } as any,
+ // we use 'any' because validate requires valid Type or function usage
+ {
+ path: '/',
+ validate: { params: { validate: () => 'error' } } as any,
+ },
(context, req, res) => res.ok({})
)
).toThrowErrorMatchingInlineSnapshot(
- `"Expected a valid schema declared with '@kbn/config-schema' package at key: [params]."`
+ `"Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [params]."`
);
});
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index 5c52e71cd54bbf..bb56ee3727d1a2 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -17,24 +17,18 @@
* under the License.
*/
-import { ObjectType, TypeOf, Type } from '@kbn/config-schema';
import { Request, ResponseObject, ResponseToolkit } from 'hapi';
import Boom from 'boom';
-import { Stream } from 'stream';
+import { Type } from '@kbn/config-schema';
import { Logger } from '../../logging';
import { KibanaRequest } from './request';
import { KibanaResponseFactory, kibanaResponseFactory, IKibanaResponse } from './response';
-import {
- RouteConfig,
- RouteConfigOptions,
- RouteMethod,
- RouteSchemas,
- validBodyOutput,
-} from './route';
+import { RouteConfig, RouteConfigOptions, RouteMethod, validBodyOutput } from './route';
import { HapiResponseAdapter } from './response_adapter';
import { RequestHandlerContext } from '../../../server';
import { wrapErrors } from './error_wrapper';
+import { RouteValidator } from './validator';
interface RouterRoute {
method: RouteMethod;
@@ -48,11 +42,7 @@ interface RouterRoute {
*
* @public
*/
-export type RouteRegistrar = <
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
->(
+export type RouteRegistrar = (
route: RouteConfig
,
handler: RequestHandler
) => void;
@@ -108,9 +98,7 @@ export interface IRouter {
* Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
* @param handler {@link RequestHandler} - a route handler to wrap
*/
- handleLegacyErrors:
(
- handler: RequestHandler
- ) => RequestHandler
;
+ handleLegacyErrors:
(handler: RequestHandler
) => RequestHandler
;
/**
* Returns all routes registered with this router.
@@ -120,12 +108,9 @@ export interface IRouter {
getRoutes: () => RouterRoute[];
}
-export type ContextEnhancer<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType,
- Method extends RouteMethod
-> = (handler: RequestHandler
) => RequestHandlerEnhanced
;
+export type ContextEnhancer
= (
+ handler: RequestHandler
+) => RequestHandlerEnhanced
;
function getRouteFullPath(routerPath: string, routePath: string) {
// If router's path ends with slash and route's path starts with slash,
@@ -140,11 +125,10 @@ function getRouteFullPath(routerPath: string, routePath: string) {
* @returns Route schemas if `validate` is specified on the route, otherwise
* undefined.
*/
-function routeSchemasFromRouteConfig<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
->(route: RouteConfig, routeMethod: RouteMethod) {
+function routeSchemasFromRouteConfig
(
+ route: RouteConfig
,
+ routeMethod: RouteMethod
+) {
// The type doesn't allow `validate` to be undefined, but it can still
// happen when it's used from JavaScript.
if (route.validate === undefined) {
@@ -155,15 +139,17 @@ function routeSchemasFromRouteConfig<
if (route.validate !== false) {
Object.entries(route.validate).forEach(([key, schema]) => {
- if (!(schema instanceof Type)) {
+ if (!(schema instanceof Type || typeof schema === 'function')) {
throw new Error(
- `Expected a valid schema declared with '@kbn/config-schema' package at key: [${key}].`
+ `Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [${key}].`
);
}
});
}
- return route.validate ? route.validate : undefined;
+ if (route.validate) {
+ return RouteValidator.from(route.validate);
+ }
}
/**
@@ -174,12 +160,7 @@ function routeSchemasFromRouteConfig<
*/
function validOptions(
method: RouteMethod,
- routeConfig: RouteConfig<
- ObjectType,
- ObjectType,
- ObjectType | Type | Type,
- typeof method
- >
+ routeConfig: RouteConfig
) {
const shouldNotHavePayload = ['head', 'get'].includes(method);
const { options = {}, validate } = routeConfig;
@@ -225,11 +206,7 @@ export class Router implements IRouter {
private readonly log: Logger,
private readonly enhanceWithContext: ContextEnhancer
) {
- const buildMethod = (method: Method) => <
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(
+ const buildMethod = (method: Method) => (
route: RouteConfig
,
handler: RequestHandler
) => {
@@ -260,17 +237,11 @@ export class Router implements IRouter {
return [...this.routes];
}
- public handleLegacyErrors
(
- handler: RequestHandler
- ): RequestHandler
{
+ public handleLegacyErrors
(handler: RequestHandler
): RequestHandler
{
return wrapErrors(handler);
}
- private async handle<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >({
+ private async handle({
routeSchemas,
request,
responseToolkit,
@@ -279,9 +250,9 @@ export class Router implements IRouter {
request: Request;
responseToolkit: ResponseToolkit;
handler: RequestHandlerEnhanced
;
- routeSchemas?: RouteSchemas
;
+ routeSchemas?: RouteValidator
;
}) {
- let kibanaRequest: KibanaRequest, TypeOf, TypeOf, typeof request.method>;
+ let kibanaRequest: KibanaRequest;
const hapiResponseAdapter = new HapiResponseAdapter(responseToolkit);
try {
kibanaRequest = KibanaRequest.from(request, routeSchemas);
@@ -303,12 +274,9 @@ type WithoutHeadArgument = T extends (first: any, ...rest: infer Params) => i
? (...rest: Params) => Return
: never;
-type RequestHandlerEnhanced<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
- Method extends RouteMethod
-> = WithoutHeadArgument>;
+type RequestHandlerEnhanced = WithoutHeadArgument<
+ RequestHandler
+>;
/**
* A function executed when route path matched requested resource path.
@@ -345,12 +313,12 @@ type RequestHandlerEnhanced<
* @public
*/
export type RequestHandler<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
+ P = unknown,
+ Q = unknown,
+ B = unknown,
Method extends RouteMethod = any
> = (
context: RequestHandlerContext,
- request: KibanaRequest, TypeOf, TypeOf, Method>,
+ request: KibanaRequest,
response: KibanaResponseFactory
) => IKibanaResponse | Promise>;
diff --git a/src/core/server/http/router/validator/index.ts b/src/core/server/http/router/validator/index.ts
new file mode 100644
index 00000000000000..edb116c40144a4
--- /dev/null
+++ b/src/core/server/http/router/validator/index.ts
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+export {
+ RouteValidator,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+} from './validator';
+export { RouteValidationError } from './validator_error';
diff --git a/src/core/server/http/router/validator/validator.test.ts b/src/core/server/http/router/validator/validator.test.ts
new file mode 100644
index 00000000000000..729eb1b60c10a8
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.test.ts
@@ -0,0 +1,135 @@
+/*
+ * 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 { RouteValidationError, RouteValidator } from './';
+import { schema, Type } from '@kbn/config-schema';
+
+describe('Router validator', () => {
+ it('should validate and infer the type from a function', () => {
+ const validator = RouteValidator.from({
+ params: ({ foo }, validationResult) => {
+ if (typeof foo === 'string') {
+ return validationResult.ok({ foo });
+ }
+ return validationResult.badRequest('Not a string', ['foo']);
+ },
+ });
+ expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+ expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+ expect(() => validator.getParams(undefined)).toThrowError(
+ "Cannot destructure property `foo` of 'undefined' or 'null'."
+ );
+ expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+ expect(validator.getBody(undefined)).toStrictEqual({});
+ expect(validator.getQuery(undefined)).toStrictEqual({});
+ });
+
+ it('should validate and infer the type from a function that does not use the resolver', () => {
+ const validator = RouteValidator.from({
+ params: data => {
+ if (typeof data.foo === 'string') {
+ return { value: { foo: data.foo as string } };
+ }
+ return { error: new RouteValidationError('Not a string', ['foo']) };
+ },
+ });
+ expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+ expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+ expect(() => validator.getParams(undefined)).toThrowError(
+ `Cannot read property 'foo' of undefined`
+ );
+ expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+ expect(validator.getBody(undefined)).toStrictEqual({});
+ expect(validator.getQuery(undefined)).toStrictEqual({});
+ });
+
+ it('should validate and infer the type from a config-schema ObjectType', () => {
+ const schemaValidation = RouteValidator.from({
+ params: schema.object({
+ foo: schema.string(),
+ }),
+ });
+
+ expect(schemaValidation.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(schemaValidation.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+ '[foo]: expected value of type [string] but got [number]'
+ );
+ expect(() => schemaValidation.getParams({})).toThrowError(
+ '[foo]: expected value of type [string] but got [undefined]'
+ );
+ expect(() => schemaValidation.getParams(undefined)).toThrowError(
+ '[foo]: expected value of type [string] but got [undefined]'
+ );
+ expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+ '[myField.foo]: expected value of type [string] but got [undefined]'
+ );
+ });
+
+ it('should validate and infer the type from a config-schema non-ObjectType', () => {
+ const schemaValidation = RouteValidator.from({ params: schema.buffer() });
+
+ const foo = Buffer.from('hi!');
+ expect(schemaValidation.getParams(foo)).toStrictEqual(foo);
+ expect(schemaValidation.getParams(foo).byteLength).toBeGreaterThan(0); // It knows it's a buffer! :)
+ expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+ 'expected value of type [Buffer] but got [Object]'
+ );
+ expect(() => schemaValidation.getParams({})).toThrowError(
+ 'expected value of type [Buffer] but got [Object]'
+ );
+ expect(() => schemaValidation.getParams(undefined)).toThrowError(
+ `expected value of type [Buffer] but got [undefined]`
+ );
+ expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+ '[myField]: expected value of type [Buffer] but got [Object]'
+ );
+ });
+
+ it('should catch the errors thrown by the validate function', () => {
+ const validator = RouteValidator.from({
+ params: data => {
+ throw new Error('Something went terribly wrong');
+ },
+ });
+
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('Something went terribly wrong');
+ expect(() => validator.getParams({}, 'myField')).toThrowError(
+ '[myField]: Something went terribly wrong'
+ );
+ });
+
+ it('should not accept invalid validation options', () => {
+ const wrongValidateSpec = RouteValidator.from({
+ params: { validate: (data: T): T => data } as Type,
+ });
+
+ expect(() => wrongValidateSpec.getParams({ foo: 1 })).toThrowError(
+ 'The validation rule provided in the handler is not valid'
+ );
+ });
+});
diff --git a/src/core/server/http/router/validator/validator.ts b/src/core/server/http/router/validator/validator.ts
new file mode 100644
index 00000000000000..65c0a934e6ef00
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.ts
@@ -0,0 +1,280 @@
+/*
+ * 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 { ValidationError, Type, schema, ObjectType } from '@kbn/config-schema';
+import { Stream } from 'stream';
+import { RouteValidationError } from './validator_error';
+
+/**
+ * Validation result factory to be used in the custom validation function to return the valid data or validation errors
+ *
+ * See {@link RouteValidationFunction}.
+ *
+ * @public
+ */
+export interface RouteValidationResultFactory {
+ ok: (value: T) => { value: T };
+ badRequest: (error: Error | string, path?: string[]) => { error: RouteValidationError };
+}
+
+/**
+ * The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements.
+ *
+ * @example
+ *
+ * The validation should look something like:
+ * ```typescript
+ * interface MyExpectedBody {
+ * bar: string;
+ * baz: number;
+ * }
+ *
+ * const myBodyValidation: RouteValidationFunction = (data, validationResult) => {
+ * const { ok, badRequest } = validationResult;
+ * const { bar, baz } = data || {};
+ * if (typeof bar === 'string' && typeof baz === 'number') {
+ * return ok({ bar, baz });
+ * } else {
+ * return badRequest('Wrong payload', ['body']);
+ * }
+ * }
+ * ```
+ *
+ * @public
+ */
+export type RouteValidationFunction = (
+ data: any,
+ validationResult: RouteValidationResultFactory
+) =>
+ | {
+ value: T;
+ error?: never;
+ }
+ | {
+ value?: never;
+ error: RouteValidationError;
+ };
+
+/**
+ * Allowed property validation options: either @kbn/config-schema validations or custom validation functions
+ *
+ * See {@link RouteValidationFunction} for custom validation.
+ *
+ * @public
+ */
+export type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+
+// Ugly as hell but we need this conditional typing to have proper type inference
+type RouteValidationResultType | undefined> = NonNullable<
+ T extends RouteValidationFunction
+ ? ReturnType['value']
+ : T extends Type
+ ? ReturnType
+ : undefined
+>;
+
+/**
+ * The configuration object to the RouteValidator class.
+ * Set `params`, `query` and/or `body` to specify the validation logic to follow for that property.
+ *
+ * @public
+ */
+export interface RouteValidatorConfig {
+ /**
+ * Validation logic for the URL params
+ * @public
+ */
+ params?: RouteValidationSpec
;
+ /**
+ * Validation logic for the Query params
+ * @public
+ */
+ query?: RouteValidationSpec;
+ /**
+ * Validation logic for the body payload
+ * @public
+ */
+ body?: RouteValidationSpec;
+}
+
+/**
+ * Additional options for the RouteValidator class to modify its default behaviour.
+ *
+ * @public
+ */
+export interface RouteValidatorOptions {
+ /**
+ * Set the `unsafe` config to avoid running some additional internal *safe* validations on top of your custom validation
+ * @public
+ */
+ unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ };
+}
+
+/**
+ * Route validations config and options merged into one object
+ * @public
+ */
+export type RouteValidatorFullConfig = RouteValidatorConfig
&
+ RouteValidatorOptions;
+
+/**
+ * Route validator class to define the validation logic for each new route.
+ *
+ * @internal
+ */
+export class RouteValidator
{
+ public static from
(
+ opts: RouteValidator
| RouteValidatorFullConfig
+ ) {
+ if (opts instanceof RouteValidator) {
+ return opts;
+ }
+ const { params, query, body, ...options } = opts;
+ return new RouteValidator({ params, query, body }, options);
+ }
+
+ private static ResultFactory: RouteValidationResultFactory = {
+ ok: (value: T) => ({ value }),
+ badRequest: (error: Error | string, path?: string[]) => ({
+ error: new RouteValidationError(error, path),
+ }),
+ };
+
+ private constructor(
+ private readonly config: RouteValidatorConfig,
+ private readonly options: RouteValidatorOptions = {}
+ ) {}
+
+ /**
+ * Get validated URL params
+ * @internal
+ */
+ public getParams(data: unknown, namespace?: string): Readonly
{
+ return this.validate(this.config.params, this.options.unsafe?.params, data, namespace);
+ }
+
+ /**
+ * Get validated query params
+ * @internal
+ */
+ public getQuery(data: unknown, namespace?: string): Readonly {
+ return this.validate(this.config.query, this.options.unsafe?.query, data, namespace);
+ }
+
+ /**
+ * Get validated body
+ * @internal
+ */
+ public getBody(data: unknown, namespace?: string): Readonly {
+ return this.validate(this.config.body, this.options.unsafe?.body, data, namespace);
+ }
+
+ /**
+ * Has body validation
+ * @internal
+ */
+ public hasBody(): boolean {
+ return typeof this.config.body !== 'undefined';
+ }
+
+ private validate(
+ validationRule?: RouteValidationSpec,
+ unsafe?: boolean,
+ data?: unknown,
+ namespace?: string
+ ): RouteValidationResultType {
+ if (typeof validationRule === 'undefined') {
+ return {};
+ }
+ let precheckedData = this.preValidateSchema(data).validate(data, {}, namespace);
+
+ if (unsafe !== true) {
+ precheckedData = this.safetyPrechecks(precheckedData, namespace);
+ }
+
+ const customCheckedData = this.customValidation(validationRule, precheckedData, namespace);
+
+ if (unsafe === true) {
+ return customCheckedData;
+ }
+
+ return this.safetyPostchecks(customCheckedData, namespace);
+ }
+
+ private safetyPrechecks(data: T, namespace?: string): T {
+ // We can add any pre-validation safety logic in here
+ return data;
+ }
+
+ private safetyPostchecks(data: T, namespace?: string): T {
+ // We can add any post-validation safety logic in here
+ return data;
+ }
+
+ private customValidation(
+ validationRule: RouteValidationSpec,
+ data?: unknown,
+ namespace?: string
+ ): RouteValidationResultType {
+ if (validationRule instanceof Type) {
+ return validationRule.validate(data, {}, namespace);
+ } else if (typeof validationRule === 'function') {
+ return this.validateFunction(validationRule, data, namespace);
+ } else {
+ throw new ValidationError(
+ new RouteValidationError(`The validation rule provided in the handler is not valid`),
+ namespace
+ );
+ }
+ }
+
+ private validateFunction(
+ validateFn: RouteValidationFunction,
+ data: unknown,
+ namespace?: string
+ ): T {
+ let result: ReturnType;
+ try {
+ result = validateFn(data, RouteValidator.ResultFactory);
+ } catch (err) {
+ result = { error: new RouteValidationError(err) };
+ }
+
+ if (result.error) {
+ throw new ValidationError(result.error, namespace);
+ }
+ return result.value;
+ }
+
+ private preValidateSchema(data: any) {
+ if (Buffer.isBuffer(data)) {
+ // if options.body.parse !== true
+ return schema.buffer();
+ } else if (data instanceof Stream) {
+ // if options.body.output === 'stream'
+ return schema.stream();
+ } else {
+ return schema.maybe(schema.nullable(schema.object({}, { allowUnknowns: true })));
+ }
+ }
+}
diff --git a/src/core/server/http/router/validator/validator_error.ts b/src/core/server/http/router/validator/validator_error.ts
new file mode 100644
index 00000000000000..d306db4ad1cf4f
--- /dev/null
+++ b/src/core/server/http/router/validator/validator_error.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { SchemaTypeError } from '@kbn/config-schema';
+
+/**
+ * Error to return when the validation is not successful.
+ * @public
+ */
+export class RouteValidationError extends SchemaTypeError {
+ constructor(error: Error | string, path: string[] = []) {
+ super(error, path);
+
+ // Set the prototype explicitly, see:
+ // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
+ Object.setPrototypeOf(this, RouteValidationError.prototype);
+ }
+}
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 060265120b865e..878f854f2a5174 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -134,10 +134,16 @@ export {
RouteRegistrar,
RouteMethod,
RouteConfigOptions,
- RouteSchemas,
RouteConfigOptionsBody,
RouteContentType,
validBodyOutput,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+ RouteValidationError,
SessionStorage,
SessionStorageCookieOptions,
SessionCookieValidationResult,
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 85c0af8131ccb6..ef5368751c8f5a 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -115,6 +115,7 @@ import { RenderSearchTemplateParams } from 'elasticsearch';
import { Request } from 'hapi';
import { ResponseObject } from 'hapi';
import { ResponseToolkit } from 'hapi';
+import { SchemaTypeError } from '@kbn/config-schema';
import { ScrollParams } from 'elasticsearch';
import { SearchParams } from 'elasticsearch';
import { SearchResponse } from 'elasticsearch';
@@ -449,11 +450,11 @@ export interface AuthToolkit {
export class BasePath {
// @internal
constructor(serverBasePath?: string);
- get: (request: LegacyRequest | KibanaRequest) => string;
+ get: (request: KibanaRequest | LegacyRequest) => string;
prepend: (path: string) => string;
remove: (path: string) => string;
readonly serverBasePath: string;
- set: (request: LegacyRequest | KibanaRequest, requestSpecificBasePath: string) => void;
+ set: (request: KibanaRequest | LegacyRequest, requestSpecificBasePath: string) => void;
}
// Warning: (ae-forgotten-export) The symbol "BootstrapArgs" needs to be exported by the entry point index.d.ts
@@ -805,7 +806,7 @@ export interface IRouter {
//
// @internal
getRoutes: () => RouterRoute[];
- handleLegacyErrors: (handler: RequestHandler
) => RequestHandler
;
+ handleLegacyErrors:
(handler: RequestHandler
) => RequestHandler
;
patch: RouteRegistrar<'patch'>;
post: RouteRegistrar<'post'>;
put: RouteRegistrar<'put'>;
@@ -841,8 +842,10 @@ export class KibanaRequest | Type>(req: Request, routeSchemas?: RouteSchemas, withoutSecretHeaders?: boolean): KibanaRequest
;
+ static from
(req: Request, routeSchemas?: RouteValidator
| RouteValidatorFullConfig
, withoutSecretHeaders?: boolean): KibanaRequest
;
readonly headers: Headers;
// (undocumented)
readonly params: Params;
@@ -1159,7 +1162,7 @@ export type RedirectResponseOptions = HttpResponseOptions & {
};
// @public
-export type RequestHandler
| Type, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest, TypeOf, TypeOf, Method>, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
+export type RequestHandler = (context: RequestHandlerContext, request: KibanaRequest
, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
// @public
export interface RequestHandlerContext {
@@ -1201,10 +1204,10 @@ export type ResponseHeaders = {
};
// @public
-export interface RouteConfig | Type, Method extends RouteMethod> {
+export interface RouteConfig {
options?: RouteConfigOptions;
path: string;
- validate: RouteSchemas | false;
+ validate: RouteValidatorFullConfig
| false;
}
// @public
@@ -1229,16 +1232,54 @@ export type RouteContentType = 'application/json' | 'application/*+json' | 'appl
export type RouteMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
// @public
-export type RouteRegistrar = | Type>(route: RouteConfig, handler: RequestHandler
) => void;
+export type RouteRegistrar = (route: RouteConfig
, handler: RequestHandler
) => void;
// @public
-export interface RouteSchemas
| Type> {
- // (undocumented)
- body?: B;
+export class RouteValidationError extends SchemaTypeError {
+ constructor(error: Error | string, path?: string[]);
+}
+
+// @public
+export type RouteValidationFunction = (data: any, validationResult: RouteValidationResultFactory) => {
+ value: T;
+ error?: never;
+} | {
+ value?: never;
+ error: RouteValidationError;
+};
+
+// @public
+export interface RouteValidationResultFactory {
// (undocumented)
- params?: P;
+ badRequest: (error: Error | string, path?: string[]) => {
+ error: RouteValidationError;
+ };
// (undocumented)
- query?: Q;
+ ok: (value: T) => {
+ value: T;
+ };
+}
+
+// @public
+export type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+
+// @public
+export interface RouteValidatorConfig {
+ body?: RouteValidationSpec;
+ params?: RouteValidationSpec
;
+ query?: RouteValidationSpec;
+}
+
+// @public
+export type RouteValidatorFullConfig = RouteValidatorConfig
& RouteValidatorOptions;
+
+// @public
+export interface RouteValidatorOptions {
+ unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ };
}
// @public (undocumented)
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index 22fbf0ab5a5f89..e20d1b5cd77173 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -21,7 +21,7 @@ import StubIndexPattern from 'test_utils/stub_index_pattern';
import stubbedLogstashFields from 'fixtures/logstash_fields';
import { getKbnFieldType } from '../plugins/data/common';
-import { mockUiSettings } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
+import { npSetup } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
export default function stubbedLogstashIndexPatternService() {
const mockLogstashFields = stubbedLogstashFields();
@@ -41,13 +41,8 @@ export default function stubbedLogstashIndexPatternService() {
};
});
- const indexPattern = new StubIndexPattern(
- 'logstash-*',
- cfg => cfg,
- 'time',
- fields,
- mockUiSettings
- );
+ const indexPattern = new StubIndexPattern('logstash-*', cfg => cfg, 'time', fields, npSetup.core);
+
indexPattern.id = 'logstash-*';
indexPattern.isTimeNanosBased = () => false;
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index c9ce825f3596e6..09881c00c63b6e 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -30,9 +30,16 @@ export function plugin() {
export { DataStart };
export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
-export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
+export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
+export { SearchSourceFields } from './search/types';
+export {
+ SavedQueryAttributes,
+ SavedQuery,
+ SavedQueryTimeFilter,
+} from '../../../../plugins/data/public';
/** @public static code */
export * from '../common';
export { FilterStateManager } from './filter/filter_manager';
export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
+export { getRequestInspectorStats, getResponseInspectorStats } from './search';
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 676904faf6f2ff..6c67408158b51c 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -18,6 +18,7 @@
*/
import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { SearchService, SearchStart } from './search';
import { DataPublicPluginStart } from '../../../../plugins/data/public';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -32,8 +33,9 @@ export interface DataPluginStartDependencies {
*
* @public
*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DataStart {}
+export interface DataStart {
+ search: SearchStart;
+}
/**
* Data Plugin - public
@@ -48,13 +50,20 @@ export interface DataStart {}
*/
export class DataPlugin implements Plugin {
+ private readonly search = new SearchService();
+
public setup(core: CoreSetup) {}
public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
// This is required for when Angular code uses Field and FieldList.
setFieldFormats(data.fieldFormats);
- return {};
+
+ return {
+ search: this.search.start(core),
+ };
}
- public stop() {}
+ public stop() {
+ this.search.stop();
+ }
}
diff --git a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
index c94d35d1f7f2a5..a14e2c8492648f 100644
--- a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
+++ b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
@@ -32,7 +32,7 @@ import {
import { npStart } from 'ui/new_platform';
import {
SearchSource,
- SearchSourceContract,
+ ISearchSource,
getRequestInspectorStats,
getResponseInspectorStats,
} from '../../../../../ui/public/courier';
@@ -51,7 +51,7 @@ import { PersistedState } from '../../../../../ui/public/persisted_state';
import { Adapters } from '../../../../../../plugins/inspector/public';
export interface RequestHandlerParams {
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
aggs: AggConfigs;
timeRange?: TimeRange;
query?: Query;
diff --git a/src/legacy/ui/public/courier/fetch/call_client.test.ts b/src/legacy/core_plugins/data/public/search/fetch/call_client.test.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/call_client.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/call_client.test.ts
diff --git a/src/legacy/ui/public/courier/fetch/call_client.ts b/src/legacy/core_plugins/data/public/search/fetch/call_client.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/call_client.ts
rename to src/legacy/core_plugins/data/public/search/fetch/call_client.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_request.ts b/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_request.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_response.ts b/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_response.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
index 9a47fff2745c32..f7f3d1c1fbd0c2 100644
--- a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
@@ -181,7 +181,7 @@ exports[`ShardFailureModal renders matching snapshot given valid properties 1`]
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
diff --git a/src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss b/src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss
rename to src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
index 6028a50cf9c3e4..60e0e35a0f1520 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
@@ -19,7 +19,7 @@
import React from 'react';
import { EuiCodeBlock, EuiDescriptionList, EuiSpacer } from '@elastic/eui';
import { ShardFailure } from './shard_failure_types';
-import { getFlattenedObject } from '../../../../../../legacy/utils/get_flattened_object';
+import { getFlattenedObject } from '../../../../../../../legacy/utils/get_flattened_object';
import { ShardFailureDescriptionHeader } from './shard_failure_description_header';
/**
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
index ea4f33f9e914ef..947f33efa242c0 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
@@ -35,7 +35,7 @@ export function getFailureSummaryText(failure: ShardFailure, failureDetails?: st
const displayDetails =
typeof failureDetails === 'string' ? failureDetails : getFailureSummaryDetailsText(failure);
- return i18n.translate('common.ui.courier.fetch.shardsFailedModal.failureHeader', {
+ return i18n.translate('data.search.searchSource.fetch.shardsFailedModal.failureHeader', {
defaultMessage: '{failureName} at {failureDetails}',
values: { failureName, failureDetails: displayDetails },
description: 'Summary of shard failures, e.g. "IllegalArgumentException at shard 0 node xyz"',
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
similarity index 85%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
index d028a831a6e398..65cb49c6115756 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
@@ -59,15 +59,18 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
const tabs = [
{
id: 'table',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures', {
- defaultMessage: 'Shard failures',
- description: 'Name of the tab displaying shard failures',
- }),
+ name: i18n.translate(
+ 'data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures',
+ {
+ defaultMessage: 'Shard failures',
+ description: 'Name of the tab displaying shard failures',
+ }
+ ),
content: ,
},
{
id: 'json-request',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest', {
defaultMessage: 'Request',
description: 'Name of the tab displaying the JSON request',
}),
@@ -79,7 +82,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
},
{
id: 'json-response',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse', {
defaultMessage: 'Response',
description: 'Name of the tab displaying the JSON response',
}),
@@ -104,7 +107,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
{copy => (
@@ -112,7 +115,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
onClose()} fill data-test-sub="closeShardFailureModal">
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
similarity index 92%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
index b02344ce6dd728..d81ee70a4611cd 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
@@ -22,7 +22,7 @@ import { npStart } from 'ui/new_platform';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiButton, EuiTextAlign } from '@elastic/eui';
-import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../../plugins/kibana_react/public';
import { ShardFailureModal } from './shard_failure_modal';
import { ResponseWithShardFailure, Request } from './shard_failure_types';
@@ -57,7 +57,7 @@ export function ShardFailureOpenModalButton({ request, response, title }: Props)
data-test-subj="openShardFailureModalBtn"
>
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
similarity index 87%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
index 54de64e52f745e..5d5047631231ab 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
@@ -44,7 +44,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
render: (item: ListItem) => {
const failureSummeryText = getFailureSummaryText(item);
const collapseLabel = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedModal.tableRowCollapse',
+ 'data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse',
{
defaultMessage: 'Collapse {rowDescription}',
description: 'Collapse a row of a table with failures',
@@ -53,7 +53,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
);
const expandLabel = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedModal.tableRowExpand',
+ 'data.search.searchSource.fetch.shardsFailedModal.tableRowExpand',
{
defaultMessage: 'Expand {rowDescription}',
description: 'Expand a row of a table with failures',
@@ -81,7 +81,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'shard',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColShard', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColShard', {
defaultMessage: 'Shard',
}),
sortable: true,
@@ -90,7 +90,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'index',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColIndex', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColIndex', {
defaultMessage: 'Index',
}),
sortable: true,
@@ -98,7 +98,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'node',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColNode', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColNode', {
defaultMessage: 'Node',
}),
sortable: true,
@@ -106,7 +106,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'reason.type',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColReason', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColReason', {
defaultMessage: 'Reason',
}),
truncateText: true,
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
diff --git a/src/legacy/ui/public/courier/fetch/errors.ts b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
similarity index 91%
rename from src/legacy/ui/public/courier/fetch/errors.ts
rename to src/legacy/core_plugins/data/public/search/fetch/errors.ts
index a2ac013915b4bb..5f5dc0452df513 100644
--- a/src/legacy/ui/public/courier/fetch/errors.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
@@ -17,9 +17,10 @@
* under the License.
*/
-import { SearchError } from '../../courier';
-import { KbnError } from '../../../../../plugins/kibana_utils/public';
+import { SearchError } from '../search_strategy';
+import { KbnError } from '../../../../../../plugins/kibana_utils/public';
import { SearchResponse } from '../types';
+
/**
* Request Failure - When an entire multi request fails
* @param {Error} err - the Error that came back
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
index d96fb536985da0..69a343c78b1e12 100644
--- a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
@@ -19,7 +19,7 @@
import { fetchSoon } from './fetch_soon';
import { callClient } from './call_client';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
import { FetchHandlers, FetchOptions } from './types';
import { SearchRequest, SearchResponse } from '../types';
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/get_search_params.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
index 76f3105d7f942e..f856aa77bf1f8e 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
@@ -18,7 +18,7 @@
*/
import { getMSearchParams, getSearchParams } from './get_search_params';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
function getConfigStub(config: any = {}) {
return {
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
similarity index 97%
rename from src/legacy/ui/public/courier/fetch/get_search_params.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
index 9fb8f2c728c6f0..de9ec4cb920e8e 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
const sessionId = Date.now();
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.test.ts b/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
similarity index 95%
rename from src/legacy/ui/public/courier/fetch/handle_response.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
index 0163aca7771610..f8763a71d840e4 100644
--- a/src/legacy/ui/public/courier/fetch/handle_response.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
@@ -18,9 +18,9 @@
*/
import { handleResponse } from './handle_response';
-import { toastNotifications } from '../../notify/toasts';
+import { toastNotifications } from 'ui/notify/toasts';
-jest.mock('../../notify/toasts', () => {
+jest.mock('ui/notify/toasts', () => {
return {
toastNotifications: {
addWarning: jest.fn(),
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.tsx b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
similarity index 84%
rename from src/legacy/ui/public/courier/fetch/handle_response.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
index d7f2263268f8c4..e3fd5ad15242d0 100644
--- a/src/legacy/ui/public/courier/fetch/handle_response.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
@@ -20,23 +20,23 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
import { EuiSpacer } from '@elastic/eui';
-import { toastNotifications } from '../../notify/toasts';
+import { toastNotifications } from 'ui/notify/toasts';
import { ShardFailureOpenModalButton } from './components/shard_failure_open_modal_button';
import { Request, ResponseWithShardFailure } from './components/shard_failure_types';
import { SearchRequest, SearchResponse } from '../types';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
export function handleResponse(request: SearchRequest, response: SearchResponse) {
if (response.timed_out) {
toastNotifications.addWarning({
- title: i18n.translate('common.ui.courier.fetch.requestTimedOutNotificationMessage', {
+ title: i18n.translate('data.search.searchSource.fetch.requestTimedOutNotificationMessage', {
defaultMessage: 'Data might be incomplete because your request timed out',
}),
});
}
if (response._shards && response._shards.failed) {
- const title = i18n.translate('common.ui.courier.fetch.shardsFailedNotificationMessage', {
+ const title = i18n.translate('data.search.searchSource.fetch.shardsFailedNotificationMessage', {
defaultMessage: '{shardsFailed} of {shardsTotal} shards failed',
values: {
shardsFailed: response._shards.failed,
@@ -44,7 +44,7 @@ export function handleResponse(request: SearchRequest, response: SearchResponse)
},
});
const description = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedNotificationDescription',
+ 'data.search.searchSource.fetch.shardsFailedNotificationDescription',
{
defaultMessage: 'The data you are seeing might be incomplete or wrong.',
}
diff --git a/src/legacy/ui/public/courier/fetch/index.ts b/src/legacy/core_plugins/data/public/search/fetch/index.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/index.ts
rename to src/legacy/core_plugins/data/public/search/fetch/index.ts
diff --git a/src/legacy/ui/public/courier/fetch/types.ts b/src/legacy/core_plugins/data/public/search/fetch/types.ts
similarity index 95%
rename from src/legacy/ui/public/courier/fetch/types.ts
rename to src/legacy/core_plugins/data/public/search/fetch/types.ts
index 03bf51ae15d453..0887a1f84c7c8c 100644
--- a/src/legacy/ui/public/courier/fetch/types.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/types.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
import { SearchRequest, SearchResponse } from '../types';
export interface ApiCaller {
diff --git a/src/legacy/core_plugins/data/public/search/index.ts b/src/legacy/core_plugins/data/public/search/index.ts
index 9880b336e76e5c..d930a472195147 100644
--- a/src/legacy/core_plugins/data/public/search/index.ts
+++ b/src/legacy/core_plugins/data/public/search/index.ts
@@ -16,3 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+export { SearchService, SearchSetup, SearchStart } from './search_service';
+
+export { getRequestInspectorStats, getResponseInspectorStats } from './utils';
diff --git a/src/legacy/core_plugins/data/public/search/search_service.ts b/src/legacy/core_plugins/data/public/search/search_service.ts
new file mode 100644
index 00000000000000..85701187fb31d8
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_service.ts
@@ -0,0 +1,51 @@
+/*
+ * 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 { Plugin, CoreSetup, CoreStart } from '../../../../../core/public';
+import { SearchSource } from './search_source';
+import { defaultSearchStrategy } from './search_strategy';
+import { SearchStrategyProvider } from './search_strategy/types';
+
+export interface SearchSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface
+
+export interface SearchStart {
+ defaultSearchStrategy: SearchStrategyProvider;
+ SearchSource: typeof SearchSource;
+}
+
+/**
+ * The contract provided here is a new platform shim for ui/courier.
+ *
+ * Once it has been refactored to work with new platform services,
+ * it will move into the existing search service in src/plugins/data/public/search
+ */
+export class SearchService implements Plugin {
+ public setup(core: CoreSetup): SearchSetup {
+ return {};
+ }
+
+ public start(core: CoreStart): SearchStart {
+ return {
+ defaultSearchStrategy,
+ SearchSource,
+ };
+ }
+
+ public stop() {}
+}
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
diff --git a/src/legacy/server/sample_data/index.js b/src/legacy/core_plugins/data/public/search/search_source/index.ts
similarity index 93%
rename from src/legacy/server/sample_data/index.js
rename to src/legacy/core_plugins/data/public/search/search_source/index.ts
index 2e24946761f207..72170adc2b1296 100644
--- a/src/legacy/server/sample_data/index.js
+++ b/src/legacy/core_plugins/data/public/search/search_source/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export { sampleDataMixin } from './sample_data_mixin';
+export * from './search_source';
diff --git a/src/legacy/core_plugins/data/public/search/search_source/mocks.ts b/src/legacy/core_plugins/data/public/search/search_source/mocks.ts
new file mode 100644
index 00000000000000..fd72158012de6f
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/mocks.ts
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+/*
+ * 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 { ISearchSource } from './search_source';
+
+export const searchSourceMock: MockedKeys = {
+ setPreferredSearchStrategyId: jest.fn(),
+ setFields: jest.fn().mockReturnThis(),
+ setField: jest.fn().mockReturnThis(),
+ getId: jest.fn(),
+ getFields: jest.fn(),
+ getField: jest.fn(),
+ getOwnField: jest.fn(),
+ create: jest.fn().mockReturnThis(),
+ createCopy: jest.fn().mockReturnThis(),
+ createChild: jest.fn().mockReturnThis(),
+ setParent: jest.fn(),
+ getParent: jest.fn().mockReturnThis(),
+ fetch: jest.fn().mockResolvedValue({}),
+ onRequestStart: jest.fn(),
+ getSearchRequestBody: jest.fn(),
+ destroy: jest.fn(),
+ history: [],
+};
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
similarity index 97%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
index d27b01eb5cf7cf..22d1d931a9d096 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
@@ -19,7 +19,7 @@
import { normalizeSortRequest } from './normalize_sort_request';
import { SortDirection } from './types';
-import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
jest.mock('ui/new_platform');
@@ -40,7 +40,7 @@ describe('SearchSource#normalizeSortRequest', function() {
};
const indexPattern = {
fields: [scriptedField, murmurScriptedField],
- } as IndexPattern;
+ } as IIndexPattern;
it('should return an array', function() {
const sortable = { someField: SortDirection.desc };
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
similarity index 93%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
index 0f8fc8076caa08..93834c95514dc2 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
@@ -17,12 +17,12 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
import { EsQuerySortValue, SortOptions } from './types';
export function normalizeSortRequest(
sortObject: EsQuerySortValue | EsQuerySortValue[],
- indexPattern: IndexPattern | string | undefined,
+ indexPattern: IIndexPattern | string | undefined,
defaultSortOptions: SortOptions = {}
) {
const sortArray: EsQuerySortValue[] = Array.isArray(sortObject) ? sortObject : [sortObject];
@@ -38,7 +38,7 @@ export function normalizeSortRequest(
*/
function normalize(
sortable: EsQuerySortValue,
- indexPattern: IndexPattern | string | undefined,
+ indexPattern: IIndexPattern | string | undefined,
defaultSortOptions: any
) {
const [[sortField, sortOrder]] = Object.entries(sortable);
diff --git a/src/legacy/ui/public/courier/search_source/search_source.test.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_source/search_source.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
index ddd3717f55e297..28f8dba9a75de3 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
@@ -18,7 +18,7 @@
*/
import { SearchSource } from '../search_source';
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
jest.mock('ui/new_platform');
@@ -26,7 +26,7 @@ jest.mock('../fetch', () => ({
fetchSoon: jest.fn().mockResolvedValue({}),
}));
-jest.mock('../../chrome', () => ({
+jest.mock('ui/chrome', () => ({
dangerouslyGetActiveInjector: () => ({
get: jest.fn(),
}),
diff --git a/src/legacy/core_plugins/data/public/search/search_source/search_source.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
new file mode 100644
index 00000000000000..01fc34e230a316
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
@@ -0,0 +1,410 @@
+/*
+ * 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.
+ */
+
+/**
+ * @name SearchSource
+ *
+ * @description A promise-based stream of search results that can inherit from other search sources.
+ *
+ * Because filters/queries in Kibana have different levels of persistence and come from different
+ * places, it is important to keep track of where filters come from for when they are saved back to
+ * the savedObject store in the Kibana index. To do this, we create trees of searchSource objects
+ * that can have associated query parameters (index, query, filter, etc) which can also inherit from
+ * other searchSource objects.
+ *
+ * At query time, all of the searchSource objects that have subscribers are "flattened", at which
+ * point the query params from the searchSource are collected while traversing up the inheritance
+ * chain. At each link in the chain a decision about how to merge the query params is made until a
+ * single set of query parameters is created for each active searchSource (a searchSource with
+ * subscribers).
+ *
+ * That set of query parameters is then sent to elasticsearch. This is how the filter hierarchy
+ * works in Kibana.
+ *
+ * Visualize, starting from a new search:
+ *
+ * - the `savedVis.searchSource` is set as the `appSearchSource`.
+ * - The `savedVis.searchSource` would normally inherit from the `appSearchSource`, but now it is
+ * upgraded to inherit from the `rootSearchSource`.
+ * - Any interaction with the visualization will still apply filters to the `appSearchSource`, so
+ * they will be stored directly on the `savedVis.searchSource`.
+ * - Any interaction with the time filter will be written to the `rootSearchSource`, so those
+ * filters will not be saved by the `savedVis`.
+ * - When the `savedVis` is saved to elasticsearch, it takes with it all the filters that are
+ * defined on it directly, but none of the ones that it inherits from other places.
+ *
+ * Visualize, starting from an existing search:
+ *
+ * - The `savedVis` loads the `savedSearch` on which it is built.
+ * - The `savedVis.searchSource` is set to inherit from the `saveSearch.searchSource` and set as
+ * the `appSearchSource`.
+ * - The `savedSearch.searchSource`, is set to inherit from the `rootSearchSource`.
+ * - Then the `savedVis` is written to elasticsearch it will be flattened and only include the
+ * filters created in the visualize application and will reconnect the filters from the
+ * `savedSearch` at runtime to prevent losing the relationship
+ *
+ * Dashboard search sources:
+ *
+ * - Each panel in a dashboard has a search source.
+ * - The `savedDashboard` also has a searchsource, and it is set as the `appSearchSource`.
+ * - Each panel's search source inherits from the `appSearchSource`, meaning that they inherit from
+ * the dashboard search source.
+ * - When a filter is added to the search box, or via a visualization, it is written to the
+ * `appSearchSource`.
+ */
+
+import _ from 'lodash';
+import { npSetup } from 'ui/new_platform';
+import chrome from 'ui/chrome';
+import { fieldWildcardFilter } from 'ui/field_wildcard';
+import { normalizeSortRequest } from './normalize_sort_request';
+import { fetchSoon } from '../fetch';
+import { getHighlightRequest, esFilters, esQuery } from '../../../../../../plugins/data/public';
+import { RequestFailure } from '../fetch/errors';
+import { filterDocvalueFields } from './filter_docvalue_fields';
+import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types';
+import { FetchOptions, ApiCaller } from '../fetch/types';
+
+const esShardTimeout = npSetup.core.injectedMetadata.getInjectedVar('esShardTimeout') as number;
+const config = npSetup.core.uiSettings;
+
+export type ISearchSource = Pick;
+
+export class SearchSource {
+ private id: string = _.uniqueId('data_source');
+ private searchStrategyId?: string;
+ private parent?: SearchSource;
+ private requestStartHandlers: Array<
+ (searchSource: ISearchSource, options?: FetchOptions) => Promise
+ > = [];
+ private inheritOptions: SearchSourceOptions = {};
+ public history: SearchRequest[] = [];
+
+ constructor(private fields: SearchSourceFields = {}) {}
+
+ /** ***
+ * PUBLIC API
+ *****/
+
+ setPreferredSearchStrategyId(searchStrategyId: string) {
+ this.searchStrategyId = searchStrategyId;
+ }
+
+ setFields(newFields: SearchSourceFields) {
+ this.fields = newFields;
+ return this;
+ }
+
+ setField(field: K, value: SearchSourceFields[K]) {
+ if (value == null) {
+ delete this.fields[field];
+ } else {
+ this.fields[field] = value;
+ }
+ return this;
+ }
+
+ getId() {
+ return this.id;
+ }
+
+ getFields() {
+ return { ...this.fields };
+ }
+
+ /**
+ * Get fields from the fields
+ */
+ getField(field: K, recurse = true): SearchSourceFields[K] {
+ if (!recurse || this.fields[field] !== void 0) {
+ return this.fields[field];
+ }
+ const parent = this.getParent();
+ return parent && parent.getField(field);
+ }
+
+ /**
+ * Get the field from our own fields, don't traverse up the chain
+ */
+ getOwnField(field: K): SearchSourceFields[K] {
+ return this.getField(field, false);
+ }
+
+ create() {
+ return new SearchSource();
+ }
+
+ createCopy() {
+ const newSearchSource = new SearchSource();
+ newSearchSource.setFields({ ...this.fields });
+ // when serializing the internal fields we lose the internal classes used in the index
+ // pattern, so we have to set it again to workaround this behavior
+ newSearchSource.setField('index', this.getField('index'));
+ newSearchSource.setParent(this.getParent());
+ return newSearchSource;
+ }
+
+ createChild(options = {}) {
+ const childSearchSource = new SearchSource();
+ childSearchSource.setParent(this, options);
+ return childSearchSource;
+ }
+
+ /**
+ * Set a searchSource that this source should inherit from
+ * @param {SearchSource} parent - the parent searchSource
+ * @param {SearchSourceOptions} options - the inherit options
+ * @return {this} - chainable
+ */
+ setParent(parent?: ISearchSource, options: SearchSourceOptions = {}) {
+ this.parent = parent as SearchSource;
+ this.inheritOptions = options;
+ return this;
+ }
+
+ /**
+ * Get the parent of this SearchSource
+ * @return {undefined|searchSource}
+ */
+ getParent() {
+ return this.parent;
+ }
+
+ /**
+ * Fetch this source and reject the returned Promise on error
+ *
+ * @async
+ */
+ async fetch(options: FetchOptions = {}) {
+ const $injector = await chrome.dangerouslyGetActiveInjector();
+ const es = $injector.get('es') as ApiCaller;
+
+ await this.requestIsStarting(options);
+
+ const searchRequest = await this.flatten();
+ this.history = [searchRequest];
+
+ const response = await fetchSoon(
+ searchRequest,
+ {
+ ...(this.searchStrategyId && { searchStrategyId: this.searchStrategyId }),
+ ...options,
+ },
+ { es, config, esShardTimeout }
+ );
+
+ if (response.error) {
+ throw new RequestFailure(null, response);
+ }
+
+ return response;
+ }
+
+ /**
+ * Add a handler that will be notified whenever requests start
+ * @param {Function} handler
+ * @return {undefined}
+ */
+ onRequestStart(
+ handler: (searchSource: ISearchSource, options?: FetchOptions) => Promise
+ ) {
+ this.requestStartHandlers.push(handler);
+ }
+
+ async getSearchRequestBody() {
+ const searchRequest = await this.flatten();
+ return searchRequest.body;
+ }
+
+ /**
+ * Completely destroy the SearchSource.
+ * @return {undefined}
+ */
+ destroy() {
+ this.requestStartHandlers.length = 0;
+ }
+
+ /** ****
+ * PRIVATE APIS
+ ******/
+
+ /**
+ * Called by requests of this search source when they are started
+ * @param {Courier.Request} request
+ * @param options
+ * @return {Promise}
+ */
+ private requestIsStarting(options: FetchOptions = {}) {
+ const handlers = [...this.requestStartHandlers];
+ // If callParentStartHandlers has been set to true, we also call all
+ // handlers of parent search sources.
+ if (this.inheritOptions.callParentStartHandlers) {
+ let searchSource = this.getParent();
+ while (searchSource) {
+ handlers.push(...searchSource.requestStartHandlers);
+ searchSource = searchSource.getParent();
+ }
+ }
+
+ return Promise.all(handlers.map(fn => fn(this, options)));
+ }
+
+ /**
+ * Used to merge properties into the data within ._flatten().
+ * The data is passed in and modified by the function
+ *
+ * @param {object} data - the current merged data
+ * @param {*} val - the value at `key`
+ * @param {*} key - The key of `val`
+ * @return {undefined}
+ */
+ private mergeProp(
+ data: SearchRequest,
+ val: SearchSourceFields[K],
+ key: K
+ ) {
+ val = typeof val === 'function' ? val(this) : val;
+ if (val == null || !key) return;
+
+ const addToRoot = (rootKey: string, value: any) => {
+ data[rootKey] = value;
+ };
+
+ /**
+ * Add the key and val to the body of the request
+ */
+ const addToBody = (bodyKey: string, value: any) => {
+ // ignore if we already have a value
+ if (data.body[bodyKey] == null) {
+ data.body[bodyKey] = value;
+ }
+ };
+
+ switch (key) {
+ case 'filter':
+ return addToRoot('filters', (data.filters || []).concat(val));
+ case 'query':
+ return addToRoot(key, (data[key] || []).concat(val));
+ case 'fields':
+ const fields = _.uniq((data[key] || []).concat(val));
+ return addToRoot(key, fields);
+ case 'index':
+ case 'type':
+ case 'highlightAll':
+ return key && data[key] == null && addToRoot(key, val);
+ case 'searchAfter':
+ return addToBody('search_after', val);
+ case 'source':
+ return addToBody('_source', val);
+ case 'sort':
+ const sort = normalizeSortRequest(val, this.getField('index'), config.get('sort:options'));
+ return addToBody(key, sort);
+ default:
+ return addToBody(key, val);
+ }
+ }
+
+ /**
+ * Walk the inheritance chain of a source and return its
+ * flat representation (taking into account merging rules)
+ * @returns {Promise}
+ * @resolved {Object|null} - the flat data of the SearchSource
+ */
+ private mergeProps(root = this, searchRequest: SearchRequest = { body: {} }) {
+ Object.entries(this.fields).forEach(([key, value]) => {
+ this.mergeProp(searchRequest, value, key as keyof SearchSourceFields);
+ });
+ if (this.parent) {
+ this.parent.mergeProps(root, searchRequest);
+ }
+ return searchRequest;
+ }
+
+ private flatten() {
+ const searchRequest = this.mergeProps();
+
+ searchRequest.body = searchRequest.body || {};
+ const { body, index, fields, query, filters, highlightAll } = searchRequest;
+
+ const computedFields = index ? index.getComputedFields() : {};
+
+ body.stored_fields = computedFields.storedFields;
+ body.script_fields = body.script_fields || {};
+ _.extend(body.script_fields, computedFields.scriptFields);
+
+ const defaultDocValueFields = computedFields.docvalueFields
+ ? computedFields.docvalueFields
+ : [];
+ body.docvalue_fields = body.docvalue_fields || defaultDocValueFields;
+
+ if (!body.hasOwnProperty('_source') && index) {
+ body._source = index.getSourceFiltering();
+ }
+
+ if (body._source) {
+ // exclude source fields for this index pattern specified by the user
+ const filter = fieldWildcardFilter(body._source.excludes, config.get('metaFields'));
+ body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) =>
+ filter(docvalueField.field)
+ );
+ }
+
+ // if we only want to search for certain fields
+ if (fields) {
+ // filter out the docvalue_fields, and script_fields to only include those that we are concerned with
+ body.docvalue_fields = filterDocvalueFields(body.docvalue_fields, fields);
+ body.script_fields = _.pick(body.script_fields, fields);
+
+ // request the remaining fields from both stored_fields and _source
+ const remainingFields = _.difference(fields, _.keys(body.script_fields));
+ body.stored_fields = remainingFields;
+ _.set(body, '_source.includes', remainingFields);
+ }
+
+ const esQueryConfigs = esQuery.getEsQueryConfig(config);
+ body.query = esQuery.buildEsQuery(index, query, filters, esQueryConfigs);
+
+ if (highlightAll && body.query) {
+ body.highlight = getHighlightRequest(body.query, config.get('doc_table:highlight'));
+ delete searchRequest.highlightAll;
+ }
+
+ const translateToQuery = (filter: esFilters.Filter) => filter && (filter.query || filter);
+
+ // re-write filters within filter aggregations
+ (function recurse(aggBranch) {
+ if (!aggBranch) return;
+ Object.keys(aggBranch).forEach(function(id) {
+ const agg = aggBranch[id];
+
+ if (agg.filters) {
+ // translate filters aggregations
+ const { filters: aggFilters } = agg.filters;
+ Object.keys(aggFilters).forEach(filterId => {
+ aggFilters[filterId] = translateToQuery(aggFilters[filterId]);
+ });
+ }
+
+ recurse(agg.aggs || agg.aggregations);
+ });
+ })(body.aggs || body.aggregations);
+
+ return searchRequest;
+ }
+}
diff --git a/src/legacy/ui/public/courier/search_source/types.ts b/src/legacy/core_plugins/data/public/search/search_source/types.ts
similarity index 94%
rename from src/legacy/ui/public/courier/search_source/types.ts
rename to src/legacy/core_plugins/data/public/search/search_source/types.ts
index 8fd6d8cfa5fa09..9c5b57519d75f9 100644
--- a/src/legacy/ui/public/courier/search_source/types.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/types.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import { NameList } from 'elasticsearch';
-import { esFilters, Query, IndexPattern } from '../../../../../plugins/data/public';
+import { esFilters, IndexPattern, Query } from '../../../../../../plugins/data/public';
export type EsQuerySearchAfter = [string | number, string | number];
@@ -54,7 +54,7 @@ export interface SearchSourceOptions {
callParentStartHandlers?: boolean;
}
-export { SearchSourceContract } from './search_source';
+export { ISearchSource } from './search_source';
export interface SortOptions {
mode?: 'min' | 'max' | 'sum' | 'avg' | 'median';
diff --git a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
index 53a857a72c1a3a..0ec6a6c2e143e7 100644
--- a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
@@ -18,7 +18,7 @@
*/
import { defaultSearchStrategy } from './default_search_strategy';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
import { SearchStrategySearchParams } from './types';
const { search } = defaultSearchStrategy;
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts
new file mode 100644
index 00000000000000..9bfa1df71aa81a
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts
@@ -0,0 +1,78 @@
+/*
+ * 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 { SearchStrategyProvider, SearchStrategySearchParams } from './types';
+import { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
+import {
+ getSearchParams,
+ getMSearchParams,
+ getPreference,
+ getTimeout,
+} from '../fetch/get_search_params';
+
+export const defaultSearchStrategy: SearchStrategyProvider = {
+ id: 'default',
+
+ search: params => {
+ return params.config.get('courier:batchSearches') ? msearch(params) : search(params);
+ },
+
+ isViable: indexPattern => {
+ return indexPattern && isDefaultTypeIndexPattern(indexPattern);
+ },
+};
+
+function msearch({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
+ const inlineRequests = searchRequests.map(({ index, body, search_type: searchType }) => {
+ const inlineHeader = {
+ index: index.title || index,
+ search_type: searchType,
+ ignore_unavailable: true,
+ preference: getPreference(config),
+ };
+ const inlineBody = {
+ ...body,
+ timeout: getTimeout(esShardTimeout),
+ };
+ return `${JSON.stringify(inlineHeader)}\n${JSON.stringify(inlineBody)}`;
+ });
+
+ const searching = es.msearch({
+ ...getMSearchParams(config),
+ body: `${inlineRequests.join('\n')}\n`,
+ });
+ return {
+ searching: searching.then(({ responses }) => responses),
+ abort: searching.abort,
+ };
+}
+
+function search({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
+ const abortController = new AbortController();
+ const searchParams = getSearchParams(config, esShardTimeout);
+ const promises = searchRequests.map(({ index, body }) => {
+ const searching = es.search({ index: index.title || index, body, ...searchParams });
+ abortController.signal.addEventListener('abort', searching.abort);
+ return searching.catch(({ response }) => JSON.parse(response));
+ });
+ return {
+ searching: Promise.all(promises),
+ abort: () => abortController.abort(),
+ };
+}
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/index.ts b/src/legacy/core_plugins/data/public/search/search_strategy/index.ts
new file mode 100644
index 00000000000000..1584baa4faade4
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/index.ts
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+export {
+ addSearchStrategy,
+ hasSearchStategyForIndexPattern,
+ getSearchStrategyById,
+ getSearchStrategyForSearchRequest,
+} from './search_strategy_registry';
+
+export { defaultSearchStrategy } from './default_search_strategy';
+
+export { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
+
+export { SearchError, getSearchErrorType } from './search_error';
diff --git a/src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts b/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
similarity index 93%
rename from src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
index 3785ce63410787..7d03b1dc9e0b1a 100644
--- a/src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
export const isDefaultTypeIndexPattern = (indexPattern: IndexPattern) => {
// Default index patterns don't have `type` defined.
diff --git a/src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts b/src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
similarity index 83%
rename from src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
index 24c3876cfcc051..dc7331e614a0e4 100644
--- a/src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
@@ -27,11 +27,14 @@ export const noOpSearchStrategy: SearchStrategyProvider = {
search: () => {
const searchError = new SearchError({
status: '418', // "I'm a teapot" error
- title: i18n.translate('common.ui.courier.noSearchStrategyRegisteredErrorMessageTitle', {
- defaultMessage: 'No search strategy registered',
- }),
+ title: i18n.translate(
+ 'data.search.searchSource.noSearchStrategyRegisteredErrorMessageTitle',
+ {
+ defaultMessage: 'No search strategy registered',
+ }
+ ),
message: i18n.translate(
- 'common.ui.courier.noSearchStrategyRegisteredErrorMessageDescription',
+ 'data.search.searchSource.noSearchStrategyRegisteredErrorMessageDescription',
{
defaultMessage: `Couldn't find a search strategy for the search request`,
}
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts
new file mode 100644
index 00000000000000..d4042fb17499cb
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+interface SearchErrorOptions {
+ status: string;
+ title: string;
+ message: string;
+ path: string;
+ type: string;
+}
+
+export class SearchError extends Error {
+ public name: string;
+ public status: string;
+ public title: string;
+ public message: string;
+ public path: string;
+ public type: string;
+
+ constructor({ status, title, message, path, type }: SearchErrorOptions) {
+ super(message);
+ this.name = 'SearchError';
+ this.status = status;
+ this.title = title;
+ this.message = message;
+ this.path = path;
+ this.type = type;
+
+ // captureStackTrace is only available in the V8 engine, so any browser using
+ // a different JS engine won't have access to this method.
+ if (Error.captureStackTrace) {
+ Error.captureStackTrace(this, SearchError);
+ }
+
+ // Babel doesn't support traditional `extends` syntax for built-in classes.
+ // https://babeljs.io/docs/en/caveats/#classes
+ Object.setPrototypeOf(this, SearchError.prototype);
+ }
+}
+
+export function getSearchErrorType({ message }: Pick) {
+ const msg = message.toLowerCase();
+ if (msg.indexOf('unsupported query') > -1) {
+ return 'UNSUPPORTED_QUERY';
+ }
+}
diff --git a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
index ae2ed6128c8ea8..73b011896a97dc 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
import { noOpSearchStrategy } from './no_op_search_strategy';
import {
searchStrategies,
diff --git a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
similarity index 97%
rename from src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
index 9ef007f97531ea..d814a04737f753 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
import { SearchStrategyProvider } from './types';
import { noOpSearchStrategy } from './no_op_search_strategy';
import { SearchResponse } from '../types';
diff --git a/src/legacy/ui/public/courier/search_strategy/types.ts b/src/legacy/core_plugins/data/public/search/search_strategy/types.ts
similarity index 94%
rename from src/legacy/ui/public/courier/search_strategy/types.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/types.ts
index 1542f9824a5b1b..ad8576589e4e38 100644
--- a/src/legacy/ui/public/courier/search_strategy/types.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/types.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
import { FetchHandlers } from '../fetch/types';
import { SearchRequest, SearchResponse } from '../types';
diff --git a/src/legacy/core_plugins/data/public/search/types.ts b/src/legacy/core_plugins/data/public/search/types.ts
new file mode 100644
index 00000000000000..23d74ce6a57da8
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/types.ts
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+export * from './fetch/types';
+export * from './search_source/types';
+export * from './search_strategy/types';
+export * from './utils/types';
diff --git a/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts
similarity index 72%
rename from src/legacy/ui/public/courier/utils/courier_inspector_utils.ts
rename to src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts
index b4d5d5537333e3..7f7d216d8f0f3f 100644
--- a/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts
+++ b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts
@@ -26,28 +26,28 @@
import { i18n } from '@kbn/i18n';
import { SearchResponse } from 'elasticsearch';
-import { SearchSourceContract, RequestInspectorStats } from '../types';
+import { ISearchSource, RequestInspectorStats } from '../types';
-export function getRequestInspectorStats(searchSource: SearchSourceContract) {
+export function getRequestInspectorStats(searchSource: ISearchSource) {
const stats: RequestInspectorStats = {};
const index = searchSource.getField('index');
if (index) {
stats.indexPattern = {
- label: i18n.translate('common.ui.courier.indexPatternLabel', {
+ label: i18n.translate('data.search.searchSource.indexPatternLabel', {
defaultMessage: 'Index pattern',
}),
value: index.title,
- description: i18n.translate('common.ui.courier.indexPatternDescription', {
+ description: i18n.translate('data.search.searchSource.indexPatternDescription', {
defaultMessage: 'The index pattern that connected to the Elasticsearch indices.',
}),
};
stats.indexPatternId = {
- label: i18n.translate('common.ui.courier.indexPatternIdLabel', {
+ label: i18n.translate('data.search.searchSource.indexPatternIdLabel', {
defaultMessage: 'Index pattern ID',
}),
value: index.id!,
- description: i18n.translate('common.ui.courier.indexPatternIdDescription', {
+ description: i18n.translate('data.search.searchSource.indexPatternIdDescription', {
defaultMessage: 'The ID in the {kibanaIndexPattern} index.',
values: { kibanaIndexPattern: '.kibana' },
}),
@@ -58,7 +58,7 @@ export function getRequestInspectorStats(searchSource: SearchSourceContract) {
}
export function getResponseInspectorStats(
- searchSource: SearchSourceContract,
+ searchSource: ISearchSource,
resp: SearchResponse
) {
const lastRequest = searchSource.history && searchSource.history[searchSource.history.length - 1];
@@ -66,14 +66,14 @@ export function getResponseInspectorStats(
if (resp && resp.took) {
stats.queryTime = {
- label: i18n.translate('common.ui.courier.queryTimeLabel', {
+ label: i18n.translate('data.search.searchSource.queryTimeLabel', {
defaultMessage: 'Query time',
}),
- value: i18n.translate('common.ui.courier.queryTimeValue', {
+ value: i18n.translate('data.search.searchSource.queryTimeValue', {
defaultMessage: '{queryTime}ms',
values: { queryTime: resp.took },
}),
- description: i18n.translate('common.ui.courier.queryTimeDescription', {
+ description: i18n.translate('data.search.searchSource.queryTimeDescription', {
defaultMessage:
'The time it took to process the query. ' +
'Does not include the time to send the request or parse it in the browser.',
@@ -83,21 +83,21 @@ export function getResponseInspectorStats(
if (resp && resp.hits) {
stats.hitsTotal = {
- label: i18n.translate('common.ui.courier.hitsTotalLabel', {
+ label: i18n.translate('data.search.searchSource.hitsTotalLabel', {
defaultMessage: 'Hits (total)',
}),
value: `${resp.hits.total}`,
- description: i18n.translate('common.ui.courier.hitsTotalDescription', {
+ description: i18n.translate('data.search.searchSource.hitsTotalDescription', {
defaultMessage: 'The number of documents that match the query.',
}),
};
stats.hits = {
- label: i18n.translate('common.ui.courier.hitsLabel', {
+ label: i18n.translate('data.search.searchSource.hitsLabel', {
defaultMessage: 'Hits',
}),
value: `${resp.hits.hits.length}`,
- description: i18n.translate('common.ui.courier.hitsDescription', {
+ description: i18n.translate('data.search.searchSource.hitsDescription', {
defaultMessage: 'The number of documents returned by the query.',
}),
};
@@ -105,14 +105,14 @@ export function getResponseInspectorStats(
if (lastRequest && (lastRequest.ms === 0 || lastRequest.ms)) {
stats.requestTime = {
- label: i18n.translate('common.ui.courier.requestTimeLabel', {
+ label: i18n.translate('data.search.searchSource.requestTimeLabel', {
defaultMessage: 'Request time',
}),
- value: i18n.translate('common.ui.courier.requestTimeValue', {
+ value: i18n.translate('data.search.searchSource.requestTimeValue', {
defaultMessage: '{requestTime}ms',
values: { requestTime: lastRequest.ms },
}),
- description: i18n.translate('common.ui.courier.requestTimeDescription', {
+ description: i18n.translate('data.search.searchSource.requestTimeDescription', {
defaultMessage:
'The time of the request from the browser to Elasticsearch and back. ' +
'Does not include the time the requested waited in the queue.',
diff --git a/src/legacy/core_plugins/data/public/search/utils/index.ts b/src/legacy/core_plugins/data/public/search/utils/index.ts
new file mode 100644
index 00000000000000..021ece8701e981
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/utils/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export * from './courier_inspector_utils';
diff --git a/src/legacy/ui/public/courier/utils/types.ts b/src/legacy/core_plugins/data/public/search/utils/types.ts
similarity index 100%
rename from src/legacy/ui/public/courier/utils/types.ts
rename to src/legacy/core_plugins/data/public/search/utils/types.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts
index 864ce3b146689f..176fe68fe4788a 100644
--- a/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts
@@ -17,13 +17,13 @@
* under the License.
*/
-import { SearchSource as SearchSourceClass } from 'ui/courier';
+import { SearchSource as SearchSourceClass, ISearchSource } from 'ui/courier';
import { Class } from '@kbn/utility-types';
export { Vis, VisParams } from 'ui/vis';
export { VisOptionsProps } from 'ui/vis/editors/default';
export { ValidatedDualRange } from 'ui/validated_range';
-export { SearchSourceFields } from 'ui/courier/types';
+export { SearchSourceFields } from '../../data/public';
-export type SearchSource = Class;
+export type SearchSource = Class;
export const SearchSource = SearchSourceClass;
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
index bad006aa8c7d5a..24efbc2d41f4fd 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
+++ b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
@@ -24,6 +24,8 @@ import { findTestSubject } from '@elastic/eui/lib/test';
import { flattenHitWrapper } from '../../../../data/public/';
import { DocViewTable } from './table';
+jest.mock('ui/new_platform');
+
// @ts-ignore
const indexPattern = {
fields: {
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index dd741197376575..111b74d8aa6af9 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -26,14 +26,11 @@ import { importApi } from './server/routes/api/import';
import { exportApi } from './server/routes/api/export';
import { homeApi } from './server/routes/api/home';
import { managementApi } from './server/routes/api/management';
-import { scriptsApi } from './server/routes/api/scripts';
-import { registerKqlTelemetryApi } from './server/routes/api/kql_telemetry';
import { registerFieldFormats } from './server/field_formats/register';
import { registerTutorials } from './server/tutorials/register';
import * as systemApi from './server/lib/system_api';
import mappings from './mappings.json';
import { getUiSettingDefaults } from './ui_setting_defaults';
-import { makeKQLUsageCollector } from './server/lib/kql_usage_collector';
import { registerCspCollector } from './server/lib/csp_usage_collector';
import { injectVars } from './inject_vars';
import { i18n } from '@kbn/i18n';
@@ -325,15 +322,12 @@ export default function(kibana) {
init: async function(server) {
const { usageCollection } = server.newPlatform.setup.plugins;
// routes
- scriptsApi(server);
importApi(server);
exportApi(server);
homeApi(server);
managementApi(server);
- registerKqlTelemetryApi(server);
registerFieldFormats(server);
registerTutorials(server);
- makeKQLUsageCollector(usageCollection, server);
registerCspCollector(usageCollection, server);
server.expose('systemApi', systemApi);
server.injectUiAppVars('kibana', () => injectVars(server));
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc b/src/legacy/core_plugins/kibana/public/.eslintrc
deleted file mode 100644
index cc44af915ba258..00000000000000
--- a/src/legacy/core_plugins/kibana/public/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-rules:
- no-console: 2
- 'import/no-default-export': error
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc.js b/src/legacy/core_plugins/kibana/public/.eslintrc.js
new file mode 100644
index 00000000000000..160adcc5b63f1b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/.eslintrc.js
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+const path = require('path');
+
+/**
+ * Builds custom restricted paths configuration for the shimmed plugins within the kibana plugin.
+ * These custom rules extend the default checks in the top level `eslintrc.js` by also checking two other things:
+ * * Making sure nothing within np_ready imports from the `ui` directory
+ * * Making sure no other code is importing things deep from within the shimmed plugins
+ * @param shimmedPlugins List of plugin names within the kibana plugin that are partially np ready
+ * @returns zones configuration for the no-restricted-paths linter
+ */
+function buildRestrictedPaths(shimmedPlugins) {
+ return shimmedPlugins.map(shimmedPlugin => ([{
+ target: [
+ `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/np_ready/**/*`,
+ ],
+ from: [
+ 'ui/**/*',
+ 'src/legacy/ui/**/*',
+ 'src/legacy/core_plugins/kibana/public/**/*',
+ 'src/legacy/core_plugins/data/public/**/*',
+ '!src/legacy/core_plugins/data/public/index.ts',
+ `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+ ],
+ allowSameFolder: false,
+ errorMessage: `${shimmedPlugin} is a shimmed plugin that is not allowed to import modules from the legacy platform. If you need legacy modules for the transition period, import them either in the legacy_imports, kibana_services or index module.`,
+ }, {
+ target: [
+ 'src/**/*',
+ `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+ 'x-pack/**/*',
+ ],
+ from: [
+ `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+ `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/index.ts`,
+ ],
+ allowSameFolder: false,
+ errorMessage: `kibana/public/${shimmedPlugin} is behaving like a NP plugin and does not allow deep imports. If you need something from within ${shimmedPlugin} in another plugin, consider re-exporting it from the top level index module`,
+ }])).reduce((acc, part) => [...acc, ...part], []);
+}
+
+module.exports = {
+ rules: {
+ 'no-console': 2,
+ 'import/no-default-export': 'error',
+ '@kbn/eslint/no-restricted-paths': [
+ 'error',
+ {
+ basePath: path.resolve(__dirname, '../../../../../'),
+ zones: buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools', 'home']),
+ },
+ ],
+ },
+};
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
index 653e7d4215eefe..1c450879ee5530 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
@@ -18,7 +18,10 @@
*/
import React from 'react';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { DashboardEmptyScreen, DashboardEmptyScreenProps } from '../dashboard_empty_screen';
+import {
+ DashboardEmptyScreen,
+ DashboardEmptyScreenProps,
+} from '../np_ready/dashboard_empty_screen';
// @ts-ignore
import { findTestSubject } from '@elastic/eui/lib/test';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
index bf7135098ea74b..1c2405b5824f23 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { searchSourceMock } from '../../../../../ui/public/courier/search_source/mocks';
+import { searchSourceMock } from 'ui/courier/search_source/mocks';
import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
export function getSavedDashboardMock(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
index dccc4c11e334f8..fd39f28a7673a1 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/index.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
@@ -17,19 +17,15 @@
* under the License.
*/
-import {
- npSetup,
- npStart,
- SavedObjectRegistryProvider,
- legacyChrome,
- IPrivate,
-} from './legacy_imports';
+import { npSetup, npStart, legacyChrome } from './legacy_imports';
import { DashboardPlugin, LegacyAngularInjectedDependencies } from './plugin';
import { start as data } from '../../../data/public/legacy';
import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
-import './saved_dashboard/saved_dashboards';
+import './saved_dashboard/saved_dashboard_register';
import './dashboard_config';
+export * from './np_ready/dashboard_constants';
+
/**
* Get dependencies relying on the global angular context.
* They also have to get resolved together with the legacy imports above
@@ -37,14 +33,8 @@ import './dashboard_config';
async function getAngularDependencies(): Promise {
const injector = await legacyChrome.dangerouslyGetActiveInjector();
- const Private = injector.get('Private');
-
- const savedObjectRegistry = Private(SavedObjectRegistryProvider);
-
return {
dashboardConfig: injector.get('dashboardConfig'),
- savedObjectRegistry,
- savedDashboards: injector.get('savedDashboards'),
};
}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index adae063a1470bb..ec0913e5fb3e77 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -32,7 +32,6 @@ export { AppState } from 'ui/state_management/app_state';
export { AppStateClass } from 'ui/state_management/app_state';
export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
export { npSetup, npStart } from 'ui/new_platform';
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
export { IPrivate } from 'ui/private';
export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
@@ -57,7 +56,7 @@ export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_to
// @ts-ignore
export { PromiseServiceCreator } from 'ui/promises/promises';
// @ts-ignore
-export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
+export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
// @ts-ignore
export { confirmModalFactory } from 'ui/modals/confirm_modal';
export { configureAppAngularModule } from 'ui/legacy_compat';
@@ -65,3 +64,6 @@ export { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_mon
export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
export { IInjector } from 'ui/chrome';
+export { SavedObjectLoader } from 'ui/saved_objects';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
+export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
index 09677f149c064c..ad4feacde08156 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
@@ -37,7 +37,7 @@ jest.mock(
jest.mock('ui/new_platform');
import { migratePanelsTo730 } from './migrate_to_730_panels';
-import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../types';
+import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../np_ready/types';
import {
RawSavedDashboardPanelTo60,
RawSavedDashboardPanel610,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
index b1b5a57ca27dc9..b0d20b44827281 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
@@ -34,7 +34,7 @@ import {
SavedDashboardPanel620,
SavedDashboardPanel630,
SavedDashboardPanel610,
-} from '../types';
+} from '../np_ready/types';
const PANEL_HEIGHT_SCALE_FACTOR = 5;
const PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS = 4;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
index 7fba2f4003f310..c264358a8f81fb 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { GridData } from '../types';
+import { GridData } from '../np_ready/types';
import { Doc, DocPre700 } from '../../../migrations/types';
export interface SavedObjectAttributes {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/dashboard/application.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 3482197e381e68..2a5dedab981510 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -19,7 +19,6 @@
import { EuiConfirmModal, EuiIcon } from '@elastic/eui';
import angular, { IModule } from 'angular';
-import { IPrivate } from 'ui/private';
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
import {
AppMountContext,
@@ -28,7 +27,7 @@ import {
SavedObjectsClientContract,
IUiSettingsClient,
} from 'kibana/public';
-import { Storage } from '../../../../../plugins/kibana_utils/public';
+import { Storage } from '../../../../../../plugins/kibana_utils/public';
import {
GlobalStateProvider,
StateManagementConfigProvider,
@@ -43,23 +42,24 @@ import {
RedirectWhenMissingProvider,
confirmModalFactory,
configureAppAngularModule,
-} from './legacy_imports';
+ SavedObjectLoader,
+ IPrivate,
+} from '../legacy_imports';
// @ts-ignore
import { initDashboardApp } from './legacy_app';
-import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
-import { SharePluginStart } from '../../../../../plugins/share/public';
+import { IEmbeddableStart } from '../../../../../../plugins/embeddable/public';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
+import { DataPublicPluginStart as NpDataStart } from '../../../../../../plugins/data/public';
+import { SharePluginStart } from '../../../../../../plugins/share/public';
export interface RenderDeps {
core: LegacyCoreStart;
npDataStart: NpDataStart;
navigation: NavigationStart;
savedObjectsClient: SavedObjectsClientContract;
- savedObjectRegistry: any;
+ savedDashboards: SavedObjectLoader;
dashboardConfig: any;
- savedDashboards: any;
dashboardCapabilities: any;
uiSettings: IUiSettingsClient;
chrome: ChromeStart;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
index 04a8e68276fc20..e9fdc335ba5729 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -25,10 +25,10 @@ import {
AppState as TAppState,
IInjector,
KbnUrl,
-} from './legacy_imports';
+} from '../legacy_imports';
-import { ViewMode } from '../../../embeddable_api/public/np_ready/public';
-import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
+import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
+import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types';
import {
IIndexPattern,
@@ -36,7 +36,7 @@ import {
Query,
esFilters,
SavedQuery,
-} from '../../../../../../src/plugins/data/public';
+} from '../../../../../../plugins/data/public';
import { DashboardAppController } from './dashboard_app_controller';
import { RenderDeps } from './application';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 24b64a88998f4e..5ba457b6c33620 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -37,9 +37,10 @@ import {
KbnUrl,
SavedObjectSaveOpts,
unhashUrl,
-} from './legacy_imports';
-import { FilterStateManager, IndexPattern } from '../../../data/public';
-import { Query, SavedQuery, IndexPatternsContract } from '../../../../../plugins/data/public';
+ VISUALIZE_EMBEDDABLE_TYPE,
+} from '../legacy_imports';
+import { FilterStateManager, IndexPattern } from '../../../../data/public';
+import { Query, SavedQuery, IndexPatternsContract } from '../../../../../../plugins/data/public';
import {
DashboardContainer,
@@ -47,14 +48,14 @@ import {
DashboardContainerFactory,
DashboardContainerInput,
DashboardPanelState,
-} from '../../../dashboard_embeddable_container/public/np_ready/public';
+} from '../../../../dashboard_embeddable_container/public/np_ready/public';
import {
isErrorEmbeddable,
ErrorEmbeddable,
ViewMode,
openAddPanelFlyout,
EmbeddableFactoryNotFoundError,
-} from '../../../embeddable_api/public/np_ready/public';
+} from '../../../../embeddable_api/public/np_ready/public';
import { DashboardAppState, NavAction, ConfirmModalFn, SavedDashboardPanel } from './types';
import { showOptionsPopover } from './top_nav/show_options_popover';
@@ -67,13 +68,12 @@ import { getTopNavConfig } from './top_nav/get_top_nav_config';
import { TopNavIds } from './top_nav/top_nav_ids';
import { getDashboardTitle } from './dashboard_strings';
import { DashboardAppScope } from './dashboard_app';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize/embeddable';
import { convertSavedDashboardPanelToPanelState } from './lib/embeddable_saved_object_converters';
import { RenderDeps } from './application';
import {
SavedObjectFinderProps,
SavedObjectFinderUi,
-} from '../../../../../plugins/kibana_react/public';
+} from '../../../../../../plugins/kibana_react/public';
export interface DashboardAppControllerDependencies extends RenderDeps {
$scope: DashboardAppScope;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen_constants.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen_constants.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
index 8b786144c74205..4d5101e1f9e5f7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
@@ -19,8 +19,8 @@
import './np_core.test.mocks';
import { DashboardStateManager } from './dashboard_state_manager';
-import { getAppStateMock, getSavedDashboardMock } from './__tests__';
-import { AppStateClass } from './legacy_imports';
+import { getAppStateMock, getSavedDashboardMock } from '../__tests__';
+import { AppStateClass } from '../legacy_imports';
import { DashboardAppState } from './types';
import { TimeRange, TimefilterContract, InputTimeRange } from 'src/plugins/data/public';
import { ViewMode } from 'src/plugins/embeddable/public';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
index ac8628ec2a9d94..6df18757da6f51 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
@@ -23,23 +23,23 @@ import _ from 'lodash';
import { Moment } from 'moment';
import { DashboardContainer } from 'src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
+import { ViewMode } from '../../../../../../plugins/embeddable/public';
import {
stateMonitorFactory,
StateMonitor,
AppStateClass as TAppStateClass,
migrateLegacyQuery,
-} from './legacy_imports';
+} from '../legacy_imports';
import {
Query,
esFilters,
TimefilterContract as Timefilter,
-} from '../../../../../../src/plugins/data/public';
+} from '../../../../../../plugins/data/public';
import { getAppStateDefaults, migrateAppState } from './lib';
import { convertPanelStateToSavedDashboardPanel } from './lib/embeddable_saved_object_converters';
import { FilterUtils } from './lib/filter_utils';
-import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
import { SavedDashboardPanel, DashboardAppState, DashboardAppStateDefaults } from './types';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
index d932116d08dc8f..d9406ccba18ba3 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
@@ -18,7 +18,7 @@
*/
import { i18n } from '@kbn/i18n';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
+import { ViewMode } from '../../../../../../plugins/embeddable/public';
/**
* @param title {string} the current title of the dashboard
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.ts
index 8a733f940734b9..1a6c2b09ee3fc2 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { State } from './legacy_imports';
-import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
+import { State } from '../legacy_imports';
+import { DataPublicPluginStart as NpDataStart } from '../../../../../../plugins/data/public';
/**
* Helper function to sync the global state with the various state providers
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts
similarity index 80%
rename from src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts
index 55abfa179b56d8..bc281c6eb340f3 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts
@@ -18,9 +18,12 @@
*/
import { i18n } from '@kbn/i18n';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
+import { CoreStart } from 'kibana/public';
-export function addHelpMenuToAppChrome(chrome) {
+export function addHelpMenuToAppChrome(
+ chrome: CoreStart['chrome'],
+ docLinks: CoreStart['docLinks']
+) {
chrome.setHelpExtension({
appName: i18n.translate('kbn.dashboard.helpMenu.appName', {
defaultMessage: 'Dashboards',
@@ -28,7 +31,7 @@ export function addHelpMenuToAppChrome(chrome) {
links: [
{
linkType: 'documentation',
- href: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`,
+ href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/dashboard.html`,
},
],
});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
index 927717948168a8..540bfcf5aa6847 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -22,23 +22,35 @@ import { i18n } from '@kbn/i18n';
import dashboardTemplate from './dashboard_app.html';
import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
-import { ensureDefaultIndexPattern } from './legacy_imports';
+import {
+ ensureDefaultIndexPattern,
+ registerTimefilterWithGlobalStateFactory,
+} from '../legacy_imports';
import { initDashboardAppDirective } from './dashboard_app';
import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
import {
InvalidJSONProperty,
SavedObjectNotFound,
-} from '../../../../../plugins/kibana_utils/public';
+} from '../../../../../../plugins/kibana_utils/public';
import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing';
import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
-import { registerTimefilterWithGlobalStateFactory } from '../../../../ui/public/timefilter/setup_router';
import { syncOnMount } from './global_state_sync';
export function initDashboardApp(app, deps) {
initDashboardAppDirective(app, deps);
app.directive('dashboardListing', function(reactDirective) {
- return reactDirective(DashboardListing);
+ return reactDirective(DashboardListing, [
+ ['core', { watchDepth: 'reference' }],
+ ['createItem', { watchDepth: 'reference' }],
+ ['getViewUrl', { watchDepth: 'reference' }],
+ ['editItem', { watchDepth: 'reference' }],
+ ['findItems', { watchDepth: 'reference' }],
+ ['deleteItems', { watchDepth: 'reference' }],
+ ['listingLimit', { watchDepth: 'reference' }],
+ ['hideWriteControls', { watchDepth: 'reference' }],
+ ['initialFilter', { watchDepth: 'reference' }],
+ ]);
});
function createNewDashboardCtrl($scope) {
@@ -86,7 +98,8 @@ export function initDashboardApp(app, deps) {
...defaults,
template: dashboardListingTemplate,
controller($injector, $location, $scope) {
- const services = deps.savedObjectRegistry.byLoaderPropertiesName;
+ const service = deps.savedDashboards;
+
const kbnUrl = $injector.get('kbnUrl');
const dashboardConfig = deps.dashboardConfig;
@@ -95,7 +108,7 @@ export function initDashboardApp(app, deps) {
kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
};
$scope.find = search => {
- return services.dashboards.find(search, $scope.listingLimit);
+ return service.find(search, $scope.listingLimit);
};
$scope.editItem = ({ id }) => {
kbnUrl.redirect(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
@@ -104,7 +117,7 @@ export function initDashboardApp(app, deps) {
return deps.addBasePath(`#${createDashboardEditUrl(id)}`);
};
$scope.delete = dashboards => {
- return services.dashboards.delete(dashboards.map(d => d.id));
+ return service.delete(dashboards.map(d => d.id));
};
$scope.hideWriteControls = dashboardConfig.getHideWriteControls();
$scope.initialFilter = $location.search().filter || EMPTY_FILTER;
@@ -116,6 +129,7 @@ export function initDashboardApp(app, deps) {
},
]);
addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
+ $scope.core = deps.core;
},
resolve: {
dash: function($rootScope, $route, redirectWhenMissing, kbnUrl) {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
index 19a0c32210737b..6fbc04969b1c8c 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
@@ -19,7 +19,7 @@
import _ from 'lodash';
import moment, { Moment } from 'moment';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../../../../plugins/data/public';
/**
* @typedef {Object} QueryFilter
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
index eb4a4356fb27a6..eceb51f17d164d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { ViewMode } from '../../../../../../../src/plugins/embeddable/public';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
+import { ViewMode } from '../../../../../../../plugins/embeddable/public';
+import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
import { DashboardAppStateDefaults } from '../types';
export function getAppStateDefaults(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/index.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
index c4ad754548459d..4083900c7ede7e 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
@@ -19,7 +19,7 @@
import semver from 'semver';
import { i18n } from '@kbn/i18n';
-import { createUiStatsReporter, METRIC_TYPE } from '../../../../ui_metric/public';
+import { createUiStatsReporter, METRIC_TYPE } from '../../../../../ui_metric/public';
import {
DashboardAppState,
SavedDashboardPanelTo60,
@@ -29,7 +29,7 @@ import {
SavedDashboardPanel640To720,
SavedDashboardPanel620,
} from '../types';
-import { migratePanelsTo730 } from '../migrations/migrate_to_730_panels';
+import { migratePanelsTo730 } from '../../migrations/migrate_to_730_panels';
/**
* Attempts to migrate the state stored in the URL into the latest version of it.
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
index e322677433ce6f..691c87122564f6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
@@ -18,7 +18,7 @@
*/
import { TimefilterContract } from 'src/plugins/data/public';
-import { SavedObjectSaveOpts } from '../legacy_imports';
+import { SavedObjectSaveOpts } from '../../legacy_imports';
import { updateSavedDashboard } from './update_saved_dashboard';
import { DashboardStateManager } from '../dashboard_state_manager';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
index ce9096b3a56f0c..2072b5d4f6eb06 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
@@ -19,9 +19,9 @@
import _ from 'lodash';
import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public';
-import { AppState } from '../legacy_imports';
+import { AppState } from '../../legacy_imports';
import { FilterUtils } from './filter_utils';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
export function updateSavedDashboard(
savedDashboard: SavedObjectDashboard,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
index 2946597581fdb5..827fe6eabe7849 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
@@ -23,9 +23,8 @@ import PropTypes from 'prop-types';
import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { npStart } from 'ui/new_platform';
-import { TableListView } from '../../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '../../../../../../../plugins/kibana_react/public';
export const EMPTY_FILTER = '';
@@ -60,8 +59,8 @@ export class DashboardListing extends React.Component {
tableListTitle={i18n.translate('kbn.dashboard.listing.dashboardsTitle', {
defaultMessage: 'Dashboards',
})}
- toastNotifications={npStart.core.notifications.toasts}
- uiSettings={npStart.core.uiSettings}
+ toastNotifications={this.props.core.notifications.toasts}
+ uiSettings={this.props.core.uiSettings}
/>
);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
index a933607d256a95..c47a54ad60460b 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
@@ -42,17 +42,6 @@ jest.mock(
{ virtual: true }
);
-jest.mock('ui/new_platform', () => {
- return {
- npStart: {
- core: {
- notifications: { toasts: {} },
- uiSettings: { get: jest.fn(() => 10) },
- },
- },
- };
-});
-
import React from 'react';
import { shallow } from 'enzyme';
@@ -83,6 +72,7 @@ test('renders empty page in before initial fetch to avoid flickering', () => {
getViewUrl={() => {}}
listingLimit={1000}
hideWriteControls={false}
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
expect(component).toMatchSnapshot();
@@ -100,6 +90,7 @@ describe('after fetch', () => {
listingLimit={1000}
hideWriteControls={false}
initialFilter="my dashboard"
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
@@ -121,6 +112,7 @@ describe('after fetch', () => {
getViewUrl={() => {}}
listingLimit={1000}
hideWriteControls={false}
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
@@ -142,6 +134,7 @@ describe('after fetch', () => {
getViewUrl={() => {}}
listingLimit={1}
hideWriteControls={false}
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
@@ -163,6 +156,7 @@ describe('after fetch', () => {
getViewUrl={() => {}}
listingLimit={1}
hideWriteControls={true}
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
@@ -184,6 +178,7 @@ describe('after fetch', () => {
getViewUrl={() => {}}
listingLimit={1}
hideWriteControls={false}
+ core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
/>
);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
index a1dd9f30bdd81f..f473e91af7ae9d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
@@ -1,4 +1,5 @@
({
+jest.mock('../../legacy_imports', () => ({
SavedObjectSaveModal: () => null,
}));
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
index 0640b2be431be9..bd53fd5a13083e 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
@@ -21,7 +21,7 @@ import React, { Fragment } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui';
-import { SavedObjectSaveModal } from '../legacy_imports';
+import { SavedObjectSaveModal } from '../../legacy_imports';
interface SaveOptions {
newTitle: string;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_options_popover.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_options_popover.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/top_nav_ids.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/top_nav_ids.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/types.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
index 371274401739e0..e3eb25a208856f 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/types.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
@@ -18,7 +18,7 @@
*/
import { ViewMode } from 'src/plugins/embeddable/public';
-import { AppState } from './legacy_imports';
+import { AppState } from '../legacy_imports';
import {
RawSavedDashboardPanelTo60,
RawSavedDashboardPanel610,
@@ -26,8 +26,8 @@ import {
RawSavedDashboardPanel630,
RawSavedDashboardPanel640To720,
RawSavedDashboardPanel730ToLatest,
-} from './migrations/types';
-import { Query, esFilters } from '../../../../../plugins/data/public';
+} from '../migrations/types';
+import { Query, esFilters } from '../../../../../../plugins/data/public';
export type NavAction = (anchorElement?: any) => void;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index 0e0d315ce592dc..ca4b18a37504c6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -26,24 +26,23 @@ import {
SavedObjectsClientContract,
} from 'kibana/public';
import { i18n } from '@kbn/i18n';
-import { RenderDeps } from './application';
+import { RenderDeps } from './np_ready/application';
import { DataStart } from '../../../data/public';
import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
import { Storage } from '../../../../../plugins/kibana_utils/public';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { DashboardConstants } from './dashboard_constants';
+import { DashboardConstants } from './np_ready/dashboard_constants';
import {
FeatureCatalogueCategory,
HomePublicPluginSetup,
} from '../../../../../plugins/home/public';
import { SharePluginStart } from '../../../../../plugins/share/public';
import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import { createSavedDashboardLoader } from './saved_dashboard/saved_dashboards';
export interface LegacyAngularInjectedDependencies {
dashboardConfig: any;
- savedObjectRegistry: any;
- savedDashboards: any;
}
export interface DashboardPluginStartDependencies {
@@ -90,6 +89,13 @@ export class DashboardPlugin implements Plugin {
npDataStart,
} = this.startDependencies;
const angularDependencies = await getAngularDependencies();
+ const savedDashboards = createSavedDashboardLoader({
+ savedObjectsClient,
+ indexPatterns: npDataStart.indexPatterns,
+ chrome: contextCore.chrome,
+ overlays: contextCore.overlays,
+ });
+
const deps: RenderDeps = {
core: contextCore as LegacyCoreStart,
...angularDependencies,
@@ -97,6 +103,7 @@ export class DashboardPlugin implements Plugin {
share,
npDataStart,
savedObjectsClient,
+ savedDashboards,
chrome: contextCore.chrome,
addBasePath: contextCore.http.basePath.prepend,
uiSettings: contextCore.uiSettings,
@@ -105,7 +112,7 @@ export class DashboardPlugin implements Plugin {
dashboardCapabilities: contextCore.application.capabilities.dashboard,
localStorage: new Storage(localStorage),
};
- const { renderApp } = await import('./application');
+ const { renderApp } = await import('./np_ready/application');
return renderApp(params.element, params.appBasePath, deps);
},
};
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
index dc52b3ab7ad177..18e15b215523e4 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { SearchSourceContract } from 'ui/courier';
+import { ISearchSource } from 'ui/courier';
import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
import { extractReferences, injectReferences } from './saved_dashboard_references';
-import { createDashboardEditUrl } from '../dashboard_constants';
import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public';
+import { createDashboardEditUrl } from '..';
export interface SavedObjectDashboard extends SavedObject {
id?: string;
@@ -36,7 +36,7 @@ export interface SavedObjectDashboard extends SavedObject {
uiStateJSON?: string;
lastSavedTitle: string;
refreshInterval?: RefreshInterval;
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
getQuery(): Query;
getFilters(): esFilters.Filter[];
}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts
index 31ee7299e1ff16..b9ea49ca4fd441 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts
@@ -16,10 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { i18n } from '@kbn/i18n';
+import { npStart } from 'ui/new_platform';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+// @ts-ignore
+import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+import { createSavedDashboardLoader } from './saved_dashboards';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import './saved_dashboards';
+const module = uiModules.get('app/dashboard');
-SavedObjectRegistryProvider.register((savedDashboards: any) => {
- return savedDashboards;
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+savedObjectManagementRegistry.register({
+ service: 'savedDashboards',
+ title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
+ defaultMessage: 'dashboards',
+ }),
});
+
+// this is no longer used in the conroller, but just here for savedObjectManagementRegistry
+module.service('savedDashboards', () =>
+ createSavedDashboardLoader({
+ savedObjectsClient: npStart.core.savedObjects.client,
+ indexPatterns: npStart.plugins.data.indexPatterns,
+ chrome: npStart.core.chrome,
+ overlays: npStart.core.overlays,
+ })
+);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
index 768dc6650595f7..4ece5d46358ba5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
@@ -17,36 +17,11 @@
* under the License.
*/
-import { i18n } from '@kbn/i18n';
-import { npStart } from 'ui/new_platform';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/saved_objects';
-// @ts-ignore
-import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
import { createSavedDashboardClass } from './saved_dashboard';
-const module = uiModules.get('app/dashboard');
-
-// Register this service with the saved object registry so it can be
-// edited by the object editor.
-savedObjectManagementRegistry.register({
- service: 'savedDashboards',
- title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
- defaultMessage: 'dashboards',
- }),
-});
-
-// This is the only thing that gets injected into controllers
-module.service('savedDashboards', function() {
- const savedObjectsClient = npStart.core.savedObjects.client;
- const services = {
- savedObjectsClient,
- indexPatterns: npStart.plugins.data.indexPatterns,
- chrome: npStart.core.chrome,
- overlays: npStart.core.overlays,
- };
-
+export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {
const SavedDashboard = createSavedDashboardClass(services);
- return new SavedObjectLoader(SavedDashboard, savedObjectsClient, npStart.core.chrome);
-});
+ return new SavedObjectLoader(SavedDashboard, services.savedObjectsClient, services.chrome);
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
index dcd04d31af0763..378a9e93256557 100644
--- a/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/directives/field_calculator.js
@@ -20,7 +20,7 @@
import _ from 'lodash';
import { pluginInstance } from 'plugins/kibana/discover/index';
import ngMock from 'ng_mock';
-import { fieldCalculator } from '../../components/field_chooser/lib/field_calculator';
+import { fieldCalculator } from '../../np_ready/components/field_chooser/lib/field_calculator';
import expect from '@kbn/expect';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/doc_table.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/doc_table.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
index f264f0fb4d7546..d9fdcc48608d22 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
@@ -20,7 +20,7 @@
import expect from '@kbn/expect';
import ngMock from 'ng_mock';
-import { getSort } from '../../lib/get_sort';
+import { getSort } from '../../../np_ready/angular/doc_table/lib/get_sort';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
const defaultSort = [{ time: 'desc' }];
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
index 677a067e7b3fea..012f2b6061ee42 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
@@ -50,14 +50,18 @@ describe('Doc Table', function() {
// Stub `getConverterFor` for a field in the indexPattern to return mock data.
// Returns `val` if provided, otherwise generates fake data for the field.
fakeRowVals = getFakeRowVals('formatted', 0, mapping);
- stubFieldFormatConverter = function($root, field, val = null) {
- $root.indexPattern.fields.getByName(field).format.getConverterFor = () => (...args) => {
+ stubFieldFormatConverter = function($root, field, val) {
+ const convertFn = (value, type, options) => {
if (val) {
return val;
}
- const fieldName = _.get(args, '[1].name', null);
+ const fieldName = _.get(options, 'field.name', null);
+
return fakeRowVals[fieldName] || '';
};
+
+ $root.indexPattern.fields.getByName(field).format.convert = convertFn;
+ $root.indexPattern.fields.getByName(field).format.getConverterFor = () => convertFn;
};
})
);
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/_utils.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/_utils.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
index 1dbdea4c89f00f..90614cf3c132c2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
@@ -20,8 +20,8 @@
import expect from '@kbn/expect';
import ngMock from 'ng_mock';
import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
-import { createIndexPatternsStub } from '../../api/__tests__/_stubs';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
+import { createIndexPatternsStub } from '../../np_ready/angular/context/api/__tests__/_stubs';
import { pluginInstance } from 'plugins/kibana/discover/index';
import { npStart } from 'ui/new_platform';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
index 52db1bab649456..1ad4bdbea210db 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
import ngMock from 'ng_mock';
import { pluginInstance } from 'plugins/kibana/discover/index';
import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
describe('context app', function() {
beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
index 6cc5e1ae6db042..e9ec2c300faa11 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
@@ -22,7 +22,7 @@ import ngMock from 'ng_mock';
import { pluginInstance } from 'plugins/kibana/discover/index';
import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
describe('context app', function() {
beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
index a976cf0d04d20d..15f3eefac3fd1a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
@@ -22,7 +22,7 @@ import ngMock from 'ng_mock';
import { pluginInstance } from 'plugins/kibana/discover/index';
import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
describe('context app', function() {
beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/_index.scss b/src/legacy/core_plugins/kibana/public/discover/_index.scss
index 0d70bb993fac10..386472a9f6e015 100644
--- a/src/legacy/core_plugins/kibana/public/discover/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/_index.scss
@@ -1,26 +1,2 @@
// Discover plugin styles
-@import 'mixins';
-
-// Prefix all styles with "dsc" to avoid conflicts.
-// Examples
-// dscTable
-// dscTable__footer
-// monChart__legend--small
-// monChart__legend-isLoading
-
-@import 'components/fetch_error/index';
-@import 'components/field_chooser/index';
-@import 'angular/directives/index';
-@import 'angular/doc_table/index';
-
-@import 'hacks';
-
-@import 'discover';
-
-@import 'embeddable/index';
-
-// Doc Viewer
-@import 'components/doc_viewer/index';
-
-// Context styles
-@import 'angular/context/index';
+@import 'np_ready/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
deleted file mode 100644
index 23d6609a5cffbb..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './doc_table';
-@import './components/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
deleted file mode 100644
index a73ff41db7c03e..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './table_header';
-@import './table_row/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
deleted file mode 100644
index a452ce140ba931..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './cell';
-@import './details';
-@import './open';
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
similarity index 88%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts
rename to src/legacy/core_plugins/kibana/public/discover/build_services.ts
index 27c7c00fb729c6..aaacde7e4060f7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
@@ -26,14 +26,13 @@ import {
} from 'kibana/public';
import * as docViewsRegistry from 'ui/registry/doc_views';
import { FilterManager, TimefilterContract, IndexPatternsContract } from 'src/plugins/data/public';
+import { createSavedSearchesService } from './saved_searches';
// @ts-ignore
-import { createSavedSearchesService } from '../saved_searches';
-// @ts-ignore
-import { DiscoverStartPlugins } from '../plugin';
-import { DataStart } from '../../../../data/public';
-import { EuiUtilsStart } from '../../../../../../plugins/eui_utils/public';
-import { SavedSearch } from '../types';
-import { SharePluginStart } from '../../../../../../plugins/share/public';
+import { DiscoverStartPlugins } from './plugin';
+import { DataStart } from '../../../data/public';
+import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
+import { SharePluginStart } from '../../../../../plugins/share/public';
+import { SavedSearch } from './np_ready/types';
export interface DiscoverServices {
addBasePath: (path: string) => string;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
deleted file mode 100644
index d7737bbfe4078a..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DiscoverIndexPattern A single index pattern is just displayed 1`] = `
-
-`;
-
-exports[`DiscoverIndexPattern Invalid props dont cause an exception: "" 1`] = `""`;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss
deleted file mode 100644
index ad65834519eb15..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './field_chooser';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx
deleted file mode 100644
index 68ef0f5b46694e..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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 React from 'react';
-import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { SavedObject } from 'kibana/server';
-import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
-import { comboBoxKeyCodes } from '@elastic/eui';
-
-const indexPattern1 = {
- id: 'test1',
- attributes: {
- title: 'test1',
- },
-} as SavedObject;
-
-const indexPattern2 = {
- id: 'test2',
- attributes: {
- title: 'test2',
- },
-} as SavedObject;
-
-describe('DiscoverIndexPattern', () => {
- test('Invalid props dont cause an exception', () => {
- const props = {
- indexPatternList: null,
- selectedIndexPattern: null,
- setIndexPattern: jest.fn(),
- } as any;
-
- expect(shallowWithIntl()).toMatchSnapshot(`""`);
- });
- test('A single index pattern is just displayed', () => {
- const props = {
- indexPatternList: [indexPattern1],
- selectedIndexPattern: indexPattern1,
- setIndexPattern: jest.fn(),
- } as DiscoverIndexPatternProps;
-
- expect(shallowWithIntl()).toMatchSnapshot();
- });
-
- test('Multiple index patterns are selectable', () => {
- const props = {
- indexPatternList: [indexPattern1, indexPattern2],
- selectedIndexPattern: indexPattern2,
- setIndexPattern: jest.fn(),
- } as DiscoverIndexPatternProps;
- const component = mountWithIntl();
- findTestSubject(component, 'indexPattern-switch-link').simulate('click');
-
- const searchInput = findTestSubject(component, 'comboBoxSearchInput');
- searchInput.simulate('change', { target: { value: 'test1' } });
- searchInput.simulate('keyDown', { keyCode: comboBoxKeyCodes.ENTER });
- expect(props.setIndexPattern).toBeCalledWith('test1');
- });
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx
deleted file mode 100644
index 55f58d352ac23f..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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 React, { useState } from 'react';
-import { EuiComboBox } from '@elastic/eui';
-import { SavedObject } from 'kibana/server';
-import { DiscoverIndexPatternTitle } from './discover_index_pattern_title';
-
-export interface DiscoverIndexPatternProps {
- /**
- * list of available index patterns, if length > 1, component offers a "change" link
- */
- indexPatternList: SavedObject[];
- /**
- * currently selected index pattern, due to angular issues it's undefined at first rendering
- */
- selectedIndexPattern: SavedObject;
- /**
- * triggered when user selects a new index pattern
- */
- setIndexPattern: (id: string) => void;
-}
-
-/**
- * Component allows you to select an index pattern in discovers side bar
- */
-export function DiscoverIndexPattern({
- indexPatternList,
- selectedIndexPattern,
- setIndexPattern,
-}: DiscoverIndexPatternProps) {
- if (!indexPatternList || indexPatternList.length === 0 || !selectedIndexPattern) {
- // just in case, shouldn't happen
- return null;
- }
- const [selected, setSelected] = useState(selectedIndexPattern);
- const [showCombo, setShowCombo] = useState(false);
- const options = indexPatternList.map(entity => ({
- value: entity.id,
- label: entity.attributes!.title,
- }));
- const selectedOptions = selected
- ? [{ value: selected.id, label: selected.attributes.title }]
- : [];
-
- const findIndexPattern = (id?: string) => indexPatternList.find(entity => entity.id === id);
-
- if (!showCombo) {
- return (
- 1}
- onChange={() => setShowCombo(true)}
- title={selected.attributes ? selected.attributes.title : ''}
- />
- );
- }
-
- /**
- * catches a EuiComboBox related 'Can't perform a React state update on an unmounted component'
- * warning in console by delaying the hiding/removal of the EuiComboBox a bit
- */
- function hideCombo() {
- setTimeout(() => setShowCombo(false), 50);
- }
-
- return (
- hideCombo()}
- onChange={choices => {
- const newSelected = choices[0] && findIndexPattern(choices[0].value);
- if (newSelected) {
- setSelected(newSelected);
- setIndexPattern(newSelected.id);
- }
- hideCombo();
- }}
- inputRef={el => {
- // auto focus input element when combo box is displayed
- if (el) {
- el.focus();
- }
- }}
- options={options}
- selectedOptions={selectedOptions}
- singleSelection={{ asPlainText: true }}
- />
- );
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx
deleted file mode 100644
index fb5c3c8d45ce85..00000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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 React from 'react';
-import { EuiToolTip, EuiFlexItem, EuiFlexGroup, EuiTitle, EuiButtonEmpty } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-export interface DiscoverIndexPatternTitleProps {
- /**
- * determines whether the change link is displayed
- */
- isChangeable: boolean;
- /**
- * function triggered when the change link is clicked
- */
- onChange: () => void;
- /**
- * title of the current index pattern
- */
- title: string;
-}
-
-/**
- * Component displaying the title of the current selected index pattern
- * and if changeable is true, a link is provided to change the index pattern
- */
-export function DiscoverIndexPatternTitle({
- isChangeable,
- onChange,
- title,
-}: DiscoverIndexPatternTitleProps) {
- return (
-
-
-
-
- {title}
-
-
-
- {isChangeable && (
-
-
- }
- >
- onChange()}
- iconSide="right"
- iconType="arrowDown"
- color="text"
- />
-
-
- )}
-
- );
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index 1335dbb01d4a73..1cefabe08c2d57 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -69,24 +69,24 @@ import { configureAppAngularModule } from 'ui/legacy_compat';
import { IndexPatterns } from '../../../../../plugins/data/public';
import { Storage } from '../../../../../plugins/kibana_utils/public';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { createDocTableDirective } from './angular/doc_table/doc_table';
-import { createTableHeaderDirective } from './angular/doc_table/components/table_header';
+import { createDocTableDirective } from './np_ready/angular/doc_table/doc_table';
+import { createTableHeaderDirective } from './np_ready/angular/doc_table/components/table_header';
import {
createToolBarPagerButtonsDirective,
createToolBarPagerTextDirective,
-} from './angular/doc_table/components/pager';
-import { createTableRowDirective } from './angular/doc_table/components/table_row';
-import { createPagerFactory } from './angular/doc_table/lib/pager/pager_factory';
-import { createInfiniteScrollDirective } from './angular/doc_table/infinite_scroll';
-import { createDocViewerDirective } from './angular/doc_viewer';
-import { createFieldSearchDirective } from './components/field_chooser/discover_field_search_directive';
-import { createIndexPatternSelectDirective } from './components/field_chooser/discover_index_pattern_directive';
-import { createStringFieldProgressBarDirective } from './components/field_chooser/string_progress_bar';
+} from './np_ready/angular/doc_table/components/pager';
+import { createTableRowDirective } from './np_ready/angular/doc_table/components/table_row';
+import { createPagerFactory } from './np_ready/angular/doc_table/lib/pager/pager_factory';
+import { createInfiniteScrollDirective } from './np_ready/angular/doc_table/infinite_scroll';
+import { createDocViewerDirective } from './np_ready/angular/doc_viewer';
+import { createFieldSearchDirective } from './np_ready/components/field_chooser/discover_field_search_directive';
+import { createIndexPatternSelectDirective } from './np_ready/components/field_chooser/discover_index_pattern_directive';
+import { createStringFieldProgressBarDirective } from './np_ready/components/field_chooser/string_progress_bar';
// @ts-ignore
-import { createFieldChooserDirective } from './components/field_chooser/field_chooser';
+import { createFieldChooserDirective } from './np_ready/components/field_chooser/field_chooser';
// @ts-ignore
-import { createDiscoverFieldDirective } from './components/field_chooser/discover_field';
+import { createDiscoverFieldDirective } from './np_ready/components/field_chooser/discover_field';
import { DiscoverStartPlugins } from './plugin';
/**
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.ts b/src/legacy/core_plugins/kibana/public/discover/index.ts
index e85408dc9bf6b9..347f545dea4c95 100644
--- a/src/legacy/core_plugins/kibana/public/discover/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/index.ts
@@ -18,7 +18,6 @@
*/
import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects';
import { DiscoverPlugin, DiscoverSetup, DiscoverStart } from './plugin';
// Core will be looking for this when loading our plugin in the new platform
@@ -33,8 +32,4 @@ export const pluginInstance = plugin({} as PluginInitializerContext);
pluginInstance.start(npStart.core, npStart.plugins);
})();
-SavedObjectRegistryProvider.register((savedSearches: any) => {
- return savedSearches;
-});
-
export { createSavedSearchesService } from './saved_searches/saved_searches';
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index d13d0dc868a588..ca169e5f803ab6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import angular from 'angular'; // just used in embeddables and discover controller
-import { DiscoverServices } from './helpers/build_services';
+import { DiscoverServices } from './build_services';
let angularModule: any = null;
let services: DiscoverServices | null = null;
@@ -47,6 +47,10 @@ export function setServices(newServices: any) {
services = newServices;
}
+// import directives that
+import 'ui/directives/css_truncate';
+import 'ui/directives/field_name';
+
// EXPORT legacy static dependencies, should be migrated when available in a new version;
export { angular };
export { wrapInI18nContext } from 'ui/i18n';
@@ -59,7 +63,10 @@ export {
hasSearchStategyForIndexPattern,
isDefaultTypeIndexPattern,
SearchSource,
-} from '../../../../ui/public/courier';
+ EsQuerySortValue,
+ SortDirection,
+ ISearchSource,
+} from 'ui/courier';
// @ts-ignore
export { intervalOptions } from 'ui/agg_types/buckets/_interval_options';
// @ts-ignore
@@ -78,6 +85,8 @@ export { tabifyAggResponse } from 'ui/agg_response/tabify';
export { vislibSeriesResponseHandlerProvider } from 'ui/vis/response_handlers/vislib';
export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
+// @ts-ignore
+export { formatMsg, formatStack } from 'ui/notify/lib/index';
// EXPORT types
export { Vis } from 'ui/vis';
@@ -90,3 +99,6 @@ export {
export { ElasticSearchHit } from 'ui/registry/doc_views_types';
export { DocViewRenderProps, DocViewRenderFn } from 'ui/registry/doc_views';
export { Adapters } from 'ui/inspector/types';
+export { DocView, DocViewInput } from 'ui/registry/doc_views_types';
+export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
+export { IInjector } from 'ui/chrome';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_discover.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_discover.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_discover.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_discover.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/_hacks.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_hacks.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_hacks.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_hacks.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss
new file mode 100644
index 00000000000000..0de036b1e17074
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss
@@ -0,0 +1,15 @@
+// Discover plugin styles
+@import 'mixins';
+@import 'discover';
+@import 'hacks';
+
+// Prefix all styles with "dsc" to avoid conflicts.
+// Examples
+// dscTable
+// dscTable__footer
+// monChart__legend--small
+// monChart__legend-isLoading
+
+@import 'components/index';
+@import 'angular/index';
+@import 'embeddable/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_mixins.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_mixins.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_mixins.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_mixins.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss
new file mode 100644
index 00000000000000..9e00ade3d41f6d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss
@@ -0,0 +1,3 @@
+@import 'directives/index';
+@import 'doc_table/index';
+@import 'context/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
index d33e3424e46475..a370c66ae330b9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
@@ -19,12 +19,12 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
-import { getAngularModule, getServices, subscribeWithScope } from './../kibana_services';
+import { getAngularModule, getServices, subscribeWithScope } from '../../kibana_services';
import './context_app';
import contextAppRouteTemplate from './context.html';
import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
+import { FilterStateManager } from '../../../../../data/public';
const { chrome } = getServices();
const k7Breadcrumbs = $route => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/NOTES.md
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/NOTES.md
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
index 3bc83cacaaf288..53be4e5bd0f2d0 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
@@ -19,7 +19,7 @@
import sinon from 'sinon';
import moment from 'moment';
-import { SearchSource } from '../../../../kibana_services';
+import { SearchSource } from '../../../../../kibana_services';
export function createIndexPatternsStub() {
return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/successors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/successors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
index fd71b7c49e8376..a6c6d910846254 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
@@ -17,14 +17,14 @@
* under the License.
*/
-import { IndexPattern, SearchSource } from '../../../kibana_services';
+import { IndexPattern, SearchSource } from '../../../../kibana_services';
import { reverseSortDir, SortDirection } from './utils/sorting';
import { extractNanos, convertIsoToMillis } from './utils/date_conversion';
import { fetchHitsInInterval } from './utils/fetch_hits_in_interval';
import { generateIntervals } from './utils/generate_intervals';
import { getEsQuerySearchAfter } from './utils/get_es_query_search_after';
import { getEsQuerySort } from './utils/get_es_query_sort';
-import { esFilters, IndexPatternsContract } from '../../../../../../../../plugins/data/public';
+import { esFilters, IndexPatternsContract } from '../../../../../../../../../plugins/data/public';
export type SurrDocType = 'successors' | 'predecessors';
export interface EsHitRecord {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/date_conversion.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/date_conversion.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/sorting.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/sorting.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/date_conversion.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/date_conversion.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
index 19c2ee2cdfe10f..e7df44e6fe61c7 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
@@ -16,11 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import {
- EsQuerySortValue,
- SortDirection,
- SearchSourceContract,
-} from '../../../../../../../../ui/public/courier';
+import { EsQuerySortValue, SortDirection, ISearchSource } from '../../../../../kibana_services';
import { convertTimeValueToIso } from './date_conversion';
import { EsHitRecordList } from '../context';
import { IntervalValue } from './generate_intervals';
@@ -40,7 +36,7 @@ interface RangeQuery {
* and filters set.
*/
export async function fetchHitsInInterval(
- searchSource: SearchSourceContract,
+ searchSource: ISearchSource,
timeField: string,
sort: [EsQuerySortValue, EsQuerySortValue],
sortDir: SortDirection,
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
index cb4878239ff920..373dc37e56f6f3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { SortDirection } from '../../../../../../../../ui/public/courier';
+import { SortDirection } from '../../../../../kibana_services';
export type IntervalValue = number | null;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
index 39c69112e58cb6..8bcf5328f24ba1 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { EsQuerySortValue, SortDirection } from '../../../../../../../../ui/public/courier/types';
+import { EsQuerySortValue, SortDirection } from '../../../../../kibana_services';
/**
* Returns `EsQuerySort` which is used to sort records in the ES query
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
index 4a0f531845f46e..ef1be8d48d3388 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IndexPattern } from '../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
export enum SortDirection {
asc = 'asc',
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_action_bar.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_action_bar.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
index 55a378367392c4..697b039adde818 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { getAngularModule, wrapInI18nContext } from '../../../../kibana_services';
+import { getAngularModule, wrapInI18nContext } from '../../../../../kibana_services';
import { ActionBar } from './action_bar';
getAngularModule().directive('contextActionBar', function(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_warning.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_warning.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
index b7f6fab676a1e1..966ecffda7755d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
@@ -20,13 +20,13 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
import React from 'react';
-import { getServices, SearchSource } from '../../../kibana_services';
+import { getServices, SearchSource } from '../../../../kibana_services';
import { fetchAnchorProvider } from '../api/anchor';
import { fetchContextProvider } from '../api/context';
import { getQueryParameterActions } from '../query_parameters';
import { FAILURE_REASONS, LOADING_STATUS } from './constants';
-import { MarkdownSimple } from '../../../../../../kibana_react/public';
+import { MarkdownSimple } from '../../../../../../../kibana_react/public';
export function QueryActionsProvider(Promise) {
const fetchAnchor = fetchAnchorProvider(getServices().indexPatterns, new SearchSource());
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/constants.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/constants.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/constants.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/constants.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/state.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js
index 01573f8983d0fa..c5f1836bcc0e1c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js
@@ -18,8 +18,8 @@
*/
import _ from 'lodash';
-import { getServices } from '../../../kibana_services';
-import { generateFilters } from '../../../../../../../../plugins/data/public';
+import { getServices } from '../../../../kibana_services';
+import { generateFilters } from '../../../../../../../../../plugins/data/public';
import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE, QUERY_PARAMETER_KEYS } from './constants';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/constants.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/state.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/state.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context_app.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
index 3f91980ccc50f2..5fa0958249d79e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
@@ -18,7 +18,7 @@
*/
import _ from 'lodash';
-import { getServices, callAfterBindingsWorkaround, getAngularModule } from './../kibana_services';
+import { getServices, callAfterBindingsWorkaround, getAngularModule } from '../../kibana_services';
import contextAppTemplate from './context_app.html';
import './context/components/action_bar';
import { getFirstSortableField } from './context/api/utils/sorting';
@@ -36,9 +36,6 @@ import {
const { timefilter } = getServices();
-// load directives
-import '../../../../data/public/legacy';
-
const module = getAngularModule();
module.directive('contextApp', function ContextApp() {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/__snapshots__/no_results.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/__snapshots__/no_results.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_histogram.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_histogram.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_no_results.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_no_results.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
index 496e1cf375588e..28ce64c0a5f9ce 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
@@ -45,7 +45,7 @@ import {
import { i18n } from '@kbn/i18n';
import { EuiChartThemeType } from '@elastic/eui/src/themes/charts/themes';
import { Subscription } from 'rxjs';
-import { getServices, timezoneProvider } from '../../kibana_services';
+import { getServices, timezoneProvider } from '../../../kibana_services';
export interface DiscoverHistogramProps {
chartData: any;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
similarity index 91%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
index eb4cf10a2d28f0..1a3922dfc20081 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
@@ -17,12 +17,11 @@
* under the License.
*/
-import '../../../../../../ui/public/render_complete/directive';
import { DiscoverNoResults } from './no_results';
import { DiscoverUninitialized } from './uninitialized';
import { DiscoverUnsupportedIndexPattern } from './unsupported_index_pattern';
import { DiscoverHistogram } from './histogram';
-import { getAngularModule, wrapInI18nContext } from '../../kibana_services';
+import { getAngularModule, wrapInI18nContext } from '../../../kibana_services';
const app = getAngularModule();
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
index d22a8d495bd0eb..ba02068590c149 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
@@ -32,7 +32,7 @@ import {
EuiSpacer,
EuiText,
} from '@elastic/eui';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
// eslint-disable-next-line react/prefer-stateless-function
export class DiscoverNoResults extends Component {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
index 33dff54f94c7f2..7de792c6129931 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
@@ -22,7 +22,7 @@ import { renderWithIntl } from 'test_utils/enzyme_helpers';
import { DiscoverNoResults } from './no_results';
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
return {
getServices: () => ({
docLinks: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/uninitialized.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/uninitialized.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/discover.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/discover.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 39a7bb96e11e0e..abf025524522b8 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -57,7 +57,8 @@ import {
SavedObjectSaveModal,
getAngularModule,
ensureDefaultIndexPattern,
-} from '../kibana_services';
+ registerTimefilterWithGlobalStateFactory,
+} from '../../kibana_services';
const {
core,
@@ -72,10 +73,9 @@ const {
} = getServices();
import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs';
-import { generateFilters } from '../../../../../../plugins/data/public';
+import { generateFilters } from '../../../../../../../plugins/data/public';
import { getIndexPatternId } from '../helpers/get_index_pattern_id';
-import { registerTimefilterWithGlobalStateFactory } from '../../../../../ui/public/timefilter/setup_router';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
+import { FilterStateManager } from '../../../../../data/public';
const { getSavedQuery } = data.query.savedQueries;
@@ -328,6 +328,7 @@ function discoverController(
makeUrl: searchId => {
return kbnUrl.eval('#/discover/{{id}}', { id: searchId });
},
+ I18nContext: core.i18n.Context,
});
},
};
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
index af9556656afab9..459dcfb30d17b9 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { getAngularModule, wrapInI18nContext, getServices } from '../kibana_services';
+import { getAngularModule, wrapInI18nContext, getServices } from '../../kibana_services';
// @ts-ignore
import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
import html from './doc.html';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_doc_table.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_doc_table.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss
new file mode 100644
index 00000000000000..3663d807851c48
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss
@@ -0,0 +1,2 @@
+@import 'doc_table';
+@import 'components/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/actions/columns.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/actions/columns.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss
new file mode 100644
index 00000000000000..6a294c1ed173db
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss
@@ -0,0 +1,2 @@
+@import 'table_header';
+@import 'table_row/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_table_header.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_table_header.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/index.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/index.ts
index 3a037971a1253d..f21f3b17c69558 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/index.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { wrapInI18nContext } from '../../../../kibana_services';
+import { wrapInI18nContext } from '../../../../../kibana_services';
import { ToolBarPagerText } from './tool_bar_pager_text';
import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
index 055f14f164476f..a5cb9180333a4a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { wrapInI18nContext } from 'ui/i18n';
import { IUiSettingsClient } from 'kibana/public';
import { TableHeader } from './table_header/table_header';
+import { wrapInI18nContext } from '../../../../kibana_services';
export function createTableHeaderDirective(reactDirective: any, config: IUiSettingsClient) {
return reactDirective(
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
index 80f963c8ccb3ee..13833d724967a0 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { IndexPattern } from '../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
// @ts-ignore
-import { shortenDottedString } from '../../../../../../common/utils/shorten_dotted_string';
+import { shortenDottedString } from '../../../../../../../common/utils/shorten_dotted_string';
export type SortOrder = [string, 'asc' | 'desc'];
export interface ColumnProps {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.test.tsx
index e5706b5e3c9bb9..ef3d4ecc4b18fc 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.test.tsx
@@ -23,7 +23,7 @@ import { TableHeader } from './table_header';
// @ts-ignore
import { findTestSubject } from '@elastic/eui/lib/test';
import { SortOrder } from './helpers';
-import { IndexPattern, IFieldType } from '../../../../kibana_services';
+import { IndexPattern, IFieldType } from '../../../../../kibana_services';
function getMockIndexPattern() {
return ({
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
index 71674710ac8559..17b961dbe68326 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import React from 'react';
-import { IndexPattern } from '../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
// @ts-ignore
import { TableHeaderColumn } from './table_header_column';
import { SortOrder, getDisplayedColumns } from './helpers';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header_column.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header_column.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
index 8ff4ab46ef5321..8df035d0984694 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
@@ -24,15 +24,15 @@ import { IUiSettingsClient } from 'kibana/public';
import rison from 'rison-node';
import '../../doc_viewer';
// @ts-ignore
-import { noWhiteSpace } from '../../../../../common/utils/no_white_space';
+import { noWhiteSpace } from '../../../../../../common/utils/no_white_space';
import openRowHtml from './table_row/open.html';
import detailsHtml from './table_row/details.html';
-import { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
+import { dispatchRenderComplete } from '../../../../../../../../../plugins/kibana_utils/public';
import cellTemplateHtml from '../components/table_row/cell.html';
import truncateByHeightTemplateHtml from '../components/table_row/truncate_by_height.html';
-import { esFilters } from '../../../../../../../../plugins/data/public';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
// guesstimate at the minimum number of chars wide cells in the table should be
const MIN_LINE_LENGTH = 20;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_cell.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_cell.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_details.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_details.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss
new file mode 100644
index 00000000000000..c7ccdaa39ff65e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss
@@ -0,0 +1,3 @@
+@import 'cell';
+@import 'details';
+@import 'open';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_open.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_open.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/cell.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/cell.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/details.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/details.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/open.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/open.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/truncate_by_height.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/truncate_by_height.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
index 92ebc24c6e3782..3329ffc7cd102a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
@@ -23,7 +23,7 @@ import html from './doc_table.html';
import './infinite_scroll';
import './components/table_header';
import './components/table_row';
-import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
+import { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
import './components/pager';
import './lib/pager';
// @ts-ignore
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table_strings.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table_strings.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/infinite_scroll.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/infinite_scroll.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
index ebf715a64d9397..0bf8a93a883673 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IIndexPattern } from '../../../../../../../../plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../../plugins/data/public';
import { SortOrder } from '../components/table_header/helpers';
export function getSort(
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort_for_search_source.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort_for_search_source.ts
index 952eadf7cbd942..26bba4589cf6a5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort_for_search_source.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { IndexPattern } from '../../../kibana_services';
+import { IndexPattern } from '../../../../kibana_services';
import { SortOrder } from '../components/table_header/helpers';
import { getSort } from './get_sort';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager_factory.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager_factory.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/get_painless_error.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/get_painless_error.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/application.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/application.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/application.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/application.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
new file mode 100644
index 00000000000000..0491430e5fddde
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
@@ -0,0 +1,3 @@
+@import 'fetch_error/index';
+@import 'field_chooser/index';
+@import 'doc_viewer/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
index 4df56483fa5c60..656e8598aa12ff 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
@@ -28,7 +28,7 @@ jest.mock('../doc_viewer/doc_viewer', () => ({
DocViewer: 'test',
}));
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
return {
getServices: () => ({
metadata: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
index 7020addb2bc6d0..819eb9df592bd0 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
@@ -22,7 +22,7 @@ import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent } from '@elastic
import { IndexPatternsContract } from 'src/plugins/data/public';
import { DocViewer } from '../doc_viewer/doc_viewer';
import { ElasticRequestState, useEsDocSearch } from './use_es_doc_search';
-import { ElasticSearchHit, getServices } from '../../kibana_services';
+import { ElasticSearchHit, getServices } from '../../../kibana_services';
export interface ElasticSearchResult {
hits: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
index 20bffe829de166..a40d9731a04f5f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import { useEffect, useState } from 'react';
-import { ElasticSearchHit, IndexPattern } from '../../kibana_services';
+import { ElasticSearchHit, IndexPattern } from '../../../kibana_services';
import { DocProps } from './doc';
export enum ElasticRequestState {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_doc_viewer.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_doc_viewer.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
similarity index 79%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
index 158ed4ccc7759e..c0644a6458694b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
@@ -21,33 +21,46 @@ import { mount, shallow } from 'enzyme';
import { DocViewer } from './doc_viewer';
// @ts-ignore
import { findTestSubject } from '@elastic/eui/lib/test';
-import {
- addDocView,
- emptyDocViews,
- DocViewRenderProps,
- getDocViewsSorted as mockGetDocViewsSorted,
-} from 'ui/registry/doc_views';
+import { DocViewRenderProps, DocViewInput, getServices } from '../../../kibana_services';
+
+jest.mock('../../../kibana_services', () => {
+ const docViews: DocViewInput[] = [];
+
+ function addDocView(docView: DocViewInput) {
+ docViews.push(docView);
+ }
-jest.mock('../../kibana_services', () => {
return {
getServices: () => ({
docViewsRegistry: {
- getDocViewsSorted: (hit: any) => {
- return mockGetDocViewsSorted(hit);
+ getDocViewsSorted: () => {
+ return docViews;
},
+ addDocView,
+ docViews,
},
}),
+ formatMsg: (x: any) => String(x),
+ formatStack: (x: any) => String(x),
};
});
+const {
+ docViewsRegistry: { docViews, addDocView },
+} = getServices();
+
+function emptyDocViews() {
+ docViews.length = 0;
+}
+
beforeEach(() => {
emptyDocViews();
jest.clearAllMocks();
});
test('Render with 3 different tabs', () => {
- addDocView({ order: 20, title: 'React component', component: () => test
});
addDocView({ order: 10, title: 'Render function', render: jest.fn() });
+ addDocView({ order: 20, title: 'React component', component: () => test
});
addDocView({ order: 30, title: 'Invalid doc view' });
const renderProps = { hit: {} } as DocViewRenderProps;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
index a2d58439ad031c..00926d70db25c3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
@@ -17,9 +17,8 @@
* under the License.
*/
import React from 'react';
-import { DocView } from 'ui/registry/doc_views_types';
import { EuiTabbedContent } from '@elastic/eui';
-import { getServices, DocViewRenderProps } from '../../kibana_services';
+import { getServices, DocViewRenderProps, DocView } from '../../../kibana_services';
import { DocViewerTab } from './doc_viewer_tab';
/**
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
index 80b9cb5110db72..201ed562cfd6f0 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
@@ -18,8 +18,7 @@
*/
import React from 'react';
import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
-// @ts-ignore
-import { formatMsg, formatStack } from 'ui/notify/lib/index';
+import { formatMsg, formatStack } from '../../../kibana_services';
interface Props {
error: Error | string | null;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
index 476d7cef159fb0..c100e71b5f2b52 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
@@ -19,7 +19,7 @@
import React from 'react';
import { mount } from 'enzyme';
import { DocViewRenderTab } from './doc_viewer_render_tab';
-import { DocViewRenderProps } from '../../kibana_services';
+import { DocViewRenderProps } from '../../../kibana_services';
test('Mounting and unmounting DocViewerRenderTab', () => {
const unmountFn = jest.fn();
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
index 8ac11caefff905..31a8808a3a1c92 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import React, { useRef, useEffect } from 'react';
-import { DocViewRenderFn, DocViewRenderProps } from '../../kibana_services';
+import { DocViewRenderFn, DocViewRenderProps } from '../../../kibana_services';
interface Props {
render: DocViewRenderFn;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
index 19558129eae8d0..e08b0b2323d813 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
@@ -18,7 +18,7 @@
*/
import React from 'react';
import { I18nProvider } from '@kbn/i18n/react';
-import { DocViewRenderProps, DocViewRenderFn } from '../../kibana_services';
+import { DocViewRenderProps, DocViewRenderFn } from '../../../kibana_services';
import { DocViewRenderTab } from './doc_viewer_render_tab';
import { DocViewerError } from './doc_viewer_render_error';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_fetch_error.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_fetch_error.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_fetch_error.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_fetch_error.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
index 8f67c1952f9986..d2dda32f318fe5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
@@ -19,7 +19,7 @@
import React, { Fragment } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiCodeBlock, EuiSpacer } from '@elastic/eui';
-import { getAngularModule, wrapInI18nContext, getServices } from '../../kibana_services';
+import { getAngularModule, wrapInI18nContext, getServices } from '../../../kibana_services';
interface Props {
fetchError: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
new file mode 100644
index 00000000000000..42c11152e2633d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DiscoverIndexPattern Invalid props dont cause an exception: "" 1`] = `""`;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_field_chooser.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_field_chooser.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss
new file mode 100644
index 00000000000000..91daed8ea048ef
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss
@@ -0,0 +1 @@
+@import 'field_chooser';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx
new file mode 100644
index 00000000000000..60842ac81ee03b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx
@@ -0,0 +1,122 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import React, { useState } from 'react';
+import {
+ EuiButtonEmpty,
+ EuiPopover,
+ EuiPopoverTitle,
+ EuiSelectable,
+ EuiButtonEmptyProps,
+} from '@elastic/eui';
+import { EuiSelectableProps } from '@elastic/eui/src/components/selectable/selectable';
+import { IndexPatternRef } from './types';
+
+export type ChangeIndexPatternTriggerProps = EuiButtonEmptyProps & {
+ label: string;
+ title?: string;
+};
+
+// TODO: refactor to shared component with ../../../../../../../../x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern
+
+export function ChangeIndexPattern({
+ indexPatternRefs,
+ indexPatternId,
+ onChangeIndexPattern,
+ trigger,
+ selectableProps,
+}: {
+ trigger: ChangeIndexPatternTriggerProps;
+ indexPatternRefs: IndexPatternRef[];
+ onChangeIndexPattern: (newId: string) => void;
+ indexPatternId?: string;
+ selectableProps?: EuiSelectableProps;
+}) {
+ const [isPopoverOpen, setPopoverIsOpen] = useState(false);
+
+ const createTrigger = function() {
+ const { label, title, ...rest } = trigger;
+ return (
+ setPopoverIsOpen(!isPopoverOpen)}
+ {...rest}
+ >
+ {label}
+
+ );
+ };
+
+ return (
+ setPopoverIsOpen(false)}
+ className="eui-textTruncate"
+ anchorClassName="eui-textTruncate"
+ display="block"
+ panelPaddingSize="s"
+ ownFocus
+ >
+
+
+ {i18n.translate('kbn.discover.fieldChooser.indexPattern.changeIndexPatternTitle', {
+ defaultMessage: 'Change index pattern',
+ })}
+
+ ({
+ label: title,
+ key: id,
+ value: id,
+ checked: id === indexPatternId ? 'on' : undefined,
+ }))}
+ onChange={choices => {
+ const choice = (choices.find(({ checked }) => checked) as unknown) as {
+ value: string;
+ };
+ onChangeIndexPattern(choice.value);
+ setPopoverIsOpen(false);
+ }}
+ searchProps={{
+ compressed: true,
+ ...(selectableProps ? selectableProps.searchProps : undefined),
+ }}
+ >
+ {(list, search) => (
+ <>
+ {search}
+ {list}
+ >
+ )}
+
+
+
+ );
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
index 0d2d0788dd1755..f7f219a287492f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
@@ -20,10 +20,8 @@
import $ from 'jquery';
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
import html from './discover_field.html';
-import 'ui/directives/css_truncate';
-import 'ui/directives/field_name';
import './string_progress_bar';
import detailsHtml from './lib/detail_views/string.html';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search_directive.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search_directive.ts
index 69865ec4243253..6d570349ee0c6c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search_directive.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
import { DiscoverFieldSearch } from './discover_field_search';
export function createFieldSearchDirective(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx
new file mode 100644
index 00000000000000..96b8cc383888e3
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx
@@ -0,0 +1,100 @@
+/*
+ * 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 React from 'react';
+import { shallowWithIntl as shallow } from 'test_utils/enzyme_helpers';
+
+// @ts-ignore
+import { ShallowWrapper } from 'enzyme';
+import { ChangeIndexPattern } from './change_indexpattern';
+import { SavedObject } from 'kibana/server';
+import { DiscoverIndexPattern } from './discover_index_pattern';
+import { EuiSelectable, EuiSelectableList } from '@elastic/eui';
+
+const indexPattern1 = {
+ id: 'test1',
+ attributes: {
+ title: 'test1 title',
+ },
+} as SavedObject;
+
+const indexPattern2 = {
+ id: 'test2',
+ attributes: {
+ title: 'test2 title',
+ },
+} as SavedObject;
+
+const defaultProps = {
+ indexPatternList: [indexPattern1, indexPattern2],
+ selectedIndexPattern: indexPattern1,
+ setIndexPattern: jest.fn(async () => {}),
+};
+
+function getIndexPatternPickerList(instance: ShallowWrapper) {
+ return instance
+ .find(ChangeIndexPattern)
+ .first()
+ .dive()
+ .find(EuiSelectable);
+}
+
+function getIndexPatternPickerOptions(instance: ShallowWrapper) {
+ return getIndexPatternPickerList(instance)
+ .dive()
+ .find(EuiSelectableList)
+ .prop('options');
+}
+
+function selectIndexPatternPickerOption(instance: ShallowWrapper, selectedLabel: string) {
+ const options: Array<{ label: string; checked?: 'on' | 'off' }> = getIndexPatternPickerOptions(
+ instance
+ ).map((option: any) =>
+ option.label === selectedLabel
+ ? { ...option, checked: 'on' }
+ : { ...option, checked: undefined }
+ );
+ return getIndexPatternPickerList(instance).prop('onChange')!(options);
+}
+
+describe('DiscoverIndexPattern', () => {
+ test('Invalid props dont cause an exception', () => {
+ const props = {
+ indexPatternList: null,
+ selectedIndexPattern: null,
+ setIndexPattern: jest.fn(),
+ } as any;
+
+ expect(shallow()).toMatchSnapshot(`""`);
+ });
+ test('should list all index patterns', () => {
+ const instance = shallow();
+
+ expect(getIndexPatternPickerOptions(instance)!.map((option: any) => option.label)).toEqual([
+ 'test1 title',
+ 'test2 title',
+ ]);
+ });
+
+ test('should switch data panel to target index pattern', () => {
+ const instance = shallow();
+
+ selectIndexPatternPickerOption(instance, 'test2 title');
+ expect(defaultProps.setIndexPattern).toHaveBeenCalledWith('test2');
+ });
+});
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
new file mode 100644
index 00000000000000..37338decce2c29
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
@@ -0,0 +1,85 @@
+/*
+ * 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 React, { useState } from 'react';
+import { SavedObject } from 'kibana/server';
+import { I18nProvider } from '@kbn/i18n/react';
+
+import { IndexPatternRef } from './types';
+import { ChangeIndexPattern } from './change_indexpattern';
+export interface DiscoverIndexPatternProps {
+ /**
+ * list of available index patterns, if length > 1, component offers a "change" link
+ */
+ indexPatternList: SavedObject[];
+ /**
+ * currently selected index pattern, due to angular issues it's undefined at first rendering
+ */
+ selectedIndexPattern: SavedObject;
+ /**
+ * triggered when user selects a new index pattern
+ */
+ setIndexPattern: (id: string) => void;
+}
+
+/**
+ * Component allows you to select an index pattern in discovers side bar
+ */
+export function DiscoverIndexPattern({
+ indexPatternList,
+ selectedIndexPattern,
+ setIndexPattern,
+}: DiscoverIndexPatternProps) {
+ if (!indexPatternList || indexPatternList.length === 0 || !selectedIndexPattern) {
+ // just in case, shouldn't happen
+ return null;
+ }
+ const options: IndexPatternRef[] = indexPatternList.map(entity => ({
+ id: entity.id,
+ title: entity.attributes!.title,
+ }));
+
+ const [selected, setSelected] = useState({
+ id: selectedIndexPattern.id,
+ title: selectedIndexPattern.attributes!.title,
+ });
+
+ return (
+
+
+ {
+ const indexPattern = options.find(pattern => pattern.id === id);
+ if (indexPattern) {
+ setIndexPattern(id);
+ setSelected(indexPattern);
+ }
+ }}
+ />
+
+
+ );
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
index 46c8fa854847aa..8bbeac086f093d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
import { DiscoverIndexPattern } from './discover_index_pattern';
export function createIndexPatternSelectDirective(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
index cf636a1675eb04..47b3ec6b07e8ee 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
@@ -23,7 +23,7 @@ import { fieldCalculator } from './lib/field_calculator';
import './discover_field';
import './discover_field_search_directive';
import './discover_index_pattern_directive';
-import { FieldList } from '../../../../../../../plugins/data/public';
+import { FieldList } from '../../../../../../../../plugins/data/public';
import fieldChooserTemplate from './field_chooser.html';
export function createFieldChooserDirective($location, config, $route) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/detail_views/string.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/detail_views/string.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/field_calculator.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/field_calculator.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
index 7e4fc79839a52d..0c5e7fa69357df 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
@@ -18,7 +18,7 @@
*/
import React from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiProgress, EuiText, EuiToolTip } from '@elastic/eui';
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
interface Props {
percent: number;
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/scripts/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.ts
similarity index 86%
rename from src/legacy/core_plugins/kibana/server/routes/api/scripts/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.ts
index 441963b02f14fe..302bf5165777c1 100644
--- a/src/legacy/core_plugins/kibana/server/routes/api/scripts/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.ts
@@ -17,8 +17,7 @@
* under the License.
*/
-import { registerLanguages } from './register_languages';
-
-export function scriptsApi(server) {
- registerLanguages(server);
+export interface IndexPatternRef {
+ id: string;
+ title: string;
}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js
index eb40130137e007..37fa79b490d56e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js
@@ -18,7 +18,7 @@
*/
import { i18n } from '@kbn/i18n';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
const { docLinks } = getServices();
export function addHelpMenuToAppChrome(chrome) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/__snapshots__/open_search_panel.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/__snapshots__/open_search_panel.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/__snapshots__/open_search_panel.test.js.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/__snapshots__/open_search_panel.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
index ec1763f44f25f6..ebe4cbb1ddb690 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
@@ -32,8 +32,8 @@ import {
EuiFlyoutBody,
EuiTitle,
} from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
-import { getServices } from '../../kibana_services';
+import { SavedObjectFinderUi } from '../../../../../../../../plugins/kibana_react/public';
+import { getServices } from '../../../kibana_services';
const SEARCH_OBJECT_TYPE = 'search';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
index 22487421bf61be..c8f2ca220386dc 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
@@ -20,7 +20,7 @@
import React from 'react';
import { shallow } from 'enzyme';
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
return {
getServices: () => ({
core: { uiSettings: {}, savedObjects: {} },
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
index 4beee3c02fa6f5..e40d700b488853 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
@@ -20,11 +20,10 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { OpenSearchPanel } from './open_search_panel';
-import { I18nContext } from 'ui/i18n';
let isOpen = false;
-export function showOpenSearchPanel({ makeUrl }) {
+export function showOpenSearchPanel({ makeUrl, I18nContext }) {
if (isOpen) {
return;
}
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/_embeddables.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_embeddables.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/_embeddables.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_embeddables.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
index 273c7d80f216c1..3aa8dea816694f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
@@ -21,7 +21,6 @@ import * as Rx from 'rxjs';
import { Subscription } from 'rxjs';
import { i18n } from '@kbn/i18n';
import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { SearchSourceContract } from '../../../../../ui/public/courier';
import {
esFilters,
TimeRange,
@@ -31,12 +30,12 @@ import {
getTime,
Query,
IFieldType,
-} from '../../../../../../plugins/data/public';
+} from '../../../../../../../plugins/data/public';
import {
APPLY_FILTER_TRIGGER,
Container,
Embeddable,
-} from '../../../../embeddable_api/public/np_ready/public';
+} from '../../../../../embeddable_api/public/np_ready/public';
import * as columnActions from '../angular/doc_table/actions/columns';
import { SavedSearch } from '../types';
import searchTemplate from './search_template.html';
@@ -51,7 +50,8 @@ import {
getServices,
IndexPattern,
RequestAdapter,
-} from '../kibana_services';
+ ISearchSource,
+} from '../../kibana_services';
import { SEARCH_EMBEDDABLE_TYPE } from './constants';
interface SearchScope extends ng.IScope {
@@ -89,7 +89,7 @@ export class SearchEmbeddable extends Embeddable
private inspectorAdaptors: Adapters;
private searchScope?: SearchScope;
private panelTitle: string = '';
- private filtersSearchSource?: SearchSourceContract;
+ private filtersSearchSource?: ISearchSource;
private searchInstance?: JQLite;
private autoRefreshFetchSubscription?: Subscription;
private subscription?: Subscription;
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
index b5475b2629c703..3226b3af93cee6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
@@ -18,15 +18,14 @@
*/
import { i18n } from '@kbn/i18n';
import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { IInjector } from 'ui/chrome';
-import { getServices } from '../kibana_services';
+import { getServices, IInjector } from '../../kibana_services';
import {
EmbeddableFactory,
ErrorEmbeddable,
Container,
-} from '../../../../../../plugins/embeddable/public';
+} from '../../../../../../../plugins/embeddable/public';
-import { TimeRange } from '../../../../../../plugins/data/public';
+import { TimeRange } from '../../../../../../../plugins/data/public';
import { SearchEmbeddable } from './search_embeddable';
import { SearchInput, SearchOutput } from './types';
import { SEARCH_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_template.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_template.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_template.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_template.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.ts
index adfa3d5acbf7a3..3d6acb0963bed6 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.ts
@@ -20,7 +20,12 @@
import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from 'src/plugins/embeddable/public';
import { SavedSearch } from '../types';
import { SortOrder } from '../angular/doc_table/components/table_header/helpers';
-import { esFilters, IIndexPattern, TimeRange, Query } from '../../../../../../plugins/data/public';
+import {
+ esFilters,
+ IIndexPattern,
+ TimeRange,
+ Query,
+} from '../../../../../../../plugins/data/public';
export interface SearchInput extends EmbeddableInput {
timeRange: TimeRange;
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/breadcrumbs.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/breadcrumbs.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/breadcrumbs.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
index bd62460fd68687..8f4d1b28624a42 100644
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IIndexPattern } from '../../../../../../plugins/data/common/index_patterns';
+import { IIndexPattern } from '../../../../../../../plugins/data/common/index_patterns';
export function findIndexPatternById(
indexPatterns: IIndexPattern[],
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.ts
similarity index 58%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.ts
index eb8c2aec915581..74255642ab2c95 100644
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.ts
@@ -18,24 +18,22 @@
*/
import { i18n } from '@kbn/i18n';
import {
- FeatureCatalogueRegistryProvider,
FeatureCatalogueCategory,
-} from 'ui/registry/feature_catalogue';
+ HomePublicPluginSetup,
+} from '../../../../../../plugins/home/public';
-export function registerFeature() {
- FeatureCatalogueRegistryProvider.register(() => {
- return {
- id: 'discover',
- title: i18n.translate('kbn.discover.discoverTitle', {
- defaultMessage: 'Discover',
- }),
- description: i18n.translate('kbn.discover.discoverDescription', {
- defaultMessage: 'Interactively explore your data by querying and filtering raw documents.',
- }),
- icon: 'discoverApp',
- path: '/app/kibana#/discover',
- showOnHomePage: true,
- category: FeatureCatalogueCategory.DATA,
- };
+export function registerFeature(home: HomePublicPluginSetup) {
+ home.featureCatalogue.register({
+ id: 'discover',
+ title: i18n.translate('kbn.discover.discoverTitle', {
+ defaultMessage: 'Discover',
+ }),
+ description: i18n.translate('kbn.discover.discoverDescription', {
+ defaultMessage: 'Interactively explore your data by querying and filtering raw documents.',
+ }),
+ icon: 'discoverApp',
+ path: '/app/kibana#/discover',
+ showOnHomePage: true,
+ category: FeatureCatalogueCategory.DATA,
});
}
diff --git a/src/legacy/core_plugins/kibana/public/discover/types.d.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/types.d.ts
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/discover/types.d.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/types.d.ts
index 6cdd802fa2800e..d36a6b02e1f7a4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/types.d.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/types.d.ts
@@ -17,14 +17,13 @@
* under the License.
*/
-import { SearchSourceContract } from '../../../../ui/public/courier';
+import { ISearchSource } from '../kibana_services';
import { SortOrder } from './angular/doc_table/components/table_header/helpers';
-export { SortOrder } from './angular/doc_table/components/table_header/helpers';
export interface SavedSearch {
readonly id: string;
title: string;
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
description?: string;
columns: string[];
sort: SortOrder[];
diff --git a/src/legacy/core_plugins/kibana/public/discover/plugin.ts b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
index b5a8e25dc11eac..0cff1e66f3636c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
@@ -20,16 +20,17 @@ import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public'
import angular from 'angular';
import { IUiActionsStart } from 'src/plugins/ui_actions/public';
import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { registerFeature } from './helpers/register_feature';
+import { registerFeature } from './np_ready/register_feature';
import './kibana_services';
import { IEmbeddableStart, IEmbeddableSetup } from '../../../../../plugins/embeddable/public';
import { getInnerAngularModule, getInnerAngularModuleEmbeddable } from './get_inner_angular';
import { setAngularModule, setServices } from './kibana_services';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
-import { buildServices } from './helpers/build_services';
+import { buildServices } from './build_services';
import { SharePluginStart } from '../../../../../plugins/share/public';
import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import { HomePublicPluginSetup } from '../../../../../plugins/home/public';
/**
* These are the interfaces with your public contracts. You should export these
@@ -42,6 +43,7 @@ export interface DiscoverSetupPlugins {
uiActions: IUiActionsStart;
embeddable: IEmbeddableSetup;
kibana_legacy: KibanaLegacySetup;
+ home: HomePublicPluginSetup;
}
export interface DiscoverStartPlugins {
uiActions: IUiActionsStart;
@@ -84,10 +86,11 @@ export class DiscoverPlugin implements Plugin {
}
await this.initializeServices();
await this.initializeInnerAngular();
- const { renderApp } = await import('./application');
+ const { renderApp } = await import('./np_ready/application');
return renderApp(innerAngularName, params.element);
},
});
+ registerFeature(plugins.home);
}
start(core: CoreStart, plugins: DiscoverStartPlugins): DiscoverStart {
@@ -115,14 +118,13 @@ export class DiscoverPlugin implements Plugin {
};
this.registerEmbeddable(core, plugins);
- registerFeature();
}
/**
* register embeddable with a slimmer embeddable version of inner angular
*/
private async registerEmbeddable(core: CoreStart, plugins: DiscoverStartPlugins) {
- const { SearchEmbeddableFactory } = await import('./embeddable');
+ const { SearchEmbeddableFactory } = await import('./np_ready/embeddable');
const getInjector = async () => {
if (!this.initializeServices) {
throw Error('Discover plugin registerEmbeddable: initializeServices is undefined');
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts
index bdb1495a33925f..ab7894fd5e730b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts
@@ -31,13 +31,13 @@ savedObjectManagementRegistry.register({
service: 'savedSearches',
title: 'searches',
});
+const services = {
+ savedObjectsClient: npStart.core.savedObjects.client,
+ indexPatterns: npStart.plugins.data.indexPatterns,
+ chrome: npStart.core.chrome,
+ overlays: npStart.core.overlays,
+};
+const savedSearches = createSavedSearchesService(services);
+
const module = uiModules.get('discover/saved_searches');
-module.service('savedSearches', () => {
- const services = {
- savedObjectsClient: npStart.core.savedObjects.client,
- indexPatterns: npStart.plugins.data.indexPatterns,
- chrome: npStart.core.chrome,
- overlays: npStart.core.overlays,
- };
- return createSavedSearchesService(services);
-});
+module.service('savedSearches', () => savedSearches);
diff --git a/src/legacy/core_plugins/kibana/public/home/_index.scss b/src/legacy/core_plugins/kibana/public/home/_index.scss
index 192091fb04e3c9..f42254c1096ce6 100644
--- a/src/legacy/core_plugins/kibana/public/home/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/home/_index.scss
@@ -1 +1 @@
-@import './components/index';
+@import 'np_ready/components/index';
diff --git a/src/legacy/core_plugins/kibana/public/home/render_app.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/home/render_app.tsx
rename to src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx
index a8c35144a45b01..8345491d99972c 100644
--- a/src/legacy/core_plugins/kibana/public/home/render_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx
@@ -22,7 +22,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
import { i18n } from '@kbn/i18n';
// @ts-ignore
import { HomeApp } from './components/home_app';
-import { getServices } from './kibana_services';
+import { getServices } from '../kibana_services';
export const renderApp = async (element: HTMLElement) => {
const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/home.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/home.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/recently_accessed.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/recently_accessed.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/sample_data_view_data_button.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/sample_data_view_data_button.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/synopsis.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/synopsis.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/synopsis.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/synopsis.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/welcome.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/welcome.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_add_data.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_add_data.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_home.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_home.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_home.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_home.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_index.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss
similarity index 52%
rename from src/legacy/core_plugins/kibana/public/home/components/_index.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss
index af23752e542873..870099ffb350e4 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss
@@ -5,10 +5,10 @@
// homChart__legend--small
// homChart__legend-isLoading
-@import './add_data';
-@import './home';
-@import './sample_data_set_cards';
-@import './synopsis';
-@import './welcome';
+@import 'add_data';
+@import 'home';
+@import 'sample_data_set_cards';
+@import 'synopsis';
+@import 'welcome';
-@import './tutorial/tutorial';
+@import 'tutorial/tutorial';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_sample_data_set_cards.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_sample_data_set_cards.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_sample_data_set_cards.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_sample_data_set_cards.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_synopsis.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_synopsis.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_synopsis.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_synopsis.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_welcome.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_welcome.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_welcome.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_welcome.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/add_data.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js
index 8ea9d78507ceba..a49620be2d229e 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js
@@ -21,7 +21,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
import {
EuiButton,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
index 9457f766409b8f..86eec564f0b61b 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
@@ -20,9 +20,9 @@
import React from 'react';
import { AddData } from './add_data';
import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
-jest.mock('../kibana_services', () => {
+jest.mock('../../kibana_services', () => {
const mock = {
getBasePath: jest.fn(() => 'path'),
};
diff --git a/src/legacy/core_plugins/kibana/public/home/components/feature_directory.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/feature_directory.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
index 447a54bd897011..5545944a1029ff 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/feature_directory.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
@@ -31,7 +31,7 @@ import {
EuiSpacer,
} from '@elastic/eui';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/home.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
index d552dd070c86d8..5c32a463da1153 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
@@ -38,8 +38,8 @@ import {
} from '@elastic/eui';
import { Welcome } from './welcome';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-import { getServices } from '../kibana_services';
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
+import { getServices } from '../../kibana_services';
const KEY_ENABLE_WELCOME = 'home:welcome:show';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/home.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
index 1f46cf2875feea..be2ceb66f69d03 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
@@ -23,9 +23,10 @@ import React from 'react';
import sinon from 'sinon';
import { shallow } from 'enzyme';
import { Home } from './home';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-jest.mock('../kibana_services', () => ({
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
+
+jest.mock('../../kibana_services', () => ({
getServices: () => ({
getBasePath: () => 'path',
getInjected: () => '',
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
index cd7bc82fe33459..a0b9d7c779b029 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
@@ -22,7 +22,7 @@ import {
overlayServiceMock,
httpServiceMock,
injectedMetadataServiceMock,
-} from '../../../../../../core/public/mocks';
+} from '../../../../../../../core/public/mocks';
jest.doMock('ui/new_platform', () => {
return {
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home_app.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/home/components/home_app.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
index 29f24f5b841a34..6532737cc02e84 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home_app.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
@@ -27,7 +27,9 @@ import { Tutorial } from './tutorial/tutorial';
import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom';
import { getTutorial } from '../load_tutorials';
import { replaceTemplateStrings } from './tutorial/replace_template_strings';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
+// TODO This is going to be refactored soon
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { npSetup } from 'ui/new_platform';
export function HomeApp({ directories }) {
const {
diff --git a/src/legacy/core_plugins/kibana/public/home/components/recently_accessed.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/recently_accessed.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/recently_accessed.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/recently_accessed.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data/index.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data/index.tsx
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data/index.tsx
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_card.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_card.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_set_card.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_card.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
index 7daf10e5f01f88..198e0d95271d7b 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
@@ -24,7 +24,7 @@ import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
import { SampleDataSetCard, INSTALLED_STATUS, UNINSTALLED_STATUS } from './sample_data_set_card';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
import {
listSampleDataSets,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.js
index c9bd32a7d14d50..e6f5c07c94f9fe 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
import { EuiButton, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
export class SampleDataViewDataButton extends React.Component {
addBasePath = getServices().addBasePath;
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.test.js
index f594ec1264c942..e33c206ed8482d 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.test.js
@@ -22,7 +22,7 @@ import { shallow } from 'enzyme';
import { SampleDataViewDataButton } from './sample_data_view_data_button';
-jest.mock('../kibana_services', () => ({
+jest.mock('../../kibana_services', () => ({
getServices: () => ({
addBasePath: path => `root${path}`,
}),
diff --git a/src/legacy/core_plugins/kibana/public/home/components/synopsis.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/synopsis.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/synopsis.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/synopsis.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/content.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/content.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/footer.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/footer.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/instruction_set.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/instruction_set.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/introduction.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/introduction.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/tutorial.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/tutorial.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/_tutorial.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/_tutorial.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/_tutorial.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/_tutorial.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
index db1f55b503e847..669eb6c4c42cd9 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
@@ -19,7 +19,7 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Markdown } from '../../../../../kibana_react/public';
+import { Markdown } from '../../../../../../kibana_react/public';
const whiteListedRules = ['backticks', 'emphasis', 'link', 'list'];
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
index d3a4d7085a0aa1..64864b6a5404d5 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
@@ -22,7 +22,7 @@ import { shallow } from 'enzyme';
import { Content } from './content';
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
return {
Markdown: () => ,
};
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
index 7ec2133a98ca18..4f60de00819e71 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
import { Instruction } from './instruction';
import { ParameterForm } from './parameter_form';
import { Content } from './content';
-import { getDisplayText } from '../../../../common/tutorials/instruction_variant';
+import { getDisplayText } from '../../../../../common/tutorials/instruction_variant';
import {
EuiTabs,
EuiTab,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
index 6c9ce530f6b200..21c3ddeceff6b0 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
@@ -45,7 +45,7 @@ const instructionVariants = [
},
];
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
return {
Markdown: () => ,
};
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
index ae87bc6030c9ae..8862ef7334f931 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
@@ -22,7 +22,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
import { Introduction } from './introduction';
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
return {
Markdown: () => ,
};
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/number_parameter.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/number_parameter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/number_parameter.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/number_parameter.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/parameter_form.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/parameter_form.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/parameter_form.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/parameter_form.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
index 62116ae1a06637..daf996444eb3c2 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
@@ -18,7 +18,7 @@
*/
import { Writer } from 'mustache';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
const TEMPLATE_TAGS = ['{', '}'];
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/status_check_states.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/status_check_states.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/status_check_states.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/status_check_states.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/string_parameter.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/string_parameter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/string_parameter.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/string_parameter.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.js
index 7461db9c54cc82..314ddf2196f06c 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.js
@@ -37,7 +37,7 @@ import {
import * as StatusCheckStates from './status_check_states';
import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
const INSTRUCTIONS_TYPE = {
ELASTIC_CLOUD: 'elasticCloud',
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
index 41d83d7562f6ec..733223fe79046f 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
@@ -22,7 +22,7 @@ import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
import { Tutorial } from './tutorial';
-jest.mock('../../kibana_services', () => ({
+jest.mock('../../../kibana_services', () => ({
getServices: () => ({
getBasePath: jest.fn(() => 'path'),
chrome: {
@@ -30,7 +30,7 @@ jest.mock('../../kibana_services', () => ({
},
}),
}));
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
return {
Markdown: () => ,
};
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial_directory.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial_directory.js
index 0c537c8e9ae8ac..06da6f35ee42e5 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial_directory.js
@@ -22,7 +22,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Synopsis } from './synopsis';
import { SampleDataSetCards } from './sample_data_set_cards';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
import {
EuiPage,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx
index 42c6e6ff6056a3..28bdab14193c40 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import { shallow } from 'enzyme';
import { Welcome } from './welcome';
-jest.mock('../kibana_services', () => ({
+jest.mock('../../kibana_services', () => ({
getServices: () => ({
addBasePath: (path: string) => `root${path}`,
trackUiMetric: () => {},
diff --git a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx
index 435bf98ca7840d..9bbb7aaceb915b 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx
@@ -36,7 +36,7 @@ import {
EuiPortal,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
import { SampleDataCard } from './sample_data';
interface Props {
diff --git a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js b/src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/load_tutorials.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
index be840272962594..6a0a01ebda8db9 100644
--- a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
@@ -18,7 +18,7 @@
*/
import _ from 'lodash';
-import { getServices } from './kibana_services';
+import { getServices } from '../kibana_services';
import { i18n } from '@kbn/i18n';
const baseUrlLP = getServices().addBasePath('/api/kibana/home/tutorials_LP');
diff --git a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js b/src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/sample_data_client.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
index 600b1c3cb7dfff..34c85d8d2c3503 100644
--- a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
@@ -17,7 +17,7 @@
* under the License.
*/
-import { getServices } from './kibana_services';
+import { getServices } from '../kibana_services';
const sampleDataUrl = '/api/sample_data';
diff --git a/src/legacy/core_plugins/kibana/public/home/plugin.ts b/src/legacy/core_plugins/kibana/public/home/plugin.ts
index fc1747d71d069e..a998e4d07ab156 100644
--- a/src/legacy/core_plugins/kibana/public/home/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/home/plugin.ts
@@ -88,7 +88,7 @@ export class HomePlugin implements Plugin {
indexPatternService: this.dataStart!.indexPatterns,
...angularDependencies,
});
- const { renderApp } = await import('./render_app');
+ const { renderApp } = await import('./np_ready/application');
return await renderApp(params.element);
},
});
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
index 611fe613ad99c7..3b49af9a4a6a66 100644
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ b/src/legacy/core_plugins/kibana/public/index.scss
@@ -11,13 +11,14 @@
@import './dev_tools/index';
// Discover styles
-@import './discover/index';
+@import 'discover/index';
// Home styles
@import './home/index';
// Visualize styles
@import './visualize/index';
+@import './visualize_embeddable/index';
// Has to come after visualize because of some
// bad cascading in the Editor layout
@import 'src/legacy/ui/public/vis/index';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/_index.scss
index fbd218a64b5fb8..0632831578bd01 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/visualize/_index.scss
@@ -1,11 +1,2 @@
-// Prefix all styles with "vis" to avoid conflicts.
-// Examples
-// visChart
-// visChart__legend
-// visChart__legend--small
-// visChart__legend-isLoading
-
-@import './editor/index';
-@import './embeddable/index';
-@import './listing/index';
-@import './wizard/index';
+// Visualize plugin styles
+@import 'np_ready/index';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss
deleted file mode 100644
index 15c3c6df0ac039..00000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss
deleted file mode 100644
index 6b31803e7c8c52..00000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './visualize_lab_disabled';
-@import './embeddables';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/index.ts b/src/legacy/core_plugins/kibana/public/visualize/index.ts
index 7c22bb3d0eaeb8..a389a44197baf4 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/index.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/index.ts
@@ -25,13 +25,15 @@ import {
legacyChrome,
npSetup,
npStart,
- SavedObjectRegistryProvider,
VisEditorTypesRegistryProvider,
} from './legacy_imports';
import { VisualizePlugin, LegacyAngularInjectedDependencies } from './plugin';
import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
+export * from './np_ready/visualize_constants';
+export { showNewVisModal } from './np_ready/wizard';
+
/**
* Get dependencies relying on the global angular context.
* They also have to get resolved together with the legacy imports above
@@ -42,13 +44,10 @@ async function getAngularDependencies(): Promise('Private');
const editorTypes = Private(VisEditorTypesRegistryProvider);
- const savedObjectRegistry = Private(SavedObjectRegistryProvider);
return {
legacyChrome,
editorTypes,
- savedObjectRegistry,
- savedVisualizations: injector.get('savedVisualizations'),
};
}
@@ -66,3 +65,5 @@ async function getAngularDependencies(): Promise string;
@@ -47,13 +48,13 @@ export interface VisualizeKibanaServices {
navigation: NavigationStart;
toastNotifications: ToastsStart;
savedObjectsClient: SavedObjectsClientContract;
- savedObjectRegistry: any;
savedQueryService: DataPublicPluginStart['query']['savedQueries'];
savedVisualizations: SavedVisualizations;
share: SharePluginStart;
uiSettings: IUiSettingsClient;
visualizeCapabilities: any;
visualizations: VisualizationsStart;
+ usageCollection?: UsageCollectionSetup;
}
let services: VisualizeKibanaServices | null = null;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index b9909e522b571f..141063adcbd6ab 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -43,7 +43,6 @@ export { IPrivate } from 'ui/private';
// @ts-ignore
export { PrivateProvider } from 'ui/private/private';
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
@@ -72,4 +71,7 @@ export { defaultEditor } from 'ui/vis/editors/default/default';
export { VisType } from 'ui/vis';
export { wrapInI18nContext } from 'ui/i18n';
-export { VisSavedObject } from './embeddable/visualize_embeddable';
+export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants';
+export { VisSavedObject } from '../visualize_embeddable/visualize_embeddable';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
+export { VisualizeEmbeddableFactory } from '../visualize_embeddable/visualize_embeddable_factory';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss
deleted file mode 100644
index 0829e9af7039b7..00000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './listing';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss
new file mode 100644
index 00000000000000..f97ae012055b0f
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss
@@ -0,0 +1,10 @@
+// Prefix all styles with "vis" to avoid conflicts.
+// Examples
+// visChart
+// visChart__legend
+// visChart__legend--small
+// visChart__legend-isLoading
+
+@import 'editor/index';
+@import 'listing/index';
+@import 'wizard/index';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/application.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/application.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
index 3161576eacf71d..dcd68a26743ab5 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/application.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
@@ -38,12 +38,12 @@ import {
PrivateProvider,
PromiseServiceCreator,
StateManagementConfigProvider,
-} from './legacy_imports';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
+} from '../legacy_imports';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
// @ts-ignore
import { initVisualizeApp } from './legacy_app';
-import { VisualizeKibanaServices } from './kibana_services';
+import { VisualizeKibanaServices } from '../kibana_services';
let angularModuleInstance: IModule | null = null;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/breadcrumbs.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
index dfe74acd47ea89..f738820677beb4 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
@@ -1,11 +1,7 @@
.visEditor {
@include flex-parent();
- @include euiBreakpoint('l', 'xl') {
- position: absolute;
- width: 100%;
- height: 100%;
- }
+ height: 100%;
@include euiBreakpoint('xs', 's', 'm') {
.visualization {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss
new file mode 100644
index 00000000000000..9d3ca4b5399472
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss
@@ -0,0 +1 @@
+@import 'editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index f745e65cc5d1cf..ed9bec9db41126 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -21,33 +21,33 @@ import angular from 'angular';
import _ from 'lodash';
import { Subscription } from 'rxjs';
import { i18n } from '@kbn/i18n';
-import '../saved_visualizations/saved_visualizations';
+import '../../saved_visualizations/saved_visualizations';
import React from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { migrateAppState } from './lib';
-import { DashboardConstants } from '../../dashboard/dashboard_constants';
import { VisualizeConstants } from '../visualize_constants';
import { getEditBreadcrumbs } from '../breadcrumbs';
import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
-import { unhashUrl } from '../../../../../../plugins/kibana_utils/public';
+import { FilterStateManager } from '../../../../../data/public';
+import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
import { initVisEditorDirective } from './visualization_editor';
import { initVisualizationDirective } from './visualization';
import {
+ subscribeWithScope,
absoluteToParsedUrl,
KibanaParsedUrl,
migrateLegacyQuery,
SavedObjectSaveModal,
showSaveModal,
stateMonitorFactory,
- subscribeWithScope,
-} from '../legacy_imports';
+ DashboardConstants,
+} from '../../legacy_imports';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
export function initEditorDirective(app, deps) {
app.directive('visualizeApp', function() {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/lib/index.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/lib/index.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/lib/migrate_app_state.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/lib/migrate_app_state.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.ts
index 71156bc38d4980..f29fb72a9fbc5a 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { State } from './legacy_imports';
-import { DataPublicPluginStart as DataStart } from '../../../../../plugins/data/public';
+import { State } from '../legacy_imports';
+import { DataPublicPluginStart as DataStart } from '../../../../../../plugins/data/public';
/**
* Helper function to sync the global state with the various state providers
diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/visualize/legacy_app.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
index e948862071f69d..d99771ccc912dd 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
@@ -29,7 +29,7 @@ import { VisualizeListingController } from './listing/visualize_listing';
import {
ensureDefaultIndexPattern,
registerTimefilterWithGlobalStateFactory,
-} from './legacy_imports';
+} from '../legacy_imports';
import { syncOnMount } from './global_state_sync';
import {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss
new file mode 100644
index 00000000000000..924c164e467d88
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss
@@ -0,0 +1 @@
+@import 'listing';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/_listing.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/_listing.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
index 4ee8809fab2285..522d20fffafd37 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
@@ -17,6 +17,7 @@
add-base-path="listingController.addBasePath"
ui-settings="listingController.uiSettings"
saved-objects="listingController.savedObjects"
+ usage-collection="listingController.usageCollection"
>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
index ca6660f34a0a6e..ac8308e1cd1c54 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
@@ -23,8 +23,8 @@ import { NewVisModal } from '../wizard/new_vis_modal';
import { VisualizeConstants } from '../visualize_constants';
import { i18n } from '@kbn/i18n';
-import { getServices } from '../kibana_services';
-import { wrapInI18nContext } from '../legacy_imports';
+import { getServices } from '../../kibana_services';
+import { wrapInI18nContext } from '../../legacy_imports';
export function initListingDirective(app) {
app.directive('visualizeListingTable', reactDirective =>
@@ -37,6 +37,7 @@ export function initListingDirective(app) {
['addBasePath', { watchDepth: 'reference' }],
['uiSettings', { watchDepth: 'reference' }],
['savedObjects', { watchDepth: 'reference' }],
+ ['usageCollection', { watchDepth: 'reference' }],
'isOpen',
])
);
@@ -47,8 +48,8 @@ export function VisualizeListingController($injector, createNewVis) {
addBasePath,
chrome,
legacyChrome,
- savedObjectRegistry,
savedObjectsClient,
+ savedVisualizations,
data: {
query: {
timefilter: { timefilter },
@@ -58,6 +59,7 @@ export function VisualizeListingController($injector, createNewVis) {
uiSettings,
visualizations,
core: { docLinks, savedObjects },
+ usageCollection,
} = getServices();
const kbnUrl = $injector.get('kbnUrl');
@@ -68,6 +70,7 @@ export function VisualizeListingController($injector, createNewVis) {
this.addBasePath = addBasePath;
this.uiSettings = uiSettings;
this.savedObjects = savedObjects;
+ this.usageCollection = usageCollection;
this.createNewVis = () => {
this.showNewVisModal = true;
@@ -94,15 +97,11 @@ export function VisualizeListingController($injector, createNewVis) {
// In case the user navigated to the page via the /visualize/new URL we start the dialog immediately
this.createNewVis();
}
-
- // TODO: Extract this into an external service.
- const services = savedObjectRegistry.byLoaderPropertiesName;
- const visualizationService = services.visualizations;
this.visTypeRegistry = visualizations.types;
this.fetchItems = filter => {
const isLabsEnabled = uiSettings.get('visualize:enableLabs');
- return visualizationService
+ return savedVisualizations
.findListItems(filter, uiSettings.get('savedObjects:listingLimit'))
.then(result => {
this.totalItems = result.total;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
index 890fa64af96935..840e647edcc86d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
@@ -21,11 +21,11 @@ import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-import { TableListView } from '../../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '../../../../../../../plugins/kibana_react/public';
import { EuiIcon, EuiBetaBadge, EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
class VisualizeListingTable extends Component {
constructor(props) {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/types.d.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
index b6a39812153846..f47a54baac9a1c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { VisSavedObject } from './legacy_imports';
+import { VisSavedObject } from '../legacy_imports';
export interface SavedVisualizations {
urlFor: (id: string) => string;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
index c64287a0e63b82..1e7ac668697de7 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
@@ -18,7 +18,7 @@
*/
import { IModule } from 'angular';
-import { VisualizeKibanaServices } from './kibana_services';
+import { VisualizeKibanaServices } from '../kibana_services';
// @ts-ignore
import { initEditorDirective } from './editor/editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/visualize_constants.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/visualize_constants.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/_dialog.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_dialog.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/_dialog.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_dialog.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss
new file mode 100644
index 00000000000000..a10b4b1b347b7e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss
@@ -0,0 +1 @@
+@import 'dialog';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/index.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
index 8e4d50d27a453f..2005133e6d03e4 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
@@ -20,11 +20,10 @@
import React from 'react';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { VisType } from '../legacy_imports';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { VisType } from '../../legacy_imports';
+import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
-jest.mock('ui/new_platform');
-jest.mock('../legacy_imports', () => ({
+jest.mock('../../legacy_imports', () => ({
State: () => null,
AppState: () => null,
}));
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
index e84797302589d3..9e8f46407f5918 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
@@ -22,13 +22,17 @@ import React from 'react';
import { EuiModal, EuiOverlayMask } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { METRIC_TYPE, UiStatsMetricType } from '@kbn/analytics';
import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
-import { VisType } from '../legacy_imports';
+import { VisType } from '../../legacy_imports';
import { VisualizeConstants } from '../visualize_constants';
-import { createUiStatsReporter, METRIC_TYPE } from '../../../../ui_metric/public';
import { SearchSelection } from './search_selection';
import { TypeSelection } from './type_selection';
-import { TypesStart, VisTypeAlias } from '../../../../visualizations/public/np_ready/public/types';
+import {
+ TypesStart,
+ VisTypeAlias,
+} from '../../../../../visualizations/public/np_ready/public/types';
+import { UsageCollectionSetup } from '../../../../../../../plugins/usage_collection/public';
interface TypeSelectionProps {
isOpen: boolean;
@@ -38,6 +42,7 @@ interface TypeSelectionProps {
addBasePath: (path: string) => string;
uiSettings: IUiSettingsClient;
savedObjects: SavedObjectsStart;
+ usageCollection?: UsageCollectionSetup;
}
interface TypeSelectionState {
@@ -53,7 +58,9 @@ class NewVisModal extends React.Component;
+ private readonly trackUiMetric:
+ | ((type: UiStatsMetricType, eventNames: string | string[], count?: number) => void)
+ | undefined;
constructor(props: TypeSelectionProps) {
super(props);
@@ -63,7 +70,10 @@ class NewVisModal extends React.Component void;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
index 88838e16c40e24..567b7e861ad8ed 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
@@ -23,7 +23,8 @@ import ReactDOM from 'react-dom';
import { I18nProvider } from '@kbn/i18n/react';
import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
import { NewVisModal } from './new_vis_modal';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
+import { UsageCollectionSetup } from '../../../../../../../plugins/usage_collection/public';
interface ShowNewVisModalParams {
editorParams?: string[];
@@ -34,7 +35,8 @@ export function showNewVisModal(
{ editorParams = [] }: ShowNewVisModalParams = {},
addBasePath: (path: string) => string,
uiSettings: IUiSettingsClient,
- savedObjects: SavedObjectsStart
+ savedObjects: SavedObjectsStart,
+ usageCollection?: UsageCollectionSetup
) {
const container = document.createElement('div');
const onClose = () => {
@@ -53,6 +55,7 @@ export function showNewVisModal(
addBasePath={addBasePath}
uiSettings={uiSettings}
savedObjects={savedObjects}
+ usageCollection={usageCollection}
/>
);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/index.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
index 38cd7fbe315ad8..28cafde45a7148 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
@@ -34,13 +34,13 @@ import {
EuiSpacer,
EuiTitle,
} from '@elastic/eui';
-import { VisType } from '../../legacy_imports';
-import { memoizeLast } from '../../../../../visualizations/public/np_ready/public/legacy/memoize';
-import { VisTypeAlias } from '../../../../../visualizations/public';
+import { VisType } from '../../../legacy_imports';
+import { memoizeLast } from '../../../../../../visualizations/public/np_ready/public/legacy/memoize';
+import { VisTypeAlias } from '../../../../../../visualizations/public';
import { NewVisHelp } from './new_vis_help';
import { VisHelpText } from './vis_help_text';
import { VisTypeIcon } from './vis_type_icon';
-import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../../../../visualizations/public/np_ready/public/types';
export interface VisTypeListEntry extends VisType {
highlighted: boolean;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_help_text.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_help_text.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_help_text.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_help_text.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_type_icon.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_type_icon.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_type_icon.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_type_icon.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts b/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
index 9dff936761a4b1..9ea26f129895ce 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
@@ -34,22 +34,24 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../p
import { SharePluginStart } from '../../../../../plugins/share/public';
import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
import { VisualizationsStart } from '../../../visualizations/public';
-import { VisualizeEmbeddableFactory } from './embeddable/visualize_embeddable_factory';
-import { VISUALIZE_EMBEDDABLE_TYPE } from './embeddable/constants';
-import { VisualizeConstants } from './visualize_constants';
+import { VisualizeConstants } from './np_ready/visualize_constants';
import { setServices, VisualizeKibanaServices } from './kibana_services';
import {
FeatureCatalogueCategory,
HomePublicPluginSetup,
} from '../../../../../plugins/home/public';
-import { defaultEditor, VisEditorTypesRegistryProvider } from './legacy_imports';
-import { SavedVisualizations } from './types';
+import {
+ defaultEditor,
+ VisEditorTypesRegistryProvider,
+ VisualizeEmbeddableFactory,
+ VISUALIZE_EMBEDDABLE_TYPE,
+} from './legacy_imports';
+import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
+import { createSavedVisLoader } from './saved_visualizations/saved_visualizations';
export interface LegacyAngularInjectedDependencies {
legacyChrome: any;
editorTypes: any;
- savedObjectRegistry: any;
- savedVisualizations: SavedVisualizations;
}
export interface VisualizePluginStartDependencies {
@@ -66,6 +68,7 @@ export interface VisualizePluginSetupDependencies {
};
home: HomePublicPluginSetup;
kibana_legacy: KibanaLegacySetup;
+ usageCollection?: UsageCollectionSetup;
}
export class VisualizePlugin implements Plugin {
@@ -80,7 +83,12 @@ export class VisualizePlugin implements Plugin {
public async setup(
core: CoreSetup,
- { home, kibana_legacy, __LEGACY: { getAngularDependencies } }: VisualizePluginSetupDependencies
+ {
+ home,
+ kibana_legacy,
+ __LEGACY: { getAngularDependencies },
+ usageCollection,
+ }: VisualizePluginSetupDependencies
) {
kibana_legacy.registerLegacyApp({
id: 'visualize',
@@ -100,6 +108,12 @@ export class VisualizePlugin implements Plugin {
} = this.startDependencies;
const angularDependencies = await getAngularDependencies();
+ const savedVisualizations = createSavedVisLoader({
+ savedObjectsClient,
+ indexPatterns: data.indexPatterns,
+ chrome: contextCore.chrome,
+ overlays: contextCore.overlays,
+ });
const deps: VisualizeKibanaServices = {
...angularDependencies,
addBasePath: contextCore.http.basePath.prepend,
@@ -112,16 +126,18 @@ export class VisualizePlugin implements Plugin {
localStorage: new Storage(localStorage),
navigation,
savedObjectsClient,
+ savedVisualizations,
savedQueryService: data.query.savedQueries,
share,
toastNotifications: contextCore.notifications.toasts,
uiSettings: contextCore.uiSettings,
visualizeCapabilities: contextCore.application.capabilities.visualize,
visualizations,
+ usageCollection,
};
setServices(deps);
- const { renderApp } = await import('./application');
+ const { renderApp } = await import('./np_ready/application');
return renderApp(params.element, params.appBasePath, deps);
},
});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts
index 3490e0ab127edc..9f7ba342d803f5 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts
@@ -29,12 +29,12 @@ import { Vis } from 'ui/vis';
import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
import { updateOldState } from '../../../../visualizations/public';
-import { VisualizeConstants } from '../visualize_constants';
import { extractReferences, injectReferences } from './saved_visualization_references';
import { IIndexPattern } from '../../../../../../plugins/data/public';
import { VisSavedObject } from '../legacy_imports';
import { createSavedSearchesService } from '../../discover';
+import { VisualizeConstants } from '..';
async function _afterEsResp(savedVis: VisSavedObject, services: any) {
await _getLinkedSavedSearch(savedVis, services);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts
index 6549b317d16346..b71a10ab000d89 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts
@@ -18,7 +18,7 @@
*/
import { extractReferences, injectReferences } from './saved_visualization_references';
-import { VisSavedObject } from '../embeddable/visualize_embeddable';
+import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
describe('extractReferences', () => {
test('extracts nothing if savedSearchId is empty', () => {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts
index dd8c2e9d2b74fa..0c76aaff4345d8 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import { SavedObjectAttributes, SavedObjectReference } from 'kibana/server';
-import { VisSavedObject } from '../embeddable/visualize_embeddable';
+import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
export function extractReferences({
attributes,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts
index 803474b1f7b3f1..cbf72339804ce9 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts
@@ -16,15 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { npStart } from 'ui/new_platform';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
// @ts-ignore
import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
import './saved_visualizations';
+import { createSavedVisLoader } from './saved_visualizations';
-SavedObjectRegistryProvider.register((savedVisualizations: any) => {
- return savedVisualizations;
-});
+const services = {
+ savedObjectsClient: npStart.core.savedObjects.client,
+ indexPatterns: npStart.plugins.data.indexPatterns,
+ chrome: npStart.core.chrome,
+ overlays: npStart.core.overlays,
+};
+
+const savedObjectLoaderVisualize = createSavedVisLoader(services);
// Register this service with the saved object registry so it can be
// edited by the object editor.
@@ -32,3 +39,5 @@ savedObjectManagementRegistry.register({
service: 'savedVisualizations',
title: 'visualizations',
});
+
+uiModules.get('app/visualize').service('savedVisualizations', () => savedObjectLoaderVisualize);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts
index 7425250bffe1ac..c19c7818c1fbda 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts
@@ -16,26 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { npStart } from 'ui/new_platform';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
-import { createVisualizeEditUrl } from '../visualize_constants';
// @ts-ignore
import { findListItems } from './find_list_items';
import { createSavedVisClass } from './_saved_vis';
-const app = uiModules.get('app/visualize');
+import { createVisualizeEditUrl } from '..';
+
+export function createSavedVisLoader(services: SavedObjectKibanaServices) {
+ const { savedObjectsClient } = services;
-app.service('savedVisualizations', function() {
- const savedObjectsClient = npStart.core.savedObjects.client;
- const services = {
- savedObjectsClient,
- indexPatterns: npStart.plugins.data.indexPatterns,
- chrome: npStart.core.chrome,
- overlays: npStart.core.overlays,
- };
class SavedObjectLoaderVisualize extends SavedObjectLoader {
mapHitSource = (source: Record, id: string) => {
const visTypes = visualizations.types;
@@ -81,6 +73,5 @@ app.service('savedVisualizations', function() {
}
}
const SavedVis = createSavedVisClass(services);
-
- return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient, npStart.core.chrome);
-});
+ return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient, services.chrome);
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss
deleted file mode 100644
index 328af16f3eebda..00000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './dialog';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_embeddables.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_embeddables.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/_embeddables.scss
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/_embeddables.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss
new file mode 100644
index 00000000000000..c1e3809657bfa0
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss
@@ -0,0 +1,2 @@
+@import 'visualize_lab_disabled';
+@import 'embeddables';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_visualize_lab_disabled.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_visualize_lab_disabled.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/_visualize_lab_disabled.scss
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/_visualize_lab_disabled.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/constants.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/constants.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx b/src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_embeddable.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_embeddable.tsx
index d8792a761b1860..f9dfd5d2b98f41 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_embeddable.tsx
@@ -19,7 +19,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import { Embeddable, EmbeddableOutput } from '../../../../../../plugins/embeddable/public';
+import { Embeddable, EmbeddableOutput } from '../../../../../plugins/embeddable/public';
import { DisabledLabVisualization } from './disabled_lab_visualization';
import { VisualizeInput } from './visualize_embeddable';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_visualization.tsx b/src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_visualization.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_visualization.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_visualization.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/get_index_pattern.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/get_index_pattern.ts
index 7fe3678bb1f770..36efc4b86d0d31 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/get_index_pattern.ts
@@ -20,7 +20,7 @@
import { npStart } from 'ui/new_platform';
import { VisSavedObject } from './visualize_embeddable';
-import { indexPatterns, IIndexPattern } from '../../../../../../plugins/data/public';
+import { indexPatterns, IIndexPattern } from '../../../../../plugins/data/public';
export async function getIndexPattern(
savedVis: VisSavedObject
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/index.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
index 45cc1dc5fb9ddd..4d45b0d86023ec 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
@@ -29,7 +29,7 @@ import { getTableAggs } from 'ui/visualize/loader/pipeline_helpers/utilities';
import { AppState } from 'ui/state_management/app_state';
import { npStart } from 'ui/new_platform';
import { IExpressionLoaderParams } from 'src/plugins/expressions/public';
-import { SearchSourceContract } from 'ui/courier';
+import { ISearchSource } from 'ui/courier';
import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
import {
IIndexPattern,
@@ -38,23 +38,23 @@ import {
onlyDisabledFiltersChanged,
esFilters,
mapAndFlattenFilters,
-} from '../../../../../../plugins/data/public';
+} from '../../../../../plugins/data/public';
import {
EmbeddableInput,
EmbeddableOutput,
Embeddable,
Container,
APPLY_FILTER_TRIGGER,
-} from '../../../../../../plugins/embeddable/public';
-import { dispatchRenderComplete } from '../../../../../../plugins/kibana_utils/public';
-import { SavedSearch } from '../../discover/types';
+} from '../../../../../plugins/embeddable/public';
+import { dispatchRenderComplete } from '../../../../../plugins/kibana_utils/public';
+import { SavedSearch } from '../discover/np_ready/types';
const getKeys = (o: T): Array => Object.keys(o) as Array;
export interface VisSavedObject extends SavedObject {
vis: Vis;
description?: string;
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
title: string;
uiStateJSON?: string;
destroy: () => void;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable_factory.tsx
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable_factory.tsx
index a377dafe9e5123..dd6723fb578afe 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable_factory.tsx
@@ -35,7 +35,7 @@ import 'uiExports/visualize';
import { i18n } from '@kbn/i18n';
import chrome from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
+import { npSetup, npStart } from 'ui/new_platform';
import { Legacy } from 'kibana';
@@ -45,10 +45,10 @@ import {
ErrorEmbeddable,
Container,
EmbeddableOutput,
-} from '../../../../../../plugins/embeddable/public';
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
-import { showNewVisModal } from '../wizard';
-import { SavedVisualizations } from '../types';
+} from '../../../../../plugins/embeddable/public';
+import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
+import { showNewVisModal } from '../visualize';
+import { SavedVisualizations } from '../visualize/np_ready/types';
import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
import { getIndexPattern } from './get_index_pattern';
import {
@@ -58,7 +58,7 @@ import {
VisSavedObject,
} from './visualize_embeddable';
import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../visualizations/public/np_ready/public/types';
interface VisualizationAttributes extends SavedObjectAttributes {
visState: string;
@@ -200,7 +200,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
},
npStart.core.http.basePath.prepend,
npStart.core.uiSettings,
- npStart.core.savedObjects
+ npStart.core.savedObjects,
+ npSetup.plugins.usageCollection
);
}
return undefined;
diff --git a/src/legacy/core_plugins/kibana/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/ui_setting_defaults.js
index 682da20ca4118d..196d9662f8b15c 100644
--- a/src/legacy/core_plugins/kibana/ui_setting_defaults.js
+++ b/src/legacy/core_plugins/kibana/ui_setting_defaults.js
@@ -20,6 +20,7 @@
import moment from 'moment-timezone';
import numeralLanguages from '@elastic/numeral/languages';
import { i18n } from '@kbn/i18n';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../plugins/data/common';
export function getUiSettingDefaults() {
const weekdays = moment.weekdays().slice();
@@ -121,7 +122,7 @@ export function getUiSettingDefaults() {
},
'search:queryLanguage': {
name: queryLanguageSettingName,
- value: 'kuery',
+ value: DEFAULT_QUERY_LANGUAGE,
description: i18n.translate('kbn.advancedSettings.searchQueryLanguageText', {
defaultMessage:
'Query language used by the query bar. KQL is a new language built specifically for Kibana.',
diff --git a/src/legacy/core_plugins/timelion/index.ts b/src/legacy/core_plugins/timelion/index.ts
index 77e62ed02718cc..ec121647f4e477 100644
--- a/src/legacy/core_plugins/timelion/index.ts
+++ b/src/legacy/core_plugins/timelion/index.ts
@@ -31,7 +31,7 @@ const experimentalLabel = i18n.translate('timelion.uiSettings.experimentalLabel'
const timelionPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
new Plugin({
- require: ['kibana', 'elasticsearch'],
+ require: ['kibana', 'elasticsearch', 'data'],
config(Joi: any) {
return Joi.object({
enabled: Joi.boolean().default(true),
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
index bff847becb7a82..7ef722ee3a277c 100644
--- a/src/legacy/core_plugins/timelion/public/app.js
+++ b/src/legacy/core_plugins/timelion/public/app.js
@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
import { capabilities } from 'ui/capabilities';
import { docTitle } from 'ui/doc_title';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
import { fatalError, toastNotifications } from 'ui/notify';
import { timezoneProvider } from 'ui/vis/lib/timezone';
import { timefilter } from 'ui/timefilter';
@@ -36,15 +35,15 @@ require('ui/autoload/all');
// TODO: remove ui imports completely (move to plugins)
import 'ui/directives/input_focus';
-import 'ui/directives/saved_object_finder';
+import './directives/saved_object_finder';
import 'ui/directives/listen';
import 'ui/kbn_top_nav';
import 'ui/saved_objects/ui/saved_object_save_as_checkbox';
-import './services/saved_sheets';
-import './services/_saved_sheet';
+import '../../data/public/legacy';
import './services/saved_sheet_register';
import rootTemplate from 'plugins/timelion/index.html';
+import { createSavedVisLoader } from '../../kibana/public/visualize';
require('plugins/timelion/directives/cells/cells');
require('plugins/timelion/directives/fixed_element');
@@ -129,8 +128,12 @@ app.controller('timelion', function(
timefilter.enableAutoRefreshSelector();
timefilter.enableTimeRangeSelector();
- const savedVisualizations = Private(SavedObjectRegistryProvider).byLoaderPropertiesName
- .visualizations;
+ const savedVisualizations = createSavedVisLoader({
+ savedObjectsClient: npStart.core.savedObjects.client,
+ indexPatterns: npStart.plugins.data.indexPatterns,
+ chrome: npStart.core.chrome,
+ overlays: npStart.core.overlays,
+ });
const timezone = Private(timezoneProvider)();
const defaultExpression = '.es(*)';
diff --git a/src/legacy/ui/public/directives/partials/saved_object_finder.html b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
similarity index 86%
rename from src/legacy/ui/public/directives/partials/saved_object_finder.html
rename to src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
index adf7f5dacae9a6..ad148801c03a4a 100644
--- a/src/legacy/ui/public/directives/partials/saved_object_finder.html
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
@@ -23,7 +23,7 @@
@@ -33,7 +33,7 @@
ng-if="onAddNew"
ng-click="onAddNew()"
data-test-subj="addNewSavedObjectLink"
- i18n-id="common.ui.savedObjectFinder.addNewItemButtonLabel"
+ i18n-id="timelion.savedObjectFinder.addNewItemButtonLabel"
i18n-default-message="Add new {item}"
i18n-values="{item: finder.properties.noun}"
i18n-description="{item} can be a type of object in Kibana, like 'visualization', 'dashboard', etc"
@@ -43,7 +43,7 @@
class="kuiButton kuiButton--secondary"
ng-if="!useLocalManagement"
ng-click="finder.manageObjects(finder.properties.name)"
- i18n-id="common.ui.savedObjectFinder.manageItemsButtonLabel"
+ i18n-id="timelion.savedObjectFinder.manageItemsButtonLabel"
i18n-default-message="Manage {items}"
i18n-values="{items: finder.properties.nouns}"
i18n-description="{items} can be a type of object in Kibana, like 'visualizations', 'dashboards', etc"
@@ -64,11 +64,11 @@
aria-live="assertive"
>
@@ -108,7 +108,7 @@
class="list-group-item list-group-no-results"
ng-if="finder.hits.length === 0"
>
-
{
- return savedSheets;
-});
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts b/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
index d851b5a8636581..df3898e3410ddd 100644
--- a/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
+++ b/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
@@ -33,29 +33,28 @@ savedObjectManagementRegistry.register({
title: 'sheets',
});
-// This is the only thing that gets injected into controllers
-module.service('savedSheets', function() {
- const savedObjectsClient = npStart.core.savedObjects.client;
- const services = {
- savedObjectsClient,
- indexPatterns: npStart.plugins.data.indexPatterns,
- chrome: npStart.core.chrome,
- overlays: npStart.core.overlays,
- };
+const savedObjectsClient = npStart.core.savedObjects.client;
+const services = {
+ savedObjectsClient,
+ indexPatterns: npStart.plugins.data.indexPatterns,
+ chrome: npStart.core.chrome,
+ overlays: npStart.core.overlays,
+};
- const SavedSheet = createSavedSheetClass(services, npStart.core.uiSettings);
+const SavedSheet = createSavedSheetClass(services, npStart.core.uiSettings);
- const savedSheetLoader = new SavedObjectLoader(
- SavedSheet,
- savedObjectsClient,
- npStart.core.chrome
- );
- savedSheetLoader.urlFor = id => `#/${encodeURIComponent(id)}`;
- // Customize loader properties since adding an 's' on type doesn't work for type 'timelion-sheet'.
- savedSheetLoader.loaderProperties = {
- name: 'timelion-sheet',
- noun: 'Saved Sheets',
- nouns: 'saved sheets',
- };
- return savedSheetLoader;
-});
+export const savedSheetLoader = new SavedObjectLoader(
+ SavedSheet,
+ savedObjectsClient,
+ npStart.core.chrome
+);
+savedSheetLoader.urlFor = id => `#/${encodeURIComponent(id)}`;
+// Customize loader properties since adding an 's' on type doesn't work for type 'timelion-sheet'.
+savedSheetLoader.loaderProperties = {
+ name: 'timelion-sheet',
+ noun: 'Saved Sheets',
+ nouns: 'saved sheets',
+};
+
+// This is the only thing that gets injected into controllers
+module.service('savedSheets', () => savedSheetLoader);
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
index a2f98b8c64e538..1f6600ea56a128 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
@@ -110,7 +110,7 @@ describe('Table Vis - Controller', () => {
(cfg: any) => cfg,
'time',
stubFields,
- npStart.core.uiSettings
+ npStart.core
);
});
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index 0f9e9c11a9dbc2..59c6bddb64521d 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -28,7 +28,7 @@ import {
createFormat,
} from '../../../legacy_imports';
// eslint-disable-next-line
-import { SearchSourceContract } from '../../../../../../ui/public/courier/search_source/search_source';
+import { ISearchSource } from '../../../../../../ui/public/courier/search_source/search_source';
import { Vis, VisParams, VisState } from '..';
interface SchemaConfigParams {
@@ -466,7 +466,7 @@ export const buildVislibDimensions = async (
// take a Vis object and decorate it with the necessary params (dimensions, bucket, metric, etc)
export const getVisParams = async (
vis: Vis,
- params: { searchSource: SearchSourceContract; timeRange?: any; abortSignal?: AbortSignal }
+ params: { searchSource: ISearchSource; timeRange?: any; abortSignal?: AbortSignal }
) => {
const schemas = getSchemas(vis, params.timeRange);
let visConfig = cloneDeep(vis.params);
@@ -484,7 +484,7 @@ export const getVisParams = async (
export const buildPipeline = async (
vis: Vis,
params: {
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
timeRange?: any;
}
) => {
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index 9a18f7e8a30038..1cce1e1e6aeb6d 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -44,6 +44,7 @@ import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
import { IndexPatternsServiceFactory } from './index_patterns';
import { Capabilities } from '../../core/server';
import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
+import { HomeServerPluginSetup } from '../../plugins/home/server';
// lot of legacy code was assuming this type only had these two methods
export type KibanaConfig = Pick;
@@ -99,6 +100,7 @@ type KbnMixinFunc = (kbnServer: KbnServer, server: Server, config: any) => Promi
export interface PluginsSetup {
usageCollection: UsageCollectionSetup;
+ home: HomeServerPluginSetup;
[key: string]: object;
}
diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
index ffa16fb0a0ad1e..98484a0de6f655 100644
--- a/src/legacy/server/kbn_server.js
+++ b/src/legacy/server/kbn_server.js
@@ -35,7 +35,6 @@ import optimizeMixin from '../../optimize';
import * as Plugins from './plugins';
import { indexPatternsMixin } from './index_patterns';
import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
-import { sampleDataMixin } from './sample_data';
import { capabilitiesMixin } from './capabilities';
import { urlShorteningMixin } from './url_shortening';
import { serverExtensionsMixin } from './server_extensions';
@@ -112,9 +111,6 @@ export default class KbnServer {
// setup capabilities routes
capabilitiesMixin,
- // setup routes for installing/uninstalling sample data sets
- sampleDataMixin,
-
// setup routes for short urls
urlShorteningMixin,
diff --git a/src/legacy/server/sample_data/README.md b/src/legacy/server/sample_data/README.md
deleted file mode 100644
index 9e935043489226..00000000000000
--- a/src/legacy/server/sample_data/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### What happens when a user installs a sample data set?
-1) Kibana deletes existing Elastic search indicies for the sample data set if they exist from previous installs.
-2) Kibana creates Elasticsearch indicies with the provided field mappings.
-3) Kibana uses bulk insert to ingest the new-line delimited json into the Elasticsearch index. Kibana migrates timestamps provided in new-line delimited json to the current time frame for any date field defined in `timeFields`
-4) Kibana will install all saved objects for sample data set. This will override any saved objects previouslly installed for sample data set.
-
-Elasticsearch index names are prefixed with `kibana_sample_data_`. For more details see [createIndexName](/src/legacy/server/sample_data/routes/lib/create_index_name.js)
-
-Sample data sets typically provide data that spans 5 weeks from the past and 5 weeks into the future so users see data relative to `now` for a few weeks after installing sample data sets.
-
-### Adding new sample data sets
-Use [existing sample data sets](/src/legacy/server/sample_data/data_sets) as examples.
-To avoid bloating the Kibana distribution, keep data set size to a minimum.
-
-Follow the steps below to add new Sample data sets to Kibana.
-1) Create new-line delimited json containing sample data.
-2) Create file with Elasticsearch field mappings for sample data indices.
-3) Create Kibana saved objects for sample data including index-patterns, visualizations, and dashboards. The best way to extract the saved objects is from the Kibana management -> saved objects [export UI](https://www.elastic.co/guide/en/kibana/current/managing-saved-objects.html#_export)
-4) Define sample data spec conforming to [Data Set Schema](/src/legacy/server/sample_data/data_set_schema.js).
-5) Register sample data by calling `server.registerSampleDataset(yourSpecProvider)` where `yourSpecProvider` is a function that returns an object containing your sample data spec from step 4.
diff --git a/src/legacy/server/sample_data/routes/install.js b/src/legacy/server/sample_data/routes/install.js
deleted file mode 100644
index 42635618e1ad6b..00000000000000
--- a/src/legacy/server/sample_data/routes/install.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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 Boom from 'boom';
-import Joi from 'joi';
-import { usage } from '../usage';
-import { loadData } from './lib/load_data';
-import { createIndexName } from './lib/create_index_name';
-import {
- dateToIso8601IgnoringTime,
- translateTimeRelativeToDifference,
- translateTimeRelativeToWeek,
-} from './lib/translate_timestamp';
-
-function insertDataIntoIndex(
- dataIndexConfig,
- index,
- nowReference,
- request,
- server,
- callWithRequest
-) {
- const bulkInsert = async docs => {
- function updateTimestamps(doc) {
- dataIndexConfig.timeFields.forEach(timeFieldName => {
- if (doc[timeFieldName]) {
- doc[timeFieldName] = dataIndexConfig.preserveDayOfWeekTimeOfDay
- ? translateTimeRelativeToWeek(
- doc[timeFieldName],
- dataIndexConfig.currentTimeMarker,
- nowReference
- )
- : translateTimeRelativeToDifference(
- doc[timeFieldName],
- dataIndexConfig.currentTimeMarker,
- nowReference
- );
- }
- });
- return doc;
- }
-
- const insertCmd = { index: { _index: index } };
-
- const bulk = [];
- docs.forEach(doc => {
- bulk.push(insertCmd);
- bulk.push(updateTimestamps(doc));
- });
- const resp = await callWithRequest(request, 'bulk', { body: bulk });
- if (resp.errors) {
- server.log(
- ['warning'],
- `sample_data install errors while bulk inserting. Elasticsearch response: ${JSON.stringify(
- resp,
- null,
- ''
- )}`
- );
- return Promise.reject(
- new Error(`Unable to load sample data into index "${index}", see kibana logs for details`)
- );
- }
- };
-
- return loadData(dataIndexConfig.dataPath, bulkInsert);
-}
-
-export const createInstallRoute = () => ({
- path: '/api/sample_data/{id}',
- method: 'POST',
- config: {
- validate: {
- query: Joi.object().keys({ now: Joi.date().iso() }),
- params: Joi.object()
- .keys({ id: Joi.string().required() })
- .required(),
- },
- handler: async (request, h) => {
- const { server, params, query } = request;
-
- const sampleDataset = server.getSampleDatasets().find(({ id }) => id === params.id);
- if (!sampleDataset) {
- return h.response().code(404);
- }
-
- const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-
- const now = query.now ? query.now : new Date();
- const nowReference = dateToIso8601IgnoringTime(now);
-
- const counts = {};
- for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
- const dataIndexConfig = sampleDataset.dataIndices[i];
- const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
-
- // clean up any old installation of dataset
- try {
- await callWithRequest(request, 'indices.delete', { index });
- } catch (err) {
- // ignore delete errors
- }
-
- try {
- const createIndexParams = {
- index: index,
- body: {
- settings: { index: { number_of_shards: 1, auto_expand_replicas: '0-1' } },
- mappings: { properties: dataIndexConfig.fields },
- },
- };
- await callWithRequest(request, 'indices.create', createIndexParams);
- } catch (err) {
- const errMsg = `Unable to create sample data index "${index}", error: ${err.message}`;
- server.log(['warning'], errMsg);
- return h.response(errMsg).code(err.status);
- }
-
- try {
- const count = await insertDataIntoIndex(
- dataIndexConfig,
- index,
- nowReference,
- request,
- server,
- callWithRequest
- );
- counts[index] = count;
- } catch (err) {
- server.log(['warning'], `sample_data install errors while loading data. Error: ${err}`);
- return h.response(err.message).code(500);
- }
- }
-
- let createResults;
- try {
- createResults = await request
- .getSavedObjectsClient()
- .bulkCreate(sampleDataset.savedObjects, { overwrite: true });
- } catch (err) {
- server.log(['warning'], `bulkCreate failed, error: ${err.message}`);
- return Boom.badImplementation(
- `Unable to load kibana saved objects, see kibana logs for details`
- );
- }
- const errors = createResults.saved_objects.filter(savedObjectCreateResult => {
- return Boolean(savedObjectCreateResult.error);
- });
- if (errors.length > 0) {
- server.log(
- ['warning'],
- `sample_data install errors while loading saved objects. Errors: ${errors.join(',')}`
- );
- return h
- .response(`Unable to load kibana saved objects, see kibana logs for details`)
- .code(403);
- }
-
- // track the usage operation in a non-blocking way
- usage(request).addInstall(params.id);
-
- return h.response({
- elasticsearchIndicesCreated: counts,
- kibanaSavedObjectsLoaded: sampleDataset.savedObjects.length,
- });
- },
- },
-});
diff --git a/src/legacy/server/sample_data/routes/lib/create_index_name.test.js b/src/legacy/server/sample_data/routes/lib/create_index_name.test.js
deleted file mode 100644
index e285dc0120ac86..00000000000000
--- a/src/legacy/server/sample_data/routes/lib/create_index_name.test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 { createIndexName } from './create_index_name';
-
-test('should include sampleDataSetId and dataIndexId in elasticsearch index name', async () => {
- expect(createIndexName('mySampleDataSetId', 'myDataIndexId')).toBe(
- 'kibana_sample_data_mySampleDataSetId_myDataIndexId'
- );
-});
-
-test('should only include sampleDataSetId when sampleDataSetId and dataIndexId are identical', async () => {
- expect(createIndexName('flights', 'flights')).toBe('kibana_sample_data_flights');
-});
diff --git a/src/legacy/server/sample_data/routes/lib/load_data.test.js b/src/legacy/server/sample_data/routes/lib/load_data.test.js
deleted file mode 100644
index 0af07e14ff9658..00000000000000
--- a/src/legacy/server/sample_data/routes/lib/load_data.test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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 { loadData } from './load_data';
-
-test('load flight data', async () => {
- let myDocsCount = 0;
- const bulkInsertMock = docs => {
- myDocsCount += docs.length;
- };
- const count = await loadData(
- './src/legacy/server/sample_data/data_sets/flights/flights.json.gz',
- bulkInsertMock
- );
- expect(myDocsCount).toBe(13059);
- expect(count).toBe(13059);
-});
-
-test('load log data', async () => {
- let myDocsCount = 0;
- const bulkInsertMock = docs => {
- myDocsCount += docs.length;
- };
- const count = await loadData(
- './src/legacy/server/sample_data/data_sets/logs/logs.json.gz',
- bulkInsertMock
- );
- expect(myDocsCount).toBe(14074);
- expect(count).toBe(14074);
-});
-
-test('load ecommerce data', async () => {
- let myDocsCount = 0;
- const bulkInsertMock = docs => {
- myDocsCount += docs.length;
- };
- const count = await loadData(
- './src/legacy/server/sample_data/data_sets/ecommerce/ecommerce.json.gz',
- bulkInsertMock
- );
- expect(myDocsCount).toBe(4675);
- expect(count).toBe(4675);
-});
diff --git a/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js b/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js
deleted file mode 100644
index e03d4870ad064e..00000000000000
--- a/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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 { translateTimeRelativeToWeek } from './translate_timestamp';
-
-describe('translateTimeRelativeToWeek', () => {
- const sourceReference = '2018-01-02T00:00:00'; //Tuesday
- const targetReference = '2018-04-25T18:24:58.650'; // Wednesday
-
- describe('2 weeks before', () => {
- test('should properly adjust timestamp when day is before targetReference day of week', () => {
- const source = '2017-12-18T23:50:00'; // Monday, -2 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-09T23:50:00'); // Monday 2 week before targetReference week
- });
-
- test('should properly adjust timestamp when day is same as targetReference day of week', () => {
- const source = '2017-12-20T23:50:00'; // Wednesday, -2 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-11T23:50:00'); // Wednesday 2 week before targetReference week
- });
-
- test('should properly adjust timestamp when day is after targetReference day of week', () => {
- const source = '2017-12-22T16:16:50'; // Friday, -2 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-13T16:16:50'); // Friday 2 week before targetReference week
- });
- });
-
- describe('week before', () => {
- test('should properly adjust timestamp when day is before targetReference day of week', () => {
- const source = '2017-12-25T23:50:00'; // Monday, -1 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-16T23:50:00'); // Monday 1 week before targetReference week
- });
-
- test('should properly adjust timestamp when day is same as targetReference day of week', () => {
- const source = '2017-12-27T23:50:00'; // Wednesday, -1 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-18T23:50:00'); // Wednesday 1 week before targetReference week
- });
-
- test('should properly adjust timestamp when day is after targetReference day of week', () => {
- const source = '2017-12-29T16:16:50'; // Friday, -1 week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-20T16:16:50'); // Friday 1 week before targetReference week
- });
- });
-
- describe('same week', () => {
- test('should properly adjust timestamp when day is before targetReference day of week', () => {
- const source = '2018-01-01T23:50:00'; // Monday, same week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-23T23:50:00'); // Monday same week as targetReference
- });
-
- test('should properly adjust timestamp when day is same as targetReference day of week', () => {
- const source = '2018-01-03T23:50:00'; // Wednesday, same week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-25T23:50:00'); // Wednesday same week as targetReference
- });
-
- test('should properly adjust timestamp when day is after targetReference day of week', () => {
- const source = '2018-01-05T16:16:50'; // Friday, same week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-27T16:16:50'); // Friday same week as targetReference
- });
- });
-
- describe('week after', () => {
- test('should properly adjust timestamp when day is before targetReference day of week', () => {
- const source = '2018-01-08T23:50:00'; // Monday, 1 week after relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-04-30T23:50:00'); // Monday 1 week after targetReference week
- });
-
- test('should properly adjust timestamp when day is same as targetReference day of week', () => {
- const source = '2018-01-10T23:50:00'; // Wednesday, same week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-05-02T23:50:00'); // Wednesday 1 week after targetReference week
- });
-
- test('should properly adjust timestamp when day is after targetReference day of week', () => {
- const source = '2018-01-12T16:16:50'; // Friday, same week relative to sourceReference
- const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
- expect(timestamp).toBe('2018-05-04T16:16:50'); // Friday 1 week after targetReference week
- });
- });
-});
diff --git a/src/legacy/server/sample_data/routes/list.js b/src/legacy/server/sample_data/routes/list.js
deleted file mode 100644
index 65370e6da9fb1f..00000000000000
--- a/src/legacy/server/sample_data/routes/list.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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 _ from 'lodash';
-import { createIndexName } from './lib/create_index_name';
-
-const NOT_INSTALLED = 'not_installed';
-const INSTALLED = 'installed';
-const UNKNOWN = 'unknown';
-
-export const createListRoute = () => ({
- path: '/api/sample_data',
- method: 'GET',
- config: {
- handler: async request => {
- const { callWithRequest } = request.server.plugins.elasticsearch.getCluster('data');
-
- const sampleDatasets = request.server.getSampleDatasets().map(sampleDataset => {
- return {
- id: sampleDataset.id,
- name: sampleDataset.name,
- description: sampleDataset.description,
- previewImagePath: sampleDataset.previewImagePath,
- darkPreviewImagePath: sampleDataset.darkPreviewImagePath,
- overviewDashboard: sampleDataset.overviewDashboard,
- appLinks: sampleDataset.appLinks,
- defaultIndex: sampleDataset.defaultIndex,
- dataIndices: sampleDataset.dataIndices.map(({ id }) => ({ id })),
- };
- });
-
- const isInstalledPromises = sampleDatasets.map(async sampleDataset => {
- 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 callWithRequest(request, 'indices.exists', { index: index });
- if (!indexExists) {
- sampleDataset.status = NOT_INSTALLED;
- return;
- }
-
- const { count } = await callWithRequest(request, 'count', { index: index });
- if (count === 0) {
- sampleDataset.status = NOT_INSTALLED;
- return;
- }
- } catch (err) {
- sampleDataset.status = UNKNOWN;
- sampleDataset.statusMsg = err.message;
- return;
- }
- }
-
- try {
- await request.getSavedObjectsClient().get('dashboard', sampleDataset.overviewDashboard);
- } catch (err) {
- // savedObjectClient.get() throws an boom error when object is not found.
- if (_.get(err, 'output.statusCode') === 404) {
- sampleDataset.status = NOT_INSTALLED;
- return;
- }
-
- sampleDataset.status = UNKNOWN;
- sampleDataset.statusMsg = err.message;
- return;
- }
-
- sampleDataset.status = INSTALLED;
- });
-
- await Promise.all(isInstalledPromises);
- return sampleDatasets;
- },
- },
-});
diff --git a/src/legacy/server/sample_data/routes/uninstall.js b/src/legacy/server/sample_data/routes/uninstall.js
deleted file mode 100644
index 6177c0379cd68b..00000000000000
--- a/src/legacy/server/sample_data/routes/uninstall.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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 _ from 'lodash';
-import Joi from 'joi';
-import { usage } from '../usage';
-import { createIndexName } from './lib/create_index_name';
-
-export const createUninstallRoute = () => ({
- path: '/api/sample_data/{id}',
- method: 'DELETE',
- config: {
- validate: {
- params: Joi.object()
- .keys({
- id: Joi.string().required(),
- })
- .required(),
- },
- handler: async (request, h) => {
- const { server, params } = request;
- const sampleDataset = server.getSampleDatasets().find(({ id }) => id === params.id);
-
- if (!sampleDataset) {
- return h.response().code(404);
- }
-
- const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-
- for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
- const dataIndexConfig = sampleDataset.dataIndices[i];
- const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
-
- try {
- await callWithRequest(request, 'indices.delete', { index: index });
- } catch (err) {
- return h
- .response(`Unable to delete sample data index "${index}", error: ${err.message}`)
- .code(err.status);
- }
- }
-
- const deletePromises = sampleDataset.savedObjects.map(({ type, id }) =>
- request.getSavedObjectsClient().delete(type, id)
- );
-
- try {
- await Promise.all(deletePromises);
- } catch (err) {
- // ignore 404s since users could have deleted some of the saved objects via the UI
- if (_.get(err, 'output.statusCode') !== 404) {
- return h
- .response(`Unable to delete sample dataset saved objects, error: ${err.message}`)
- .code(403);
- }
- }
-
- // track the usage operation in a non-blocking way
- usage(request).addUninstall(params.id);
-
- return {};
- },
- },
-});
diff --git a/src/legacy/server/sample_data/sample_data_mixin.js b/src/legacy/server/sample_data/sample_data_mixin.js
deleted file mode 100644
index 338d6fd8cb5dae..00000000000000
--- a/src/legacy/server/sample_data/sample_data_mixin.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * 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 Joi from 'joi';
-import { sampleDataSchema } from './data_set_schema';
-import { createListRoute, createInstallRoute, createUninstallRoute } from './routes';
-import { flightsSpecProvider, logsSpecProvider, ecommerceSpecProvider } from './data_sets';
-import { makeSampleDataUsageCollector } from './usage';
-
-export function sampleDataMixin(kbnServer, server) {
- server.route(createListRoute());
- server.route(createInstallRoute());
- server.route(createUninstallRoute());
-
- const sampleDatasets = [];
-
- server.decorate('server', 'getSampleDatasets', () => {
- return sampleDatasets;
- });
-
- server.decorate('server', 'registerSampleDataset', specProvider => {
- const { error, value } = Joi.validate(specProvider(server), sampleDataSchema);
-
- if (error) {
- throw new Error(`Unable to register sample dataset spec because it's invalid. ${error}`);
- }
-
- const defaultIndexSavedObjectJson = value.savedObjects.find(savedObjectJson => {
- return savedObjectJson.type === 'index-pattern' && savedObjectJson.id === value.defaultIndex;
- });
- if (!defaultIndexSavedObjectJson) {
- throw new Error(
- `Unable to register sample dataset spec, defaultIndex: "${value.defaultIndex}" does not exist in savedObjects list.`
- );
- }
-
- const dashboardSavedObjectJson = value.savedObjects.find(savedObjectJson => {
- return savedObjectJson.type === 'dashboard' && savedObjectJson.id === value.overviewDashboard;
- });
- if (!dashboardSavedObjectJson) {
- throw new Error(
- `Unable to register sample dataset spec, overviewDashboard: "${value.overviewDashboard}" does not exist in savedObjects list.`
- );
- }
-
- sampleDatasets.push(value);
- });
-
- server.decorate('server', 'addSavedObjectsToSampleDataset', (id, savedObjects) => {
- const sampleDataset = sampleDatasets.find(sampleDataset => {
- return sampleDataset.id === id;
- });
-
- if (!sampleDataset) {
- throw new Error(`Unable to find sample dataset with id: ${id}`);
- }
-
- sampleDataset.savedObjects = sampleDataset.savedObjects.concat(savedObjects);
- });
-
- server.decorate('server', 'addAppLinksToSampleDataset', (id, appLinks) => {
- const sampleDataset = sampleDatasets.find(sampleDataset => {
- return sampleDataset.id === id;
- });
-
- if (!sampleDataset) {
- throw new Error(`Unable to find sample dataset with id: ${id}`);
- }
-
- sampleDataset.appLinks = sampleDataset.appLinks.concat(appLinks);
- });
-
- server.decorate(
- 'server',
- 'replacePanelInSampleDatasetDashboard',
- ({
- sampleDataId,
- dashboardId,
- oldEmbeddableId,
- embeddableId,
- embeddableType,
- embeddableConfig = {},
- }) => {
- const sampleDataset = sampleDatasets.find(sampleDataset => {
- return sampleDataset.id === sampleDataId;
- });
- if (!sampleDataset) {
- throw new Error(`Unable to find sample dataset with id: ${sampleDataId}`);
- }
-
- const dashboard = sampleDataset.savedObjects.find(savedObject => {
- return savedObject.id === dashboardId && savedObject.type === 'dashboard';
- });
- if (!dashboard) {
- throw new Error(`Unable to find dashboard with id: ${dashboardId}`);
- }
-
- try {
- const reference = dashboard.references.find(reference => {
- return reference.id === oldEmbeddableId;
- });
- if (!reference) {
- throw new Error(`Unable to find reference for embeddable: ${oldEmbeddableId}`);
- }
- reference.type = embeddableType;
- reference.id = embeddableId;
-
- const panels = JSON.parse(dashboard.attributes.panelsJSON);
- const panel = panels.find(panel => {
- return panel.panelRefName === reference.name;
- });
- if (!panel) {
- throw new Error(`Unable to find panel for reference: ${reference.name}`);
- }
- panel.embeddableConfig = embeddableConfig;
- dashboard.attributes.panelsJSON = JSON.stringify(panels);
- } catch (error) {
- throw new Error(
- `Unable to replace panel with embeddable ${oldEmbeddableId}, error: ${error}`
- );
- }
- }
- );
-
- server.registerSampleDataset(flightsSpecProvider);
- server.registerSampleDataset(logsSpecProvider);
- server.registerSampleDataset(ecommerceSpecProvider);
-
- makeSampleDataUsageCollector(server);
-}
diff --git a/src/legacy/ui/public/agg_types/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts
index 9306ffcaff9fd9..07e0d46e4eb70c 100644
--- a/src/legacy/ui/public/agg_types/agg_config.ts
+++ b/src/legacy/ui/public/agg_types/agg_config.ts
@@ -27,7 +27,7 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
import { npStart } from 'ui/new_platform';
-import { SearchSourceContract, FetchOptions } from '../courier/types';
+import { ISearchSource, FetchOptions } from '../courier/types';
import { AggType } from './agg_type';
import { AggGroupNames } from '../vis/editors/default/agg_groups';
import { writeParams } from './agg_params';
@@ -236,7 +236,7 @@ export class AggConfig {
* @param {Courier.FetchOptions} options
* @return {Promise}
*/
- onSearchRequestStart(searchSource: SearchSourceContract, options?: FetchOptions) {
+ onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
if (!this.type) {
return Promise.resolve();
}
diff --git a/src/legacy/ui/public/agg_types/agg_configs.ts b/src/legacy/ui/public/agg_types/agg_configs.ts
index b5a7474c99b0e7..ece9c90d09b689 100644
--- a/src/legacy/ui/public/agg_types/agg_configs.ts
+++ b/src/legacy/ui/public/agg_types/agg_configs.ts
@@ -32,7 +32,7 @@ import { Schema } from '../vis/editors/default/schemas';
import { AggConfig, AggConfigOptions } from './agg_config';
import { AggGroupNames } from '../vis/editors/default/agg_groups';
import { IndexPattern } from '../../../core_plugins/data/public';
-import { SearchSourceContract, FetchOptions } from '../courier/types';
+import { ISearchSource, FetchOptions } from '../courier/types';
type Schemas = Record;
@@ -306,7 +306,7 @@ export class AggConfigs {
return _.find(reqAgg.getResponseAggs(), { id });
}
- onSearchRequestStart(searchSource: SearchSourceContract, options?: FetchOptions) {
+ onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
return Promise.all(
// @ts-ignore
this.getRequestAggs().map((agg: AggConfig) => agg.onSearchRequestStart(searchSource, options))
diff --git a/src/legacy/ui/public/agg_types/agg_type.ts b/src/legacy/ui/public/agg_types/agg_type.ts
index ff4c6875ec6c06..39be1983223bc2 100644
--- a/src/legacy/ui/public/agg_types/agg_type.ts
+++ b/src/legacy/ui/public/agg_types/agg_type.ts
@@ -24,7 +24,7 @@ import { initParams } from './agg_params';
import { AggConfig } from '../vis';
import { AggConfigs } from './agg_configs';
-import { SearchSource } from '../courier';
+import { ISearchSource } from '../courier';
import { Adapters } from '../inspector';
import { BaseParamType } from './param_types/base';
import { AggParamType } from '../agg_types/param_types/agg';
@@ -51,7 +51,7 @@ export interface AggTypeConfig<
resp: any,
aggConfigs: AggConfigs,
aggConfig: TAggConfig,
- searchSource: SearchSource,
+ searchSource: ISearchSource,
inspectorAdapters: Adapters,
abortSignal?: AbortSignal
) => Promise;
@@ -180,7 +180,7 @@ export class AggType<
resp: any,
aggConfigs: AggConfigs,
aggConfig: TAggConfig,
- searchSource: SearchSource,
+ searchSource: ISearchSource,
inspectorAdapters: Adapters,
abortSignal?: AbortSignal
) => Promise;
diff --git a/src/legacy/ui/public/agg_types/buckets/terms.ts b/src/legacy/ui/public/agg_types/buckets/terms.ts
index e38f7ca4cc038e..c805e53eb2b913 100644
--- a/src/legacy/ui/public/agg_types/buckets/terms.ts
+++ b/src/legacy/ui/public/agg_types/buckets/terms.ts
@@ -17,10 +17,9 @@
* under the License.
*/
-import chrome from 'ui/chrome';
import { noop } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { SearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
+import { ISearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
import { BucketAggType } from './_bucket_agg_type';
import { BUCKET_TYPES } from './bucket_agg_types';
import { IBucketAggConfig } from './_bucket_agg_type';
@@ -80,14 +79,8 @@ export const termsBucketAgg = new BucketAggType({
if (val === '__missing__') {
return bucket.params.missingBucketLabel;
}
- const parsedUrl = {
- origin: window.location.origin,
- pathname: window.location.pathname,
- basePath: chrome.getBasePath(),
- };
- const converter = bucket.params.field.format.getConverterFor(type);
- return converter(val, undefined, undefined, parsedUrl);
+ return bucket.params.field.format.convert(val, type);
};
},
} as FieldFormat;
@@ -97,7 +90,7 @@ export const termsBucketAgg = new BucketAggType({
resp: any,
aggConfigs: AggConfigs,
aggConfig: IBucketAggConfig,
- searchSource: SearchSource,
+ searchSource: ISearchSource,
inspectorAdapters: Adapters,
abortSignal?: AbortSignal
) => {
diff --git a/src/legacy/ui/public/agg_types/param_types/base.ts b/src/legacy/ui/public/agg_types/param_types/base.ts
index bc8fd30e6324e3..f466a9512edf90 100644
--- a/src/legacy/ui/public/agg_types/param_types/base.ts
+++ b/src/legacy/ui/public/agg_types/param_types/base.ts
@@ -19,7 +19,7 @@
import { AggConfigs } from '../agg_configs';
import { AggConfig } from '../../vis';
-import { SearchSourceContract, FetchOptions } from '../../courier/types';
+import { ISearchSource, FetchOptions } from '../../courier/types';
export class BaseParamType {
name: string;
@@ -54,7 +54,7 @@ export class BaseParamType {
*/
modifyAggConfigOnSearchRequestStart: (
aggConfig: TAggConfig,
- searchSource?: SearchSourceContract,
+ searchSource?: ISearchSource,
options?: FetchOptions
) => void;
diff --git a/src/legacy/ui/public/courier/_index.scss b/src/legacy/ui/public/courier/_index.scss
index a5b3911b1d53c8..17382cfa30ce53 100644
--- a/src/legacy/ui/public/courier/_index.scss
+++ b/src/legacy/ui/public/courier/_index.scss
@@ -1 +1 @@
-@import './fetch/components/shard_failure_modal';
\ No newline at end of file
+@import '../../../core_plugins/data/public/search/fetch/components/shard_failure_modal';
\ No newline at end of file
diff --git a/src/legacy/ui/public/courier/index.ts b/src/legacy/ui/public/courier/index.ts
index c8a06ec2a5518d..709ff1c11e9013 100644
--- a/src/legacy/ui/public/courier/index.ts
+++ b/src/legacy/ui/public/courier/index.ts
@@ -17,31 +17,46 @@
* under the License.
*/
-export { SearchSource } from './search_source';
+/**
+ * Nothing to see here!
+ *
+ * Courier / SearchSource has moved to the data plugin, and is being
+ * re-exported from ui/courier for backwards compatibility.
+ */
+
+import { start as dataStart } from '../../../core_plugins/data/public/legacy';
+
+// runtime contracts
+export const { defaultSearchStrategy, SearchSource } = dataStart.search;
+
+// types
+export {
+ ISearchSource,
+ EsQuerySortValue, // used externally by Discover
+ FetchOptions, // used externally by AggTypes
+ SortDirection, // used externally by Discover
+} from '../../../core_plugins/data/public';
+
+// static code
+export {
+ getRequestInspectorStats,
+ getResponseInspectorStats,
+} from '../../../core_plugins/data/public';
// TODO: Exporting this mock outside of jest tests causes errors because
// jest is undefined. Need to refactor the mock to be consistent with
// other NP-style mocks.
// export { searchSourceMock } from './search_source/mocks';
+// Most these can probably be made internal to the search
+// service, so we are temporarily deeply importing them
+// until we relocate them to a longer-term home.
+/* eslint-disable @kbn/eslint/no-restricted-paths */
export {
addSearchStrategy, // used externally by Rollups
getSearchErrorType, // used externally by Rollups
hasSearchStategyForIndexPattern, // used externally by Discover
isDefaultTypeIndexPattern, // used externally by Discover
SearchError, // used externally by Visualizations & Rollups
-} from './search_strategy';
-
-export {
- getRequestInspectorStats,
- getResponseInspectorStats,
-} from './utils/courier_inspector_utils';
-
-// types
-export { SearchSourceContract } from './search_source';
-
-export {
- EsQuerySortValue, // used externally by Discover
- FetchOptions, // used externally by AggTypes
- SortDirection, // used externally by Discover
-} from './types';
+} from '../../../core_plugins/data/public/search/search_strategy';
+/* eslint-enable @kbn/eslint/no-restricted-paths */
diff --git a/src/legacy/ui/public/courier/search_source/index.ts b/src/legacy/ui/public/courier/search_source/index.ts
index 72170adc2b1296..e7ca48a894b3dc 100644
--- a/src/legacy/ui/public/courier/search_source/index.ts
+++ b/src/legacy/ui/public/courier/search_source/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export * from './search_source';
+export { SearchSource, ISearchSource } from '../index';
diff --git a/src/legacy/ui/public/courier/search_source/mocks.ts b/src/legacy/ui/public/courier/search_source/mocks.ts
index 2b83f379b4f090..7b7843d22f5198 100644
--- a/src/legacy/ui/public/courier/search_source/mocks.ts
+++ b/src/legacy/ui/public/courier/search_source/mocks.ts
@@ -36,9 +36,11 @@
* under the License.
*/
-import { SearchSourceContract } from './search_source';
+// This mock is here for BWC, but will be left behind and replaced by
+// the data service mock in the new platform.
+import { ISearchSource } from '../index';
-export const searchSourceMock: MockedKeys = {
+export const searchSourceMock: MockedKeys = {
setPreferredSearchStrategyId: jest.fn(),
setFields: jest.fn().mockReturnThis(),
setField: jest.fn().mockReturnThis(),
diff --git a/src/legacy/ui/public/courier/search_source/search_source.ts b/src/legacy/ui/public/courier/search_source/search_source.ts
index e862bb1118a74b..e7ca48a894b3dc 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.ts
+++ b/src/legacy/ui/public/courier/search_source/search_source.ts
@@ -17,394 +17,4 @@
* under the License.
*/
-/**
- * @name SearchSource
- *
- * @description A promise-based stream of search results that can inherit from other search sources.
- *
- * Because filters/queries in Kibana have different levels of persistence and come from different
- * places, it is important to keep track of where filters come from for when they are saved back to
- * the savedObject store in the Kibana index. To do this, we create trees of searchSource objects
- * that can have associated query parameters (index, query, filter, etc) which can also inherit from
- * other searchSource objects.
- *
- * At query time, all of the searchSource objects that have subscribers are "flattened", at which
- * point the query params from the searchSource are collected while traversing up the inheritance
- * chain. At each link in the chain a decision about how to merge the query params is made until a
- * single set of query parameters is created for each active searchSource (a searchSource with
- * subscribers).
- *
- * That set of query parameters is then sent to elasticsearch. This is how the filter hierarchy
- * works in Kibana.
- *
- * Visualize, starting from a new search:
- *
- * - the `savedVis.searchSource` is set as the `appSearchSource`.
- * - The `savedVis.searchSource` would normally inherit from the `appSearchSource`, but now it is
- * upgraded to inherit from the `rootSearchSource`.
- * - Any interaction with the visualization will still apply filters to the `appSearchSource`, so
- * they will be stored directly on the `savedVis.searchSource`.
- * - Any interaction with the time filter will be written to the `rootSearchSource`, so those
- * filters will not be saved by the `savedVis`.
- * - When the `savedVis` is saved to elasticsearch, it takes with it all the filters that are
- * defined on it directly, but none of the ones that it inherits from other places.
- *
- * Visualize, starting from an existing search:
- *
- * - The `savedVis` loads the `savedSearch` on which it is built.
- * - The `savedVis.searchSource` is set to inherit from the `saveSearch.searchSource` and set as
- * the `appSearchSource`.
- * - The `savedSearch.searchSource`, is set to inherit from the `rootSearchSource`.
- * - Then the `savedVis` is written to elasticsearch it will be flattened and only include the
- * filters created in the visualize application and will reconnect the filters from the
- * `savedSearch` at runtime to prevent losing the relationship
- *
- * Dashboard search sources:
- *
- * - Each panel in a dashboard has a search source.
- * - The `savedDashboard` also has a searchsource, and it is set as the `appSearchSource`.
- * - Each panel's search source inherits from the `appSearchSource`, meaning that they inherit from
- * the dashboard search source.
- * - When a filter is added to the search box, or via a visualization, it is written to the
- * `appSearchSource`.
- */
-
-import _ from 'lodash';
-import { npSetup } from 'ui/new_platform';
-import { normalizeSortRequest } from './normalize_sort_request';
-import { fetchSoon } from '../fetch';
-import { fieldWildcardFilter } from '../../field_wildcard';
-import { getHighlightRequest, esFilters, esQuery } from '../../../../../plugins/data/public';
-import chrome from '../../chrome';
-import { RequestFailure } from '../fetch/errors';
-import { filterDocvalueFields } from './filter_docvalue_fields';
-import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types';
-import { FetchOptions, ApiCaller } from '../fetch/types';
-
-const esShardTimeout = npSetup.core.injectedMetadata.getInjectedVar('esShardTimeout') as number;
-const config = npSetup.core.uiSettings;
-
-export type SearchSourceContract = Pick;
-
-export class SearchSource {
- private id: string = _.uniqueId('data_source');
- private searchStrategyId?: string;
- private parent?: SearchSource;
- private requestStartHandlers: Array<
- (searchSource: SearchSourceContract, options?: FetchOptions) => Promise
- > = [];
- private inheritOptions: SearchSourceOptions = {};
- public history: SearchRequest[] = [];
-
- constructor(private fields: SearchSourceFields = {}) {}
-
- /** ***
- * PUBLIC API
- *****/
-
- setPreferredSearchStrategyId(searchStrategyId: string) {
- this.searchStrategyId = searchStrategyId;
- }
-
- setFields(newFields: SearchSourceFields) {
- this.fields = newFields;
- return this;
- }
-
- setField(field: K, value: SearchSourceFields[K]) {
- if (value == null) {
- delete this.fields[field];
- } else {
- this.fields[field] = value;
- }
- return this;
- }
-
- getId() {
- return this.id;
- }
-
- getFields() {
- return { ...this.fields };
- }
-
- /**
- * Get fields from the fields
- */
- getField(field: K, recurse = true): SearchSourceFields[K] {
- if (!recurse || this.fields[field] !== void 0) {
- return this.fields[field];
- }
- const parent = this.getParent();
- return parent && parent.getField(field);
- }
-
- /**
- * Get the field from our own fields, don't traverse up the chain
- */
- getOwnField(field: K): SearchSourceFields[K] {
- return this.getField(field, false);
- }
-
- create() {
- return new SearchSource();
- }
-
- createCopy() {
- const newSearchSource = new SearchSource();
- newSearchSource.setFields({ ...this.fields });
- // when serializing the internal fields we lose the internal classes used in the index
- // pattern, so we have to set it again to workaround this behavior
- newSearchSource.setField('index', this.getField('index'));
- newSearchSource.setParent(this.getParent());
- return newSearchSource;
- }
-
- createChild(options = {}) {
- const childSearchSource = new SearchSource();
- childSearchSource.setParent(this, options);
- return childSearchSource;
- }
-
- /**
- * Set a searchSource that this source should inherit from
- * @param {SearchSource} parent - the parent searchSource
- * @param {SearchSourceOptions} options - the inherit options
- * @return {this} - chainable
- */
- setParent(parent?: SearchSourceContract, options: SearchSourceOptions = {}) {
- this.parent = parent as SearchSource;
- this.inheritOptions = options;
- return this;
- }
-
- /**
- * Get the parent of this SearchSource
- * @return {undefined|searchSource}
- */
- getParent() {
- return this.parent;
- }
-
- /**
- * Fetch this source and reject the returned Promise on error
- *
- * @async
- */
- async fetch(options: FetchOptions = {}) {
- const $injector = await chrome.dangerouslyGetActiveInjector();
- const es = $injector.get('es') as ApiCaller;
-
- await this.requestIsStarting(options);
-
- const searchRequest = await this.flatten();
- this.history = [searchRequest];
-
- const response = await fetchSoon(
- searchRequest,
- {
- ...(this.searchStrategyId && { searchStrategyId: this.searchStrategyId }),
- ...options,
- },
- { es, config, esShardTimeout }
- );
-
- if (response.error) {
- throw new RequestFailure(null, response);
- }
-
- return response;
- }
-
- /**
- * Add a handler that will be notified whenever requests start
- * @param {Function} handler
- * @return {undefined}
- */
- onRequestStart(
- handler: (searchSource: SearchSourceContract, options?: FetchOptions) => Promise
- ) {
- this.requestStartHandlers.push(handler);
- }
-
- async getSearchRequestBody() {
- const searchRequest = await this.flatten();
- return searchRequest.body;
- }
-
- /**
- * Completely destroy the SearchSource.
- * @return {undefined}
- */
- destroy() {
- this.requestStartHandlers.length = 0;
- }
-
- /** ****
- * PRIVATE APIS
- ******/
-
- /**
- * Called by requests of this search source when they are started
- * @param {Courier.Request} request
- * @param options
- * @return {Promise}
- */
- private requestIsStarting(options: FetchOptions = {}) {
- const handlers = [...this.requestStartHandlers];
- // If callParentStartHandlers has been set to true, we also call all
- // handlers of parent search sources.
- if (this.inheritOptions.callParentStartHandlers) {
- let searchSource = this.getParent();
- while (searchSource) {
- handlers.push(...searchSource.requestStartHandlers);
- searchSource = searchSource.getParent();
- }
- }
-
- return Promise.all(handlers.map(fn => fn(this, options)));
- }
-
- /**
- * Used to merge properties into the data within ._flatten().
- * The data is passed in and modified by the function
- *
- * @param {object} data - the current merged data
- * @param {*} val - the value at `key`
- * @param {*} key - The key of `val`
- * @return {undefined}
- */
- private mergeProp(
- data: SearchRequest,
- val: SearchSourceFields[K],
- key: K
- ) {
- val = typeof val === 'function' ? val(this) : val;
- if (val == null || !key) return;
-
- const addToRoot = (rootKey: string, value: any) => {
- data[rootKey] = value;
- };
-
- /**
- * Add the key and val to the body of the request
- */
- const addToBody = (bodyKey: string, value: any) => {
- // ignore if we already have a value
- if (data.body[bodyKey] == null) {
- data.body[bodyKey] = value;
- }
- };
-
- switch (key) {
- case 'filter':
- return addToRoot('filters', (data.filters || []).concat(val));
- case 'query':
- return addToRoot(key, (data[key] || []).concat(val));
- case 'fields':
- const fields = _.uniq((data[key] || []).concat(val));
- return addToRoot(key, fields);
- case 'index':
- case 'type':
- case 'highlightAll':
- return key && data[key] == null && addToRoot(key, val);
- case 'searchAfter':
- return addToBody('search_after', val);
- case 'source':
- return addToBody('_source', val);
- case 'sort':
- const sort = normalizeSortRequest(val, this.getField('index'), config.get('sort:options'));
- return addToBody(key, sort);
- default:
- return addToBody(key, val);
- }
- }
-
- /**
- * Walk the inheritance chain of a source and return its
- * flat representation (taking into account merging rules)
- * @returns {Promise}
- * @resolved {Object|null} - the flat data of the SearchSource
- */
- private mergeProps(root = this, searchRequest: SearchRequest = { body: {} }) {
- Object.entries(this.fields).forEach(([key, value]) => {
- this.mergeProp(searchRequest, value, key as keyof SearchSourceFields);
- });
- if (this.parent) {
- this.parent.mergeProps(root, searchRequest);
- }
- return searchRequest;
- }
-
- private flatten() {
- const searchRequest = this.mergeProps();
-
- searchRequest.body = searchRequest.body || {};
- const { body, index, fields, query, filters, highlightAll } = searchRequest;
-
- const computedFields = index ? index.getComputedFields() : {};
-
- body.stored_fields = computedFields.storedFields;
- body.script_fields = body.script_fields || {};
- _.extend(body.script_fields, computedFields.scriptFields);
-
- const defaultDocValueFields = computedFields.docvalueFields
- ? computedFields.docvalueFields
- : [];
- body.docvalue_fields = body.docvalue_fields || defaultDocValueFields;
-
- if (!body.hasOwnProperty('_source') && index) {
- body._source = index.getSourceFiltering();
- }
-
- if (body._source) {
- // exclude source fields for this index pattern specified by the user
- const filter = fieldWildcardFilter(body._source.excludes, config.get('metaFields'));
- body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) =>
- filter(docvalueField.field)
- );
- }
-
- // if we only want to search for certain fields
- if (fields) {
- // filter out the docvalue_fields, and script_fields to only include those that we are concerned with
- body.docvalue_fields = filterDocvalueFields(body.docvalue_fields, fields);
- body.script_fields = _.pick(body.script_fields, fields);
-
- // request the remaining fields from both stored_fields and _source
- const remainingFields = _.difference(fields, _.keys(body.script_fields));
- body.stored_fields = remainingFields;
- _.set(body, '_source.includes', remainingFields);
- }
-
- const esQueryConfigs = esQuery.getEsQueryConfig(config);
- body.query = esQuery.buildEsQuery(index, query, filters, esQueryConfigs);
-
- if (highlightAll && body.query) {
- body.highlight = getHighlightRequest(body.query, config.get('doc_table:highlight'));
- delete searchRequest.highlightAll;
- }
-
- const translateToQuery = (filter: esFilters.Filter) => filter && (filter.query || filter);
-
- // re-write filters within filter aggregations
- (function recurse(aggBranch) {
- if (!aggBranch) return;
- Object.keys(aggBranch).forEach(function(id) {
- const agg = aggBranch[id];
-
- if (agg.filters) {
- // translate filters aggregations
- const { filters: aggFilters } = agg.filters;
- Object.keys(aggFilters).forEach(filterId => {
- aggFilters[filterId] = translateToQuery(aggFilters[filterId]);
- });
- }
-
- recurse(agg.aggs || agg.aggregations);
- });
- })(body.aggs || body.aggregations);
-
- return searchRequest;
- }
-}
+export { SearchSource, ISearchSource } from '../index';
diff --git a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts b/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
index 5be4fef0766555..55dee19cae32a8 100644
--- a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
+++ b/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
@@ -17,65 +17,8 @@
* under the License.
*/
-import { SearchStrategyProvider, SearchStrategySearchParams } from './types';
-import { addSearchStrategy } from './search_strategy_registry';
-import { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
-import {
- getSearchParams,
- getMSearchParams,
- getPreference,
- getTimeout,
-} from '../fetch/get_search_params';
-
-export const defaultSearchStrategy: SearchStrategyProvider = {
- id: 'default',
-
- search: params => {
- return params.config.get('courier:batchSearches') ? msearch(params) : search(params);
- },
-
- isViable: indexPattern => {
- return indexPattern && isDefaultTypeIndexPattern(indexPattern);
- },
-};
-
-function msearch({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
- const inlineRequests = searchRequests.map(({ index, body, search_type: searchType }) => {
- const inlineHeader = {
- index: index.title || index,
- search_type: searchType,
- ignore_unavailable: true,
- preference: getPreference(config),
- };
- const inlineBody = {
- ...body,
- timeout: getTimeout(esShardTimeout),
- };
- return `${JSON.stringify(inlineHeader)}\n${JSON.stringify(inlineBody)}`;
- });
-
- const searching = es.msearch({
- ...getMSearchParams(config),
- body: `${inlineRequests.join('\n')}\n`,
- });
- return {
- searching: searching.then(({ responses }) => responses),
- abort: searching.abort,
- };
-}
-
-function search({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
- const abortController = new AbortController();
- const searchParams = getSearchParams(config, esShardTimeout);
- const promises = searchRequests.map(({ index, body }) => {
- const searching = es.search({ index: index.title || index, body, ...searchParams });
- abortController.signal.addEventListener('abort', searching.abort);
- return searching.catch(({ response }) => JSON.parse(response));
- });
- return {
- searching: Promise.all(promises),
- abort: () => abortController.abort(),
- };
-}
+import { addSearchStrategy, defaultSearchStrategy } from '../index';
addSearchStrategy(defaultSearchStrategy);
+
+export { defaultSearchStrategy };
diff --git a/src/legacy/ui/public/courier/search_strategy/index.ts b/src/legacy/ui/public/courier/search_strategy/index.ts
index 229d0cbb1da5da..1dce0316596d07 100644
--- a/src/legacy/ui/public/courier/search_strategy/index.ts
+++ b/src/legacy/ui/public/courier/search_strategy/index.ts
@@ -20,10 +20,6 @@
export {
addSearchStrategy,
hasSearchStategyForIndexPattern,
- getSearchStrategyById,
- getSearchStrategyForSearchRequest,
-} from './search_strategy_registry';
-
-export { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
-
-export { SearchError, getSearchErrorType } from './search_error';
+ isDefaultTypeIndexPattern,
+ SearchError,
+} from '../index';
diff --git a/src/legacy/ui/public/courier/search_strategy/search_error.ts b/src/legacy/ui/public/courier/search_strategy/search_error.ts
index d4042fb17499cb..a815ac4ff008f4 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_error.ts
+++ b/src/legacy/ui/public/courier/search_strategy/search_error.ts
@@ -17,46 +17,4 @@
* under the License.
*/
-interface SearchErrorOptions {
- status: string;
- title: string;
- message: string;
- path: string;
- type: string;
-}
-
-export class SearchError extends Error {
- public name: string;
- public status: string;
- public title: string;
- public message: string;
- public path: string;
- public type: string;
-
- constructor({ status, title, message, path, type }: SearchErrorOptions) {
- super(message);
- this.name = 'SearchError';
- this.status = status;
- this.title = title;
- this.message = message;
- this.path = path;
- this.type = type;
-
- // captureStackTrace is only available in the V8 engine, so any browser using
- // a different JS engine won't have access to this method.
- if (Error.captureStackTrace) {
- Error.captureStackTrace(this, SearchError);
- }
-
- // Babel doesn't support traditional `extends` syntax for built-in classes.
- // https://babeljs.io/docs/en/caveats/#classes
- Object.setPrototypeOf(this, SearchError.prototype);
- }
-}
-
-export function getSearchErrorType({ message }: Pick) {
- const msg = message.toLowerCase();
- if (msg.indexOf('unsupported query') > -1) {
- return 'UNSUPPORTED_QUERY';
- }
-}
+export { SearchError } from '../index';
diff --git a/src/legacy/ui/public/courier/types.ts b/src/legacy/ui/public/courier/types.ts
index 23d74ce6a57da8..75035ceef321fa 100644
--- a/src/legacy/ui/public/courier/types.ts
+++ b/src/legacy/ui/public/courier/types.ts
@@ -17,7 +17,9 @@
* under the License.
*/
-export * from './fetch/types';
-export * from './search_source/types';
-export * from './search_strategy/types';
-export * from './utils/types';
+export {
+ ISearchSource,
+ EsQuerySortValue, // used externally by Discover
+ FetchOptions, // used externally by AggTypes
+ SortDirection, // used externally by Discover
+} from './index';
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
index 3b2a77cefb7305..3d4292cef27f4c 100644
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -45,11 +45,18 @@ export const mockUiSettings = {
'format:defaultTypeMap': {},
};
-export const npSetup = {
- core: {
- chrome: {},
- uiSettings: mockUiSettings,
+const mockCore = {
+ chrome: {},
+ uiSettings: mockUiSettings,
+ http: {
+ basePath: {
+ get: sinon.fake.returns(''),
+ },
},
+};
+
+export const npSetup = {
+ core: mockCore,
plugins: {
usageCollection: {
allowTrackUserAgent: sinon.fake(),
@@ -95,7 +102,7 @@ export const npSetup = {
getSavedQueryCount: sinon.fake(),
},
},
- fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+ fieldFormats: getFieldFormatsRegistry(mockCore),
},
share: {
register: () => {},
@@ -224,7 +231,7 @@ export const npStart = {
history: sinon.fake(),
},
},
- fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+ fieldFormats: getFieldFormatsRegistry(mockCore),
},
share: {
toggleShareContextMenu: () => {},
diff --git a/src/legacy/ui/public/registry/doc_views_helpers.tsx b/src/legacy/ui/public/registry/doc_views_helpers.tsx
index d9e42e71dfff1d..61545609f205da 100644
--- a/src/legacy/ui/public/registry/doc_views_helpers.tsx
+++ b/src/legacy/ui/public/registry/doc_views_helpers.tsx
@@ -26,7 +26,7 @@ import {
AngularController,
AngularDirective,
} from './doc_views_types';
-import { DocViewerError } from '../../../core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error';
+import { DocViewerError } from '../../../core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error';
/**
* Compiles and injects the give angular template into the given dom node
diff --git a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js b/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
index 30fb0c0c38aef2..d9622ac3dc6d21 100644
--- a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
+++ b/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
@@ -26,7 +26,7 @@ import { createSavedObjectClass } from '../saved_object';
import StubIndexPattern from 'test_utils/stub_index_pattern';
import { npStart } from 'ui/new_platform';
import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
-import { mockUiSettings } from '../../new_platform/new_platform.karma_mock';
+import { npSetup } from '../../new_platform/new_platform.karma_mock';
const getConfig = cfg => cfg;
@@ -310,7 +310,7 @@ describe('Saved Object', function() {
getConfig,
null,
[],
- mockUiSettings
+ npSetup.core
);
indexPattern.title = indexPattern.id;
savedObject.searchSource.setField('index', indexPattern);
@@ -700,7 +700,7 @@ describe('Saved Object', function() {
getConfig,
null,
[],
- mockUiSettings
+ npSetup.core
);
indexPattern.title = indexPattern.id;
savedObject.searchSource.setField('index', indexPattern);
diff --git a/src/legacy/ui/public/saved_objects/index.ts b/src/legacy/ui/public/saved_objects/index.ts
index 3c77a02c608c65..129938ebe05090 100644
--- a/src/legacy/ui/public/saved_objects/index.ts
+++ b/src/legacy/ui/public/saved_objects/index.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-export { SavedObjectRegistryProvider } from './saved_object_registry';
export { SavedObjectsClientProvider } from './saved_objects_client_provider';
export { SavedObjectLoader } from './saved_object_loader';
export { findObjectByTitle } from './helpers/find_object_by_title';
diff --git a/src/legacy/ui/public/saved_objects/types.ts b/src/legacy/ui/public/saved_objects/types.ts
index c4e6438424046f..2578c2015e819f 100644
--- a/src/legacy/ui/public/saved_objects/types.ts
+++ b/src/legacy/ui/public/saved_objects/types.ts
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import {
ChromeStart,
OverlayStart,
@@ -23,7 +24,7 @@ import {
SavedObjectAttributes,
SavedObjectReference,
} from 'kibana/public';
-import { SearchSource, SearchSourceContract } from 'ui/courier';
+import { ISearchSource } from 'ui/courier';
import { IIndexPattern, IndexPatternsContract } from '../../../../plugins/data/public';
export interface SavedObject {
@@ -46,7 +47,7 @@ export interface SavedObject {
lastSavedTitle: string;
migrationVersion?: Record;
save: (saveOptions: SavedObjectSaveOpts) => Promise;
- searchSource?: SearchSourceContract;
+ searchSource?: ISearchSource;
showInRecentlyAccessed: boolean;
title: string;
}
@@ -88,7 +89,7 @@ export interface SavedObjectConfig {
mapping?: any;
migrationVersion?: Record;
path?: string;
- searchSource?: SearchSource | boolean;
+ searchSource?: ISearchSource | boolean;
type?: string;
}
diff --git a/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss b/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
index 571064a1f29c4e..d44129b6ec849a 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
@@ -112,8 +112,16 @@
align-self: center;
}
}
+}
- .index-pattern-selection:not(.euiComboBox) {
- padding: $euiSizeS 0;
- }
+.indexPattern__container {
+ display: flex;
+ align-items: center;
+ height: $euiSize * 3;
+ margin-top: -$euiSizeS;
+}
+
+.indexPattern__triggerButton {
+ @include euiTitle('xs');
+ line-height: $euiSizeXXL;
}
diff --git a/src/legacy/ui/public/styles/_legacy/components/_table.scss b/src/legacy/ui/public/styles/_legacy/components/_table.scss
index e7c1bda829f0e1..c9472cbd2faa73 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_table.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_table.scss
@@ -1,4 +1,4 @@
-@import '../../../../../core_plugins/kibana/public/discover/mixins';
+@import '../../../../../core_plugins/kibana/public/discover/np_ready/mixins';
.table {
// Nesting
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
index d754c1d3955955..0b99810a85afec 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -23,7 +23,7 @@ import { AggConfig, Vis } from 'ui/vis';
import { npStart } from 'ui/new_platform';
import { SerializedFieldFormat } from 'src/plugins/expressions/public';
-import { IFieldFormatId, FieldFormat } from '../../../../../../plugins/data/public';
+import { IFieldFormatId, FieldFormat, ContentType } from '../../../../../../plugins/data/public';
import { tabifyGetColumns } from '../../../agg_response/tabify/_get_columns';
import { DateRangeKey, convertDateRangeToString } from '../../../agg_types/buckets/date_range';
@@ -129,42 +129,23 @@ export const getFormat: FormatFactory = mapping => {
});
return new IpRangeFormat();
} else if (isTermsFieldFormat(mapping) && mapping.params) {
- const params = mapping.params;
+ const { params } = mapping;
+ const convert = (val: string, type: ContentType) => {
+ const format = getFieldFormat(params.id, mapping.params);
+
+ if (val === '__other__') {
+ return params.otherBucketLabel;
+ }
+ if (val === '__missing__') {
+ return params.missingBucketLabel;
+ }
+
+ return format.convert(val, type);
+ };
+
return {
- getConverterFor: (type: string) => {
- const format = getFieldFormat(params.id, mapping.params);
- return (val: string) => {
- if (val === '__other__') {
- return params.otherBucketLabel;
- }
- if (val === '__missing__') {
- return params.missingBucketLabel;
- }
- const parsedUrl = {
- origin: window.location.origin,
- pathname: window.location.pathname,
- basePath: npStart.core.http.basePath,
- };
- // @ts-ignore
- return format.convert(val, undefined, undefined, parsedUrl);
- };
- },
- convert: (val: string, type: string) => {
- const format = getFieldFormat(params.id, mapping.params);
- if (val === '__other__') {
- return params.otherBucketLabel;
- }
- if (val === '__missing__') {
- return params.missingBucketLabel;
- }
- const parsedUrl = {
- origin: window.location.origin,
- pathname: window.location.pathname,
- basePath: npStart.core.http.basePath,
- };
- // @ts-ignore
- return format.convert(val, type, undefined, parsedUrl);
- },
+ convert,
+ getConverterFor: (type: ContentType) => (val: string) => convert(val, type),
} as FieldFormat;
} else {
return getFieldFormat(id, mapping.params);
diff --git a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
index a9203415321faa..5054c34118f786 100644
--- a/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
+++ b/src/legacy/ui/public/visualize/loader/utils/query_geohash_bounds.ts
@@ -24,13 +24,13 @@ import { toastNotifications } from 'ui/notify';
import { AggConfig } from 'ui/vis';
import { timefilter } from 'ui/timefilter';
import { Vis } from '../../../vis';
-import { SearchSource, SearchSourceContract } from '../../../courier';
+import { SearchSource, ISearchSource } from '../../../courier';
import { esFilters, Query } from '../../../../../../plugins/data/public';
interface QueryGeohashBoundsParams {
filters?: esFilters.Filter[];
query?: Query;
- searchSource?: SearchSourceContract;
+ searchSource?: ISearchSource;
}
/**
diff --git a/src/plugins/data/common/constants.ts b/src/plugins/data/common/constants.ts
new file mode 100644
index 00000000000000..00786a0c72cf1e
--- /dev/null
+++ b/src/plugins/data/common/constants.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export const DEFAULT_QUERY_LANGUAGE = 'kuery';
diff --git a/src/plugins/data/common/field_formats/content_types/html_content_type.ts b/src/plugins/data/common/field_formats/content_types/html_content_type.ts
index ba2236c41790fa..1b6ee9e63fad16 100644
--- a/src/plugins/data/common/field_formats/content_types/html_content_type.ts
+++ b/src/plugins/data/common/field_formats/content_types/html_content_type.ts
@@ -26,7 +26,8 @@ const getConvertFn = (
format: IFieldFormat,
convert?: HtmlContextTypeConvert
): HtmlContextTypeConvert => {
- const fallbackHtml: HtmlContextTypeConvert = (value, field, hit) => {
+ const fallbackHtml: HtmlContextTypeConvert = (value, options = {}) => {
+ const { field, hit } = options;
const formatted = escape(format.convert(value, 'text'));
return !field || !hit || !hit.highlight || !hit.highlight[field.name]
@@ -43,27 +44,23 @@ export const setup = (
): HtmlContextTypeConvert => {
const convert = getConvertFn(format, htmlContextTypeConvert);
- const recurse: HtmlContextTypeConvert = (value, field, hit, meta) => {
+ const recurse: HtmlContextTypeConvert = (value, options = {}) => {
if (value == null) {
return asPrettyString(value);
}
if (!value || !isFunction(value.map)) {
- return convert.call(format, value, field, hit, meta);
+ return convert.call(format, value, options);
}
- const subValues = value.map((v: any) => {
- return recurse(v, field, hit, meta);
- });
- const useMultiLine = subValues.some((sub: string) => {
- return sub.indexOf('\n') > -1;
- });
+ const subValues = value.map((v: any) => recurse(v, options));
+ const useMultiLine = subValues.some((sub: string) => sub.indexOf('\n') > -1);
return subValues.join(',' + (useMultiLine ? '\n' : ' '));
};
- const wrap: HtmlContextTypeConvert = (value, field, hit, meta) => {
- return `${recurse(value, field, hit, meta)}`;
+ const wrap: HtmlContextTypeConvert = (value, options) => {
+ return `${recurse(value, options)}`;
};
return wrap;
diff --git a/src/plugins/data/common/field_formats/converters/source.ts b/src/plugins/data/common/field_formats/converters/source.ts
index c9906fb1360524..702e1579e945f2 100644
--- a/src/plugins/data/common/field_formats/converters/source.ts
+++ b/src/plugins/data/common/field_formats/converters/source.ts
@@ -42,7 +42,9 @@ export class SourceFormat extends FieldFormat {
textConvert: TextContextTypeConvert = value => JSON.stringify(value);
- htmlConvert: HtmlContextTypeConvert = (value, field, hit) => {
+ htmlConvert: HtmlContextTypeConvert = (value, options = {}) => {
+ const { field, hit } = options;
+
if (!field) {
const converter = this.getConverterFor('text') as Function;
diff --git a/src/plugins/data/common/field_formats/converters/url.test.ts b/src/plugins/data/common/field_formats/converters/url.test.ts
index 66307cefe08f75..b1107d46179bff 100644
--- a/src/plugins/data/common/field_formats/converters/url.test.ts
+++ b/src/plugins/data/common/field_formats/converters/url.test.ts
@@ -169,64 +169,64 @@ describe('UrlFormat', () => {
describe('whitelist', () => {
test('should assume a relative url if the value is not in the whitelist without a base path', () => {
- const url = new UrlFormat({});
const parsedUrl = {
origin: 'http://kibana',
basePath: '',
};
+ const url = new UrlFormat({ parsedUrl });
const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
- expect(converter('www.elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('www.elastic.co')).toBe(
'www.elastic.co'
);
- expect(converter('elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('elastic.co')).toBe(
'elastic.co'
);
- expect(converter('elastic', null, null, parsedUrl)).toBe(
+ expect(converter('elastic')).toBe(
'elastic'
);
- expect(converter('ftp://elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('ftp://elastic.co')).toBe(
'ftp://elastic.co'
);
});
test('should assume a relative url if the value is not in the whitelist with a basepath', () => {
- const url = new UrlFormat({});
const parsedUrl = {
origin: 'http://kibana',
basePath: '/xyz',
};
+ const url = new UrlFormat({ parsedUrl });
const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
- expect(converter('www.elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('www.elastic.co')).toBe(
'www.elastic.co'
);
- expect(converter('elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('elastic.co')).toBe(
'elastic.co'
);
- expect(converter('elastic', null, null, parsedUrl)).toBe(
+ expect(converter('elastic')).toBe(
'elastic'
);
- expect(converter('ftp://elastic.co', null, null, parsedUrl)).toBe(
+ expect(converter('ftp://elastic.co')).toBe(
'ftp://elastic.co'
);
});
test('should rely on parsedUrl', () => {
- const url = new UrlFormat({});
const parsedUrl = {
origin: 'http://kibana.host.com',
basePath: '/abc',
};
+ const url = new UrlFormat({ parsedUrl });
const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
- expect(converter('../app/kibana', null, null, parsedUrl)).toBe(
+ expect(converter('../app/kibana')).toBe(
'../app/kibana'
);
});
@@ -244,54 +244,52 @@ describe('UrlFormat', () => {
});
test('should support multiple types of relative urls', () => {
- const url = new UrlFormat({});
const parsedUrl = {
origin: 'http://kibana.host.com',
pathname: '/nbc/app/kibana#/discover',
basePath: '/nbc',
};
+ const url = new UrlFormat({ parsedUrl });
const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
- expect(converter('#/foo', null, null, parsedUrl)).toBe(
+ expect(converter('#/foo')).toBe(
'#/foo'
);
- expect(converter('/nbc/app/kibana#/discover', null, null, parsedUrl)).toBe(
+ expect(converter('/nbc/app/kibana#/discover')).toBe(
'/nbc/app/kibana#/discover'
);
- expect(converter('../foo/bar', null, null, parsedUrl)).toBe(
+ expect(converter('../foo/bar')).toBe(
'../foo/bar'
);
});
test('should support multiple types of urls w/o basePath', () => {
- const url = new UrlFormat({});
const parsedUrl = {
origin: 'http://kibana.host.com',
pathname: '/app/kibana',
};
+ const url = new UrlFormat({ parsedUrl });
const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
- expect(converter('10.22.55.66', null, null, parsedUrl)).toBe(
+ expect(converter('10.22.55.66')).toBe(
'10.22.55.66'
);
- expect(
- converter('http://www.domain.name/app/kibana#/dashboard/', null, null, parsedUrl)
- ).toBe(
+ expect(converter('http://www.domain.name/app/kibana#/dashboard/')).toBe(
'http://www.domain.name/app/kibana#/dashboard/'
);
- expect(converter('/app/kibana', null, null, parsedUrl)).toBe(
+ expect(converter('/app/kibana')).toBe(
'/app/kibana'
);
- expect(converter('kibana#/dashboard/', null, null, parsedUrl)).toBe(
+ expect(converter('kibana#/dashboard/')).toBe(
'kibana#/dashboard/'
);
- expect(converter('#/dashboard/', null, null, parsedUrl)).toBe(
+ expect(converter('#/dashboard/')).toBe(
'#/dashboard/'
);
});
diff --git a/src/plugins/data/common/field_formats/converters/url.ts b/src/plugins/data/common/field_formats/converters/url.ts
index bd68dedf38a678..3c88511a4c63ee 100644
--- a/src/plugins/data/common/field_formats/converters/url.ts
+++ b/src/plugins/data/common/field_formats/converters/url.ts
@@ -134,7 +134,11 @@ export class UrlFormat extends FieldFormat {
textConvert: TextContextTypeConvert = value => this.formatLabel(value);
- htmlConvert: HtmlContextTypeConvert = (rawValue, field, hit, parsedUrl) => {
+ htmlConvert: HtmlContextTypeConvert = (rawValue, options = {}) => {
+ const { field, hit } = options;
+ const { parsedUrl } = this._params;
+ const { basePath, pathname, origin } = parsedUrl || {};
+
const url = escape(this.formatUrl(rawValue));
const label = escape(this.formatLabel(rawValue, url));
@@ -170,17 +174,17 @@ export class UrlFormat extends FieldFormat {
if (!inWhitelist) {
// Handles urls like: `#/discover`
if (url[0] === '#') {
- prefix = `${parsedUrl.origin}${parsedUrl.pathname}`;
+ prefix = `${origin}${pathname}`;
}
// Handle urls like: `/app/kibana` or `/xyz/app/kibana`
- else if (url.indexOf(parsedUrl.basePath || '/') === 0) {
- prefix = `${parsedUrl.origin}`;
+ else if (url.indexOf(basePath || '/') === 0) {
+ prefix = `${origin}`;
}
// Handle urls like: `../app/kibana`
else {
const prefixEnd = url[0] === '/' ? '' : '/';
- prefix = `${parsedUrl.origin}${parsedUrl.basePath || ''}/app${prefixEnd}`;
+ prefix = `${origin}${basePath || ''}/app${prefixEnd}`;
}
}
diff --git a/src/plugins/data/common/field_formats/field_format.ts b/src/plugins/data/common/field_formats/field_format.ts
index 85d276767b5a79..50f07846a3cebd 100644
--- a/src/plugins/data/common/field_formats/field_format.ts
+++ b/src/plugins/data/common/field_formats/field_format.ts
@@ -24,6 +24,8 @@ import {
FIELD_FORMAT_IDS,
FieldFormatConvert,
FieldFormatConvertFunction,
+ HtmlContextTypeOptions,
+ TextContextTypeOptions,
} from './types';
import {
htmlContentTypeSetup,
@@ -63,8 +65,20 @@ export abstract class FieldFormat {
*/
convertObject: FieldFormatConvert | undefined;
+ /**
+ * @property {htmlConvert}
+ * @protected
+ * have to remove the protected because of
+ * https://github.com/Microsoft/TypeScript/issues/17293
+ */
htmlConvert: HtmlContextTypeConvert | undefined;
+ /**
+ * @property {textConvert}
+ * @protected
+ * have to remove the protected because of
+ * https://github.com/Microsoft/TypeScript/issues/17293
+ */
textConvert: TextContextTypeConvert | undefined;
/**
@@ -76,7 +90,7 @@ export abstract class FieldFormat {
protected readonly _params: any;
protected getConfig: Function | undefined;
- constructor(_params: any = {}, getConfig?: Function) {
+ constructor(_params: Record = {}, getConfig?: Function) {
this._params = _params;
if (getConfig) {
@@ -94,11 +108,15 @@ export abstract class FieldFormat {
* injecting into the DOM or a DOM attribute
* @public
*/
- convert(value: any, contentType: ContentType = DEFAULT_CONTEXT_TYPE): string {
+ convert(
+ value: any,
+ contentType: ContentType = DEFAULT_CONTEXT_TYPE,
+ options?: HtmlContextTypeOptions | TextContextTypeOptions
+ ): string {
const converter = this.getConverterFor(contentType);
if (converter) {
- return converter.call(this, value);
+ return converter.call(this, value, options);
}
return value;
diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/data/common/field_formats/types.ts
index fc8e6e20a1a968..dce3c66b0f886b 100644
--- a/src/plugins/data/common/field_formats/types.ts
+++ b/src/plugins/data/common/field_formats/types.ts
@@ -24,15 +24,19 @@ export type ContentType = 'html' | 'text';
export { IFieldFormat } from './field_format';
/** @internal **/
-export type HtmlContextTypeConvert = (
- value: any,
- field?: any,
- hit?: Record,
- meta?: any
-) => string;
+export interface HtmlContextTypeOptions {
+ field?: any;
+ hit?: Record;
+}
+
+/** @internal **/
+export type HtmlContextTypeConvert = (value: any, options?: HtmlContextTypeOptions) => string;
+
+/** @internal **/
+export type TextContextTypeOptions = Record;
/** @internal **/
-export type TextContextTypeConvert = (value: any) => string;
+export type TextContextTypeConvert = (value: any, options?: TextContextTypeOptions) => string;
/** @internal **/
export type FieldFormatConvertFunction = HtmlContextTypeConvert | TextContextTypeConvert;
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index b334342a57ec6b..e02045de24e8f5 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -24,3 +24,4 @@ export * from './index_patterns';
export * from './es_query';
export * from './utils';
export * from './types';
+export * from './constants';
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index 998eaa55858d22..6553ce8ce4d915 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -3,5 +3,6 @@
"version": "kibana",
"server": true,
"ui": true,
- "requiredPlugins": ["uiActions"]
+ "requiredPlugins": ["uiActions"],
+ "optionalPlugins": ["usageCollection"]
}
diff --git a/src/plugins/data/public/field_formats_provider/field_formats.test.ts b/src/plugins/data/public/field_formats_provider/field_formats.test.ts
new file mode 100644
index 00000000000000..e58435fc71418d
--- /dev/null
+++ b/src/plugins/data/public/field_formats_provider/field_formats.test.ts
@@ -0,0 +1,136 @@
+/*
+ * 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 { CoreSetup, IUiSettingsClient } from 'kibana/public';
+
+import { FieldFormatRegisty } from './field_formats';
+import {
+ IFieldFormatType,
+ PercentFormat,
+ BoolFormat,
+ StringFormat,
+} from '../../common/field_formats';
+import { coreMock } from '../../../../core/public/mocks';
+
+const getValueOfPrivateField = (instance: any, field: string) => instance[field];
+const getUiSettingsMock = (data: any): IUiSettingsClient['get'] => () => data;
+
+describe('FieldFormatRegisty', () => {
+ let mockCoreSetup: CoreSetup;
+ let fieldFormatRegisty: FieldFormatRegisty;
+
+ beforeEach(() => {
+ mockCoreSetup = coreMock.createSetup();
+ fieldFormatRegisty = new FieldFormatRegisty();
+ });
+
+ test('should allows to create an instance of "FieldFormatRegisty"', () => {
+ expect(fieldFormatRegisty).toBeDefined();
+ expect(getValueOfPrivateField(fieldFormatRegisty, 'fieldFormats')).toBeDefined();
+ expect(getValueOfPrivateField(fieldFormatRegisty, 'defaultMap')).toEqual({});
+ });
+
+ describe('init', () => {
+ test('should provide an public "init" method', () => {
+ expect(fieldFormatRegisty.init).toBeDefined();
+ expect(typeof fieldFormatRegisty.init).toBe('function');
+ });
+
+ test('should set basePath value from "init" method', () => {
+ fieldFormatRegisty.init(mockCoreSetup);
+
+ expect(getValueOfPrivateField(fieldFormatRegisty, 'basePath')).toBe(
+ mockCoreSetup.http.basePath.get()
+ );
+ });
+
+ test('should populate the "defaultMap" object', () => {
+ const defaultMap = {
+ number: { id: 'number', params: {} },
+ };
+
+ mockCoreSetup.uiSettings.get = getUiSettingsMock(defaultMap);
+ fieldFormatRegisty.init(mockCoreSetup);
+ expect(getValueOfPrivateField(fieldFormatRegisty, 'defaultMap')).toEqual(defaultMap);
+ });
+ });
+
+ describe('register', () => {
+ test('should provide an public "register" method', () => {
+ expect(fieldFormatRegisty.register).toBeDefined();
+ expect(typeof fieldFormatRegisty.register).toBe('function');
+ });
+
+ test('should register field formats', () => {
+ fieldFormatRegisty.register([StringFormat, BoolFormat]);
+
+ const registeredFieldFormatters: Map = getValueOfPrivateField(
+ fieldFormatRegisty,
+ 'fieldFormats'
+ );
+
+ expect(registeredFieldFormatters.size).toBe(2);
+
+ expect(registeredFieldFormatters.get(BoolFormat.id)).toBe(BoolFormat);
+ expect(registeredFieldFormatters.get(StringFormat.id)).toBe(StringFormat);
+ expect(registeredFieldFormatters.get(PercentFormat.id)).toBeUndefined();
+ });
+ });
+
+ describe('getType', () => {
+ test('should provide an public "getType" method', () => {
+ expect(fieldFormatRegisty.getType).toBeDefined();
+ expect(typeof fieldFormatRegisty.getType).toBe('function');
+ });
+
+ test('should return the registered type of the field format by identifier', () => {
+ fieldFormatRegisty.register([StringFormat]);
+
+ expect(fieldFormatRegisty.getType(StringFormat.id)).toBeDefined();
+ });
+
+ test('should return void if the field format type has not been registered', () => {
+ fieldFormatRegisty.register([BoolFormat]);
+
+ expect(fieldFormatRegisty.getType(StringFormat.id)).toBeUndefined();
+ });
+ });
+
+ describe('fieldFormatMetaParamsDecorator', () => {
+ test('should set meta params for all instances of FieldFormats', () => {
+ fieldFormatRegisty.register([StringFormat]);
+
+ const ConcreteFormat = fieldFormatRegisty.getType(StringFormat.id);
+
+ expect(ConcreteFormat).toBeDefined();
+
+ if (ConcreteFormat) {
+ const stringFormat = new ConcreteFormat({
+ foo: 'foo',
+ });
+ const params = getValueOfPrivateField(stringFormat, '_params');
+
+ expect(params).toHaveProperty('foo');
+ expect(params).toHaveProperty('parsedUrl');
+ expect(params.parsedUrl).toHaveProperty('origin');
+ expect(params.parsedUrl).toHaveProperty('pathname');
+ expect(params.parsedUrl).toHaveProperty('basePath');
+ }
+ });
+ });
+});
diff --git a/src/plugins/data/public/field_formats_provider/field_formats.ts b/src/plugins/data/public/field_formats_provider/field_formats.ts
index 20e90b8e4a5458..3d60965f2e5322 100644
--- a/src/plugins/data/public/field_formats_provider/field_formats.ts
+++ b/src/plugins/data/public/field_formats_provider/field_formats.ts
@@ -18,7 +18,7 @@
*/
import { forOwn, isFunction, memoize } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient, CoreSetup } from 'kibana/public';
import {
ES_FIELD_TYPES,
KBN_FIELD_TYPES,
@@ -33,6 +33,7 @@ export class FieldFormatRegisty {
private fieldFormats: Map;
private uiSettings!: IUiSettingsClient;
private defaultMap: Record;
+ private basePath?: string;
constructor() {
this.fieldFormats = new Map();
@@ -41,8 +42,9 @@ export class FieldFormatRegisty {
getConfig = (key: string, override?: any) => this.uiSettings.get(key, override);
- init(uiSettings: IUiSettingsClient) {
+ init({ uiSettings, http }: CoreSetup) {
this.uiSettings = uiSettings;
+ this.basePath = http.basePath.get();
this.parseDefaultTypeMap(this.uiSettings.get('format:defaultTypeMap'));
@@ -73,10 +75,14 @@ export class FieldFormatRegisty {
* Get a derived FieldFormat class by its id.
*
* @param {IFieldFormatId} formatId - the format id
- * @return {FieldFormat}
+ * @return {FieldFormat | void}
*/
- getType = (formatId: IFieldFormatId): IFieldFormatType | undefined => {
- return this.fieldFormats.get(formatId);
+ getType = (formatId: IFieldFormatId): IFieldFormatType | void => {
+ const decoratedFieldFormat: any = this.fieldFormatMetaParamsDecorator(formatId);
+
+ if (decoratedFieldFormat) {
+ return decoratedFieldFormat as IFieldFormatType;
+ }
};
/**
@@ -86,12 +92,12 @@ export class FieldFormatRegisty {
*
* @param {KBN_FIELD_TYPES} fieldType
* @param {ES_FIELD_TYPES[]} esTypes - Array of ES data types
- * @return {FieldFormat}
+ * @return {FieldFormat | void}
*/
getDefaultType = (
fieldType: KBN_FIELD_TYPES,
esTypes: ES_FIELD_TYPES[]
- ): IFieldFormatType | undefined => {
+ ): IFieldFormatType | void => {
const config = this.getDefaultConfig(fieldType, esTypes);
return this.getType(config.id);
@@ -102,9 +108,9 @@ export class FieldFormatRegisty {
* using the format:defaultTypeMap config map
*
* @param {ES_FIELD_TYPES[]} esTypes - Array of ES data types
- * @return {ES_FIELD_TYPES}
+ * @return {ES_FIELD_TYPES | void}
*/
- getTypeNameByEsTypes = (esTypes: ES_FIELD_TYPES[] | undefined): ES_FIELD_TYPES | undefined => {
+ getTypeNameByEsTypes = (esTypes: ES_FIELD_TYPES[] | undefined): ES_FIELD_TYPES | void => {
if (!Array.isArray(esTypes)) {
return;
}
@@ -136,14 +142,14 @@ export class FieldFormatRegisty {
* @return {FIELD_FORMATS_INSTANCES[number]}
*/
getInstance = memoize(
- (formatId: IFieldFormatId): FieldFormat => {
+ (formatId: IFieldFormatId, params: Record = {}): FieldFormat => {
const DerivedFieldFormat = this.getType(formatId);
if (!DerivedFieldFormat) {
throw new Error(`Field Format '${formatId}' not found!`);
}
- return new DerivedFieldFormat({}, this.getConfig);
+ return new DerivedFieldFormat(params, this.getConfig);
}
);
@@ -217,10 +223,33 @@ export class FieldFormatRegisty {
}
register = (fieldFormats: IFieldFormatType[]) => {
- fieldFormats.forEach(fieldFormat => {
- this.fieldFormats.set(fieldFormat.id, fieldFormat);
- });
+ fieldFormats.forEach(fieldFormat => this.fieldFormats.set(fieldFormat.id, fieldFormat));
return this;
};
+
+ /**
+ * FieldFormat decorator - provide a one way to add meta-params for all field formatters
+ *
+ * @private
+ * @param {IFieldFormatId} formatId - the format id
+ * @return {FieldFormat | void}
+ */
+ private fieldFormatMetaParamsDecorator = (formatId: IFieldFormatId): Function | void => {
+ const concreteFieldFormat = this.fieldFormats.get(formatId);
+ const decorateMetaParams = (customOptions: Record = {}) => ({
+ parsedUrl: {
+ origin: window.location.origin,
+ pathname: window.location.pathname,
+ basePath: this.basePath,
+ },
+ ...customOptions,
+ });
+
+ if (concreteFieldFormat) {
+ return function(params: Record = {}, getConfig?: Function) {
+ return new concreteFieldFormat(decorateMetaParams(params), getConfig);
+ };
+ }
+ };
}
diff --git a/src/plugins/data/public/field_formats_provider/field_formats_service.ts b/src/plugins/data/public/field_formats_provider/field_formats_service.ts
index ea1a8af2930b01..42abeecc6fda00 100644
--- a/src/plugins/data/public/field_formats_provider/field_formats_service.ts
+++ b/src/plugins/data/public/field_formats_provider/field_formats_service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IUiSettingsClient } from 'src/core/public';
+import { CoreSetup } from 'src/core/public';
import { FieldFormatRegisty } from './field_formats';
import {
@@ -38,19 +38,11 @@ import {
UrlFormat,
} from '../../common/';
-/**
- * Field Format Service
- * @internal
- */
-interface FieldFormatsServiceDependencies {
- uiSettings: IUiSettingsClient;
-}
-
export class FieldFormatsService {
private readonly fieldFormats: FieldFormatRegisty = new FieldFormatRegisty();
- public setup({ uiSettings }: FieldFormatsServiceDependencies) {
- this.fieldFormats.init(uiSettings);
+ public setup(core: CoreSetup) {
+ this.fieldFormats.init(core);
this.fieldFormats.register([
BoolFormat,
diff --git a/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
index 02d61f8b32c861..59ee18b3dcb509 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
@@ -19,6 +19,7 @@
import _ from 'lodash';
import { IndexPattern } from './index_pattern';
+import { ContentType } from '../../../common';
const formattedCache = new WeakMap();
const partialFormattedCache = new WeakMap();
@@ -26,14 +27,16 @@ const partialFormattedCache = new WeakMap();
// Takes a hit, merges it with any stored/scripted fields, and with the metaFields
// returns a formatted version
export function formatHitProvider(indexPattern: IndexPattern, defaultFormat: any) {
- function convert(hit: Record, val: any, fieldName: string, type: string = 'html') {
+ function convert(
+ hit: Record,
+ val: any,
+ fieldName: string,
+ type: ContentType = 'html'
+ ) {
const field = indexPattern.fields.getByName(fieldName);
- if (!field) return defaultFormat.convert(val, type);
- const parsedUrl = {
- origin: window.location.origin,
- pathname: window.location.pathname,
- };
- return field.format.getConverterFor(type)(val, field, hit, parsedUrl);
+ const format = field ? field.format : defaultFormat;
+
+ return format.convert(val, type, { field, hit });
}
function formatHit(hit: Record, type: string = 'html') {
diff --git a/src/plugins/data/server/kql_telemetry/index.ts b/src/plugins/data/server/kql_telemetry/index.ts
new file mode 100644
index 00000000000000..0191113d95007c
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export { KqlTelemetryService } from './kql_telemetry_service';
diff --git a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
new file mode 100644
index 00000000000000..8f68e63703d407
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 { first } from 'rxjs/operators';
+import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { registerKqlTelemetryRoute } from './route';
+import { UsageCollectionSetup } from '../../../usage_collection/server';
+import { makeKQLUsageCollector } from './usage_collector';
+
+export class KqlTelemetryService implements Plugin {
+ constructor(private initializerContext: PluginInitializerContext) {}
+
+ public setup(
+ { http, savedObjects }: CoreSetup,
+ { usageCollection }: { usageCollection?: UsageCollectionSetup }
+ ) {
+ registerKqlTelemetryRoute(
+ http.createRouter(),
+ savedObjects,
+ this.initializerContext.logger.get('data', 'kql-telemetry')
+ );
+
+ if (usageCollection) {
+ this.initializerContext.config.legacy.globalConfig$
+ .pipe(first())
+ .toPromise()
+ .then(config => makeKQLUsageCollector(usageCollection, config.kibana.index))
+ .catch(e => {
+ this.initializerContext.logger
+ .get('kql-telemetry')
+ .warn(`Registering KQL telemetry collector failed: ${e}`);
+ });
+ }
+ }
+
+ public start() {}
+}
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js b/src/plugins/data/server/kql_telemetry/route.ts
similarity index 57%
rename from src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js
rename to src/plugins/data/server/kql_telemetry/route.ts
index 430240169c81cd..3185da22b12b32 100644
--- a/src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js
+++ b/src/plugins/data/server/kql_telemetry/route.ts
@@ -17,30 +17,28 @@
* under the License.
*/
-import Joi from 'joi';
-import Boom from 'boom';
+import { CoreSetup, IRouter, Logger } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
-export function registerKqlTelemetryApi(server) {
- server.route({
- path: '/api/kibana/kql_opt_in_telemetry',
- method: 'POST',
- config: {
+export function registerKqlTelemetryRoute(
+ router: IRouter,
+ savedObjects: CoreSetup['savedObjects'],
+ logger: Logger
+) {
+ router.post(
+ {
+ path: '/api/kibana/kql_opt_in_telemetry',
validate: {
- payload: Joi.object({
- opt_in: Joi.bool().required(),
+ body: schema.object({
+ opt_in: schema.boolean(),
}),
},
- tags: ['api'],
},
- handler: async function(request) {
- const {
- savedObjects: { getSavedObjectsRepository },
- } = server;
- const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
- const internalRepository = getSavedObjectsRepository(callWithInternalUser);
+ async (context, request, response) => {
+ const internalRepository = savedObjects.createScopedRepository(request);
const {
- payload: { opt_in: optIn },
+ body: { opt_in: optIn },
} = request;
const counterName = optIn ? 'optInCount' : 'optOutCount';
@@ -48,13 +46,19 @@ export function registerKqlTelemetryApi(server) {
try {
await internalRepository.incrementCounter('kql-telemetry', 'kql-telemetry', counterName);
} catch (error) {
- return new Boom('Something went wrong', {
+ logger.warn(`Unable to increment counter: ${error}`);
+ return response.customError({
statusCode: error.status,
- data: { success: false },
+ body: {
+ message: 'Something went wrong',
+ attributes: {
+ success: false,
+ },
+ },
});
}
- return { success: true };
- },
- });
+ return response.ok({ body: { success: true } });
+ }
+ );
}
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
similarity index 85%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
index a5db4602872ee4..446320b09757a5 100644
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
@@ -17,18 +17,22 @@
* under the License.
*/
-jest.mock('../../../ui_setting_defaults', () => ({
- getUiSettingDefaults: () => ({ 'search:queryLanguage': { value: 'lucene' } }),
-}));
-
import { fetchProvider } from './fetch';
+import { APICaller } from 'kibana/server';
+
+jest.mock('../../../common', () => ({
+ DEFAULT_QUERY_LANGUAGE: 'lucene',
+}));
-let fetch;
-let callCluster;
+let fetch: ReturnType;
+let callCluster: APICaller;
-function setupMockCallCluster(optCount, language) {
- callCluster = jest.fn((method, params) => {
- if ('id' in params && params.id === 'kql-telemetry:kql-telemetry') {
+function setupMockCallCluster(
+ optCount: { optInCount?: number; optOutCount?: number } | null,
+ language: string | undefined | null
+) {
+ callCluster = (jest.fn((method, params) => {
+ if (params && 'id' in params && params.id === 'kql-telemetry:kql-telemetry') {
if (optCount === null) {
return Promise.resolve({
_index: '.kibana_1',
@@ -46,9 +50,9 @@ function setupMockCallCluster(optCount, language) {
},
});
}
- } else if ('body' in params && params.body.query.term.type === 'config') {
+ } else if (params && 'body' in params && params.body.query.term.type === 'config') {
if (language === 'missingConfigDoc') {
- Promise.resolve({
+ return Promise.resolve({
hits: {
hits: [],
},
@@ -69,7 +73,9 @@ function setupMockCallCluster(optCount, language) {
});
}
}
- });
+
+ throw new Error('invalid call');
+ }) as unknown) as APICaller;
}
describe('makeKQLUsageCollector', () => {
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.js b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
index 0a886d364c6fdd..9f3437161541f1 100644
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.js
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
@@ -17,14 +17,14 @@
* under the License.
*/
-import { getUiSettingDefaults } from '../../../ui_setting_defaults';
import { get } from 'lodash';
+import { APICaller } from 'kibana/server';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../common';
-const uiSettingDefaults = getUiSettingDefaults();
-const defaultSearchQueryLanguageSetting = uiSettingDefaults['search:queryLanguage'].value;
+const defaultSearchQueryLanguageSetting = DEFAULT_QUERY_LANGUAGE;
-export function fetchProvider(index) {
- return async callCluster => {
+export function fetchProvider(index: string) {
+ return async (callCluster: APICaller) => {
const [response, config] = await Promise.all([
callCluster('get', {
index,
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/index.js b/src/plugins/data/server/kql_telemetry/usage_collector/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/index.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/index.ts
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
similarity index 62%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
index 34503bf56ad840..97a714f09474b6 100644
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
@@ -18,33 +18,26 @@
*/
import { makeKQLUsageCollector } from './make_kql_usage_collector';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
describe('makeKQLUsageCollector', () => {
- let server;
- let makeUsageCollectorStub;
- let registerStub;
- let usageCollection;
+ let usageCollectionMock: jest.Mocked;
beforeEach(() => {
- makeUsageCollectorStub = jest.fn();
- registerStub = jest.fn();
- usageCollection = {
- makeUsageCollector: makeUsageCollectorStub,
- registerCollector: registerStub,
- };
- server = {
- config: () => ({ get: () => '.kibana' }),
- };
+ usageCollectionMock = ({
+ makeUsageCollector: jest.fn(),
+ registerCollector: jest.fn(),
+ } as unknown) as jest.Mocked;
});
it('should call registerCollector', () => {
- makeKQLUsageCollector(usageCollection, server);
- expect(registerStub).toHaveBeenCalledTimes(1);
+ makeKQLUsageCollector(usageCollectionMock, '.kibana');
+ expect(usageCollectionMock.registerCollector).toHaveBeenCalledTimes(1);
});
it('should call makeUsageCollector with type = kql', () => {
- makeKQLUsageCollector(usageCollection, server);
- expect(makeUsageCollectorStub).toHaveBeenCalledTimes(1);
- expect(makeUsageCollectorStub.mock.calls[0][0].type).toBe('kql');
+ makeKQLUsageCollector(usageCollectionMock, '.kibana');
+ expect(usageCollectionMock.makeUsageCollector).toHaveBeenCalledTimes(1);
+ expect(usageCollectionMock.makeUsageCollector.mock.calls[0][0].type).toBe('kql');
});
});
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
similarity index 81%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
index 6d751a9e9ff45b..db4c9a8f0b4c79 100644
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
@@ -18,10 +18,13 @@
*/
import { fetchProvider } from './fetch';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
-export function makeKQLUsageCollector(usageCollection, server) {
- const index = server.config().get('kibana.index');
- const fetch = fetchProvider(index);
+export async function makeKQLUsageCollector(
+ usageCollection: UsageCollectionSetup,
+ kibanaIndex: string
+) {
+ const fetch = fetchProvider(kibanaIndex);
const kqlUsageCollector = usageCollection.makeUsageCollector({
type: 'kql',
fetch,
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 6df0a11e7538dd..591fdb4c4080d2 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -21,29 +21,42 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../..
import { IndexPatternsService } from './index_patterns';
import { ISearchSetup } from './search';
import { SearchService } from './search/search_service';
+import { ScriptsService } from './scripts';
+import { KqlTelemetryService } from './kql_telemetry';
+import { UsageCollectionSetup } from '../../usage_collection/server';
import { AutocompleteService } from './autocomplete';
export interface DataPluginSetup {
search: ISearchSetup;
}
+export interface DataPluginSetupDependencies {
+ usageCollection?: UsageCollectionSetup;
+}
export class DataServerPlugin implements Plugin {
private readonly searchService: SearchService;
+ private readonly scriptsService: ScriptsService;
+ private readonly kqlTelemetryService: KqlTelemetryService;
private readonly autocompleteService = new AutocompleteService();
private readonly indexPatterns = new IndexPatternsService();
constructor(initializerContext: PluginInitializerContext) {
this.searchService = new SearchService(initializerContext);
+ this.scriptsService = new ScriptsService();
+ this.kqlTelemetryService = new KqlTelemetryService(initializerContext);
}
- public setup(core: CoreSetup) {
+ public setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies) {
this.indexPatterns.setup(core);
+ this.scriptsService.setup(core);
this.autocompleteService.setup(core);
+ this.kqlTelemetryService.setup(core, { usageCollection });
return {
search: this.searchService.setup(core),
};
}
+
public start(core: CoreStart) {}
public stop() {}
}
diff --git a/src/plugins/data/server/scripts/index.ts b/src/plugins/data/server/scripts/index.ts
new file mode 100644
index 00000000000000..d4a3e70fdbf53f
--- /dev/null
+++ b/src/plugins/data/server/scripts/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export { ScriptsService } from './scripts_service';
diff --git a/src/plugins/data/server/scripts/route.ts b/src/plugins/data/server/scripts/route.ts
new file mode 100644
index 00000000000000..3eb77f09b25cda
--- /dev/null
+++ b/src/plugins/data/server/scripts/route.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { IRouter } from 'kibana/server';
+
+export function registerScriptsRoute(router: IRouter) {
+ router.get(
+ { path: '/api/kibana/scripts/languages', validate: false },
+ async (context, request, response) => {
+ return response.ok({
+ body: ['painless', 'expression'],
+ });
+ }
+ );
+}
diff --git a/src/legacy/ui/public/saved_objects/saved_object_registry.ts b/src/plugins/data/server/scripts/scripts_service.ts
similarity index 75%
rename from src/legacy/ui/public/saved_objects/saved_object_registry.ts
rename to src/plugins/data/server/scripts/scripts_service.ts
index 34b91267bfb322..9a3a20a64276dd 100644
--- a/src/legacy/ui/public/saved_objects/saved_object_registry.ts
+++ b/src/plugins/data/server/scripts/scripts_service.ts
@@ -17,10 +17,13 @@
* under the License.
*/
-import { uiRegistry } from '../registry/_registry';
+import { CoreSetup, Plugin } from 'kibana/server';
+import { registerScriptsRoute } from './route';
-export const SavedObjectRegistryProvider = uiRegistry({
- name: 'savedObjects',
- index: ['loaderProperties.name'],
- order: ['loaderProperties.name'],
-});
+export class ScriptsService implements Plugin {
+ public setup({ http }: CoreSetup) {
+ registerScriptsRoute(http.createRouter());
+ }
+
+ public start() {}
+}
diff --git a/src/plugins/home/README.md b/src/plugins/home/README.md
index 74e12a799b1b76..1ce0ae0bf44d31 100644
--- a/src/plugins/home/README.md
+++ b/src/plugins/home/README.md
@@ -1,13 +1,13 @@
# home plugin
Moves the legacy `ui/registry/feature_catalogue` module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls.
-# Feature catalogue (public service)
+## Feature catalogue (public service)
Replaces the legacy `ui/registry/feature_catalogue` module for registering "features" that should be showed in the home
page's feature catalogue. This should not be confused with the "feature" plugin for registering features used to derive
UI capabilities for feature controls.
-## Example registration
+### Example registration
```ts
// For legacy plugins
@@ -27,3 +27,28 @@ class MyPlugin {
```
Note that the old module supported providing a Angular DI function to receive Angular dependencies. This is no longer supported as we migrate away from Angular and will be removed in 8.0.
+
+## Sample data
+
+Replaces the sample data mixin putting functions on the global `server` object.
+
+### What happens when a user installs a sample data set?
+1) Kibana deletes existing Elastic search indicies for the sample data set if they exist from previous installs.
+2) Kibana creates Elasticsearch indicies with the provided field mappings.
+3) Kibana uses bulk insert to ingest the new-line delimited json into the Elasticsearch index. Kibana migrates timestamps provided in new-line delimited json to the current time frame for any date field defined in `timeFields`
+4) Kibana will install all saved objects for sample data set. This will override any saved objects previouslly installed for sample data set.
+
+Elasticsearch index names are prefixed with `kibana_sample_data_`. For more details see [createIndexName](/src/plugins/home/server/services/sample_data/lib/create_index_name.js)
+
+Sample data sets typically provide data that spans 5 weeks from the past and 5 weeks into the future so users see data relative to `now` for a few weeks after installing sample data sets.
+
+### Adding new sample data sets
+Use [existing sample data sets](/src/plugins/home/server/services/sample_data/data_sets) as examples.
+To avoid bloating the Kibana distribution, keep data set size to a minimum.
+
+Follow the steps below to add new Sample data sets to Kibana.
+1) Create new-line delimited json containing sample data.
+2) Create file with Elasticsearch field mappings for sample data indices.
+3) Create Kibana saved objects for sample data including index-patterns, visualizations, and dashboards. The best way to extract the saved objects is from the Kibana management -> saved objects [export UI](https://www.elastic.co/guide/en/kibana/current/managing-saved-objects.html#_export)
+4) Define sample data spec conforming to [Data Set Schema](/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts).
+5) Register sample data by calling `plguins.home.sampleData.registerSampleDataset(yourSpecProvider)` in your `setup` method where `yourSpecProvider` is a function that returns an object containing your sample data spec from step 4.
diff --git a/src/plugins/home/kibana.json b/src/plugins/home/kibana.json
index a5c65e3efa597c..31e7ebc138dcb9 100644
--- a/src/plugins/home/kibana.json
+++ b/src/plugins/home/kibana.json
@@ -2,5 +2,6 @@
"id": "home",
"version": "kibana",
"server": true,
- "ui": true
+ "ui": true,
+ "optionalPlugins": ["usage_collection"]
}
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index be4e20ab63d3c8..ed336f4a41d6e8 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -19,6 +19,8 @@
export { HomeServerPluginSetup, HomeServerPluginStart } from './plugin';
export { TutorialProvider } from './services';
+export { SampleDatasetProvider, SampleDataRegistrySetup } from './services';
+import { PluginInitializerContext } from 'src/core/server';
import { HomeServerPlugin } from './plugin';
-export const plugin = () => new HomeServerPlugin();
+export const plugin = (initContext: PluginInitializerContext) => new HomeServerPlugin(initContext);
diff --git a/src/plugins/home/server/plugin.test.mocks.ts b/src/plugins/home/server/plugin.test.mocks.ts
index a5640de579b151..ac11948c040d02 100644
--- a/src/plugins/home/server/plugin.test.mocks.ts
+++ b/src/plugins/home/server/plugin.test.mocks.ts
@@ -17,8 +17,11 @@
* under the License.
*/
import { tutorialsRegistryMock } from './services/tutorials/tutorials_registry.mock';
+import { sampleDataRegistryMock } from './services/sample_data/sample_data_registry.mock';
-export const registryMock = tutorialsRegistryMock.create();
+export const registryForTutorialsMock = tutorialsRegistryMock.create();
+export const registryForSampleDataMock = sampleDataRegistryMock.create();
jest.doMock('./services', () => ({
- TutorialsRegistry: jest.fn(() => registryMock),
+ TutorialsRegistry: jest.fn(() => registryForTutorialsMock),
+ SampleDataRegistry: jest.fn(() => registryForSampleDataMock),
}));
diff --git a/src/plugins/home/server/plugin.test.ts b/src/plugins/home/server/plugin.test.ts
index eec6501436bf40..33d907315e5124 100644
--- a/src/plugins/home/server/plugin.test.ts
+++ b/src/plugins/home/server/plugin.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { registryMock } from './plugin.test.mocks';
+import { registryForTutorialsMock, registryForSampleDataMock } from './plugin.test.mocks';
import { HomeServerPlugin } from './plugin';
import { coreMock } from '../../../core/server/mocks';
import { CoreSetup } from '../../../core/server';
@@ -26,26 +26,41 @@ type MockedKeys = { [P in keyof T]: jest.Mocked };
describe('HomeServerPlugin', () => {
beforeEach(() => {
- registryMock.setup.mockClear();
- registryMock.start.mockClear();
+ registryForTutorialsMock.setup.mockClear();
+ registryForTutorialsMock.start.mockClear();
+ registryForSampleDataMock.setup.mockClear();
+ registryForSampleDataMock.start.mockClear();
});
describe('setup', () => {
const mockCoreSetup: MockedKeys = coreMock.createSetup();
+ const initContext = coreMock.createPluginInitializerContext();
- test('wires up and returns registerTutorial and addScopedTutorialContextFactory', () => {
- const setup = new HomeServerPlugin().setup(mockCoreSetup);
+ test('wires up tutorials provider service and returns registerTutorial and addScopedTutorialContextFactory', () => {
+ const setup = new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
expect(setup).toHaveProperty('tutorials');
expect(setup.tutorials).toHaveProperty('registerTutorial');
expect(setup.tutorials).toHaveProperty('addScopedTutorialContextFactory');
});
+
+ test('wires up sample data provider service and returns registerTutorial and addScopedTutorialContextFactory', () => {
+ const setup = new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
+ expect(setup).toHaveProperty('sampleData');
+ expect(setup.sampleData).toHaveProperty('registerSampleDataset');
+ expect(setup.sampleData).toHaveProperty('getSampleDatasets');
+ expect(setup.sampleData).toHaveProperty('addSavedObjectsToSampleDataset');
+ expect(setup.sampleData).toHaveProperty('addAppLinksToSampleDataset');
+ expect(setup.sampleData).toHaveProperty('replacePanelInSampleDatasetDashboard');
+ });
});
describe('start', () => {
+ const initContext = coreMock.createPluginInitializerContext();
test('is defined', () => {
- const start = new HomeServerPlugin().start();
+ const start = new HomeServerPlugin(initContext).start();
expect(start).toBeDefined();
expect(start).toHaveProperty('tutorials');
+ expect(start).toHaveProperty('sampleData');
});
});
});
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 89dda8205ce028..23c236764cddcf 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -16,21 +16,37 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { CoreSetup, Plugin } from 'src/core/server';
-import { TutorialsRegistry, TutorialsRegistrySetup, TutorialsRegistryStart } from './services';
+import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import {
+ TutorialsRegistry,
+ TutorialsRegistrySetup,
+ TutorialsRegistryStart,
+ SampleDataRegistry,
+ SampleDataRegistrySetup,
+ SampleDataRegistryStart,
+} from './services';
+import { UsageCollectionSetup } from '../../usage_collection/server';
+
+interface HomeServerPluginSetupDependencies {
+ usage_collection?: UsageCollectionSetup;
+}
export class HomeServerPlugin implements Plugin {
+ constructor(private readonly initContext: PluginInitializerContext) {}
private readonly tutorialsRegistry = new TutorialsRegistry();
+ private readonly sampleDataRegistry = new SampleDataRegistry(this.initContext);
- public setup(core: CoreSetup) {
+ public setup(core: CoreSetup, plugins: HomeServerPluginSetupDependencies): HomeServerPluginSetup {
return {
tutorials: { ...this.tutorialsRegistry.setup(core) },
+ sampleData: { ...this.sampleDataRegistry.setup(core, plugins.usage_collection) },
};
}
- public start() {
+ public start(): HomeServerPluginStart {
return {
tutorials: { ...this.tutorialsRegistry.start() },
+ sampleData: { ...this.sampleDataRegistry.start() },
};
}
}
@@ -38,9 +54,11 @@ export class HomeServerPlugin implements Plugin [
+export const getSavedObjects = (): SavedObject[] => [
{
id: '37cc8650-b882-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.salesByCategoryTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.salesByCategoryTitle', {
defaultMessage: '[eCommerce] Sales by Category',
}),
visState:
@@ -40,15 +44,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: 'ed8436b0-b88b-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.salesByGenderTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.salesByGenderTitle', {
defaultMessage: '[eCommerce] Sales by Gender',
}),
visState:
@@ -61,15 +66,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '09ffee60-b88c-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.markdownTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.markdownTitle', {
defaultMessage: '[eCommerce] Markdown',
}),
visState:
@@ -81,15 +87,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '1c389590-b88d-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.controlsTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.controlsTitle', {
defaultMessage: '[eCommerce] Controls',
}),
visState:
@@ -101,15 +108,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '45e07720-b890-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:17:30.755Z',
- version: 2,
+ version: '2',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.promotionTrackingTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.promotionTrackingTitle', {
defaultMessage: '[eCommerce] Promotion Tracking',
}),
visState:
@@ -121,15 +129,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '10f1a240-b891-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.totalRevenueTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.totalRevenueTitle', {
defaultMessage: '[eCommerce] Total Revenue',
}),
visState:
@@ -142,15 +151,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: 'b80e6540-b891-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.soldProductsPerDayTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.soldProductsPerDayTitle', {
defaultMessage: '[eCommerce] Sold Products per Day',
}),
visState:
@@ -162,15 +172,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '4b3ec120-b892-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.averageSalesPriceTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.averageSalesPriceTitle', {
defaultMessage: '[eCommerce] Average Sales Price',
}),
visState:
@@ -184,15 +195,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '9ca7aa90-b892-11e8-a6d9-e546fe2bba5f',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.averageSoldQuantityTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.averageSoldQuantityTitle', {
defaultMessage: '[eCommerce] Average Sold Quantity',
}),
visState:
@@ -206,15 +218,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '3ba638e0-b894-11e8-a6d9-e546fe2bba5f',
type: 'search',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.ordersTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.ordersTitle', {
defaultMessage: '[eCommerce] Orders',
}),
description: '',
@@ -227,15 +240,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","highlightAll":true,"version":true,"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.averageSalesPerRegionTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.averageSalesPerRegionTitle', {
defaultMessage: '[eCommerce] Average Sales Per Region',
}),
visState:
@@ -248,15 +262,16 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: 'b72dd430-bb4d-11e8-9c84-77068524bcab',
type: 'visualization',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.topSellingProductsTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.topSellingProductsTitle', {
defaultMessage: '[eCommerce] Top Selling Products',
}),
visState:
@@ -269,12 +284,13 @@ export const getSavedObjects = () => [
'{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
type: 'index-pattern',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
title: 'kibana_sample_data_ecommerce',
@@ -283,12 +299,13 @@ export const getSavedObjects = () => [
'[{"name":"_id","type":"string","esTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","esTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","esTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","esTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"category","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"category.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "category"}}},{"name":"currency","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_birth_date","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_first_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_first_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "customer_first_name"}}},{"name":"customer_full_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_full_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "customer_full_name"}}},{"name":"customer_gender","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_id","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"customer_last_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_last_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "customer_last_name"}}},{"name":"customer_phone","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"day_of_week_i","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"email","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.city_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.continent_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.country_iso_code","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.location","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geoip.region_name","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"manufacturer","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"manufacturer.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "manufacturer"}}},{"name":"order_date","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"order_id","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products._id","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products._id.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "products._id"}}},{"name":"products.base_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.base_unit_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.category","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.category.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "products.category"}}},{"name":"products.created_on","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.discount_percentage","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.manufacturer","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.manufacturer.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "products.manufacturer"}}},{"name":"products.min_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_id","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.product_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"products.product_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "products.product_name"}}},{"name":"products.quantity","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.sku","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.tax_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxful_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.taxless_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"products.unit_discount_amount","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"sku","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxful_total_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"taxless_total_price","type":"number","esTypes":["half_float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_quantity","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"total_unique_products","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"type","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"user","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true}]',
fieldFormatMap: '{"taxful_total_price":{"id":"number","params":{"pattern":"$0,0.[00]"}}}',
},
+ references: [],
},
{
id: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
type: 'dashboard',
updated_at: '2018-10-01T15:13:03.270Z',
- version: 1,
+ version: '1',
references: [
{
name: 'panel_0',
@@ -355,11 +372,11 @@ export const getSavedObjects = () => [
dashboard: '7.0.0',
},
attributes: {
- title: i18n.translate('server.sampleData.ecommerceSpec.revenueDashboardTitle', {
+ title: i18n.translate('home.sampleData.ecommerceSpec.revenueDashboardTitle', {
defaultMessage: '[eCommerce] Revenue Dashboard',
}),
hits: 0,
- description: i18n.translate('server.sampleData.ecommerceSpec.revenueDashboardDescription', {
+ description: i18n.translate('home.sampleData.ecommerceSpec.revenueDashboardDescription', {
defaultMessage: 'Analyze mock eCommerce orders and revenue',
}),
panelsJSON:
diff --git a/src/legacy/server/sample_data/data_sets/flights/field_mappings.js b/src/plugins/home/server/services/sample_data/data_sets/flights/field_mappings.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/flights/field_mappings.js
rename to src/plugins/home/server/services/sample_data/data_sets/flights/field_mappings.ts
diff --git a/src/legacy/server/sample_data/data_sets/flights/flights.json.gz b/src/plugins/home/server/services/sample_data/data_sets/flights/flights.json.gz
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/flights/flights.json.gz
rename to src/plugins/home/server/services/sample_data/data_sets/flights/flights.json.gz
diff --git a/src/legacy/server/sample_data/data_sets/flights/index.js b/src/plugins/home/server/services/sample_data/data_sets/flights/index.ts
similarity index 71%
rename from src/legacy/server/sample_data/data_sets/flights/index.js
rename to src/plugins/home/server/services/sample_data/data_sets/flights/index.ts
index 382f82de883051..d63ea8f7fb4930 100644
--- a/src/legacy/server/sample_data/data_sets/flights/index.js
+++ b/src/plugins/home/server/services/sample_data/data_sets/flights/index.ts
@@ -21,19 +21,25 @@ import path from 'path';
import { i18n } from '@kbn/i18n';
import { getSavedObjects } from './saved_objects';
import { fieldMappings } from './field_mappings';
+import { SampleDatasetSchema, AppLinkSchema } from '../../lib/sample_dataset_registry_types';
-export function flightsSpecProvider() {
+const flightsName = i18n.translate('home.sampleData.flightsSpecTitle', {
+ defaultMessage: 'Sample flight data',
+});
+const flightsDescription = i18n.translate('home.sampleData.flightsSpecDescription', {
+ defaultMessage: 'Sample data, visualizations, and dashboards for monitoring flight routes.',
+});
+const initialAppLinks = [] as AppLinkSchema[];
+
+export const flightsSpecProvider = function(): SampleDatasetSchema {
return {
id: 'flights',
- name: i18n.translate('server.sampleData.flightsSpecTitle', {
- defaultMessage: 'Sample flight data',
- }),
- description: i18n.translate('server.sampleData.flightsSpecDescription', {
- defaultMessage: 'Sample data, visualizations, and dashboards for monitoring flight routes.',
- }),
+ name: flightsName,
+ description: flightsDescription,
previewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard.png',
darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard_dark.png',
overviewDashboard: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+ appLinks: initialAppLinks,
defaultIndex: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
savedObjects: getSavedObjects(),
dataIndices: [
@@ -46,5 +52,6 @@ export function flightsSpecProvider() {
preserveDayOfWeekTimeOfDay: true,
},
],
+ status: 'not_installed',
};
-}
+};
diff --git a/src/legacy/server/sample_data/data_sets/flights/saved_objects.js b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
similarity index 94%
rename from src/legacy/server/sample_data/data_sets/flights/saved_objects.js
rename to src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
index 69e77e67c5d9c6..1cce11aea37fbb 100644
--- a/src/legacy/server/sample_data/data_sets/flights/saved_objects.js
+++ b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
@@ -17,17 +17,21 @@
* under the License.
*/
+/* eslint max-len: 0 */
+/* eslint-disable */
+
import { i18n } from '@kbn/i18n';
+import { SavedObject } from 'kibana/server';
-export const getSavedObjects = () => [
+export const getSavedObjects = (): SavedObject[] => [
{
id: 'aeb212e0-4c84-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.controlsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.controlsTitle', {
defaultMessage: '[Flights] Controls',
}),
visState:
@@ -39,15 +43,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{}',
},
},
+ references: [],
},
{
id: 'c8fc3d30-4c87-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle', {
defaultMessage: '[Flights] Flight Count and Average Ticket Price',
}),
visState:
@@ -61,15 +66,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
type: 'search',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.flightLogTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.flightLogTitle', {
defaultMessage: '[Flights] Flight Log',
}),
description: '',
@@ -92,15 +98,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","highlightAll":true,"version":true,"query":{"language":"kuery","query":""},"filter":[]}',
},
},
+ references: [],
},
{
id: '8f4d0c00-4c86-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.airlineCarrierTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.airlineCarrierTitle', {
defaultMessage: '[Flights] Airline Carrier',
}),
visState:
@@ -113,15 +120,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: 'f8290060-4c88-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.delayTypeTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.delayTypeTitle', {
defaultMessage: '[Flights] Delay Type',
}),
visState:
@@ -134,15 +142,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.delaysAndCancellationsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.delaysAndCancellationsTitle', {
defaultMessage: '[Flights] Delays & Cancellations',
}),
visState:
@@ -154,15 +163,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{}',
},
},
+ references: [],
},
{
id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.delayBucketsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.delayBucketsTitle', {
defaultMessage: '[Flights] Delay Buckets',
}),
visState:
@@ -175,15 +185,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":true,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelayMin","value":"0","params":{"query":0,"type":"phrase"}},"query":{"match":{"FlightDelayMin":{"query":0,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '76e3c090-4c8c-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.flightDelaysTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.flightDelaysTitle', {
defaultMessage: '[Flights] Flight Delays',
}),
visState:
@@ -196,15 +207,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '707665a0-4c8c-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.flightCancellationsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.flightCancellationsTitle', {
defaultMessage: '[Flights] Flight Cancellations',
}),
visState:
@@ -217,15 +229,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.destinationWeatherTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.destinationWeatherTitle', {
defaultMessage: '[Flights] Destination Weather',
}),
visState:
@@ -238,15 +251,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '129be430-4c93-11e8-b3d7-01146121b73d',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.markdownInstructionsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.markdownInstructionsTitle', {
defaultMessage: '[Flights] Markdown Instructions',
}),
visState:
@@ -258,15 +272,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{}',
},
},
+ references: [],
},
{
id: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.originCountryTicketPricesTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.originCountryTicketPricesTitle', {
defaultMessage: '[Flights] Origin Country Ticket Prices',
}),
visState:
@@ -279,15 +294,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: 'f8283bf0-52fd-11e8-a160-89cc2ad9e8e2',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.totalFlightDelaysTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.totalFlightDelaysTitle', {
defaultMessage: '[Flights] Total Flight Delays',
}),
visState:
@@ -301,15 +317,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelay","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"FlightDelay":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '08884800-52fe-11e8-a160-89cc2ad9e8e2',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.totalFlightCancellationsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.totalFlightCancellationsTitle', {
defaultMessage: '[Flights] Total Flight Cancellations',
}),
visState:
@@ -323,15 +340,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"Cancelled","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"Cancelled":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: 'e6944e50-52fe-11e8-a160-89cc2ad9e8e2',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.originCountryTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.originCountryTitle', {
defaultMessage: '[Flights] Origin Country vs. Destination Country',
}),
visState:
@@ -345,15 +363,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '01c413e0-5395-11e8-99bf-1ba7b1bdaa61',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.totalFlightsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.totalFlightsTitle', {
defaultMessage: '[Flights] Total Flights',
}),
visState:
@@ -366,15 +385,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '2edf78b0-5395-11e8-99bf-1ba7b1bdaa61',
type: 'visualization',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.averageTicketPriceTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.averageTicketPriceTitle', {
defaultMessage: '[Flights] Average Ticket Price',
}),
visState:
@@ -387,15 +407,16 @@ export const getSavedObjects = () => [
'{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
type: 'visualization',
updated_at: '2018-05-09T15:55:51.195Z',
- version: 3,
+ version: '3',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.airportConnectionsTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.airportConnectionsTitle', {
defaultMessage: '[Flights] Airport Connections (Hover Over Airport)',
}),
visState:
@@ -407,12 +428,13 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
type: 'index-pattern',
updated_at: '2018-05-09T15:49:03.736Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
title: 'kibana_sample_data_flights',
@@ -422,12 +444,13 @@ export const getSavedObjects = () => [
fieldFormatMap:
'{"hour_of_day":{"id":"number","params":{"pattern":"00"}},"AvgTicketPrice":{"id":"number","params":{"pattern":"$0,0.[00]"}}}',
},
+ references: [],
},
{
id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
type: 'dashboard',
updated_at: '2018-05-09T15:59:04.578Z',
- version: 4,
+ version: '4',
references: [
{
name: 'panel_0',
@@ -524,12 +547,12 @@ export const getSavedObjects = () => [
dashboard: '7.0.0',
},
attributes: {
- title: i18n.translate('server.sampleData.flightsSpec.globalFlightDashboardTitle', {
+ title: i18n.translate('home.sampleData.flightsSpec.globalFlightDashboardTitle', {
defaultMessage: '[Flights] Global Flight Dashboard',
}),
hits: 0,
description: i18n.translate(
- 'server.sampleData.flightsSpec.globalFlightDashboardDescription',
+ 'home.sampleData.flightsSpec.globalFlightDashboardDescription',
{
defaultMessage:
'Analyze mock flight data for ES-Air, Logstash Airways, Kibana Airlines and JetBeats',
diff --git a/src/legacy/server/sample_data/data_sets/index.js b/src/plugins/home/server/services/sample_data/data_sets/index.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/index.js
rename to src/plugins/home/server/services/sample_data/data_sets/index.ts
diff --git a/src/legacy/server/sample_data/data_sets/logs/field_mappings.js b/src/plugins/home/server/services/sample_data/data_sets/logs/field_mappings.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/logs/field_mappings.js
rename to src/plugins/home/server/services/sample_data/data_sets/logs/field_mappings.ts
diff --git a/src/legacy/server/sample_data/data_sets/logs/index.js b/src/plugins/home/server/services/sample_data/data_sets/logs/index.ts
similarity index 72%
rename from src/legacy/server/sample_data/data_sets/logs/index.js
rename to src/plugins/home/server/services/sample_data/data_sets/logs/index.ts
index c6d955eb2ff51c..bb6e2982f59a08 100644
--- a/src/legacy/server/sample_data/data_sets/logs/index.js
+++ b/src/plugins/home/server/services/sample_data/data_sets/logs/index.ts
@@ -21,19 +21,25 @@ import path from 'path';
import { i18n } from '@kbn/i18n';
import { getSavedObjects } from './saved_objects';
import { fieldMappings } from './field_mappings';
+import { SampleDatasetSchema, AppLinkSchema } from '../../lib/sample_dataset_registry_types';
-export function logsSpecProvider() {
+const logsName = i18n.translate('home.sampleData.logsSpecTitle', {
+ defaultMessage: 'Sample web logs',
+});
+const logsDescription = i18n.translate('home.sampleData.logsSpecDescription', {
+ defaultMessage: 'Sample data, visualizations, and dashboards for monitoring web logs.',
+});
+const initialAppLinks = [] as AppLinkSchema[];
+
+export const logsSpecProvider = function(): SampleDatasetSchema {
return {
id: 'logs',
- name: i18n.translate('server.sampleData.logsSpecTitle', {
- defaultMessage: 'Sample web logs',
- }),
- description: i18n.translate('server.sampleData.logsSpecDescription', {
- defaultMessage: 'Sample data, visualizations, and dashboards for monitoring web logs.',
- }),
+ name: logsName,
+ description: logsDescription,
previewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard.png',
darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard_dark.png',
overviewDashboard: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
+ appLinks: initialAppLinks,
defaultIndex: '90943e30-9a47-11e8-b64d-95841ca0b247',
savedObjects: getSavedObjects(),
dataIndices: [
@@ -46,5 +52,6 @@ export function logsSpecProvider() {
preserveDayOfWeekTimeOfDay: true,
},
],
+ status: 'not_installed',
};
-}
+};
diff --git a/src/legacy/server/sample_data/data_sets/logs/logs.json.gz b/src/plugins/home/server/services/sample_data/data_sets/logs/logs.json.gz
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/logs/logs.json.gz
rename to src/plugins/home/server/services/sample_data/data_sets/logs/logs.json.gz
diff --git a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
similarity index 96%
rename from src/legacy/server/sample_data/data_sets/logs/saved_objects.js
rename to src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
index 9ce6e0d001e9e1..883108651bfc50 100644
--- a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js
+++ b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
@@ -17,17 +17,20 @@
* under the License.
*/
+/* eslint max-len: 0 */
+/* eslint-disable */
import { i18n } from '@kbn/i18n';
+import { SavedObject } from 'kibana/server';
-export const getSavedObjects = () => [
+export const getSavedObjects = (): SavedObject[] => [
{
id: 'e1d0f010-9ee7-11e7-8711-e7a007dcef99',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.uniqueVisitorsTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.uniqueVisitorsTitle', {
defaultMessage: '[Logs] Unique Visitors vs. Average Bytes',
}),
visState:
@@ -40,15 +43,16 @@ export const getSavedObjects = () => [
'{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.uniqueVisitorsByCountryTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.uniqueVisitorsByCountryTitle', {
defaultMessage: '[Logs] Unique Visitors by Country',
}),
visState:
@@ -61,15 +65,16 @@ export const getSavedObjects = () => [
'{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '935afa20-e0cd-11e7-9d07-1398ccfcefa3',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.heatmapTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.heatmapTitle', {
defaultMessage: '[Logs] Heatmap',
}),
visState:
@@ -83,15 +88,16 @@ export const getSavedObjects = () => [
'{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b',
type: 'visualization',
updated_at: '2018-08-29T13:23:20.897Z',
- version: 2,
+ version: '2',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.hostVisitsBytesTableTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.hostVisitsBytesTableTitle', {
defaultMessage: '[Logs] Host, Visits and Bytes Table',
}),
visState:
@@ -103,15 +109,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '69a34b00-9ee8-11e7-8711-e7a007dcef99',
type: 'visualization',
updated_at: '2018-08-29T13:24:46.136Z',
- version: 2,
+ version: '2',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.goalsTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.goalsTitle', {
defaultMessage: '[Logs] Goals',
}),
visState:
@@ -125,15 +132,16 @@ export const getSavedObjects = () => [
'{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '42b997f0-0c26-11e8-b0ec-3bb475f6b6ff',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.fileTypeScatterPlotTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.fileTypeScatterPlotTitle', {
defaultMessage: '[Logs] File Type Scatter Plot',
}),
visState:
@@ -145,15 +153,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '7cbd2350-2223-11e8-b802-5bcf64c2cfb4',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle', {
defaultMessage: '[Logs] Source and Destination Sankey Chart',
}),
visState:
@@ -165,15 +174,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '314c6f60-2224-11e8-b802-5bcf64c2cfb4',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.responseCodesOverTimeTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.responseCodesOverTimeTitle', {
defaultMessage: '[Logs] Response Codes Over Time + Annotations',
}),
visState:
@@ -185,15 +195,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '24a3e970-4257-11e8-b3aa-73fdaf54bfc9',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.inputControlsTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.inputControlsTitle', {
defaultMessage: '[Logs] Input Controls',
}),
visState:
@@ -205,15 +216,16 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '14e2e710-4258-11e8-b3aa-73fdaf54bfc9',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.visitorOSTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.visitorOSTitle', {
defaultMessage: '[Logs] Visitors by OS',
}),
visState:
@@ -226,15 +238,16 @@ export const getSavedObjects = () => [
'{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
},
},
+ references: [],
},
{
id: '47f2c680-a6e3-11e8-94b4-c30c0228351b',
type: 'visualization',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.markdownInstructionsTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.markdownInstructionsTitle', {
defaultMessage: '[Logs] Markdown Instructions',
}),
visState:
@@ -246,12 +259,13 @@ export const getSavedObjects = () => [
searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
},
},
+ references: [],
},
{
id: '90943e30-9a47-11e8-b64d-95841ca0b247',
type: 'index-pattern',
updated_at: '2018-08-29T13:22:17.617Z',
- version: 1,
+ version: '1',
migrationVersion: {},
attributes: {
title: 'kibana_sample_data_logs',
@@ -260,12 +274,13 @@ export const getSavedObjects = () => [
'[{"name":"@timestamp","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"_id","type":"string","esTypes":["_id"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_index","type":"string","esTypes":["_index"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"_score","type":"number","count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_source","type":"_source","esTypes":["_source"],"count":0,"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"name":"_type","type":"string","esTypes":["_type"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"name":"agent","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"agent.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "agent"}}},{"name":"bytes","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"clientip","type":"ip","esTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"event.dataset","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"extension","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"extension.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "extension"}}},{"name":"geo.coordinates","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.dest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.src","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"geo.srcdest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"host","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"host.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "host"}}},{"name":"index","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"index.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "index"}}},{"name":"ip","type":"ip","esTypes":["ip"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"machine.os","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"machine.os.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "machine.os"}}},{"name":"machine.ram","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"memory","type":"number","esTypes":["double"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"message","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"message.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "message"}}},{"name":"phpmemory","type":"number","esTypes":["long"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"referer","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"request","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"request.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "request"}}},{"name":"response","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"response.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "response"}}},{"name":"tags","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"tags.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "tags"}}},{"name":"timestamp","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"url","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"url.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent": "url"}}},{"name":"utc_time","type":"date","esTypes":["date"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.getHour()","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]',
fieldFormatMap: '{"hour_of_day":{}}',
},
+ references: [],
},
{
id: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
type: 'dashboard',
updated_at: '2018-08-29T13:26:13.463Z',
- version: 3,
+ version: '3',
references: [
{
name: 'panel_0',
@@ -327,11 +342,11 @@ export const getSavedObjects = () => [
dashboard: '7.0.0',
},
attributes: {
- title: i18n.translate('server.sampleData.logsSpec.webTrafficTitle', {
+ title: i18n.translate('home.sampleData.logsSpec.webTrafficTitle', {
defaultMessage: '[Logs] Web Traffic',
}),
hits: 0,
- description: i18n.translate('server.sampleData.logsSpec.webTrafficDescription', {
+ description: i18n.translate('home.sampleData.logsSpec.webTrafficDescription', {
defaultMessage: "Analyze mock web traffic log data for Elastic's website",
}),
panelsJSON:
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.js b/src/plugins/home/server/services/sample_data/index.ts
similarity index 78%
rename from src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.js
rename to src/plugins/home/server/services/sample_data/index.ts
index d28ca50e320888..f9fbee8fc6e81b 100644
--- a/src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.js
+++ b/src/plugins/home/server/services/sample_data/index.ts
@@ -16,13 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
+export {
+ SampleDataRegistry,
+ SampleDataRegistrySetup,
+ SampleDataRegistryStart,
+} from './sample_data_registry';
-export function registerLanguages(server) {
- server.route({
- path: '/api/kibana/scripts/languages',
- method: 'GET',
- handler: function() {
- return ['painless', 'expression'];
- },
- });
-}
+export { SampleDatasetSchema, SampleDatasetProvider } from './lib/sample_dataset_registry_types';
diff --git a/src/legacy/server/sample_data/routes/lib/create_index_name.js b/src/plugins/home/server/services/sample_data/lib/create_index_name.ts
similarity index 92%
rename from src/legacy/server/sample_data/routes/lib/create_index_name.js
rename to src/plugins/home/server/services/sample_data/lib/create_index_name.ts
index de9dac7c96fa06..9aecef405d7cef 100644
--- a/src/legacy/server/sample_data/routes/lib/create_index_name.js
+++ b/src/plugins/home/server/services/sample_data/lib/create_index_name.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-export function createIndexName(sampleDataSetId, dataIndexId) {
+export const createIndexName = function(sampleDataSetId: string, dataIndexId: string): string {
// Sample data schema was updated to support multiple indices in 6.5.
// This if statement ensures that sample data sets that used a single index prior to the schema change
// have the same index name to avoid orphaned indices when uninstalling.
@@ -25,4 +25,4 @@ export function createIndexName(sampleDataSetId, dataIndexId) {
return `kibana_sample_data_${sampleDataSetId}`;
}
return `kibana_sample_data_${sampleDataSetId}_${dataIndexId}`;
-}
+};
diff --git a/src/legacy/server/sample_data/routes/lib/load_data.js b/src/plugins/home/server/services/sample_data/lib/load_data.ts
similarity index 90%
rename from src/legacy/server/sample_data/routes/lib/load_data.js
rename to src/plugins/home/server/services/sample_data/lib/load_data.ts
index 9e343b644ec7b5..481ed8da93dba8 100644
--- a/src/legacy/server/sample_data/routes/lib/load_data.js
+++ b/src/plugins/home/server/services/sample_data/lib/load_data.ts
@@ -19,20 +19,20 @@
import readline from 'readline';
import fs from 'fs';
-import zlib from 'zlib';
+import { createUnzip } from 'zlib';
const BULK_INSERT_SIZE = 500;
-export function loadData(path, bulkInsert) {
+export function loadData(path: any, bulkInsert: (docs: any[]) => Promise) {
return new Promise((resolve, reject) => {
- let count = 0;
- let docs = [];
- let isPaused = false;
+ let count: number = 0;
+ let docs: any[] = [];
+ let isPaused: boolean = false;
// pause does not stop lines already in buffer. Use smaller buffer size to avoid bulk inserting to many records
const readStream = fs.createReadStream(path, { highWaterMark: 1024 * 4 });
- // eslint-disable-next-line new-cap
- const lineStream = readline.createInterface({ input: readStream.pipe(zlib.Unzip()) });
+
+ const lineStream = readline.createInterface({ input: readStream.pipe(createUnzip()) });
const onClose = async () => {
if (docs.length > 0) {
try {
@@ -46,7 +46,7 @@ export function loadData(path, bulkInsert) {
};
lineStream.on('close', onClose);
- const closeWithError = err => {
+ const closeWithError = (err: any) => {
lineStream.removeListener('close', onClose);
lineStream.close();
reject(err);
diff --git a/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts b/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts
new file mode 100644
index 00000000000000..29cf2289fc5b34
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts
@@ -0,0 +1,92 @@
+/*
+ * 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 { SavedObject } from 'src/core/server';
+
+export enum DatasetStatusTypes {
+ NOT_INSTALLED = 'not_installed',
+ INSTALLED = 'installed',
+ UNKNOWN = 'unknown',
+}
+export interface SampleDatasetDashboardPanel {
+ sampleDataId: string;
+ dashboardId: string;
+ oldEmbeddableId: string;
+ embeddableId: string;
+ embeddableType: EmbeddableTypes;
+ embeddableConfig: object;
+}
+export enum EmbeddableTypes {
+ MAP_SAVED_OBJECT_TYPE = 'map',
+ SEARCH_EMBEDDABLE_TYPE = 'search',
+ VISUALIZE_EMBEDDABLE_TYPE = 'visualization',
+}
+export interface DataIndexSchema {
+ id: string;
+
+ // path to newline delimented JSON file containing data relative to KIBANA_HOME
+ dataPath: string;
+
+ // Object defining Elasticsearch field mappings (contents of index.mappings.type.properties)
+ fields: object;
+
+ // times fields that will be updated relative to now when data is installed
+ timeFields: string[];
+
+ // Reference to now in your test data set.
+ // When data is installed, timestamps are converted to the present time.
+ // The distance between a timestamp and currentTimeMarker is preserved but the date and time will change.
+ // For example:
+ // sample data set: timestamp: 2018-01-01T00:00:00Z, currentTimeMarker: 2018-01-01T12:00:00Z
+ // installed data set: timestamp: 2018-04-18T20:33:14Z, currentTimeMarker: 2018-04-19T08:33:14Z
+ currentTimeMarker: string;
+
+ // Set to true to move timestamp to current week, preserving day of week and time of day
+ // Relative distance from timestamp to currentTimeMarker will not remain the same
+ preserveDayOfWeekTimeOfDay: boolean;
+}
+
+export interface AppLinkSchema {
+ path: string;
+ icon: string;
+ label: string;
+}
+
+export interface SampleDatasetSchema {
+ id: string;
+ name: string;
+ description: string;
+ previewImagePath: string;
+ darkPreviewImagePath: string;
+
+ // saved object id of main dashboard for sample data set
+ overviewDashboard: string;
+ appLinks: AppLinkSchema[];
+
+ // saved object id of default index-pattern for sample data set
+ defaultIndex: string;
+
+ // Kibana saved objects (index patter, visualizations, dashboard, ...)
+ // Should provide a nice demo of Kibana's functionality with the sample data set
+ savedObjects: SavedObject[];
+ dataIndices: DataIndexSchema[];
+ status?: string | undefined;
+ statusMsg?: unknown;
+}
+
+export type SampleDatasetProvider = () => SampleDatasetSchema;
diff --git a/src/legacy/server/sample_data/data_set_schema.js b/src/plugins/home/server/services/sample_data/lib/sample_dataset_schema.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_set_schema.js
rename to src/plugins/home/server/services/sample_data/lib/sample_dataset_schema.ts
diff --git a/src/legacy/server/sample_data/routes/lib/translate_timestamp.js b/src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts
similarity index 79%
rename from src/legacy/server/sample_data/routes/lib/translate_timestamp.js
rename to src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts
index 5d98eb34af2473..b4e56cdfe7f369 100644
--- a/src/legacy/server/sample_data/routes/lib/translate_timestamp.js
+++ b/src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts
@@ -19,29 +19,34 @@
const MILLISECONDS_IN_DAY = 86400000;
-function iso8601ToDateIgnoringTime(iso8601) {
+function iso8601ToDateIgnoringTime(iso8601: string) {
const split = iso8601.split('-');
if (split.length < 3) {
throw new Error('Unexpected timestamp format, expecting YYYY-MM-DDTHH:mm:ss');
}
- const year = parseInt(split[0]);
- const month = parseInt(split[1]) - 1; // javascript months are zero-based indexed
- const date = parseInt(split[2]);
+ const year = parseInt(split[0], 10);
+ const month = parseInt(split[1], 10) - 1; // javascript months are zero-based indexed
+ const date = parseInt(split[2], 10);
return new Date(year, month, date);
}
-export function dateToIso8601IgnoringTime(date) {
+export function dateToIso8601IgnoringTime(date: Date) {
// not using "Date.toISOString" because only using Date methods that deal with local time
- const year = date.getFullYear();
- const month = date.getMonth() + 1;
+ const dateItem = new Date(date);
+ const year = dateItem.getFullYear();
+ const month = dateItem.getMonth() + 1;
const monthString = month < 10 ? `0${month}` : `${month}`;
- const dateString = date.getDate() < 10 ? `0${date.getDate()}` : `${date.getDate()}`;
+ const dateString = dateItem.getDate() < 10 ? `0${dateItem.getDate()}` : `${dateItem.getDate()}`;
return `${year}-${monthString}-${dateString}`;
}
// Translate source timestamp by targetReference timestamp,
// perserving the distance between source and sourceReference
-export function translateTimeRelativeToDifference(source, sourceReference, targetReference) {
+export function translateTimeRelativeToDifference(
+ source: string,
+ sourceReference: any,
+ targetReference: any
+) {
const sourceDate = iso8601ToDateIgnoringTime(source);
const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
@@ -54,7 +59,11 @@ export function translateTimeRelativeToDifference(source, sourceReference, targe
// Translate source timestamp by targetReference timestamp,
// perserving the week distance between source and sourceReference and day of week of the source timestamp
-export function translateTimeRelativeToWeek(source, sourceReference, targetReference) {
+export function translateTimeRelativeToWeek(
+ source: string,
+ sourceReference: any,
+ targetReference: any
+) {
const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
diff --git a/src/legacy/server/sample_data/routes/index.js b/src/plugins/home/server/services/sample_data/routes/index.ts
similarity index 99%
rename from src/legacy/server/sample_data/routes/index.js
rename to src/plugins/home/server/services/sample_data/routes/index.ts
index 800c165e9eae65..41b9458b9fbb64 100644
--- a/src/legacy/server/sample_data/routes/index.js
+++ b/src/plugins/home/server/services/sample_data/routes/index.ts
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
export { createListRoute } from './list';
export { createInstallRoute } from './install';
export { createUninstallRoute } from './uninstall';
diff --git a/src/plugins/home/server/services/sample_data/routes/install.ts b/src/plugins/home/server/services/sample_data/routes/install.ts
new file mode 100644
index 00000000000000..e2c5ce68832309
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/install.ts
@@ -0,0 +1,186 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import { IRouter, Logger, RequestHandlerContext } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+import {
+ dateToIso8601IgnoringTime,
+ translateTimeRelativeToDifference,
+ translateTimeRelativeToWeek,
+} from '../lib/translate_timestamp';
+import { loadData } from '../lib/load_data';
+import { SampleDataUsageTracker } from '../usage/usage';
+
+const insertDataIntoIndex = (
+ dataIndexConfig: any,
+ index: string,
+ nowReference: string,
+ context: RequestHandlerContext,
+ logger: Logger
+) => {
+ function updateTimestamps(doc: any) {
+ dataIndexConfig.timeFields
+ .filter((timeFieldName: string) => doc[timeFieldName])
+ .forEach((timeFieldName: string) => {
+ doc[timeFieldName] = dataIndexConfig.preserveDayOfWeekTimeOfDay
+ ? translateTimeRelativeToWeek(
+ doc[timeFieldName],
+ dataIndexConfig.currentTimeMarker,
+ nowReference
+ )
+ : translateTimeRelativeToDifference(
+ doc[timeFieldName],
+ dataIndexConfig.currentTimeMarker,
+ nowReference
+ );
+ });
+ return doc;
+ }
+
+ const bulkInsert = async (docs: any) => {
+ const insertCmd = { index: { _index: index } };
+ const bulk: any[] = [];
+ docs.forEach((doc: any) => {
+ bulk.push(insertCmd);
+ bulk.push(updateTimestamps(doc));
+ });
+ const resp = await context.core.elasticsearch.adminClient.callAsCurrentUser('bulk', {
+ body: bulk,
+ });
+ if (resp.errors) {
+ const errMsg = `sample_data install errors while bulk inserting. Elasticsearch response: ${JSON.stringify(
+ resp,
+ null,
+ ''
+ )}`;
+ logger.warn(errMsg);
+ return Promise.reject(
+ new Error(`Unable to load sample data into index "${index}", see kibana logs for details`)
+ );
+ }
+ };
+ return loadData(dataIndexConfig.dataPath, bulkInsert); // this returns a Promise
+};
+
+export function createInstallRoute(
+ router: IRouter,
+ sampleDatasets: SampleDatasetSchema[],
+ logger: Logger,
+ usageTracker: SampleDataUsageTracker
+): void {
+ router.post(
+ {
+ path: '/api/sample_data/{id}',
+ validate: {
+ params: schema.object({ id: schema.string() }),
+ // TODO validate now as date
+ query: schema.object({ now: schema.maybe(schema.string()) }),
+ },
+ },
+ async (context, req, res) => {
+ const { params, query } = req;
+ const sampleDataset = sampleDatasets.find(({ id }) => id === params.id);
+ if (!sampleDataset) {
+ return res.notFound();
+ }
+ // @ts-ignore Custom query validation used
+ const now = query.now ? new Date(query.now) : new Date();
+ const nowReference = dateToIso8601IgnoringTime(now);
+ const counts = {};
+ for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
+ const dataIndexConfig = sampleDataset.dataIndices[i];
+ const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
+
+ // clean up any old installation of dataset
+ try {
+ await context.core.elasticsearch.dataClient.callAsCurrentUser('indices.delete', {
+ index,
+ });
+ } catch (err) {
+ // ignore delete errors
+ }
+
+ try {
+ const createIndexParams = {
+ index,
+ body: {
+ settings: { index: { number_of_shards: 1, auto_expand_replicas: '0-1' } },
+ mappings: { properties: dataIndexConfig.fields },
+ },
+ };
+ await context.core.elasticsearch.dataClient.callAsCurrentUser(
+ 'indices.create',
+ createIndexParams
+ );
+ } catch (err) {
+ const errMsg = `Unable to create sample data index "${index}", error: ${err.message}`;
+ logger.warn(errMsg);
+ return res.customError({ body: errMsg, statusCode: err.status });
+ }
+
+ try {
+ const count = await insertDataIntoIndex(
+ dataIndexConfig,
+ index,
+ nowReference,
+ context,
+ logger
+ );
+ (counts as any)[index] = count;
+ } catch (err) {
+ const errMsg = `sample_data install errors while loading data. Error: ${err}`;
+ logger.warn(errMsg);
+ return res.internalError({ body: errMsg });
+ }
+ }
+
+ let createResults;
+ try {
+ createResults = await context.core.savedObjects.client.bulkCreate(
+ sampleDataset.savedObjects,
+ { overwrite: true }
+ );
+ } catch (err) {
+ const errMsg = `bulkCreate failed, error: ${err.message}`;
+ logger.warn(errMsg);
+ return res.internalError({ body: errMsg });
+ }
+ const errors = createResults.saved_objects.filter(savedObjectCreateResult => {
+ return Boolean(savedObjectCreateResult.error);
+ });
+ if (errors.length > 0) {
+ const errMsg = `sample_data install errors while loading saved objects. Errors: ${errors.join(
+ ','
+ )}`;
+ logger.warn(errMsg);
+ return res.customError({ body: errMsg, statusCode: 403 });
+ }
+ usageTracker.addInstall(params.id);
+
+ // FINALLY
+ return res.ok({
+ body: {
+ elasticsearchIndicesCreated: counts,
+ kibanaSavedObjectsLoaded: sampleDataset.savedObjects.length,
+ },
+ });
+ }
+ );
+}
diff --git a/src/plugins/home/server/services/sample_data/routes/list.ts b/src/plugins/home/server/services/sample_data/routes/list.ts
new file mode 100644
index 00000000000000..37ebab1c168d20
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/list.ts
@@ -0,0 +1,92 @@
+/*
+ * 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 { isBoom } from 'boom';
+import { IRouter } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+
+const NOT_INSTALLED = 'not_installed';
+const INSTALLED = 'installed';
+const UNKNOWN = 'unknown';
+
+export const createListRoute = (router: IRouter, sampleDatasets: SampleDatasetSchema[]) => {
+ router.get({ path: '/api/sample_data', validate: false }, async (context, req, res) => {
+ const registeredSampleDatasets = sampleDatasets.map(sampleDataset => {
+ return {
+ id: sampleDataset.id,
+ name: sampleDataset.name,
+ description: sampleDataset.description,
+ previewImagePath: sampleDataset.previewImagePath,
+ darkPreviewImagePath: sampleDataset.darkPreviewImagePath,
+ overviewDashboard: sampleDataset.overviewDashboard,
+ appLinks: sampleDataset.appLinks,
+ defaultIndex: sampleDataset.defaultIndex,
+ dataIndices: sampleDataset.dataIndices.map(({ id }) => ({ id })),
+ status: sampleDataset.status,
+ statusMsg: sampleDataset.statusMsg,
+ };
+ });
+ const isInstalledPromises = registeredSampleDatasets.map(async sampleDataset => {
+ 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.dataClient.callAsCurrentUser(
+ 'indices.exists',
+ { index }
+ );
+ if (!indexExists) {
+ sampleDataset.status = NOT_INSTALLED;
+ return;
+ }
+
+ const { count } = await context.core.elasticsearch.dataClient.callAsCurrentUser('count', {
+ index,
+ });
+ if (count === 0) {
+ sampleDataset.status = NOT_INSTALLED;
+ return;
+ }
+ } catch (err) {
+ sampleDataset.status = UNKNOWN;
+ sampleDataset.statusMsg = err.message;
+ return;
+ }
+ }
+ try {
+ await context.core.savedObjects.client.get('dashboard', sampleDataset.overviewDashboard);
+ } catch (err) {
+ // savedObjectClient.get() throws an boom error when object is not found.
+ if (isBoom(err) && err.output.statusCode === 404) {
+ sampleDataset.status = NOT_INSTALLED;
+ return;
+ }
+
+ sampleDataset.status = UNKNOWN;
+ sampleDataset.statusMsg = err.message;
+ return;
+ }
+
+ sampleDataset.status = INSTALLED;
+ });
+
+ await Promise.all(isInstalledPromises);
+ return res.ok({ body: registeredSampleDatasets });
+ });
+};
diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
new file mode 100644
index 00000000000000..64fb2b8b3a547b
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
@@ -0,0 +1,96 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+import _ from 'lodash';
+import { IRouter } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+import { SampleDataUsageTracker } from '../usage/usage';
+
+export function createUninstallRoute(
+ router: IRouter,
+ sampleDatasets: SampleDatasetSchema[],
+ usageTracker: SampleDataUsageTracker
+): void {
+ router.delete(
+ {
+ path: '/api/sample_data/{id}',
+ validate: {
+ params: schema.object({ id: schema.string() }),
+ },
+ },
+ async (
+ {
+ core: {
+ elasticsearch: {
+ dataClient: { callAsCurrentUser },
+ },
+ savedObjects: { client: savedObjectsClient },
+ },
+ },
+ request,
+ response
+ ) => {
+ const sampleDataset = sampleDatasets.find(({ id }) => id === request.params.id);
+
+ if (!sampleDataset) {
+ return response.notFound();
+ }
+
+ for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
+ const dataIndexConfig = sampleDataset.dataIndices[i];
+ const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
+
+ try {
+ await callAsCurrentUser('indices.delete', { index });
+ } catch (err) {
+ return response.customError({
+ statusCode: err.status,
+ body: {
+ message: `Unable to delete sample data index "${index}", error: ${err.message}`,
+ },
+ });
+ }
+ }
+
+ const deletePromises = sampleDataset.savedObjects.map(({ type, id }) =>
+ savedObjectsClient.delete(type, id)
+ );
+
+ try {
+ await Promise.all(deletePromises);
+ } catch (err) {
+ // ignore 404s since users could have deleted some of the saved objects via the UI
+ if (_.get(err, 'output.statusCode') !== 404) {
+ return response.customError({
+ statusCode: err.status,
+ body: {
+ message: `Unable to delete sample dataset saved objects, error: ${err.message}`,
+ },
+ });
+ }
+ }
+
+ // track the usage operation in a non-blocking way
+ usageTracker.addUninstall(request.params.id);
+
+ return response.noContent();
+ }
+ );
+}
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts
new file mode 100644
index 00000000000000..4d0fb4f96023a4
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 {
+ SampleDataRegistrySetup,
+ SampleDataRegistryStart,
+ SampleDataRegistry,
+} from './sample_data_registry';
+
+const createSetupMock = (): jest.Mocked => {
+ const setup = {
+ registerSampleDataset: jest.fn(),
+ getSampleDatasets: jest.fn(),
+ addSavedObjectsToSampleDataset: jest.fn(),
+ addAppLinksToSampleDataset: jest.fn(),
+ replacePanelInSampleDatasetDashboard: jest.fn(),
+ };
+ return setup;
+};
+
+const createStartMock = (): jest.Mocked => {
+ const start = {};
+ return start;
+};
+
+const createMock = (): jest.Mocked> => {
+ const service = {
+ setup: jest.fn(),
+ start: jest.fn(),
+ };
+ service.setup.mockImplementation(createSetupMock);
+ service.start.mockImplementation(createStartMock);
+ return service;
+};
+
+export const sampleDataRegistryMock = {
+ createSetup: createSetupMock,
+ createStart: createStartMock,
+ create: createMock,
+};
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
new file mode 100644
index 00000000000000..7a4909668fff2e
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
@@ -0,0 +1,182 @@
+/*
+ * 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 Joi from 'joi';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { SavedObject } from 'src/core/public';
+import {
+ SampleDatasetProvider,
+ SampleDatasetSchema,
+ AppLinkSchema,
+ SampleDatasetDashboardPanel,
+} from './lib/sample_dataset_registry_types';
+import { sampleDataSchema } from './lib/sample_dataset_schema';
+
+import { flightsSpecProvider, logsSpecProvider, ecommerceSpecProvider } from './data_sets';
+import { createListRoute, createInstallRoute } from './routes';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { makeSampleDataUsageCollector, usage } from './usage';
+import { createUninstallRoute } from './routes/uninstall';
+
+const flightsSampleDataset = flightsSpecProvider();
+const logsSampleDataset = logsSpecProvider();
+const ecommerceSampleDataset = ecommerceSpecProvider();
+
+export class SampleDataRegistry {
+ constructor(private readonly initContext: PluginInitializerContext) {}
+ private readonly sampleDatasets: SampleDatasetSchema[] = [
+ flightsSampleDataset,
+ logsSampleDataset,
+ ecommerceSampleDataset,
+ ];
+
+ public setup(core: CoreSetup, usageCollections: UsageCollectionSetup | undefined) {
+ if (usageCollections) {
+ makeSampleDataUsageCollector(usageCollections, this.initContext);
+ }
+ const usageTracker = usage(
+ core.savedObjects,
+ this.initContext.logger.get('sample_data', 'telemetry')
+ );
+ const router = core.http.createRouter();
+ createListRoute(router, this.sampleDatasets);
+ createInstallRoute(
+ router,
+ this.sampleDatasets,
+ this.initContext.logger.get('sampleData'),
+ usageTracker
+ );
+ createUninstallRoute(router, this.sampleDatasets, usageTracker);
+
+ return {
+ registerSampleDataset: (specProvider: SampleDatasetProvider) => {
+ const { error, value } = Joi.validate(specProvider(), sampleDataSchema);
+
+ if (error) {
+ throw new Error(`Unable to register sample dataset spec because it's invalid. ${error}`);
+ }
+ const defaultIndexSavedObjectJson = value.savedObjects.find((savedObjectJson: any) => {
+ return (
+ savedObjectJson.type === 'index-pattern' && savedObjectJson.id === value.defaultIndex
+ );
+ });
+ if (!defaultIndexSavedObjectJson) {
+ throw new Error(
+ `Unable to register sample dataset spec, defaultIndex: "${value.defaultIndex}" does not exist in savedObjects list.`
+ );
+ }
+
+ const dashboardSavedObjectJson = value.savedObjects.find((savedObjectJson: any) => {
+ return (
+ savedObjectJson.type === 'dashboard' && savedObjectJson.id === value.overviewDashboard
+ );
+ });
+ if (!dashboardSavedObjectJson) {
+ throw new Error(
+ `Unable to register sample dataset spec, overviewDashboard: "${value.overviewDashboard}" does not exist in savedObject list.`
+ );
+ }
+ this.sampleDatasets.push(value);
+ },
+ getSampleDatasets: () => this.sampleDatasets,
+
+ addSavedObjectsToSampleDataset: (id: string, savedObjects: SavedObject[]) => {
+ const sampleDataset = this.sampleDatasets.find(dataset => {
+ return dataset.id === id;
+ });
+
+ if (!sampleDataset) {
+ throw new Error(`Unable to find sample dataset with id: ${id}`);
+ }
+
+ sampleDataset.savedObjects = sampleDataset.savedObjects.concat(savedObjects);
+ },
+
+ addAppLinksToSampleDataset: (id: string, appLinks: AppLinkSchema[]) => {
+ const sampleDataset = this.sampleDatasets.find(dataset => {
+ return dataset.id === id;
+ });
+
+ if (!sampleDataset) {
+ throw new Error(`Unable to find sample dataset with id: ${id}`);
+ }
+
+ sampleDataset.appLinks = sampleDataset.appLinks
+ ? sampleDataset.appLinks.concat(appLinks)
+ : [];
+ },
+
+ replacePanelInSampleDatasetDashboard: ({
+ sampleDataId,
+ dashboardId,
+ oldEmbeddableId,
+ embeddableId,
+ embeddableType,
+ embeddableConfig,
+ }: SampleDatasetDashboardPanel) => {
+ const sampleDataset = this.sampleDatasets.find(dataset => {
+ return dataset.id === sampleDataId;
+ });
+ if (!sampleDataset) {
+ throw new Error(`Unable to find sample dataset with id: ${sampleDataId}`);
+ }
+
+ const dashboard = sampleDataset.savedObjects.find((savedObject: SavedObject) => {
+ return savedObject.id === dashboardId && savedObject.type === 'dashboard';
+ });
+ if (!dashboard) {
+ throw new Error(`Unable to find dashboard with id: ${dashboardId}`);
+ }
+ try {
+ const reference = dashboard.references.find((referenceItem: any) => {
+ return referenceItem.id === oldEmbeddableId;
+ });
+ if (!reference) {
+ throw new Error(`Unable to find reference for embeddable: ${oldEmbeddableId}`);
+ }
+ reference.type = embeddableType;
+ reference.id = embeddableId;
+
+ const panels = JSON.parse(dashboard.attributes.panelsJSON);
+ const panel = panels.find((panelItem: any) => {
+ return panelItem.panelRefName === reference.name;
+ });
+ if (!panel) {
+ throw new Error(`Unable to find panel for reference: ${reference.name}`);
+ }
+ panel.embeddableConfig = embeddableConfig;
+ dashboard.attributes.panelsJSON = JSON.stringify(panels);
+ } catch (error) {
+ throw new Error(
+ `Unable to replace panel with embeddable ${oldEmbeddableId}, error: ${error}`
+ );
+ }
+ },
+ };
+ }
+
+ public start() {
+ return {};
+ }
+}
+/** @public */
+export type SampleDataRegistrySetup = ReturnType;
+
+/** @public */
+export type SampleDataRegistryStart = ReturnType;
diff --git a/src/legacy/server/sample_data/usage/collector.ts b/src/plugins/home/server/services/sample_data/usage/collector.ts
similarity index 75%
rename from src/legacy/server/sample_data/usage/collector.ts
rename to src/plugins/home/server/services/sample_data/usage/collector.ts
index bcb5e7be2597a9..19ceceb4cba143 100644
--- a/src/legacy/server/sample_data/usage/collector.ts
+++ b/src/plugins/home/server/services/sample_data/usage/collector.ts
@@ -17,17 +17,19 @@
* under the License.
*/
-import { Server } from 'hapi';
+import { PluginInitializerContext } from 'kibana/server';
+import { first } from 'rxjs/operators';
import { fetchProvider } from './collector_fetch';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/server';
+import { UsageCollectionSetup } from '../../../../../usage_collection/server';
-export function makeSampleDataUsageCollector(
+export async function makeSampleDataUsageCollector(
usageCollection: UsageCollectionSetup,
- server: Server
+ context: PluginInitializerContext
) {
let index: string;
try {
- index = server.config().get('kibana.index');
+ const config = await context.config.legacy.globalConfig$.pipe(first()).toPromise();
+ index = config.kibana.index;
} catch (err) {
return; // kibana plugin is not enabled (test environment)
}
diff --git a/src/legacy/server/sample_data/usage/collector_fetch.test.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/collector_fetch.test.ts
rename to src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
diff --git a/src/legacy/server/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/collector_fetch.ts
rename to src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
diff --git a/src/legacy/server/sample_data/usage/index.ts b/src/plugins/home/server/services/sample_data/usage/index.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/index.ts
rename to src/plugins/home/server/services/sample_data/usage/index.ts
diff --git a/src/legacy/server/sample_data/usage/usage.ts b/src/plugins/home/server/services/sample_data/usage/usage.ts
similarity index 61%
rename from src/legacy/server/sample_data/usage/usage.ts
rename to src/plugins/home/server/services/sample_data/usage/usage.ts
index 0fb17128b102cc..a06dde387bb367 100644
--- a/src/legacy/server/sample_data/usage/usage.ts
+++ b/src/plugins/home/server/services/sample_data/usage/usage.ts
@@ -17,40 +17,39 @@
* under the License.
*/
-import * as Hapi from 'hapi';
+import { Logger, SavedObjectsServiceSetup } from 'kibana/server';
const SAVED_OBJECT_ID = 'sample-data-telemetry';
-export function usage(request: Hapi.Request) {
- const { server } = request;
+export interface SampleDataUsageTracker {
+ addInstall(dataSet: string): void;
+ addUninstall(dataSet: string): void;
+}
+export function usage(
+ savedObjects: SavedObjectsServiceSetup,
+ logger: Logger
+): SampleDataUsageTracker {
const handleIncrementError = (err: Error) => {
- if (err != null) {
- server.log(['debug', 'sample_data', 'telemetry'], err.stack);
+ if (err && err.stack) {
+ logger.debug(err.stack);
}
- server.log(
- ['warning', 'sample_data', 'telemetry'],
- `saved objects repository incrementCounter encountered an error: ${err}`
- );
+ logger.warn(`saved objects repository incrementCounter encountered an error: ${err}`);
};
- const {
- savedObjects: { getSavedObjectsRepository },
- } = server;
- const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
- const internalRepository = getSavedObjectsRepository(callWithInternalUser);
+ const internalRepository = savedObjects.createInternalRepository();
return {
addInstall: async (dataSet: string) => {
try {
- internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `installCount`);
+ await internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `installCount`);
} catch (err) {
handleIncrementError(err);
}
},
addUninstall: async (dataSet: string) => {
try {
- internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `unInstallCount`);
+ await internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `unInstallCount`);
} catch (err) {
handleIncrementError(err);
}
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
index d081639e5c7e2b..951ce935760a12 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
@@ -94,17 +94,5 @@ export interface TutorialSchema {
savedObjectsInstallMsg: string;
}
export type TutorialProvider = (context: { [key: string]: unknown }) => TutorialSchema;
-export type TutorialContextFactory = (
- req: KibanaRequest<
- Readonly<{
- [x: string]: any;
- }>,
- Readonly<{
- [x: string]: any;
- }>,
- Readonly<{
- [x: string]: any;
- }>
- >
-) => { [key: string]: unknown };
+export type TutorialContextFactory = (req: KibanaRequest) => { [key: string]: unknown };
export type ScopedTutorialContextFactory = (...args: any[]) => any;
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
index bab710cdca5958..33d4dcfd6606a3 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
@@ -39,7 +39,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import React from 'react';
import { EuiText } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../legacy/core_plugins/kibana/public/visualize/embeddable/constants';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../legacy/core_plugins/kibana/public/visualize_embeddable/constants';
export interface OnSaveProps {
newTitle: string;
diff --git a/src/test_utils/public/stub_field_formats.ts b/src/test_utils/public/stub_field_formats.ts
index da1a31f1cc7a53..ea46710c0dc84c 100644
--- a/src/test_utils/public/stub_field_formats.ts
+++ b/src/test_utils/public/stub_field_formats.ts
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { IUiSettingsClient } from 'kibana/public';
+import { CoreSetup } from 'kibana/public';
import {
FieldFormatRegisty,
@@ -37,7 +37,7 @@ import {
UrlFormat,
} from '../../plugins/data/public/';
-export const getFieldFormatsRegistry = (uiSettings: IUiSettingsClient) => {
+export const getFieldFormatsRegistry = (core: CoreSetup) => {
const fieldFormats = new FieldFormatRegisty();
fieldFormats.register([
@@ -58,7 +58,7 @@ export const getFieldFormatsRegistry = (uiSettings: IUiSettingsClient) => {
UrlFormat,
]);
- fieldFormats.init(uiSettings);
+ fieldFormats.init(core);
return fieldFormats;
};
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index 14931b938732c8..7807821ab09bd3 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -40,8 +40,8 @@ setFieldFormats({
import { getFieldFormatsRegistry } from './stub_field_formats';
-export default function StubIndexPattern(pattern, getConfig, timeField, fields, uiSettings) {
- const registeredFieldFormats = getFieldFormatsRegistry(uiSettings);
+export default function StubIndexPattern(pattern, getConfig, timeField, fields, core) {
+ const registeredFieldFormats = getFieldFormatsRegistry(core);
this.id = pattern;
this.title = pattern;
diff --git a/test/api_integration/apis/general/prototype_pollution.ts b/test/api_integration/apis/general/prototype_pollution.ts
index 1b732dc81afa92..3e74480ebe9eb6 100644
--- a/test/api_integration/apis/general/prototype_pollution.ts
+++ b/test/api_integration/apis/general/prototype_pollution.ts
@@ -26,7 +26,7 @@ export default function({ getService }: FtrProviderContext) {
describe('prototype pollution smoke test', () => {
it('prevents payloads with the "constructor.prototype" pollution vector from being accepted', async () => {
await supertest
- .post('/api/sample_data/some_data_id')
+ .post('/api/saved_objects/_log_legacy_import')
.send([
{
constructor: {
@@ -44,7 +44,7 @@ export default function({ getService }: FtrProviderContext) {
it('prevents payloads with the "__proto__" pollution vector from being accepted', async () => {
await supertest
- .post('/api/sample_data/some_data_id')
+ .post('/api/saved_objects/_log_legacy_import')
.send(JSON.parse(`{"foo": { "__proto__": {} } }`))
.expect(400, {
statusCode: 400,
diff --git a/test/api_integration/apis/home/sample_data.js b/test/api_integration/apis/home/sample_data.js
index 4aaf8c75092aec..d5f03cc714f2fb 100644
--- a/test/api_integration/apis/home/sample_data.js
+++ b/test/api_integration/apis/home/sample_data.js
@@ -96,7 +96,7 @@ export default function({ getService }) {
await supertest
.delete(`/api/sample_data/flights`)
.set('kbn-xsrf', 'kibana')
- .expect(200);
+ .expect(204);
});
it('should remove elasticsearch index containing sample data', async () => {
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
index 2e0c4d449d4473..90f02c36b3b7fa 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.js
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.js
@@ -19,7 +19,7 @@
import expect from '@kbn/expect';
-import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
+import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
export default function({ getService, getPageObjects }) {
const retry = getService('retry');
diff --git a/test/functional/apps/dashboard/panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
index b69e031f846674..683f3683e65e51 100644
--- a/test/functional/apps/dashboard/panel_controls.js
+++ b/test/functional/apps/dashboard/panel_controls.js
@@ -24,7 +24,7 @@ import {
AREA_CHART_VIS_NAME,
LINE_CHART_VIS_NAME,
} from '../../page_objects/dashboard_page';
-import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
+import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
export default function({ getService, getPageObjects }) {
const browser = getService('browser');
diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
index ec258aa823405a..b0f1a3304a9b8e 100644
--- a/test/functional/page_objects/dashboard_page.js
+++ b/test/functional/page_objects/dashboard_page.js
@@ -18,7 +18,7 @@
*/
import _ from 'lodash';
-import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
+import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants';
export const PIE_CHART_VIS_NAME = 'Visualization PieChart';
export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart';
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 7537094bae3dd3..7029fbf9e1350b 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -30,7 +30,6 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
const globalNav = getService('globalNav');
const config = getService('config');
const defaultFindTimeout = config.get('timeouts.find');
- const comboBox = getService('comboBox');
const elasticChart = getService('elasticChart');
class DiscoverPage {
@@ -279,7 +278,9 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
async selectIndexPattern(indexPattern) {
await testSubjects.click('indexPattern-switch-link');
- await comboBox.set('index-pattern-selection', indexPattern);
+ await find.clickByCssSelector(
+ `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}*"]`
+ );
await PageObjects.header.waitUntilLoadingHasFinished();
}
diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
index 33b7515b58d2d5..c1ea8be9be98b9 100644
--- a/test/functional/page_objects/visualize_page.js
+++ b/test/functional/page_objects/visualize_page.js
@@ -17,7 +17,7 @@
* under the License.
*/
-import { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
+import { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
import Bluebird from 'bluebird';
import expect from '@kbn/expect';
diff --git a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
index 771e50b22f66ba..91a4fe89c1c57e 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -18,6 +18,7 @@
*/
import { Plugin, CoreSetup } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
import { PluginARequestContext } from '../../core_plugin_a/server';
declare module 'kibana/server' {
@@ -34,6 +35,25 @@ export class CorePluginBPlugin implements Plugin {
const response = await context.pluginA.ping();
return res.ok({ body: `Pong via plugin A: ${response}` });
});
+
+ router.post(
+ {
+ path: '/core_plugin_b',
+ validate: {
+ query: schema.object({ id: schema.string() }),
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && bar === baz) {
+ return ok({ bar, baz });
+ } else {
+ return badRequest(`bar: ${bar} !== baz: ${baz} or they are not string`);
+ }
+ },
+ },
+ },
+ async (context, req, res) => {
+ return res.ok({ body: `ID: ${req.query.id} - ${req.body.bar.toUpperCase()}` });
+ }
+ );
}
public start() {}
diff --git a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
index 3881af56429963..d437912c1b69a0 100644
--- a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
@@ -29,5 +29,29 @@ export default function({ getService }: PluginFunctionalProviderContext) {
.expect(200)
.expect('Pong via plugin A: true');
});
+
+ it('extend request handler context with validation', async () => {
+ await supertest
+ .post('/core_plugin_b')
+ .set('kbn-xsrf', 'anything')
+ .query({ id: 'TEST' })
+ .send({ bar: 'hi!', baz: 'hi!' })
+ .expect(200)
+ .expect('ID: TEST - HI!');
+ });
+
+ it('extend request handler context with validation (400)', async () => {
+ await supertest
+ .post('/core_plugin_b')
+ .set('kbn-xsrf', 'anything')
+ .query({ id: 'TEST' })
+ .send({ bar: 'hi!', baz: 1234 })
+ .expect(400)
+ .expect({
+ error: 'Bad Request',
+ message: '[request body]: bar: hi! !== baz: 1234 or they are not string',
+ statusCode: 400,
+ });
+ });
});
}
diff --git a/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts b/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
index 3e97d851acd296..c1a9838e90406d 100644
--- a/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
@@ -82,7 +82,7 @@ export function createApi() {
// if any validation is defined. Not having validation currently
// means we don't get the payload. See
// https://github.com/elastic/kibana/issues/50179
- body: schema.nullable(anyObject) as typeof anyObject,
+ body: schema.nullable(anyObject),
params: anyObject,
query: anyObject
}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
index 546e8967a74397..3669bd3e082016 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
@@ -6,8 +6,8 @@
// @ts-ignore
import { MAP_SAVED_OBJECT_TYPE } from '../../../maps/common/constants';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable/constants';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/constants';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize_embeddable/constants';
+import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants';
export const EmbeddableTypes = {
map: MAP_SAVED_OBJECT_TYPE,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
index 221469ad8ded19..48955711158984 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
@@ -5,7 +5,7 @@
*/
import { ExpressionFunction } from 'src/plugins/expressions/common/types';
-import { SearchInput } from 'src/legacy/core_plugins/kibana/public/discover/embeddable';
+import { SearchInput } from 'src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable';
import {
EmbeddableTypes,
EmbeddableExpressionType,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
index b00ee446a8724d..f6eb377e2698bd 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
@@ -5,7 +5,7 @@
*/
import { ExpressionFunction } from 'src/plugins/expressions/common/types';
-import { VisualizeInput } from 'src/legacy/core_plugins/kibana/public/visualize/embeddable';
+import { VisualizeInput } from 'src/legacy/core_plugins/kibana/public/visualize_embeddable';
import {
EmbeddableTypes,
EmbeddableExpressionType,
diff --git a/x-pack/legacy/plugins/canvas/server/plugin.ts b/x-pack/legacy/plugins/canvas/server/plugin.ts
index b3389711033815..2dc87e4a61e04a 100644
--- a/x-pack/legacy/plugins/canvas/server/plugin.ts
+++ b/x-pack/legacy/plugins/canvas/server/plugin.ts
@@ -63,8 +63,8 @@ export class Plugin {
registerCanvasUsageCollector(plugins.usageCollection, core);
loadSampleData(
- plugins.sampleData.addSavedObjectsToSampleDataset,
- plugins.sampleData.addAppLinksToSampleDataset
+ plugins.home.sampleData.addSavedObjectsToSampleDataset,
+ plugins.home.sampleData.addAppLinksToSampleDataset
);
}
}
diff --git a/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts b/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
index 08a71badb33ed0..ed505c09cc7a40 100644
--- a/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
+++ b/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
@@ -7,9 +7,12 @@
import { CANVAS as label } from '../../i18n';
// @ts-ignore Untyped local
import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index';
+import { SampleDataRegistrySetup } from '../../../../../../src/plugins/home/server';
-// @ts-ignore: Untyped in Kibana
-export function loadSampleData(addSavedObjectsToSampleDataset, addAppLinksToSampleDataset) {
+export function loadSampleData(
+ addSavedObjectsToSampleDataset: SampleDataRegistrySetup['addSavedObjectsToSampleDataset'],
+ addAppLinksToSampleDataset: SampleDataRegistrySetup['addAppLinksToSampleDataset']
+) {
const now = new Date();
const nowTimestamp = now.toISOString();
@@ -27,23 +30,29 @@ export function loadSampleData(addSavedObjectsToSampleDataset, addAppLinksToSamp
}
addSavedObjectsToSampleDataset('ecommerce', updateCanvasWorkpadTimestamps(ecommerceSavedObjects));
- addAppLinksToSampleDataset('ecommerce', {
- path: '/app/canvas#/workpad/workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e',
- icon: 'canvasApp',
- label,
- });
+ addAppLinksToSampleDataset('ecommerce', [
+ {
+ path: '/app/canvas#/workpad/workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e',
+ icon: 'canvasApp',
+ label,
+ },
+ ]);
addSavedObjectsToSampleDataset('flights', updateCanvasWorkpadTimestamps(flightsSavedObjects));
- addAppLinksToSampleDataset('flights', {
- path: '/app/canvas#/workpad/workpad-a474e74b-aedc-47c3-894a-db77e62c41e0',
- icon: 'canvasApp',
- label,
- });
+ addAppLinksToSampleDataset('flights', [
+ {
+ path: '/app/canvas#/workpad/workpad-a474e74b-aedc-47c3-894a-db77e62c41e0',
+ icon: 'canvasApp',
+ label,
+ },
+ ]);
addSavedObjectsToSampleDataset('logs', updateCanvasWorkpadTimestamps(webLogsSavedObjects));
- addAppLinksToSampleDataset('logs', {
- path: '/app/canvas#/workpad/workpad-ad72a4e9-b422-480c-be6d-a64a0b79541d',
- icon: 'canvasApp',
- label,
- });
+ addAppLinksToSampleDataset('logs', [
+ {
+ path: '/app/canvas#/workpad/workpad-ad72a4e9-b422-480c-be6d-a64a0b79541d',
+ icon: 'canvasApp',
+ label,
+ },
+ ]);
}
diff --git a/x-pack/legacy/plugins/canvas/server/shim.ts b/x-pack/legacy/plugins/canvas/server/shim.ts
index 7641e51f14e564..1ca6e28bd347e5 100644
--- a/x-pack/legacy/plugins/canvas/server/shim.ts
+++ b/x-pack/legacy/plugins/canvas/server/shim.ts
@@ -7,7 +7,7 @@
import { ElasticsearchPlugin } from 'src/legacy/core_plugins/elasticsearch';
import { Legacy } from 'kibana';
-import { CoreSetup as ExistingCoreSetup } from 'src/core/server';
+import { HomeServerPluginSetup } from 'src/plugins/home/server';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import { PluginSetupContract } from '../../../../plugins/features/server';
@@ -23,6 +23,7 @@ export interface CoreSetup {
export interface PluginsSetup {
features: PluginSetupContract;
+ home: HomeServerPluginSetup;
interpreter: {
register: (specs: any) => any;
};
@@ -39,9 +40,7 @@ export interface PluginsSetup {
export async function createSetupShim(
server: Legacy.Server
): Promise<{ coreSetup: CoreSetup; pluginsSetup: PluginsSetup }> {
- // @ts-ignore: New Platform object not typed
- const setup: ExistingCoreSetup = server.newPlatform.setup.core;
-
+ const setup = server.newPlatform.setup.core;
return {
coreSetup: {
...setup,
@@ -58,17 +57,12 @@ export async function createSetupShim(
pluginsSetup: {
// @ts-ignore: New Platform not typed
features: server.newPlatform.setup.plugins.features,
+ home: server.newPlatform.setup.plugins.home,
// @ts-ignore Interpreter plugin not typed on legacy server
interpreter: server.plugins.interpreter,
kibana: {
injectedUiAppVars: await server.getInjectedUiAppVars('kibana'),
},
- sampleData: {
- // @ts-ignore: Missing from Legacy Server Type
- addSavedObjectsToSampleDataset: server.addSavedObjectsToSampleDataset,
- // @ts-ignore: Missing from Legacy Server Type
- addAppLinksToSampleDataset: server.addAppLinksToSampleDataset,
- },
usageCollection: server.newPlatform.setup.plugins.usageCollection,
},
};
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json
new file mode 100644
index 00000000000000..343fa904c4216c
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json
@@ -0,0 +1,11 @@
+{
+ "ml.delete_trained_model": {
+ "methods": [
+ "DELETE"
+ ],
+ "patterns": [
+ "_ml/inference/{model_id}"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-inference.html"
+ }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json
new file mode 100644
index 00000000000000..cdeaca9654b77c
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json
@@ -0,0 +1,19 @@
+{
+ "ml.get_trained_models": {
+ "url_params": {
+ "allow_no_match": "__flag__",
+ "include_model_definition": "__flag__",
+ "decompress_definition": "__flag__",
+ "from": 0,
+ "size": 0
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_ml/inference/{model_id}",
+ "_ml/inference"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference.html"
+ }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json
new file mode 100644
index 00000000000000..ab05e203b39805
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json
@@ -0,0 +1,17 @@
+{
+ "ml.get_trained_models_stats": {
+ "url_params": {
+ "allow_no_match": "__flag__",
+ "from": 0,
+ "size": 0
+ },
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_ml/inference/{model_id}/_stats",
+ "_ml/inference/_stats"
+ ],
+ "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference-stats.html"
+ }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js b/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
index f5ca413e5e2e15..def311a6baf594 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
+++ b/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
@@ -37,4 +37,33 @@ const enrichProcessorDefinition = {
},
};
-export const processors = [enrichProcessorDefinition];
+// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/inference-processor.html
+const inferenceProcessorDefinition = {
+ inference: {
+ __template: {
+ model_id: '',
+ inference_config: {},
+ field_mappings: {},
+ },
+ target_field: '',
+ model_id: '',
+ field_mappings: {
+ __template: {},
+ },
+ inference_config: {
+ regression: {
+ __template: {},
+ results_field: '',
+ },
+ classification: {
+ __template: {},
+ results_field: '',
+ num_top_classes: 2,
+ top_classes_results_field: '',
+ },
+ },
+ ...commonPipelineParams,
+ },
+};
+
+export const processors = [enrichProcessorDefinition, inferenceProcessorDefinition];
diff --git a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
index f0a0bf90d9e497..470fa00734d279 100644
--- a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
+++ b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
@@ -30,7 +30,6 @@ import 'uiExports/shareContextMenuExtensions';
import _ from 'lodash';
import 'ui/autoload/all';
import 'ui/kbn_top_nav';
-import 'plugins/kibana/dashboard';
import 'ui/vislib';
import 'ui/agg_response';
import 'ui/agg_types';
@@ -39,10 +38,7 @@ import { npStart } from 'ui/new_platform';
import { localApplicationService } from 'plugins/kibana/local_application_service';
import { showAppRedirectNotification } from 'ui/notify';
-import {
- DashboardConstants,
- createDashboardEditUrl,
-} from 'plugins/kibana/dashboard/dashboard_constants';
+import { DashboardConstants, createDashboardEditUrl } from 'plugins/kibana/dashboard';
uiModules
.get('kibana')
diff --git a/x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js
similarity index 75%
rename from x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js
rename to x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js
index a09f94ca6ce9f2..6179467966764f 100644
--- a/x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js
+++ b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js
@@ -4,8 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/
-const gws = require('../graph_client_workspace.js');
-const expect = require('@kbn/expect');
+import gws from './graph_client_workspace';
+
describe('graphui-workspace', function() {
describe('createWorkspace()', function() {
// var fooResource=null;
@@ -47,7 +47,7 @@ describe('graphui-workspace', function() {
});
it('initializeWorkspace', function() {
const { workspace } = init();
- expect(workspace.nodes).to.have.length(0);
+ expect(workspace.nodes.length).toEqual(0);
});
it('simpleSearch', function() {
//Test that a graph is loaded from a free-text search
@@ -79,16 +79,16 @@ describe('graphui-workspace', function() {
};
workspace.simpleSearch('myquery', {}, 2);
- expect(workspace.nodes).to.have.length(2);
- expect(workspace.edges).to.have.length(1);
- expect(workspace.selectedNodes).to.have.length(0);
- expect(workspace.blacklistedNodes).to.have.length(0);
+ expect(workspace.nodes.length).toEqual(2);
+ expect(workspace.edges.length).toEqual(1);
+ expect(workspace.selectedNodes.length).toEqual(0);
+ expect(workspace.blacklistedNodes.length).toEqual(0);
const nodeA = workspace.getNode(workspace.makeNodeId('field1', 'a'));
- expect(nodeA).to.be.an(Object);
+ expect(typeof nodeA).toBe('object');
const nodeD = workspace.getNode(workspace.makeNodeId('field1', 'd'));
- expect(nodeD).to.be(undefined);
+ expect(nodeD).toBe(undefined);
});
it('expandTest', function() {
@@ -121,10 +121,10 @@ describe('graphui-workspace', function() {
};
workspace.simpleSearch('myquery', {}, 2);
- expect(workspace.nodes).to.have.length(2);
- expect(workspace.edges).to.have.length(1);
- expect(workspace.selectedNodes).to.have.length(0);
- expect(workspace.blacklistedNodes).to.have.length(0);
+ expect(workspace.nodes.length).toEqual(2);
+ expect(workspace.edges.length).toEqual(1);
+ expect(workspace.selectedNodes.length).toEqual(0);
+ expect(workspace.blacklistedNodes.length).toEqual(0);
mockedResult = {
vertices: [
@@ -151,8 +151,8 @@ describe('graphui-workspace', function() {
],
};
workspace.expandGraph();
- expect(workspace.nodes).to.have.length(3); //we already had b from initial query
- expect(workspace.edges).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(3); //we already had b from initial query
+ expect(workspace.edges.length).toEqual(2);
});
it('selectionTest', function() {
@@ -203,38 +203,38 @@ describe('graphui-workspace', function() {
};
workspace.simpleSearch('myquery', {}, 2);
- expect(workspace.selectedNodes).to.have.length(0);
+ expect(workspace.selectedNodes.length).toEqual(0);
const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be.an(Object);
+ expect(typeof nodeA1).toEqual('object');
const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
- expect(nodeA2).to.be.an(Object);
+ expect(typeof nodeA2).toEqual('object');
const nodeB1 = workspace.getNode(workspace.makeNodeId('field1', 'b1'));
- expect(nodeB1).to.be.an(Object);
+ expect(typeof nodeB1).toEqual('object');
const nodeB2 = workspace.getNode(workspace.makeNodeId('field1', 'b2'));
- expect(nodeB2).to.be.an(Object);
+ expect(typeof nodeB2).toEqual('object');
- expect(workspace.selectedNodes).to.have.length(0);
+ expect(workspace.selectedNodes.length).toEqual(0);
workspace.selectNode(nodeA1);
- expect(workspace.selectedNodes).to.have.length(1);
+ expect(workspace.selectedNodes.length).toEqual(1);
workspace.selectInvert();
- expect(workspace.selectedNodes).to.have.length(3);
+ expect(workspace.selectedNodes.length).toEqual(3);
workspace.selectInvert();
- expect(workspace.selectedNodes).to.have.length(1);
+ expect(workspace.selectedNodes.length).toEqual(1);
workspace.deselectNode(nodeA1);
- expect(workspace.selectedNodes).to.have.length(0);
+ expect(workspace.selectedNodes.length).toEqual(0);
workspace.selectAll();
- expect(workspace.selectedNodes).to.have.length(4);
+ expect(workspace.selectedNodes.length).toEqual(4);
workspace.selectInvert();
- expect(workspace.selectedNodes).to.have.length(0);
+ expect(workspace.selectedNodes.length).toEqual(0);
workspace.selectNode(nodeA1);
- expect(workspace.selectedNodes).to.have.length(1);
+ expect(workspace.selectedNodes.length).toEqual(1);
workspace.selectNeighbours();
- expect(workspace.selectedNodes).to.have.length(2);
+ expect(workspace.selectedNodes.length).toEqual(2);
workspace.selectNeighbours();
//Should have reached full extent of a1-a2 island.
- expect(workspace.selectedNodes).to.have.length(2);
+ expect(workspace.selectedNodes.length).toEqual(2);
});
it('undoRedoDeletes', function() {
@@ -266,31 +266,31 @@ describe('graphui-workspace', function() {
};
workspace.simpleSearch('myquery', {}, 2);
- expect(workspace.nodes).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(2);
let nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be.an(Object);
+ expect(typeof nodeA1).toEqual('object');
const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
- expect(nodeA2).to.be.an(Object);
+ expect(typeof nodeA2).toEqual('object');
workspace.selectNode(nodeA1);
workspace.deleteSelection();
- expect(workspace.nodes).to.have.length(1);
+ expect(workspace.nodes.length).toEqual(1);
nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be(undefined);
+ expect(nodeA1).toBe(undefined);
workspace.undo();
- expect(workspace.nodes).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(2);
nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be.an(Object);
+ expect(typeof nodeA1).toEqual('object');
workspace.redo();
- expect(workspace.nodes).to.have.length(1);
+ expect(workspace.nodes.length).toEqual(1);
nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be(undefined);
+ expect(nodeA1).toBe(undefined);
workspace.undo();
- expect(workspace.nodes).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(2);
});
it('undoRedoGroupings', function() {
@@ -322,36 +322,36 @@ describe('graphui-workspace', function() {
};
workspace.simpleSearch('myquery', {}, 2);
- expect(workspace.nodes).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(2);
const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
- expect(nodeA1).to.be.an(Object);
+ expect(typeof nodeA1).toEqual('object');
const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
- expect(nodeA2).to.be.an(Object);
+ expect(typeof nodeA2).toEqual('object');
workspace.selectNode(nodeA2);
workspace.mergeSelections(nodeA1);
let groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
- expect(groupedItems).to.have.length(2);
+ expect(groupedItems.length).toEqual(2);
workspace.undo();
groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
- expect(groupedItems).to.have.length(1);
+ expect(groupedItems.length).toEqual(1);
workspace.redo();
groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
- expect(groupedItems).to.have.length(2);
+ expect(groupedItems.length).toEqual(2);
//Grouped deletes delete all grouped items
workspace.selectNone();
workspace.selectNode(nodeA1);
workspace.deleteSelection();
- expect(workspace.nodes).to.have.length(0);
- expect(workspace.selectedNodes).to.have.length(0);
+ expect(workspace.nodes.length).toEqual(0);
+ expect(workspace.selectedNodes.length).toEqual(0);
workspace.undo();
- expect(workspace.nodes).to.have.length(2);
+ expect(workspace.nodes.length).toEqual(2);
groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
- expect(groupedItems).to.have.length(2);
+ expect(groupedItems.length).toEqual(2);
});
});
});
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
index 6ada589f3740cc..d0dbf34abc0557 100644
--- a/x-pack/legacy/plugins/graph/public/app.js
+++ b/x-pack/legacy/plugins/graph/public/app.js
@@ -12,7 +12,7 @@ import { Provider } from 'react-redux';
import { isColorDark, hexToRgb } from '@elastic/eui';
import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
-import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
+import { showSaveModal } from './legacy_imports';
import appTemplate from './angular/templates/index.html';
import listingTemplate from './angular/templates/listing_ng_wrapper.html';
@@ -32,24 +32,21 @@ import { asAngularSyncedObservable } from './helpers/as_observable';
import { colorChoices } from './helpers/style_choices';
import { createGraphStore, datasourceSelector, hasFieldsSelector } from './state_management';
import { formatHttpError } from './helpers/format_http_error';
-import { checkLicense } from '../../../../plugins/graph/common/check_license';
export function initGraphApp(angularModule, deps) {
const {
chrome,
- savedGraphWorkspaces,
toastNotifications,
savedObjectsClient,
indexPatterns,
- kbnBaseUrl,
addBasePath,
getBasePath,
npData,
config,
- savedObjectRegistry,
+ savedWorkspaceLoader,
capabilities,
coreStart,
- Storage,
+ storage,
canEditDrillDownUrls,
graphSavePolicy,
} = deps;
@@ -110,22 +107,19 @@ export function initGraphApp(angularModule, deps) {
template: listingTemplate,
badge: getReadonlyBadge,
controller($location, $scope) {
- const services = savedObjectRegistry.byLoaderPropertiesName;
- const graphService = services['Graph workspace'];
-
$scope.listingLimit = config.get('savedObjects:listingLimit');
$scope.create = () => {
$location.url(getNewPath());
};
$scope.find = search => {
- return graphService.find(search, $scope.listingLimit);
+ return savedWorkspaceLoader.find(search, $scope.listingLimit);
};
$scope.editItem = workspace => {
$location.url(getEditPath(workspace));
};
$scope.getViewUrl = workspace => getEditUrl(addBasePath, workspace);
$scope.delete = workspaces => {
- return graphService.delete(workspaces.map(({ id }) => id));
+ return savedWorkspaceLoader.delete(workspaces.map(({ id }) => id));
};
$scope.capabilities = capabilities;
$scope.initialFilter = $location.search().filter || '';
@@ -139,14 +133,14 @@ export function initGraphApp(angularModule, deps) {
resolve: {
savedWorkspace: function($route) {
return $route.current.params.id
- ? savedGraphWorkspaces.get($route.current.params.id).catch(function() {
+ ? savedWorkspaceLoader.get($route.current.params.id).catch(function() {
toastNotifications.addDanger(
i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
defaultMessage: 'Missing workspace',
})
);
})
- : savedGraphWorkspaces.get();
+ : savedWorkspaceLoader.get();
},
indexPatterns: function() {
return savedObjectsClient
@@ -300,7 +294,7 @@ export function initGraphApp(angularModule, deps) {
// register things on scope passed down to react components
$scope.pluginDataStart = npData;
- $scope.storage = new Storage(window.localStorage);
+ $scope.storage = storage;
$scope.coreStart = coreStart;
$scope.loading = false;
$scope.reduxStore = store;
diff --git a/x-pack/legacy/plugins/graph/public/render_app.ts b/x-pack/legacy/plugins/graph/public/application.ts
similarity index 82%
rename from x-pack/legacy/plugins/graph/public/render_app.ts
rename to x-pack/legacy/plugins/graph/public/application.ts
index e892643cf80315..69bc7899746325 100644
--- a/x-pack/legacy/plugins/graph/public/render_app.ts
+++ b/x-pack/legacy/plugins/graph/public/application.ts
@@ -11,16 +11,6 @@ import { EuiConfirmModal } from '@elastic/eui';
// They can stay even after NP cutover
import angular from 'angular';
import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-import 'ui/angular-bootstrap';
-import 'ace';
-import 'ui/kbn_top_nav';
-import { configureAppAngularModule } from 'ui/legacy_compat';
-// @ts-ignore
-import { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
-// @ts-ignore
-import { confirmModalFactory } from 'ui/modals/confirm_modal';
-// @ts-ignore
-import { addAppRedirectMessageToUrl } from 'ui/notify';
// type imports
import {
@@ -31,6 +21,13 @@ import {
ToastsStart,
IUiSettingsClient,
} from 'kibana/public';
+import {
+ configureAppAngularModule,
+ createTopNavDirective,
+ createTopNavHelper,
+ confirmModalFactory,
+ addAppRedirectMessageToUrl,
+} from './legacy_imports';
// @ts-ignore
import { initGraphApp } from './app';
import {
@@ -40,6 +37,8 @@ import {
import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
import { checkLicense } from '../../../../plugins/graph/common/check_license';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../src/plugins/navigation/public';
+import { createSavedWorkspacesLoader } from './services/persistence/saved_workspace_loader';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
/**
* These are dependencies of the Graph app besides the base dependencies
@@ -47,7 +46,7 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../s
* plugins in LP-world, but if they are migrated only the import path in the plugin
* itself changes
*/
-export interface GraphDependencies extends LegacyAngularInjectedDependencies {
+export interface GraphDependencies {
element: HTMLElement;
appBasePath: string;
capabilities: Record>;
@@ -62,27 +61,11 @@ export interface GraphDependencies extends LegacyAngularInjectedDependencies {
savedObjectsClient: SavedObjectsClientContract;
addBasePath: (url: string) => string;
getBasePath: () => string;
- Storage: any;
+ storage: Storage;
canEditDrillDownUrls: boolean;
graphSavePolicy: string;
}
-/**
- * Dependencies of the Graph app which rely on the global angular instance.
- * These dependencies have to be migrated to their NP counterparts.
- */
-export interface LegacyAngularInjectedDependencies {
- /**
- * Instance of SavedObjectRegistryProvider
- */
- savedObjectRegistry: any;
- kbnBaseUrl: any;
- /**
- * Instance of SavedWorkspacesProvider
- */
- savedGraphWorkspaces: any;
-}
-
export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies) => {
const graphAngularModule = createLocalAngularModule(deps.navigation);
configureAppAngularModule(graphAngularModule, deps.coreStart as LegacyCoreStart, true);
@@ -92,12 +75,20 @@ export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies)
const licenseAllowsToShowThisPage = info.showAppLink && info.enableAppLink;
if (!licenseAllowsToShowThisPage) {
- const newUrl = addAppRedirectMessageToUrl(deps.addBasePath(deps.kbnBaseUrl), info.message);
+ const newUrl = addAppRedirectMessageToUrl(deps.addBasePath('/app/kibana'), info.message);
window.location.href = newUrl;
}
});
- initGraphApp(graphAngularModule, deps);
+ const savedWorkspaceLoader = createSavedWorkspacesLoader({
+ chrome: deps.coreStart.chrome,
+ indexPatterns: deps.npData.indexPatterns,
+ overlays: deps.coreStart.overlays,
+ savedObjectsClient: deps.coreStart.savedObjects.client,
+ basePath: deps.coreStart.http.basePath,
+ });
+
+ initGraphApp(graphAngularModule, { ...deps, savedWorkspaceLoader });
const $injector = mountGraphApp(appBasePath, element);
return () => {
licenseSubscription.unsubscribe();
diff --git a/x-pack/legacy/plugins/graph/public/index.ts b/x-pack/legacy/plugins/graph/public/index.ts
index 995e261a5c7a7f..d9854acb9332cf 100644
--- a/x-pack/legacy/plugins/graph/public/index.ts
+++ b/x-pack/legacy/plugins/graph/public/index.ts
@@ -4,41 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
-// legacy imports currently necessary to power Graph
-// for a cutover all of these have to be resolved
-import 'uiExports/savedObjectTypes';
-import 'uiExports/autocompleteProviders';
-import 'ui/autoload/all';
-import chrome from 'ui/chrome';
-import { IPrivate } from 'ui/private';
-// @ts-ignore
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-
import { npSetup, npStart } from 'ui/new_platform';
-import { Storage } from '../../../../../src/plugins/kibana_utils/public';
import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
import { GraphPlugin } from './plugin';
-// @ts-ignore
-import { SavedWorkspacesProvider } from './angular/services/saved_workspaces';
-import { LegacyAngularInjectedDependencies } from './render_app';
-
-/**
- * Get dependencies relying on the global angular context.
- * They also have to get resolved together with the legacy imports above
- */
-async function getAngularInjectedDependencies(): Promise {
- const injector = await chrome.dangerouslyGetActiveInjector();
-
- const Private = injector.get('Private');
-
- return {
- savedObjectRegistry: Private(SavedObjectRegistryProvider),
- kbnBaseUrl: injector.get('kbnBaseUrl'),
- savedGraphWorkspaces: Private(SavedWorkspacesProvider),
- };
-}
-
type XpackNpSetupDeps = typeof npSetup.plugins & {
licensing: LicensingPluginSetup;
};
@@ -46,16 +15,10 @@ type XpackNpSetupDeps = typeof npSetup.plugins & {
(async () => {
const instance = new GraphPlugin();
instance.setup(npSetup.core, {
- __LEGACY: {
- Storage,
- },
...(npSetup.plugins as XpackNpSetupDeps),
});
instance.start(npStart.core, {
npData: npStart.plugins.data,
navigation: npStart.plugins.navigation,
- __LEGACY: {
- angularDependencies: await getAngularInjectedDependencies(),
- },
});
})();
diff --git a/x-pack/legacy/plugins/graph/public/legacy_imports.ts b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
new file mode 100644
index 00000000000000..7ea2cf6dd901b7
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 'ui/angular-bootstrap';
+import 'ace';
+
+export { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
+export { configureAppAngularModule } from 'ui/legacy_compat';
+// @ts-ignore
+export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
+// @ts-ignore
+export { confirmModalFactory } from 'ui/modals/confirm_modal';
+// @ts-ignore
+export { addAppRedirectMessageToUrl } from 'ui/notify';
+export { SaveResult } from 'ui/saved_objects/show_saved_object_save_modal';
+export { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
diff --git a/x-pack/legacy/plugins/graph/public/plugin.ts b/x-pack/legacy/plugins/graph/public/plugin.ts
index f30742f2c00d22..ab610d76be1016 100644
--- a/x-pack/legacy/plugins/graph/public/plugin.ts
+++ b/x-pack/legacy/plugins/graph/public/plugin.ts
@@ -7,7 +7,7 @@
// NP type imports
import { CoreSetup, CoreStart, Plugin, SavedObjectsClientContract } from 'src/core/public';
import { Plugin as DataPlugin } from 'src/plugins/data/public';
-import { LegacyAngularInjectedDependencies } from './render_app';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
import { NavigationPublicPluginStart as NavigationStart } from '../../../../../src/plugins/navigation/public';
@@ -17,30 +17,20 @@ export interface GraphPluginStartDependencies {
}
export interface GraphPluginSetupDependencies {
- __LEGACY: {
- Storage: any;
- };
licensing: LicensingPluginSetup;
}
-export interface GraphPluginStartDependencies {
- __LEGACY: {
- angularDependencies: LegacyAngularInjectedDependencies;
- };
-}
-
export class GraphPlugin implements Plugin {
private navigationStart: NavigationStart | null = null;
private npDataStart: ReturnType | null = null;
private savedObjectsClient: SavedObjectsClientContract | null = null;
- private angularDependencies: LegacyAngularInjectedDependencies | null = null;
- setup(core: CoreSetup, { __LEGACY: { Storage }, licensing }: GraphPluginSetupDependencies) {
+ setup(core: CoreSetup, { licensing }: GraphPluginSetupDependencies) {
core.application.register({
id: 'graph',
title: 'Graph',
mount: async ({ core: contextCore }, params) => {
- const { renderApp } = await import('./render_app');
+ const { renderApp } = await import('./application');
return renderApp({
...params,
licensing,
@@ -53,26 +43,21 @@ export class GraphPlugin implements Plugin {
'canEditDrillDownUrls'
) as boolean,
graphSavePolicy: core.injectedMetadata.getInjectedVar('graphSavePolicy') as string,
- Storage,
+ storage: new Storage(window.localStorage),
capabilities: contextCore.application.capabilities.graph,
coreStart: contextCore,
chrome: contextCore.chrome,
config: contextCore.uiSettings,
toastNotifications: contextCore.notifications.toasts,
indexPatterns: this.npDataStart!.indexPatterns,
- ...this.angularDependencies!,
});
},
});
}
- start(
- core: CoreStart,
- { npData, navigation, __LEGACY: { angularDependencies } }: GraphPluginStartDependencies
- ) {
+ start(core: CoreStart, { npData, navigation }: GraphPluginStartDependencies) {
this.navigationStart = navigation;
this.npDataStart = npData;
- this.angularDependencies = angularDependencies;
this.savedObjectsClient = core.savedObjects.client;
}
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
similarity index 93%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
index bcde72a02f02ee..d25fcc89d6a1fb 100644
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
@@ -3,10 +3,13 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
import { i18n } from '@kbn/i18n';
import { extractReferences, injectReferences } from './saved_workspace_references';
+import {
+ createSavedObjectClass,
+ SavedObject,
+ SavedObjectKibanaServices,
+} from '../../legacy_imports';
export interface SavedWorkspace extends SavedObject {
wsState?: string;
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
similarity index 78%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
index e28bb60fb466bc..8ddff0be0d06dc 100644
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
@@ -4,24 +4,19 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import { IBasePath } from 'kibana/public';
import { i18n } from '@kbn/i18n';
import { createSavedWorkspaceClass } from './saved_workspace';
+import { SavedObjectKibanaServices } from '../../legacy_imports';
-export function SavedWorkspacesProvider() {
- const savedObjectsClient = npStart.core.savedObjects.client;
- const services = {
- savedObjectsClient,
- indexPatterns: npStart.plugins.data.indexPatterns,
- chrome: npStart.core.chrome,
- overlays: npStart.core.overlays,
- };
-
+export function createSavedWorkspacesLoader(
+ services: SavedObjectKibanaServices & { basePath: IBasePath }
+) {
+ const { savedObjectsClient, basePath } = services;
const SavedWorkspace = createSavedWorkspaceClass(services);
const urlFor = (id: string) =>
- npSetup.core.http.basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
+ basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
const mapHits = (hit: { id: string; attributes: Record }) => {
const source = hit.attributes;
source.id = hit.id;
@@ -72,5 +67,3 @@ export function SavedWorkspacesProvider() {
},
};
}
-
-SavedObjectRegistryProvider.register(SavedWorkspacesProvider);
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.test.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.ts
similarity index 100%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.ts
diff --git a/x-pack/legacy/plugins/graph/public/services/save_modal.tsx b/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
index 5930d2283b7c05..d949ac1d4a600f 100644
--- a/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
+++ b/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
@@ -5,9 +5,9 @@
*/
import React from 'react';
-import { SaveResult } from 'ui/saved_objects/show_saved_object_save_modal';
import { GraphWorkspaceSavedObject, GraphSavePolicy } from '../types';
import { SaveModal, OnSaveGraphProps } from '../components/save_modal';
+import { SaveResult } from '../legacy_imports';
export type SaveWorkspaceHandler = (
saveOptions: {
diff --git a/x-pack/legacy/plugins/graph/public/types/persistence.ts b/x-pack/legacy/plugins/graph/public/types/persistence.ts
index 7883e81fb9b8e6..7fc5e15d9ea72b 100644
--- a/x-pack/legacy/plugins/graph/public/types/persistence.ts
+++ b/x-pack/legacy/plugins/graph/public/types/persistence.ts
@@ -4,9 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { SavedObject } from 'ui/saved_objects/types';
import { AdvancedSettings, UrlTemplate, WorkspaceField } from './app_state';
import { WorkspaceNode, WorkspaceEdge } from './workspace_state';
+import { SavedObject } from '../legacy_imports';
type Omit = Pick>;
diff --git a/x-pack/legacy/plugins/infra/common/graphql/types.ts b/x-pack/legacy/plugins/infra/common/graphql/types.ts
index bd1d3945f35f79..bb089bf8bf8ad5 100644
--- a/x-pack/legacy/plugins/infra/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/common/graphql/types.ts
@@ -35,7 +35,6 @@ export interface InfraSource {
/** Sequences of log entries matching sets of highlighting queries within an interval */
logEntryHighlights: InfraLogEntryInterval[];
- logItem: InfraLogItem;
/** A snapshot of nodes */
snapshot?: InfraSnapshotResponse | null;
@@ -205,24 +204,6 @@ export interface InfraLogEntryFieldColumn {
highlights: string[];
}
-export interface InfraLogItem {
- /** The ID of the document */
- id: string;
- /** The index where the document was found */
- index: string;
- /** Time key for the document - derived from the source configuration timestamp and tiebreaker settings */
- key: InfraTimeKey;
- /** An array of flattened fields and values */
- fields: InfraLogItemField[];
-}
-
-export interface InfraLogItemField {
- /** The flattened field name */
- field: string;
- /** The value for the Field as a string */
- value: string;
-}
-
export interface InfraSnapshotResponse {
/** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
nodes: InfraSnapshotNode[];
@@ -424,9 +405,6 @@ export interface LogEntryHighlightsInfraSourceArgs {
/** The highlighting to apply to the log entries */
highlights: InfraLogEntryHighlightInput[];
}
-export interface LogItemInfraSourceArgs {
- id: string;
-}
export interface SnapshotInfraSourceArgs {
timerange: InfraTimerangeInput;
@@ -600,49 +578,6 @@ export type InfraLogMessageSegment = InfraLogMessageFieldSegment | InfraLogMessa
// Documents
// ====================================================
-export namespace FlyoutItemQuery {
- export type Variables = {
- sourceId: string;
- itemId: string;
- };
-
- export type Query = {
- __typename?: 'Query';
-
- source: Source;
- };
-
- export type Source = {
- __typename?: 'InfraSource';
-
- id: string;
-
- logItem: LogItem;
- };
-
- export type LogItem = {
- __typename?: 'InfraLogItem';
-
- id: string;
-
- index: string;
-
- key: Key;
-
- fields: Fields[];
- };
-
- export type Key = InfraTimeKeyFields.Fragment;
-
- export type Fields = {
- __typename?: 'InfraLogItemField';
-
- field: string;
-
- value: string;
- };
-}
-
export namespace LogEntryHighlightsQuery {
export type Variables = {
sourceId?: string | null;
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts
similarity index 56%
rename from x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.ts
rename to x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts
index 7511f65dfb3092..3eb7e278bf99c4 100644
--- a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts
@@ -4,10 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { createUiNewPlatformMock } from 'ui/new_platform/__mocks__/helpers';
+import * as rt from 'io-ts';
-const npStart = createUiNewPlatformMock().npStart;
-
-export function useKibanaCore() {
- return npStart.core;
-}
+export const logEntriesCursorRT = rt.type({
+ time: rt.number,
+ tiebreaker: rt.number,
+});
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts
index ee2d150fdaac00..8fed914c3dc8c9 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts
@@ -4,5 +4,6 @@
* you may not use this file except in compliance with the Elastic License.
*/
+export * from './item';
export * from './summary';
export * from './summary_highlights';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts
new file mode 100644
index 00000000000000..02335d68402c0f
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts
@@ -0,0 +1,32 @@
+/*
+ * 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 * as rt from 'io-ts';
+import { logEntriesCursorRT } from './common';
+
+export const LOG_ENTRIES_ITEM_PATH = '/api/log_entries/item';
+
+export const logEntriesItemRequestRT = rt.type({
+ sourceId: rt.string,
+ id: rt.string,
+});
+
+export type LogEntriesItemRequest = rt.TypeOf;
+
+const logEntriesItemFieldRT = rt.type({ field: rt.string, value: rt.string });
+const logEntriesItemRT = rt.type({
+ id: rt.string,
+ index: rt.string,
+ fields: rt.array(logEntriesItemFieldRT),
+ key: logEntriesCursorRT,
+});
+export const logEntriesItemResponseRT = rt.type({
+ data: logEntriesItemRT,
+});
+
+export type LogEntriesItemField = rt.TypeOf;
+export type LogEntriesItem = rt.TypeOf