ClusterClient but exposes additional callAsCurrentUser method that doesn't use credentials of the Kibana internal user (as callAsInternalUser does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.See [ScopedClusterClient](./kibana-plugin-server.scopedclusterclient.md). |
## Enumerations
@@ -96,6 +97,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [SavedObjectsClientProviderOptions](./kibana-plugin-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
| [SavedObjectsClientWrapperOptions](./kibana-plugin-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
| [SavedObjectsCreateOptions](./kibana-plugin-server.savedobjectscreateoptions.md) | |
+| [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-server.savedobjectsdeletebynamespaceoptions.md) | |
| [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md) | |
| [SavedObjectsExportOptions](./kibana-plugin-server.savedobjectsexportoptions.md) | Options controlling the export operation. |
| [SavedObjectsExportResultDetails](./kibana-plugin-server.savedobjectsexportresultdetails.md) | Structure of the export result details entry |
@@ -109,12 +111,16 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [SavedObjectsImportRetry](./kibana-plugin-server.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |
| [SavedObjectsImportUnknownError](./kibana-plugin-server.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
| [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-server.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
+| [SavedObjectsIncrementCounterOptions](./kibana-plugin-server.savedobjectsincrementcounteroptions.md) | |
| [SavedObjectsMigrationLogger](./kibana-plugin-server.savedobjectsmigrationlogger.md) | |
| [SavedObjectsMigrationVersion](./kibana-plugin-server.savedobjectsmigrationversion.md) | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
| [SavedObjectsRawDoc](./kibana-plugin-server.savedobjectsrawdoc.md) | A raw document as represented directly in the saved object index. |
| [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) | Options to control the "resolve import" operation. |
+| [SavedObjectsServiceSetup](./kibana-plugin-server.savedobjectsservicesetup.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing and querying state. The SavedObjectsServiceSetup API exposes methods for creating and registering Saved Object client wrappers. |
+| [SavedObjectsServiceStart](./kibana-plugin-server.savedobjectsservicestart.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing and querying state. The SavedObjectsServiceStart API provides a scoped Saved Objects client for interacting with Saved Objects. |
| [SavedObjectsUpdateOptions](./kibana-plugin-server.savedobjectsupdateoptions.md) | |
| [SavedObjectsUpdateResponse](./kibana-plugin-server.savedobjectsupdateresponse.md) | |
+| [SessionCookieValidationResult](./kibana-plugin-server.sessioncookievalidationresult.md) | Return type from a function to validate cookie contents. |
| [SessionStorage](./kibana-plugin-server.sessionstorage.md) | Provides an interface to store and retrieve data across requests. |
| [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) | Configuration used to create HTTP session storage based on top of cookie mechanism. |
| [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) | SessionStorage factory to bind one to an incoming request |
@@ -148,6 +154,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [IClusterClient](./kibana-plugin-server.iclusterclient.md) | Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via asScoped(...)).See [ClusterClient](./kibana-plugin-server.clusterclient.md). |
| [IContextProvider](./kibana-plugin-server.icontextprovider.md) | A function that returns a context value for a specific key of given context type. |
| [IsAuthenticated](./kibana-plugin-server.isauthenticated.md) | Return authentication status for a request. |
+| [ISavedObjectsRepository](./kibana-plugin-server.isavedobjectsrepository.md) | See [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) |
| [IScopedClusterClient](./kibana-plugin-server.iscopedclusterclient.md) | Serves the same purpose as "normal" ClusterClient but exposes additional callAsCurrentUser method that doesn't use credentials of the Kibana internal user (as callAsInternalUser does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.See [ScopedClusterClient](./kibana-plugin-server.scopedclusterclient.md). |
| [KibanaResponseFactory](./kibana-plugin-server.kibanaresponsefactory.md) | Creates an object containing request response payload, HTTP headers, error details, and other data transmitted to the client. |
| [KnownHeaders](./kibana-plugin-server.knownheaders.md) | Set of well-known HTTP headers. |
@@ -174,6 +181,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [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) |
+| [SavedObjectsClientFactory](./kibana-plugin-server.savedobjectsclientfactory.md) | Describes the factory used to create instances of the Saved Objects Client. |
| [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
| [UiSettingsType](./kibana-plugin-server.uisettingstype.md) | UI element type to represent the settings. |
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient._constructor_.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient._constructor_.md
deleted file mode 100644
index 0bcca3ec57b546..00000000000000
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient._constructor_.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) > [(constructor)](./kibana-plugin-server.savedobjectsclient._constructor_.md)
-
-## SavedObjectsClient.(constructor)
-
-Constructs a new instance of the `SavedObjectsClient` class
-
-Signature:
-
-```typescript
-constructor(repository: SavedObjectsRepository);
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| repository | SavedObjectsRepository | |
-
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
index cc00934a1e1fd5..17d29bb912c834 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
@@ -4,19 +4,12 @@
## SavedObjectsClient class
-
Signature:
```typescript
export declare class SavedObjectsClient
```
-## Constructors
-
-| Constructor | Modifiers | Description |
-| --- | --- | --- |
-| [(constructor)(repository)](./kibana-plugin-server.savedobjectsclient._constructor_.md) | | Constructs a new instance of the SavedObjectsClient class |
-
## Properties
| Property | Modifiers | Type | Description |
@@ -37,3 +30,7 @@ export declare class SavedObjectsClient
| [get(type, id, options)](./kibana-plugin-server.savedobjectsclient.get.md) | | Retrieves a single object |
| [update(type, id, attributes, options)](./kibana-plugin-server.savedobjectsclient.update.md) | | Updates an SavedObject |
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsClient` class.
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclientfactory.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclientfactory.md
new file mode 100644
index 00000000000000..9e307597206800
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclientfactory.md
@@ -0,0 +1,15 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsClientFactory](./kibana-plugin-server.savedobjectsclientfactory.md)
+
+## SavedObjectsClientFactory type
+
+Describes the factory used to create instances of the Saved Objects Client.
+
+Signature:
+
+```typescript
+export declare type SavedObjectsClientFactoryMutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsdeletebynamespaceoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsdeletebynamespaceoptions.refresh.md
new file mode 100644
index 00000000000000..2332520ac388fc
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsdeletebynamespaceoptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-server.savedobjectsdeletebynamespaceoptions.md) > [refresh](./kibana-plugin-server.savedobjectsdeletebynamespaceoptions.refresh.md)
+
+## SavedObjectsDeleteByNamespaceOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.md
new file mode 100644
index 00000000000000..38ee40157888f5
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.md
@@ -0,0 +1,20 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsIncrementCounterOptions](./kibana-plugin-server.savedobjectsincrementcounteroptions.md)
+
+## SavedObjectsIncrementCounterOptions interface
+
+
+Signature:
+
+```typescript
+export interface SavedObjectsIncrementCounterOptions extends SavedObjectsBaseOptions
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [migrationVersion](./kibana-plugin-server.savedobjectsincrementcounteroptions.migrationversion.md) | SavedObjectsMigrationVersion | |
+| [refresh](./kibana-plugin-server.savedobjectsincrementcounteroptions.refresh.md) | MutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.migrationversion.md b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.migrationversion.md
new file mode 100644
index 00000000000000..3b80dea4fecde6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.migrationversion.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsIncrementCounterOptions](./kibana-plugin-server.savedobjectsincrementcounteroptions.md) > [migrationVersion](./kibana-plugin-server.savedobjectsincrementcounteroptions.migrationversion.md)
+
+## SavedObjectsIncrementCounterOptions.migrationVersion property
+
+Signature:
+
+```typescript
+migrationVersion?: SavedObjectsMigrationVersion;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.refresh.md
new file mode 100644
index 00000000000000..acd8d6f0916f9f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsincrementcounteroptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsIncrementCounterOptions](./kibana-plugin-server.savedobjectsincrementcounteroptions.md) > [refresh](./kibana-plugin-server.savedobjectsincrementcounteroptions.refresh.md)
+
+## SavedObjectsIncrementCounterOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.bulkcreate.md b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.bulkcreate.md
new file mode 100644
index 00000000000000..003bc6ac72466d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.bulkcreate.md
@@ -0,0 +1,27 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) > [bulkCreate](./kibana-plugin-server.savedobjectsrepository.bulkcreate.md)
+
+## SavedObjectsRepository.bulkCreate() method
+
+Creates multiple documents at once
+
+Signature:
+
+```typescript
+bulkCreateArray<SavedObjectsBulkCreateObject<T>> | |
+| options | SavedObjectsCreateOptions | |
+
+Returns:
+
+`PromiseSavedObjectsBulkGetObject[] | |
+| options | SavedObjectsBaseOptions | |
+
+Returns:
+
+`PromiseArray<SavedObjectsBulkUpdateObject<T>> | |
+| options | SavedObjectsBulkUpdateOptions | |
+
+Returns:
+
+`Promisestring | |
+| attributes | T | |
+| options | SavedObjectsCreateOptions | |
+
+Returns:
+
+`Promisestring | |
+| id | string | |
+| options | SavedObjectsDeleteOptions | |
+
+Returns:
+
+`Promise<{}>`
+
+{promise}
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.deletebynamespace.md b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.deletebynamespace.md
new file mode 100644
index 00000000000000..ab6eb30e664f19
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.deletebynamespace.md
@@ -0,0 +1,27 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) > [deleteByNamespace](./kibana-plugin-server.savedobjectsrepository.deletebynamespace.md)
+
+## SavedObjectsRepository.deleteByNamespace() method
+
+Deletes all objects from the provided namespace.
+
+Signature:
+
+```typescript
+deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promisestring | |
+| options | SavedObjectsDeleteByNamespaceOptions | |
+
+Returns:
+
+`PromiseSavedObjectsFindOptions | |
+
+Returns:
+
+`Promisestring | |
+| id | string | |
+| options | SavedObjectsBaseOptions | |
+
+Returns:
+
+`Promisestring | |
+| id | string | |
+| counterFieldName | string | |
+| options | SavedObjectsIncrementCounterOptions | |
+
+Returns:
+
+`Promise<{
+ id: string;
+ type: string;
+ updated_at: string;
+ references: any;
+ version: string;
+ attributes: any;
+ }>`
+
+{promise}
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.md b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.md
new file mode 100644
index 00000000000000..019363776590cd
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.md
@@ -0,0 +1,31 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md)
+
+## SavedObjectsRepository class
+
+Signature:
+
+```typescript
+export declare class SavedObjectsRepository
+```
+
+## Methods
+
+| Method | Modifiers | Description |
+| --- | --- | --- |
+| [bulkCreate(objects, options)](./kibana-plugin-server.savedobjectsrepository.bulkcreate.md) | | Creates multiple documents at once |
+| [bulkGet(objects, options)](./kibana-plugin-server.savedobjectsrepository.bulkget.md) | | Returns an array of objects by id |
+| [bulkUpdate(objects, options)](./kibana-plugin-server.savedobjectsrepository.bulkupdate.md) | | Updates multiple objects in bulk |
+| [create(type, attributes, options)](./kibana-plugin-server.savedobjectsrepository.create.md) | | Persists an object |
+| [delete(type, id, options)](./kibana-plugin-server.savedobjectsrepository.delete.md) | | Deletes an object |
+| [deleteByNamespace(namespace, options)](./kibana-plugin-server.savedobjectsrepository.deletebynamespace.md) | | Deletes all objects from the provided namespace. |
+| [find({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespace, type, filter, })](./kibana-plugin-server.savedobjectsrepository.find.md) | | |
+| [get(type, id, options)](./kibana-plugin-server.savedobjectsrepository.get.md) | | Gets a single object |
+| [incrementCounter(type, id, counterFieldName, options)](./kibana-plugin-server.savedobjectsrepository.incrementcounter.md) | | Increases a counter field by one. Creates the document if one doesn't exist for the given id. |
+| [update(type, id, attributes, options)](./kibana-plugin-server.savedobjectsrepository.update.md) | | Updates an object |
+
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsRepository` class.
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.update.md b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.update.md
new file mode 100644
index 00000000000000..15890ab9211aa8
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsrepository.update.md
@@ -0,0 +1,29 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) > [update](./kibana-plugin-server.savedobjectsrepository.update.md)
+
+## SavedObjectsRepository.update() method
+
+Updates an object
+
+Signature:
+
+```typescript
+updatestring | |
+| id | string | |
+| attributes | Partial<T> | |
+| options | SavedObjectsUpdateOptions | |
+
+Returns:
+
+`Promise(priority: number, id: string, factory: SavedObjectsClientWrapperFactory<KibanaRequest>) => void | Add a client wrapper with the given priority. |
+| [createInternalRepository](./kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) | (extraTypes?: string[]) => ISavedObjectsRepository | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+| [createScopedRepository](./kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) | (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+| [setClientFactory](./kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md) | (customClientFactory: SavedObjectsClientFactory<KibanaRequest>) => void | Set a default factory for creating Saved Objects clients. Only one client factory can be set, subsequent calls to this method will fail. |
+
+## Remarks
+
+Note: The Saved Object setup API's should only be used for creating and registering client wrappers. Constructing a Saved Objects client or repository for use within your own plugin won't have any of the registered wrappers applied and is considered an anti-pattern. Use the Saved Objects client from the [SavedObjectsServiceStart\#getScopedClient](./kibana-plugin-server.savedobjectsservicestart.md) method or the [route handler context](./kibana-plugin-server.requesthandlercontext.md) instead.
+
+When plugins access the Saved Objects client, a new client is created using the factory provided to `setClientFactory` and wrapped by all wrappers registered through `addClientWrapper`. To create a factory or wrapper, plugins will have to construct a Saved Objects client. First create a repository by calling `scopedRepository` or `internalRepository` and then use this repository as the argument to the [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) constructor.
+
+## Example
+
+import {SavedObjectsClient, CoreSetup} from 'src/core/server';
+
+export class Plugin() { setup: (core: CoreSetup) => { core.savedObjects.setClientFactory(({request: KibanaRequest}) => { return new SavedObjectsClient(core.savedObjects.scopedRepository(request)); }) } }
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md b/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md
new file mode 100644
index 00000000000000..544e0b9d5fa736
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsServiceSetup](./kibana-plugin-server.savedobjectsservicesetup.md) > [setClientFactory](./kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md)
+
+## SavedObjectsServiceSetup.setClientFactory property
+
+Set a default factory for creating Saved Objects clients. Only one client factory can be set, subsequent calls to this method will fail.
+
+Signature:
+
+```typescript
+setClientFactory: (customClientFactory: SavedObjectsClientFactory(req: KibanaRequest, options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract | Creates a [Saved Objects client](./kibana-plugin-server.savedobjectsclientcontract.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. If other plugins have registered Saved Objects client wrappers, these will be applied to extend the functionality of the client.A client that is already scoped to the incoming request is also exposed from the route handler context see [RequestHandlerContext](./kibana-plugin-server.requesthandlercontext.md). |
+
diff --git a/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.isvalid.md b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.isvalid.md
new file mode 100644
index 00000000000000..6e5f6acca2eb90
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.isvalid.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SessionCookieValidationResult](./kibana-plugin-server.sessioncookievalidationresult.md) > [isValid](./kibana-plugin-server.sessioncookievalidationresult.isvalid.md)
+
+## SessionCookieValidationResult.isValid property
+
+Whether the cookie is valid or not.
+
+Signature:
+
+```typescript
+isValid: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.md b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.md
new file mode 100644
index 00000000000000..6d32c4cca3dd6a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.md
@@ -0,0 +1,21 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SessionCookieValidationResult](./kibana-plugin-server.sessioncookievalidationresult.md)
+
+## SessionCookieValidationResult interface
+
+Return type from a function to validate cookie contents.
+
+Signature:
+
+```typescript
+export interface SessionCookieValidationResult
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [isValid](./kibana-plugin-server.sessioncookievalidationresult.isvalid.md) | boolean | Whether the cookie is valid or not. |
+| [path](./kibana-plugin-server.sessioncookievalidationresult.path.md) | string | The "Path" attribute of the cookie; if the cookie is invalid, this is used to clear it. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.path.md b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.path.md
new file mode 100644
index 00000000000000..8ca6d452213aac
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.sessioncookievalidationresult.path.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SessionCookieValidationResult](./kibana-plugin-server.sessioncookievalidationresult.md) > [path](./kibana-plugin-server.sessioncookievalidationresult.path.md)
+
+## SessionCookieValidationResult.path property
+
+The "Path" attribute of the cookie; if the cookie is invalid, this is used to clear it.
+
+Signature:
+
+```typescript
+path?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md
index 167ab03d7567f5..ef65735e7bdbab 100644
--- a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md
@@ -4,7 +4,7 @@
## SessionStorageCookieOptions.encryptionKey property
-A key used to encrypt a cookie value. Should be at least 32 characters long.
+A key used to encrypt a cookie's value. Should be at least 32 characters long.
Signature:
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md
index de412818142f25..778dc27a190d91 100644
--- a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.md
@@ -16,8 +16,8 @@ export interface SessionStorageCookieOptionsstring | A key used to encrypt a cookie value. Should be at least 32 characters long. |
+| [encryptionKey](./kibana-plugin-server.sessionstoragecookieoptions.encryptionkey.md) | string | A key used to encrypt a cookie's value. Should be at least 32 characters long. |
| [isSecure](./kibana-plugin-server.sessionstoragecookieoptions.issecure.md) | boolean | Flag indicating whether the cookie should be sent only via a secure connection. |
| [name](./kibana-plugin-server.sessionstoragecookieoptions.name.md) | string | Name of the session cookie. |
-| [validate](./kibana-plugin-server.sessionstoragecookieoptions.validate.md) | (sessionValue: T) => boolean | Promise<boolean> | Function called to validate a cookie content. |
+| [validate](./kibana-plugin-server.sessionstoragecookieoptions.validate.md) | (sessionValue: T | T[]) => SessionCookieValidationResult | Function called to validate a cookie's decrypted value. |
diff --git a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md
index f3cbfc0d84e18e..effa4b6bbc077c 100644
--- a/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md
+++ b/docs/development/core/server/kibana-plugin-server.sessionstoragecookieoptions.validate.md
@@ -4,10 +4,10 @@
## SessionStorageCookieOptions.validate property
-Function called to validate a cookie content.
+Function called to validate a cookie's decrypted value.
Signature:
```typescript
-validate: (sessionValue: T) => boolean | Promise
-
-
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js
deleted file mode 100644
index ce94c3a5f68abb..00000000000000
--- a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js
+++ /dev/null
@@ -1,186 +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 { i18n } from '@kbn/i18n';
-import html from './vislib_vis_legend.html';
-import { Data } from '../../vislib/lib/data';
-import { uiModules } from '../../modules';
-import { createFiltersFromEvent } from '../vis_filters';
-import { htmlIdGenerator, keyCodes } from '@elastic/eui';
-import { getTableAggs } from '../../visualize/loader/pipeline_helpers/utilities';
-
-export const CUSTOM_LEGEND_VIS_TYPES = ['heatmap', 'gauge'];
-
-uiModules.get('kibana')
- .directive('vislibLegend', function ($timeout) {
-
- return {
- restrict: 'E',
- template: html,
- link: function ($scope) {
- $scope.legendId = htmlIdGenerator()('legend');
- $scope.open = $scope.uiState.get('vis.legendOpen', true);
-
- $scope.$watch('visData', function (data) {
- if (!data) return;
- $scope.data = data;
- });
-
- $scope.$watch('refreshLegend', () => {
- refresh();
- });
-
- $scope.highlight = function (event) {
- const el = event.currentTarget;
- const handler = $scope.vis.vislibVis.handler;
-
- //there is no guarantee that a Chart will set the highlight-function on its handler
- if (!handler || typeof handler.highlight !== 'function') {
- return;
- }
- handler.highlight.call(el, handler.el);
- };
-
- $scope.unhighlight = function (event) {
- const el = event.currentTarget;
- const handler = $scope.vis.vislibVis.handler;
- //there is no guarantee that a Chart will set the unhighlight-function on its handler
- if (!handler || typeof handler.unHighlight !== 'function') {
- return;
- }
- handler.unHighlight.call(el, handler.el);
- };
-
- $scope.setColor = function (label, color) {
- const colors = $scope.uiState.get('vis.colors') || {};
- if (colors[label] === color) delete colors[label];
- else colors[label] = color;
- $scope.uiState.setSilent('vis.colors', null);
- $scope.uiState.set('vis.colors', colors);
- $scope.uiState.emit('colorChanged');
- refresh();
- };
-
- $scope.toggleLegend = function () {
- const bwcAddLegend = $scope.vis.params.addLegend;
- const bwcLegendStateDefault = bwcAddLegend == null ? true : bwcAddLegend;
- $scope.open = !$scope.uiState.get('vis.legendOpen', bwcLegendStateDefault);
- // open should be applied on template before we update uiState
- $timeout(() => {
- $scope.uiState.set('vis.legendOpen', $scope.open);
- });
- };
-
- $scope.filter = function (legendData, negate) {
- $scope.vis.API.events.filter({ data: legendData.values, negate: negate });
- };
-
- $scope.canFilter = function (legendData) {
- if (CUSTOM_LEGEND_VIS_TYPES.includes($scope.vis.vislibVis.visConfigArgs.type)) {
- return false;
- }
- const filters = createFiltersFromEvent({ aggConfigs: $scope.tableAggs, data: legendData.values });
- return filters.length;
- };
-
- /**
- * Keydown listener for a legend entry.
- * This will close the details panel of this legend entry when pressing Escape.
- */
- $scope.onLegendEntryKeydown = function (event) {
- if (event.keyCode === keyCodes.ESCAPE) {
- event.preventDefault();
- event.stopPropagation();
- $scope.shownDetails = undefined;
- }
- };
-
- $scope.toggleDetails = function (label) {
- $scope.shownDetails = $scope.shownDetails === label ? undefined : label;
- };
-
- $scope.areDetailsVisible = function (label) {
- return $scope.shownDetails === label;
- };
-
- $scope.colors = [
- '#3F6833', '#967302', '#2F575E', '#99440A', '#58140C', '#052B51', '#511749', '#3F2B5B', //6
- '#508642', '#CCA300', '#447EBC', '#C15C17', '#890F02', '#0A437C', '#6D1F62', '#584477', //2
- '#629E51', '#E5AC0E', '#64B0C8', '#E0752D', '#BF1B00', '#0A50A1', '#962D82', '#614D93', //4
- '#7EB26D', '#EAB839', '#6ED0E0', '#EF843C', '#E24D42', '#1F78C1', '#BA43A9', '#705DA0', // Normal
- '#9AC48A', '#F2C96D', '#65C5DB', '#F9934E', '#EA6460', '#5195CE', '#D683CE', '#806EB7', //5
- '#B7DBAB', '#F4D598', '#70DBED', '#F9BA8F', '#F29191', '#82B5D8', '#E5A8E2', '#AEA2E0', //3
- '#E0F9D7', '#FCEACA', '#CFFAFF', '#F9E2D2', '#FCE2DE', '#BADFF4', '#F9D9F9', '#DEDAF7' //7
- ];
-
- function refresh() {
- const vislibVis = $scope.vis.vislibVis;
- if (!vislibVis || !vislibVis.visConfig) {
- $scope.labels = [{ label: i18n.translate('common.ui.vis.visTypes.legend.loadingLabel', { defaultMessage: 'loading…' }) }];
- return;
- } // make sure vislib is defined at this point
-
- if ($scope.uiState.get('vis.legendOpen') == null && $scope.vis.params.addLegend != null) {
- $scope.open = $scope.vis.params.addLegend;
- }
-
- if (CUSTOM_LEGEND_VIS_TYPES.includes(vislibVis.visConfigArgs.type)) {
- const labels = vislibVis.getLegendLabels();
- if (labels) {
- $scope.labels = _.map(labels, label => {
- return { label: label };
- });
- }
- } else {
- $scope.labels = getLabels($scope.data, vislibVis.visConfigArgs.type);
- }
-
- if (vislibVis.visConfig) {
- $scope.getColor = vislibVis.visConfig.data.getColorFunc();
- }
-
- $scope.tableAggs = getTableAggs($scope.vis);
- }
-
- // Most of these functions were moved directly from the old Legend class. Not a fan of this.
- function getLabels(data, type) {
- if (!data) return [];
- data = data.columns || data.rows || [data];
- if (type === 'pie') return Data.prototype.pieNames(data);
- return getSeriesLabels(data);
- }
-
- function getSeriesLabels(data) {
- const values = data.map(function (chart) {
- return chart.series;
- })
- .reduce(function (a, b) {
- return a.concat(b);
- }, []);
- return _.compact(_.uniq(values, 'label')).map(label => {
- return {
- ...label,
- values: [label.values[0].seriesRaw],
- };
- });
- }
- }
- };
- });
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap
new file mode 100644
index 00000000000000..f2c9f4e1b53ec3
--- /dev/null
+++ b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`VisLegend Component Legend closed should match the snapshot 1`] = `""`;
+
+exports[`VisLegend Component Legend open should match the snapshot 1`] = `"-
-
-
-
-
- -- -- - {{legendData.label}} -- ---- - - -- -- - - - -- -
-
-
+ {this.state.labels.map(item => (
+
+
+ {open && this.renderLegend(anchorPosition)}
+
+ );
+ }
+}
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/vislib_vis_legend_item.tsx b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/vislib_vis_legend_item.tsx
new file mode 100644
index 00000000000000..7376fabfe738be
--- /dev/null
+++ b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/vislib_vis_legend_item.tsx
@@ -0,0 +1,203 @@
+/*
+ * 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, { memo, BaseSyntheticEvent, KeyboardEvent } from 'react';
+import classNames from 'classnames';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+ EuiPopover,
+ keyCodes,
+ EuiIcon,
+ EuiSpacer,
+ EuiButtonEmpty,
+ EuiPopoverProps,
+ EuiButtonGroup,
+ EuiButtonGroupOption,
+} from '@elastic/eui';
+
+import { legendColors, LegendItem } from './models';
+
+interface Props {
+ item: LegendItem;
+ legendId: string;
+ selected: boolean;
+ canFilter: boolean;
+ anchorPosition: EuiPopoverProps['anchorPosition'];
+ onFilter: (item: LegendItem, negate: boolean) => void;
+ onSelect: (label: string | null) => (event?: BaseSyntheticEvent) => void;
+ onHighlight: (event: BaseSyntheticEvent) => void;
+ onUnhighlight: (event: BaseSyntheticEvent) => void;
+ setColor: (label: string, color: string) => (event: BaseSyntheticEvent) => void;
+ getColor: (label: string) => string;
+}
+
+const VisLegendItemComponent = ({
+ item,
+ legendId,
+ selected,
+ canFilter,
+ anchorPosition,
+ onFilter,
+ onSelect,
+ onHighlight,
+ onUnhighlight,
+ setColor,
+ getColor,
+}: Props) => {
+ /**
+ * Keydown listener for a legend entry.
+ * This will close the details panel of this legend entry when pressing Escape.
+ */
+ const onLegendEntryKeydown = (event: KeyboardEvent) => {
+ if (event.keyCode === keyCodes.ESCAPE) {
+ event.preventDefault();
+ event.stopPropagation();
+ onSelect(null)();
+ }
+ };
+
+ const filterOptions: EuiButtonGroupOption[] = [
+ {
+ id: 'filterIn',
+ label: i18n.translate('common.ui.vis.visTypes.legend.filterForValueButtonAriaLabel', {
+ defaultMessage: 'Filter for value {legendDataLabel}',
+ values: { legendDataLabel: item.label },
+ }),
+ iconType: 'plusInCircle',
+ 'data-test-subj': `legend-${item.label}-filterIn`,
+ },
+ {
+ id: 'filterOut',
+ label: i18n.translate('common.ui.vis.visTypes.legend.filterOutValueButtonAriaLabel', {
+ defaultMessage: 'Filter out value {legendDataLabel}',
+ values: { legendDataLabel: item.label },
+ }),
+ iconType: 'minusInCircle',
+ 'data-test-subj': `legend-${item.label}-filterOut`,
+ },
+ ];
+
+ const handleFilterChange = (id: string) => {
+ onFilter(item, id !== 'filterIn');
+ };
+
+ const renderFilterBar = () => (
+ <>
+
+ {canFilter && renderFilterBar()}
+
+
+
+
+
+ {message}
}
+ />
);
- renderSubject.next({
- type: 'error',
- error: { message: 'render error' },
+ act(() => {
+ onRenderError!(instance.getDOMNode(), new Error('render error'), {
+ done: () => {
+ renderSubject.next(1);
+ },
+ } as any);
});
+
instance.update();
+ expect(instance.find(EuiProgress)).toHaveLength(0);
+ expect(instance.find('[data-test-subj="custom-error"]')).toHaveLength(1);
+ expect(instance.find('[data-test-subj="custom-error"]').contains('render error')).toBeTruthy();
- expect(renderErrorFn).toHaveBeenCalledWith('render error');
+ act(() => {
+ loadingSubject.next();
+ renderSubject.next(2);
+ });
+ instance.update();
+ expect(instance.find(EuiProgress)).toHaveLength(0);
+ expect(instance.find('[data-test-subj="custom-error"]')).toHaveLength(0);
});
});
diff --git a/src/plugins/expressions/public/expression_renderer.tsx b/src/plugins/expressions/public/expression_renderer.tsx
index b4f0a509c81b61..3989f4ed7d6982 100644
--- a/src/plugins/expressions/public/expression_renderer.tsx
+++ b/src/plugins/expressions/public/expression_renderer.tsx
@@ -17,12 +17,15 @@
* under the License.
*/
-import { useRef, useEffect, useState } from 'react';
+import { useRef, useEffect, useState, useLayoutEffect } from 'react';
import React from 'react';
import classNames from 'classnames';
+import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { IExpressionLoaderParams } from './types';
+import { useShallowCompareEffect } from '../../kibana_react/public';
+import { IExpressionLoaderParams, IInterpreterRenderHandlers, RenderError } from './types';
import { ExpressionAST } from '../common/types';
import { ExpressionLoader } from './loader';
@@ -39,7 +42,7 @@ export interface ExpressionRendererProps extends IExpressionLoaderParams {
interface State {
isEmpty: boolean;
isLoading: boolean;
- error: null | { message: string };
+ error: null | RenderError;
}
export type ExpressionRenderer = React.FC
- {state.isEmpty ?
-
+
+
);
}
@@ -102,9 +98,9 @@ export class HorizontalLegend extends React.Component {
return (
- {' '}
`${item.metric.label}: ${item.metric.description}`));
+ bucketSize,
+ },
+ }),
+ ].concat(series.map(item => `${item.metric.label}: ${item.metric.description}`));
return (
@@ -68,7 +73,8 @@ export function MonitoringTimeseriesContainer({ series, onBrush, zoomInfo }) {
- { getTitle(series) }{ units ? ` (${units})` : '' }
+ {getTitle(series)}
+ {units ? ` (${units})` : ''}
- { zoomOutBtn(zoomInfo) }
+ {zoomOutBtn(zoomInfo)}
-
);
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
index d53f2678652325..232815e930388e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/indices/indices.js
@@ -31,12 +31,9 @@ const columns = [
field: 'name',
width: '350px',
sortable: true,
- render: (value) => (
+ render: value => (
{state.error.message}
- )
- ) : null}
+ {state.isEmpty && {
getRenderersRegistry: () => ({
get: (id: string) => renderers[id],
}),
+ getNotifications: jest.fn(() => {
+ return {
+ toasts: {
+ addError: jest.fn(() => {}),
+ },
+ };
+ }),
};
});
@@ -97,20 +104,14 @@ describe('ExpressionLoader', () => {
expect(response).toEqual({ type: 'render', as: 'test' });
});
- it('emits on loading$ when starting to load', async () => {
+ it('emits on loading$ on initial load and on updates', async () => {
const expressionLoader = new ExpressionLoader(element, expressionString, {});
- let loadingPromise = expressionLoader.loading$.pipe(first()).toPromise();
+ const loadingPromise = expressionLoader.loading$.pipe(toArray()).toPromise();
expressionLoader.update('test');
- let response = await loadingPromise;
- expect(response).toBeUndefined();
- loadingPromise = expressionLoader.loading$.pipe(first()).toPromise();
expressionLoader.update('');
- response = await loadingPromise;
- expect(response).toBeUndefined();
- loadingPromise = expressionLoader.loading$.pipe(first()).toPromise();
expressionLoader.update();
- response = await loadingPromise;
- expect(response).toBeUndefined();
+ expressionLoader.destroy();
+ expect(await loadingPromise).toHaveLength(4);
});
it('emits on render$ when rendering is done', async () => {
diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts
index 200249b60c773c..0342713f7627b1 100644
--- a/src/plugins/expressions/public/loader.ts
+++ b/src/plugins/expressions/public/loader.ts
@@ -17,8 +17,8 @@
* under the License.
*/
-import { Observable, Subject } from 'rxjs';
-import { share } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
import { Adapters, InspectorSession } from '../../inspector/public';
import { ExpressionDataHandler } from './execute';
import { ExpressionRenderHandler } from './render';
@@ -36,7 +36,7 @@ export class ExpressionLoader {
private dataHandler: ExpressionDataHandler | undefined;
private renderHandler: ExpressionRenderHandler;
private dataSubject: Subject;
- private loadingSubject: Subject;
+ private loadingSubject: Subject;
private data: Data;
private params: IExpressionLoaderParams = {};
@@ -46,12 +46,20 @@ export class ExpressionLoader {
params?: IExpressionLoaderParams
) {
this.dataSubject = new Subject();
- this.data$ = this.dataSubject.asObservable().pipe(share());
-
- this.loadingSubject = new Subject();
- this.loading$ = this.loadingSubject.asObservable().pipe(share());
-
- this.renderHandler = new ExpressionRenderHandler(element);
+ this.data$ = this.dataSubject.asObservable();
+
+ this.loadingSubject = new BehaviorSubject(false);
+ // loading is a "hot" observable,
+ // as loading$ could emit straight away in the constructor
+ // and we want to notify subscribers about it, but all subscriptions will happen later
+ this.loading$ = this.loadingSubject.asObservable().pipe(
+ filter(_ => _ === true),
+ map(() => void 0)
+ );
+
+ this.renderHandler = new ExpressionRenderHandler(element, {
+ onRenderError: params && params.onRenderError,
+ });
this.render$ = this.renderHandler.render$;
this.update$ = this.renderHandler.update$;
this.events$ = this.renderHandler.events$;
@@ -64,9 +72,14 @@ export class ExpressionLoader {
this.render(data);
});
+ this.render$.subscribe(() => {
+ this.loadingSubject.next(false);
+ });
+
this.setParams(params);
if (expression) {
+ this.loadingSubject.next(true);
this.loadData(expression, this.params);
}
}
@@ -120,7 +133,7 @@ export class ExpressionLoader {
update(expression?: string | ExpressionAST, params?: IExpressionLoaderParams): void {
this.setParams(params);
- this.loadingSubject.next();
+ this.loadingSubject.next(true);
if (expression) {
this.loadData(expression, this.params);
} else if (this.data) {
diff --git a/src/plugins/expressions/public/plugin.ts b/src/plugins/expressions/public/plugin.ts
index 3a28256d571626..7471326cdd749e 100644
--- a/src/plugins/expressions/public/plugin.ts
+++ b/src/plugins/expressions/public/plugin.ts
@@ -21,7 +21,13 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../..
import { ExpressionInterpretWithHandlers, ExpressionExecutor } from './types';
import { FunctionsRegistry, RenderFunctionsRegistry, TypesRegistry } from './registries';
import { Setup as InspectorSetup, Start as InspectorStart } from '../../inspector/public';
-import { setCoreStart, setInspector, setInterpreter, setRenderersRegistry } from './services';
+import {
+ setCoreStart,
+ setInspector,
+ setInterpreter,
+ setRenderersRegistry,
+ setNotifications,
+} from './services';
import { clog as clogFunction } from './functions/clog';
import { font as fontFunction } from './functions/font';
import { kibana as kibanaFunction } from './functions/kibana';
@@ -158,6 +164,7 @@ export class ExpressionsPublicPlugin
public start(core: CoreStart, { inspector }: ExpressionsStartDeps): ExpressionsStart {
setCoreStart(core);
setInspector(inspector);
+ setNotifications(core.notifications);
return {
execute,
diff --git a/src/plugins/expressions/public/render.test.ts b/src/plugins/expressions/public/render.test.ts
index 6b5acc8405fd27..56eb43a9bd1338 100644
--- a/src/plugins/expressions/public/render.test.ts
+++ b/src/plugins/expressions/public/render.test.ts
@@ -17,14 +17,18 @@
* under the License.
*/
-import { render, ExpressionRenderHandler } from './render';
+import { ExpressionRenderHandler, render } from './render';
import { Observable } from 'rxjs';
-import { IInterpreterRenderHandlers } from './types';
+import { IInterpreterRenderHandlers, RenderError } from './types';
import { getRenderersRegistry } from './services';
-import { first } from 'rxjs/operators';
+import { first, take, toArray } from 'rxjs/operators';
const element: HTMLElement = {} as HTMLElement;
-
+const mockNotificationService = {
+ toasts: {
+ addError: jest.fn(() => {}),
+ },
+};
jest.mock('./services', () => {
const renderers: Record = {
test: {
@@ -38,9 +42,24 @@ jest.mock('./services', () => {
getRenderersRegistry: jest.fn(() => ({
get: jest.fn((id: string) => renderers[id]),
})),
+ getNotifications: jest.fn(() => {
+ return mockNotificationService;
+ }),
};
});
+const mockMockErrorRenderFunction = jest.fn(
+ (el: HTMLElement, error: RenderError, handlers: IInterpreterRenderHandlers) => handlers.done()
+);
+// extracts data from mockMockErrorRenderFunction call to assert in tests
+const getHandledError = () => {
+ try {
+ return mockMockErrorRenderFunction.mock.calls[0][1];
+ } catch (e) {
+ return null;
+ }
+};
+
describe('render helper function', () => {
it('returns ExpressionRenderHandler instance', () => {
const response = render(element, {});
@@ -62,40 +81,33 @@ describe('ExpressionRenderHandler', () => {
});
describe('render()', () => {
- it('sends an observable error and keeps it open if invalid data is provided', async () => {
+ beforeEach(() => {
+ mockMockErrorRenderFunction.mockClear();
+ mockNotificationService.toasts.addError.mockClear();
+ });
+
+ it('in case of error render$ should emit when error renderer is finished', async () => {
const expressionRenderHandler = new ExpressionRenderHandler(element);
- const promise1 = expressionRenderHandler.render$.pipe(first()).toPromise();
expressionRenderHandler.render(false);
- await expect(promise1).resolves.toEqual({
- type: 'error',
- error: {
- message: 'invalid data provided to the expression renderer',
- },
- });
+ const promise1 = expressionRenderHandler.render$.pipe(first()).toPromise();
+ await expect(promise1).resolves.toEqual(1);
- const promise2 = expressionRenderHandler.render$.pipe(first()).toPromise();
expressionRenderHandler.render(false);
- await expect(promise2).resolves.toEqual({
- type: 'error',
- error: {
- message: 'invalid data provided to the expression renderer',
- },
- });
+ const promise2 = expressionRenderHandler.render$.pipe(first()).toPromise();
+ await expect(promise2).resolves.toEqual(2);
});
- it('sends an observable error if renderer does not exist', async () => {
- const expressionRenderHandler = new ExpressionRenderHandler(element);
- const promise = expressionRenderHandler.render$.pipe(first()).toPromise();
- expressionRenderHandler.render({ type: 'render', as: 'something' });
- await expect(promise).resolves.toEqual({
- type: 'error',
- error: {
- message: `invalid renderer id 'something'`,
- },
+ it('should use custom error handler if provided', async () => {
+ const expressionRenderHandler = new ExpressionRenderHandler(element, {
+ onRenderError: mockMockErrorRenderFunction,
});
+ await expressionRenderHandler.render(false);
+ expect(getHandledError()!.message).toEqual(
+ `invalid data provided to the expression renderer`
+ );
});
- it('sends an observable error if the rendering function throws', async () => {
+ it('should throw error if the rendering function throws', async () => {
(getRenderersRegistry as jest.Mock).mockReturnValueOnce({ get: () => true });
(getRenderersRegistry as jest.Mock).mockReturnValueOnce({
get: () => ({
@@ -105,15 +117,11 @@ describe('ExpressionRenderHandler', () => {
}),
});
- const expressionRenderHandler = new ExpressionRenderHandler(element);
- const promise = expressionRenderHandler.render$.pipe(first()).toPromise();
- expressionRenderHandler.render({ type: 'render', as: 'something' });
- await expect(promise).resolves.toEqual({
- type: 'error',
- error: {
- message: 'renderer error',
- },
+ const expressionRenderHandler = new ExpressionRenderHandler(element, {
+ onRenderError: mockMockErrorRenderFunction,
});
+ await expressionRenderHandler.render({ type: 'render', as: 'something' });
+ expect(getHandledError()!.message).toEqual('renderer error');
});
it('sends a next observable once rendering is complete', () => {
@@ -129,18 +137,56 @@ describe('ExpressionRenderHandler', () => {
});
});
+ it('default renderer should use notification service', async () => {
+ const expressionRenderHandler = new ExpressionRenderHandler(element);
+ const promise1 = expressionRenderHandler.render$.pipe(first()).toPromise();
+ expressionRenderHandler.render(false);
+ await expect(promise1).resolves.toEqual(1);
+ expect(mockNotificationService.toasts.addError).toBeCalledWith(
+ expect.objectContaining({
+ message: 'invalid data provided to the expression renderer',
+ }),
+ {
+ title: 'Error in visualisation',
+ toastMessage: 'invalid data provided to the expression renderer',
+ }
+ );
+ });
+
// in case render$ subscription happen after render() got called
// we still want to be notified about sync render$ updates
it("doesn't swallow sync render errors", async () => {
+ const expressionRenderHandler1 = new ExpressionRenderHandler(element, {
+ onRenderError: mockMockErrorRenderFunction,
+ });
+ expressionRenderHandler1.render(false);
+ const renderPromiseAfterRender = expressionRenderHandler1.render$.pipe(first()).toPromise();
+ await expect(renderPromiseAfterRender).resolves.toEqual(1);
+ expect(getHandledError()!.message).toEqual(
+ 'invalid data provided to the expression renderer'
+ );
+
+ mockMockErrorRenderFunction.mockClear();
+
+ const expressionRenderHandler2 = new ExpressionRenderHandler(element, {
+ onRenderError: mockMockErrorRenderFunction,
+ });
+ const renderPromiseBeforeRender = expressionRenderHandler2.render$.pipe(first()).toPromise();
+ expressionRenderHandler2.render(false);
+ await expect(renderPromiseBeforeRender).resolves.toEqual(1);
+ expect(getHandledError()!.message).toEqual(
+ 'invalid data provided to the expression renderer'
+ );
+ });
+
+ // it is expected side effect of using BehaviorSubject for render$,
+ // that observables will emit previous result if subscription happens after render
+ it('should emit previous render and error results', async () => {
const expressionRenderHandler = new ExpressionRenderHandler(element);
expressionRenderHandler.render(false);
- const promise = expressionRenderHandler.render$.pipe(first()).toPromise();
- await expect(promise).resolves.toEqual({
- type: 'error',
- error: {
- message: 'invalid data provided to the expression renderer',
- },
- });
+ const renderPromise = expressionRenderHandler.render$.pipe(take(2), toArray()).toPromise();
+ expressionRenderHandler.render(false);
+ await expect(renderPromise).resolves.toEqual([1, 2]);
});
});
});
diff --git a/src/plugins/expressions/public/render.ts b/src/plugins/expressions/public/render.ts
index 3c7008806e779c..62bde12490fbe4 100644
--- a/src/plugins/expressions/public/render.ts
+++ b/src/plugins/expressions/public/render.ts
@@ -17,48 +17,58 @@
* under the License.
*/
-import { Observable } from 'rxjs';
import * as Rx from 'rxjs';
-import { filter, share } from 'rxjs/operators';
-import { event, RenderId, Data, IInterpreterRenderHandlers } from './types';
+import { Observable } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import {
+ Data,
+ event,
+ IInterpreterRenderHandlers,
+ RenderError,
+ RenderErrorHandlerFnType,
+ RenderId,
+} from './types';
import { getRenderersRegistry } from './services';
-
-interface RenderError {
- type: 'error';
- error: { type?: string; message: string };
-}
+import { renderErrorHandler as defaultRenderErrorHandler } from './render_error_handler';
export type IExpressionRendererExtraHandlers = Record;
-export type RenderResult = RenderId | RenderError;
+export interface ExpressionRenderHandlerParams {
+ onRenderError: RenderErrorHandlerFnType;
+}
export class ExpressionRenderHandler {
- render$: Observable;
+ render$: Observable;
update$: Observable;
events$: Observable;
private element: HTMLElement;
private destroyFn?: any;
private renderCount: number = 0;
- private renderSubject: Rx.BehaviorSubject;
+ private renderSubject: Rx.BehaviorSubject;
private eventsSubject: Rx.Subject;
private updateSubject: Rx.Subject;
private handlers: IInterpreterRenderHandlers;
+ private onRenderError: RenderErrorHandlerFnType;
- constructor(element: HTMLElement) {
+ constructor(
+ element: HTMLElement,
+ { onRenderError }: Partial = {}
+ ) {
this.element = element;
this.eventsSubject = new Rx.Subject();
- this.events$ = this.eventsSubject.asObservable().pipe(share());
+ this.events$ = this.eventsSubject.asObservable();
+
+ this.onRenderError = onRenderError || defaultRenderErrorHandler;
- this.renderSubject = new Rx.BehaviorSubject(null as RenderResult | null);
- this.render$ = this.renderSubject.asObservable().pipe(
- share(),
- filter(_ => _ !== null)
- ) as Observable;
+ this.renderSubject = new Rx.BehaviorSubject(null as RenderId | null);
+ this.render$ = this.renderSubject.asObservable().pipe(filter(_ => _ !== null)) as Observable<
+ RenderId
+ >;
this.updateSubject = new Rx.Subject();
- this.update$ = this.updateSubject.asObservable().pipe(share());
+ this.update$ = this.updateSubject.asObservable();
this.handlers = {
onDestroy: (fn: any) => {
@@ -82,33 +92,21 @@ export class ExpressionRenderHandler {
render = async (data: Data, extraHandlers: IExpressionRendererExtraHandlers = {}) => {
if (!data || typeof data !== 'object') {
- this.renderSubject.next({
- type: 'error',
- error: {
- message: 'invalid data provided to the expression renderer',
- },
- });
- return;
+ return this.handleRenderError(new Error('invalid data provided to the expression renderer'));
}
if (data.type !== 'render' || !data.as) {
if (data.type === 'error') {
- this.renderSubject.next(data);
+ return this.handleRenderError(data.error);
} else {
- this.renderSubject.next({
- type: 'error',
- error: { message: 'invalid data provided to the expression renderer' },
- });
+ return this.handleRenderError(
+ new Error('invalid data provided to the expression renderer')
+ );
}
- return;
}
if (!getRenderersRegistry().get(data.as)) {
- this.renderSubject.next({
- type: 'error',
- error: { message: `invalid renderer id '${data.as}'` },
- });
- return;
+ return this.handleRenderError(new Error(`invalid renderer id '${data.as}'`));
}
try {
@@ -117,10 +115,7 @@ export class ExpressionRenderHandler {
.get(data.as)!
.render(this.element, data.value, { ...this.handlers, ...extraHandlers });
} catch (e) {
- this.renderSubject.next({
- type: 'error',
- error: { type: e.type, message: e.message },
- });
+ return this.handleRenderError(e);
}
};
@@ -136,10 +131,18 @@ export class ExpressionRenderHandler {
getElement = () => {
return this.element;
};
+
+ handleRenderError = (error: RenderError) => {
+ this.onRenderError(this.element, error, this.handlers);
+ };
}
-export function render(element: HTMLElement, data: Data): ExpressionRenderHandler {
- const handler = new ExpressionRenderHandler(element);
+export function render(
+ element: HTMLElement,
+ data: Data,
+ options?: Partial
+): ExpressionRenderHandler {
+ const handler = new ExpressionRenderHandler(element, options);
handler.render(data);
return handler;
}
diff --git a/src/plugins/expressions/public/render_error_handler.ts b/src/plugins/expressions/public/render_error_handler.ts
new file mode 100644
index 00000000000000..4d6bee1e375e0e
--- /dev/null
+++ b/src/plugins/expressions/public/render_error_handler.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { RenderErrorHandlerFnType, IInterpreterRenderHandlers, RenderError } from './types';
+import { getNotifications } from './services';
+
+export const renderErrorHandler: RenderErrorHandlerFnType = (
+ element: HTMLElement,
+ error: RenderError,
+ handlers: IInterpreterRenderHandlers
+) => {
+ getNotifications().toasts.addError(error, {
+ title: i18n.translate('expressions.defaultErrorRenderer.errorTitle', {
+ defaultMessage: 'Error in visualisation',
+ }),
+ toastMessage: error.message,
+ });
+ handlers.done();
+};
diff --git a/src/plugins/expressions/public/services.ts b/src/plugins/expressions/public/services.ts
index a1a42aa85e670f..75ec4826ea45aa 100644
--- a/src/plugins/expressions/public/services.ts
+++ b/src/plugins/expressions/public/services.ts
@@ -17,6 +17,7 @@
* under the License.
*/
+import { NotificationsStart } from 'kibana/public';
import { createKibanaUtilsCore, createGetterSetter } from '../../kibana_utils/public';
import { ExpressionInterpreter } from './types';
import { Start as IInspector } from '../../inspector/public';
@@ -29,6 +30,9 @@ export const [getInspector, setInspector] = createGetterSetter('Insp
export const [getInterpreter, setInterpreter] = createGetterSetter(
'Interpreter'
);
+export const [getNotifications, setNotifications] = createGetterSetter(
+ 'Notifications'
+);
export const [getRenderersRegistry, setRenderersRegistry] = createGetterSetter<
ExpressionsSetup['__LEGACY']['renderers']
diff --git a/src/plugins/expressions/public/types/index.ts b/src/plugins/expressions/public/types/index.ts
index d86e042bca15c0..66a3da48dbee9c 100644
--- a/src/plugins/expressions/public/types/index.ts
+++ b/src/plugins/expressions/public/types/index.ts
@@ -20,6 +20,7 @@
import { ExpressionInterpret } from '../interpreter_provider';
import { TimeRange, Query, esFilters } from '../../../data/public';
import { Adapters } from '../../../inspector/public';
+import { ExpressionRenderDefinition } from '../registries';
export type ExpressionInterpretWithHandlers = (
ast: Parameters[0],
@@ -58,6 +59,7 @@ export interface IExpressionLoaderParams {
customRenderers?: [];
extraHandlers?: Record;
inspectorAdapters?: Adapters;
+ onRenderError?: RenderErrorHandlerFnType;
}
export interface IInterpreterHandlers {
@@ -99,3 +101,15 @@ export interface IInterpreterSuccessResult {
}
export type IInterpreterResult = IInterpreterSuccessResult & IInterpreterErrorResult;
+
+export { ExpressionRenderDefinition };
+
+export interface RenderError extends Error {
+ type?: string;
+}
+
+export type RenderErrorHandlerFnType = (
+ domNode: HTMLElement,
+ error: RenderError,
+ handlers: IInterpreterRenderHandlers
+) => void;
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 2d82f646c827b9..46f330ea0a2c5e 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -24,4 +24,4 @@ export * from './overlays';
export * from './ui_settings';
export * from './field_icon';
export * from './table_list_view';
-export { toMountPoint } from './util';
+export { toMountPoint, useShallowCompareEffect } from './util';
diff --git a/src/plugins/kibana_react/public/util/index.ts b/src/plugins/kibana_react/public/util/index.ts
index 1053ca01603e3f..4f64d6c9c81ab6 100644
--- a/src/plugins/kibana_react/public/util/index.ts
+++ b/src/plugins/kibana_react/public/util/index.ts
@@ -20,3 +20,4 @@
export * from './use_observable';
export * from './use_unmount';
export * from './react_mount';
+export * from './use_shallow_compare_effect';
diff --git a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts
new file mode 100644
index 00000000000000..e5d9c44727c3a3
--- /dev/null
+++ b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { renderHook } from 'react-hooks-testing-library';
+import { useShallowCompareEffect } from './use_shallow_compare_effect';
+
+describe('useShallowCompareEffect', () => {
+ test("doesn't run effect on shallow change", () => {
+ const callback = jest.fn();
+ let deps = [1, { a: 'b' }, true];
+ const { rerender } = renderHook(() => useShallowCompareEffect(callback, deps));
+
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+
+ // no change
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(0);
+ callback.mockClear();
+
+ // no-change (new object with same properties)
+ deps = [1, { a: 'b' }, true];
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(0);
+ callback.mockClear();
+
+ // change (new primitive value)
+ deps = [2, { a: 'b' }, true];
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+
+ // no-change
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(0);
+ callback.mockClear();
+
+ // change (new primitive value)
+ deps = [1, { a: 'b' }, false];
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+
+ // change (new properties on object)
+ deps = [1, { a: 'c' }, false];
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+ });
+
+ test('runs effect on deep change', () => {
+ const callback = jest.fn();
+ let deps = [1, { a: { b: 'c' } }, true];
+ const { rerender } = renderHook(() => useShallowCompareEffect(callback, deps));
+
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+
+ // no change
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(0);
+ callback.mockClear();
+
+ // change (new nested object )
+ deps = [1, { a: { b: 'c' } }, true];
+ rerender();
+ expect(callback).toHaveBeenCalledTimes(1);
+ callback.mockClear();
+ });
+});
diff --git a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts
new file mode 100644
index 00000000000000..dfba7b907f5fbd
--- /dev/null
+++ b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts
@@ -0,0 +1,80 @@
+/*
+ * 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, { useEffect, useRef } from 'react';
+
+/**
+ * Similar to https://github.com/kentcdodds/use-deep-compare-effect
+ * but uses shallow compare instead of deep
+ */
+export function useShallowCompareEffect(
+ callback: React.EffectCallback,
+ deps: React.DependencyList
+) {
+ useEffect(callback, useShallowCompareMemoize(deps));
+}
+function useShallowCompareMemoize(deps: React.DependencyList) {
+ const ref = useRef(undefined);
+
+ if (!ref.current || deps.some((dep, index) => !shallowEqual(dep, ref.current![index]))) {
+ ref.current = deps;
+ }
+
+ return ref.current;
+}
+// https://github.com/facebook/fbjs/blob/master/packages/fbjs/src/core/shallowEqual.js
+function shallowEqual(objA: any, objB: any): boolean {
+ if (is(objA, objB)) {
+ return true;
+ }
+
+ if (typeof objA !== 'object' || objA === null || typeof objB !== 'object' || objB === null) {
+ return false;
+ }
+
+ const keysA = Object.keys(objA);
+ const keysB = Object.keys(objB);
+
+ if (keysA.length !== keysB.length) {
+ return false;
+ }
+
+ // Test for A's keys different from B.
+ for (let i = 0; i < keysA.length; i++) {
+ if (
+ !Object.prototype.hasOwnProperty.call(objB, keysA[i]) ||
+ !is(objA[keysA[i]], objB[keysA[i]])
+ ) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+/**
+ * IE11 does not support Object.is
+ */
+function is(x: any, y: any): boolean {
+ if (x === y) {
+ return x !== 0 || y !== 0 || 1 / x === 1 / y;
+ } else {
+ return x !== x && y !== y;
+ }
+}
diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
index 81d26a4b69478e..a6792670fdb3fa 100644
--- a/test/functional/page_objects/visualize_page.js
+++ b/test/functional/page_objects/visualize_page.js
@@ -1186,8 +1186,13 @@ export function VisualizePageProvider({ getService, getPageObjects, updateBaseli
}
async getLegendEntries() {
- const legendEntries = await find.allByCssSelector('.visLegend__valueTitle', defaultFindTimeout * 2);
- return await Promise.all(legendEntries.map(async chart => await chart.getAttribute('data-label')));
+ const legendEntries = await find.allByCssSelector(
+ '.visLegend__button',
+ defaultFindTimeout * 2
+ );
+ return await Promise.all(
+ legendEntries.map(async chart => await chart.getAttribute('data-label'))
+ );
}
async openLegendOptionColors(name) {
@@ -1217,7 +1222,7 @@ export function VisualizePageProvider({ getService, getPageObjects, updateBaseli
async toggleLegend(show = true) {
await retry.try(async () => {
- const isVisible = find.byCssSelector('vislib-legend');
+ const isVisible = find.byCssSelector('.visLegend');
if ((show && !isVisible) || (!show && isVisible)) {
await testSubjects.click('vislibToggleLegend');
}
@@ -1227,7 +1232,9 @@ export function VisualizePageProvider({ getService, getPageObjects, updateBaseli
async filterLegend(name) {
await this.toggleLegend();
await testSubjects.click(`legend-${name}`);
- await testSubjects.click(`legend-${name}-filterIn`);
+ const filters = await testSubjects.find(`legend-${name}-filters`);
+ const [filterIn] = await filters.findAllByCssSelector(`input`);
+ await filterIn.click();
await this.waitForVisualizationRenderingStabilized();
}
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/app/components/main.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/app/components/main.tsx
index c091765619a194..daa19f22a70232 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/app/components/main.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/app/components/main.tsx
@@ -29,7 +29,7 @@ import {
Context,
ExpressionRenderHandler,
ExpressionDataHandler,
- RenderResult,
+ RenderId,
} from '../../types';
import { getExpressions } from '../../services';
@@ -40,7 +40,7 @@ declare global {
context?: Context,
initialContext?: Context
) => ReturnType;
- renderPipelineResponse: (context?: Context) => Promise;
+ renderPipelineResponse: (context?: Context) => Promise;
}
}
@@ -85,16 +85,16 @@ class Main extends React.Component<{}, State> {
lastRenderHandler.destroy();
}
- lastRenderHandler = getExpressions().render(this.chartRef.current!, context);
- const renderResult = await lastRenderHandler.render$.pipe(first()).toPromise();
+ lastRenderHandler = getExpressions().render(this.chartRef.current!, context, {
+ onRenderError: (el, error, handler) => {
+ this.setState({
+ expression: 'Render error!\n\n' + JSON.stringify(error),
+ });
+ handler.done();
+ },
+ });
- if (typeof renderResult === 'object' && renderResult.type === 'error') {
- this.setState({
- expression: 'Render error!\n\n' + JSON.stringify(renderResult.error),
- });
- }
-
- return renderResult;
+ return lastRenderHandler.render$.pipe(first()).toPromise();
};
}
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/types.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/types.ts
index 082bb47d80066a..cc4190bd099fae 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/types.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/np_ready/types.ts
@@ -22,7 +22,7 @@ import {
Context,
ExpressionRenderHandler,
ExpressionDataHandler,
- RenderResult,
+ RenderId,
} from 'src/plugins/expressions/public';
import { Adapters } from 'src/plugins/inspector/public';
@@ -32,6 +32,6 @@ export {
Context,
ExpressionRenderHandler,
ExpressionDataHandler,
- RenderResult,
+ RenderId,
Adapters,
};
diff --git a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
index e1ec18fae5e3a8..7fedf1723908a9 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts
@@ -21,8 +21,8 @@ import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../functional/ftr_provider_context';
import {
ExpressionDataHandler,
- RenderResult,
Context,
+ RenderId,
} from '../../plugins/kbn_tp_run_pipeline/public/np_ready/types';
type UnWrapPromise = T extends Promise ? U : T;
@@ -168,8 +168,8 @@ export function expectExpressionProvider({
toMatchScreenshot: async () => {
const pipelineResponse = await handler.getResponse();
log.debug('starting to render');
- const result = await browser.executeAsync(
- (_context: ExpressionResult, done: (renderResult: RenderResult) => void) =>
+ const result = await browser.executeAsync(
+ (_context: ExpressionResult, done: (renderResult: RenderId) => void) =>
window.renderPipelineResponse(_context).then(renderResult => {
done(renderResult);
return renderResult;
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
index c2d8ed7f5f9c17..c24dd077b447e4 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
@@ -17,37 +17,31 @@
* under the License.
*/
-import { visFactory } from 'ui/vis/vis_factory';
-
import { SelfChangingEditor } from './self_changing_editor';
import { SelfChangingComponent } from './self_changing_components';
import { setup as visualizations } from '../../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
-function SelfChangingVisType() {
- return visFactory.createReactVisualization({
- name: 'self_changing_vis',
- title: 'Self Changing Vis',
- icon: 'visControls',
- description: 'This visualization is able to change its own settings, that you could also set in the editor.',
- visConfig: {
- component: SelfChangingComponent,
- defaults: {
- counter: 0,
- },
- },
- editorConfig: {
- optionTabs: [
- {
- name: 'options',
- title: 'Options',
- editor: SelfChangingEditor,
- },
- ],
+visualizations.types.createReactVisualization({
+ name: 'self_changing_vis',
+ title: 'Self Changing Vis',
+ icon: 'visControls',
+ description: 'This visualization is able to change its own settings, that you could also set in the editor.',
+ visConfig: {
+ component: SelfChangingComponent,
+ defaults: {
+ counter: 0,
},
- requestHandler: 'none',
- });
-}
-
-visualizations.types.registerVisualization(SelfChangingVisType);
+ },
+ editorConfig: {
+ optionTabs: [
+ {
+ name: 'options',
+ title: 'Options',
+ editor: SelfChangingEditor,
+ },
+ ],
+ },
+ requestHandler: 'none',
+});
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
index c16847dab9dc23..a3c9d9d63e3534 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.ts
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -107,13 +107,13 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
expect(await testSubjects.exists('headerGlobalNav')).to.be(true);
});
- it('can navigate from NP apps to legacy apps', async () => {
+ it.skip('can navigate from NP apps to legacy apps', async () => {
await appsMenu.clickLink('Management');
await loadingScreenShown();
await testSubjects.existOrFail('managementNav');
});
- it('can navigate from legacy apps to NP apps', async () => {
+ it.skip('can navigate from legacy apps to NP apps', async () => {
await appsMenu.clickLink('Foo');
await loadingScreenShown();
await testSubjects.existOrFail('fooAppHome');
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
index 476f01940d892b..7359a240981867 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
@@ -8,7 +8,6 @@ import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './help
import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/legacy/ui/public/index_patterns';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
const { setup } = pageHelpers.autoFollowPatternAdd;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_edit.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_edit.test.js
index 9ef412883522a7..03155f5f55000b 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_edit.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_edit.test.js
@@ -9,7 +9,6 @@ import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { AUTO_FOLLOW_PATTERN_EDIT } from './helpers/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
const { setup } = pageHelpers.autoFollowPatternEdit;
const { setup: setupAutoFollowPatternAdd } = pageHelpers.autoFollowPatternAdd;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_list.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_list.test.js
index 8a6d3821909458..904434e46dee06 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_list.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_list.test.js
@@ -9,7 +9,6 @@ import { setupEnvironment, pageHelpers, nextTick, findTestSubject, getRandomStri
import { getAutoFollowPatternClientMock } from '../../fixtures/auto_follow_pattern';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('ui/chrome', () => ({
addBasePath: () => 'api/cross_cluster_replication',
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
index d28d671fb2ace5..0d90d4cf3d2720 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
@@ -10,7 +10,6 @@ import { RemoteClustersFormField } from '../../public/app/components';
import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/legacy/ui/public/index_patterns';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
const { setup } = pageHelpers.followerIndexAdd;
const { setup: setupAutoFollowPatternAdd } = pageHelpers.autoFollowPatternAdd;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_edit.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_edit.test.js
index 5e74d923d3af5f..de1426bf4b72f2 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_edit.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_edit.test.js
@@ -10,7 +10,6 @@ import { FollowerIndexForm } from '../../public/app/components/follower_index_fo
import { FOLLOWER_INDEX_EDIT } from './helpers/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
const { setup } = pageHelpers.followerIndexEdit;
const { setup: setupFollowerIndexAdd } = pageHelpers.followerIndexAdd;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_indices_list.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_indices_list.test.js
index 6aef850672179c..13adea4592534b 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_indices_list.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_indices_list.test.js
@@ -9,7 +9,6 @@ import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './help
import { getFollowerIndexMock } from '../../fixtures/follower_index';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('ui/chrome', () => ({
addBasePath: () => 'api/cross_cluster_replication',
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/home.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/home.test.js
index 35ec99846990ab..5691ff3a8bc3ba 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/home.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/home.test.js
@@ -8,7 +8,6 @@
import { setupEnvironment, pageHelpers, nextTick } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
const { setup } = pageHelpers.home;
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js b/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
index f6cc9cb3742eab..eda275ba50c1a6 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
@@ -12,7 +12,6 @@ jest.mock('../services/auto_follow_pattern_validators', () => ({
}));
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
describe(' {
describe('updateFormErrors()', () => {
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js b/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
index f70caf2f8080b8..6c1d5c8ce171c2 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
@@ -8,7 +8,6 @@
import { validateAutoFollowPattern } from './auto_follow_pattern_validators';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
describe('Auto-follow pattern validators', () => {
describe('validateAutoFollowPattern()', () => {
diff --git a/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx b/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
index fd2004558be77a..a91e91258e240b 100644
--- a/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/search_bar.test.tsx
@@ -9,7 +9,7 @@ import { SearchBar, OuterSearchBarProps } from './search_bar';
import React, { ReactElement } from 'react';
import { CoreStart } from 'src/core/public';
import { act } from 'react-dom/test-utils';
-import { QueryBarInput, IndexPattern } from 'src/legacy/core_plugins/data/public';
+import { QueryStringInput, IndexPattern } from 'src/legacy/core_plugins/data/public';
import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
import { I18nProvider } from '@kbn/i18n/react';
@@ -25,7 +25,7 @@ import { Provider } from 'react-redux';
jest.mock('../services/source_modal', () => ({ openSourceModal: jest.fn() }));
jest.mock('../../../../../../src/legacy/core_plugins/data/public', () => ({
- QueryBarInput: () => null,
+ QueryStringInput: () => null,
}));
const waitForIndexPatternFetch = () => new Promise(r => setTimeout(r));
@@ -106,7 +106,7 @@ describe('search_bar', () => {
await waitForIndexPatternFetch();
act(() => {
- instance.find(QueryBarInput).prop('onChange')!({ language: 'lucene', query: 'testQuery' });
+ instance.find(QueryStringInput).prop('onChange')!({ language: 'lucene', query: 'testQuery' });
});
act(() => {
@@ -122,7 +122,7 @@ describe('search_bar', () => {
await waitForIndexPatternFetch();
act(() => {
- instance.find(QueryBarInput).prop('onChange')!({ language: 'kuery', query: 'test: abc' });
+ instance.find(QueryStringInput).prop('onChange')!({ language: 'kuery', query: 'test: abc' });
});
act(() => {
@@ -140,7 +140,9 @@ describe('search_bar', () => {
// pick the button component out of the tree because
// it's part of a popover and thus not covered by enzyme
- (instance.find(QueryBarInput).prop('prepend') as ReactElement).props.children.props.onClick();
+ (instance
+ .find(QueryStringInput)
+ .prop('prepend') as ReactElement).props.children.props.onClick();
expect(openSourceModal).toHaveBeenCalled();
});
diff --git a/x-pack/legacy/plugins/graph/public/components/search_bar.tsx b/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
index 56458e5de273fe..79ffad26cf9817 100644
--- a/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
@@ -10,7 +10,10 @@ import React, { useState, useEffect } from 'react';
import { i18n } from '@kbn/i18n';
import { connect } from 'react-redux';
import { IndexPatternSavedObject, IndexPatternProvider } from '../types';
-import { QueryBarInput, IndexPattern } from '../../../../../../src/legacy/core_plugins/data/public';
+import {
+ QueryStringInput,
+ IndexPattern,
+} from '../../../../../../src/legacy/core_plugins/data/public';
import { openSourceModal } from '../services/source_modal';
import {
GraphState,
@@ -101,7 +104,7 @@ export function SearchBarComponent(props: SearchBarProps) {
>
- {
return new kibana.Plugin({
id: PLUGIN_ID,
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
index 93f5928f58aa17..f2678463f57da0 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
@@ -38,7 +38,7 @@ import {
stopReportManager,
trackUiEvent,
} from '../lens_ui_telemetry';
-import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../index';
+import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../common';
import { KibanaLegacySetup } from '../../../../../../src/plugins/kibana_legacy/public';
import { EditorFrameStart } from '../types';
@@ -50,6 +50,7 @@ export interface LensPluginStartDependencies {
data: DataPublicPluginStart;
dataShim: DataStart;
}
+
export class AppPlugin {
private startDependencies: {
data: DataPublicPluginStart;
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
index 21a69bfc3a0b3c..3dd43733471297 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx
@@ -50,6 +50,7 @@ export function ExpressionWrapper({
padding="m"
expression={expression}
searchContext={{ ...context, type: 'kibana_context' }}
+ renderError={error =>
)}
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
index a50d3371f47cf2..d0b77a425d14a8 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/date_histogram.test.tsx
@@ -18,15 +18,18 @@ import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { createMockedIndexPattern } from '../../mocks';
import { IndexPatternPrivateState } from '../../types';
-jest.mock('ui/new_platform');
-jest.mock('ui/chrome', () => ({
- getUiSettingsClient: () => ({
- get(path: string) {
- if (path === 'histogram:maxBars') {
- return 10;
- }
+jest.mock('ui/new_platform', () => ({
+ npStart: {
+ core: {
+ uiSettings: {
+ get: (path: string) => {
+ if (path === 'histogram:maxBars') {
+ return 10;
+ }
+ },
+ },
},
- }),
+ },
}));
const defaultOptions = {
diff --git a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
index 185df12054a3c6..0c4e6d9f7cb10f 100644
--- a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
+++ b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
@@ -5,7 +5,7 @@
*/
import { i18n } from '@kbn/i18n';
-import { visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public';
+import { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
import { getBasePath, getEditPath } from '../common';
visualizations.types.registerAlias({
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/_chart.scss b/x-pack/legacy/plugins/monitoring/public/components/chart/_chart.scss
index d3b705a5eb4926..1b8ebb762533d9 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/_chart.scss
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/_chart.scss
@@ -1,7 +1,5 @@
-@mixin monitoringNoUserSelect(){
+@mixin monitoringNoUserSelect {
user-select: none;
- -webkit-touch-callout: none;
- -webkit-tap-highlight-color: transparent;
}
.monRhythmChart__wrapper .monRhythmChart__zoom {
@@ -12,7 +10,7 @@
.monRhythmChart__wrapper:hover .monRhythmChart__zoom {
visibility: visible;
}
-
+
.monRhythmChart {
position: relative;
display: flex;
@@ -50,7 +48,7 @@
// SASSTODO: generic selector
div {
- @include monitoringNoUserSelect();
+ @include monitoringNoUserSelect;
}
}
@@ -58,6 +56,9 @@
font-size: $euiFontSizeXS;
cursor: pointer;
color: $euiTextColor;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
&-isDisabled {
opacity: 0.5;
@@ -71,7 +72,11 @@
.monRhythmChart__legendLabel {
overflow: hidden;
white-space: nowrap;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
}
+
.monRhythmChart__legendValue {
overflow: hidden;
white-space: nowrap;
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/horizontal_legend.js b/x-pack/legacy/plugins/monitoring/public/components/chart/horizontal_legend.js
index 9ce4d6224c45ea..ab322324ac2006 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/horizontal_legend.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/horizontal_legend.js
@@ -6,9 +6,7 @@
import React from 'react';
import { includes, isFunction } from 'lodash';
-import {
- EuiKeyboardAccessible,
-} from '@elastic/eui';
+import { EuiFlexItem, EuiFlexGroup, EuiIcon, EuiKeyboardAccessible } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
@@ -23,11 +21,7 @@ export class HorizontalLegend extends React.Component {
* @param {Number} value Final value to display
*/
displayValue(value) {
- return (
-
- { value }
-
- );
+ return {value};
}
/**
@@ -44,10 +38,12 @@ export class HorizontalLegend extends React.Component {
*/
formatter(value, row) {
if (!this.validValue(value)) {
- return ({error}
}
/>
this.props.onToggle(event, row.id)}
- >
-
-
- { ' ' + row.label + ' ' }
-
- { this.formatter(this.props.seriesValues[row.id], row) }
-
+
-
+ {rows}
+
);
}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/monitoring_timeseries_container.js b/x-pack/legacy/plugins/monitoring/public/components/chart/monitoring_timeseries_container.js
index 9216ac7c28705b..6760a037fbe8a0 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/monitoring_timeseries_container.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/monitoring_timeseries_container.js
@@ -12,12 +12,18 @@ import { MonitoringTimeseries } from './monitoring_timeseries';
import { InfoTooltip } from './info_tooltip';
import {
- EuiIconTip, EuiFlexGroup, EuiFlexItem, EuiTitle, EuiScreenReaderOnly, EuiTextAlign, EuiButtonEmpty
+ EuiIconTip,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiTitle,
+ EuiScreenReaderOnly,
+ EuiTextAlign,
+ EuiButtonEmpty,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
-const zoomOutBtn = (zoomInfo) => {
+const zoomOutBtn = zoomInfo => {
if (!zoomInfo || !zoomInfo.showZoomOutBtn()) {
return null;
}
@@ -28,9 +34,9 @@ const zoomOutBtn = (zoomInfo) => {
- { rows }
-
+
- { getTitle(series) }{ units ? ` (${units})` : '' }
+ {getTitle(series)}
+ {units ? ` (${units})` : ''}
}
+ content={
@@ -95,14 +101,11 @@ export function MonitoringTimeseriesContainer({ series, onBrush, zoomInfo }) {
-
+
{value}
@@ -48,12 +45,13 @@ const columns = [
}),
field: 'status',
sortable: true,
- render: (value) => (
-
-
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
index 72a74964fd35ed..b06cbb44503d12 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
@@ -12,6 +12,7 @@ import { EuiMonitoringSSPTable } from '../../table';
import { MetricCell, OfflineCell } from './cells';
import { SetupModeBadge } from '../../setup_mode/badge';
import {
+ EuiIcon,
EuiLink,
EuiToolTip,
EuiSpacer,
@@ -21,20 +22,23 @@ import {
EuiPanel,
EuiCallOut,
EuiButton,
- EuiText
+ EuiText,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import _ from 'lodash';
import { ELASTICSEARCH_SYSTEM_ID } from '../../../../common/constants';
import { ListingCallOut } from '../../setup_mode/listing_callout';
-const getSortHandler = (type) => (item) => _.get(item, [type, 'summary', 'lastVal']);
+const getSortHandler = type => item => _.get(item, [type, 'summary', 'lastVal']);
const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
const cols = [];
- const cpuUsageColumnTitle = i18n.translate('xpack.monitoring.elasticsearch.nodes.cpuUsageColumnTitle', {
- defaultMessage: 'CPU Usage',
- });
+ const cpuUsageColumnTitle = i18n.translate(
+ 'xpack.monitoring.elasticsearch.nodes.cpuUsageColumnTitle',
+ {
+ defaultMessage: 'CPU Usage',
+ }
+ );
cols.push({
name: i18n.translate('xpack.monitoring.elasticsearch.nodes.nameColumnTitle', {
@@ -59,7 +63,7 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
const status = list[node.resolver] || {};
const instance = {
uuid: node.resolver,
- name: node.name
+ name: node.name,
};
setupModeStatus = (
@@ -82,25 +86,18 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
-
-
+
+ {node.nodeTypeClass &&
-
- {nameLink}
-
+ {nameLink}
-
);
- }
+ },
});
cols.push({
@@ -110,21 +107,19 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
field: 'isOnline',
sortable: true,
render: value => {
- const status = value ? i18n.translate('xpack.monitoring.elasticsearch.nodes.statusColumn.onlineLabel', {
- defaultMessage: 'Online',
- }) : i18n.translate('xpack.monitoring.elasticsearch.nodes.statusColumn.offlineLabel', {
- defaultMessage: 'Offline',
- });
+ const status = value
+ ? i18n.translate('xpack.monitoring.elasticsearch.nodes.statusColumn.onlineLabel', {
+ defaultMessage: 'Online',
+ })
+ : i18n.translate('xpack.monitoring.elasticsearch.nodes.statusColumn.offlineLabel', {
+ defaultMessage: 'Offline',
+ });
return (
0 ? 'danger' : 'warning'}
iconType="flag"
>
-
);
- }
- else if (setupMode.data.totalUniquePartiallyMigratedCount === setupMode.data.totalUniqueInstanceCount) {
- const finishMigrationAction = _.get(setupMode.meta, 'liveClusterUuid') === clusterUuid
- ? setupMode.shortcutToFinishMigration
- : setupMode.openFlyout;
+ } else if (
+ setupMode.data.totalUniquePartiallyMigratedCount ===
+ setupMode.data.totalUniqueInstanceCount
+ ) {
+ const finishMigrationAction =
+ _.get(setupMode.meta, 'liveClusterUuid') === clusterUuid
+ ? setupMode.shortcutToFinishMigration
+ : setupMode.openFlyout;
customRenderResponse.shouldRender = true;
customRenderResponse.componentToRender = (
{i18n.translate(
- 'xpack.monitoring.elasticsearch.nodes.metricbeatMigration.disableInternalCollectionMigrationButtonLabel', {
- defaultMessage: 'Disable self monitoring'
+ 'xpack.monitoring.elasticsearch.nodes.metricbeatMigration.disableInternalCollectionMigrationButtonLabel',
+ {
+ defaultMessage: 'Disable self monitoring',
}
)}
-
);
}
@@ -375,9 +393,12 @@ export function ElasticsearchNodes({ clusterStatus, showCgroupMetricsElasticsear
search={{
box: {
incremental: true,
- placeholder: i18n.translate('xpack.monitoring.elasticsearch.nodes.monitoringTablePlaceholder', {
- defaultMessage: 'Filter Nodes…'
- }),
+ placeholder: i18n.translate(
+ 'xpack.monitoring.elasticsearch.nodes.monitoringTablePlaceholder',
+ {
+ defaultMessage: 'Filter Nodes…',
+ }
+ ),
},
}}
onTableChange={onTableChange}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/_shard_allocation.scss b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/_shard_allocation.scss
index 690b1b81a0d03c..50e92d572908cb 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/_shard_allocation.scss
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/_shard_allocation.scss
@@ -1,9 +1,3 @@
-// SASSTODO: Generic selector
-monitoring-shard-allocation {
- display: block;
- border-top: $euiSizeS solid $euiColorLightestShade;
-}
-
.monClusterTitle {
font-size: $euiFontSizeL;
margin: 0;
@@ -11,55 +5,48 @@ monitoring-shard-allocation {
// SASSTODO: This needs a full rewrite / redesign
.monCluster {
- cluster-view {
- display: block;
- }
- .parent {
- padding-top: 14px;
- border-left: 3px solid $euiColorSuccess !important;
- &.red {
- border-left: 3px solid $euiColorDanger !important;
- }
- &.yellow {
- border-left: 3px solid $euiColorWarning !important;
- }
- }
- td.unassigned {
+ .monUnassigned {
vertical-align: middle;
width: 150px;
}
- .child {
+ .monUnassigned__children,
+ .monAssigned__children {
+ padding-top: $euiSizeL;
+ }
+
+ .monChild {
float: left;
align-self: center;
-
+ background-color: $euiColorLightestShade;
+ margin: $euiSizeS;
+ border: 1px solid $euiColorMediumShade;
+ border-radius: $euiSizeXS;
+ padding: $euiSizeXS/2 0;
+ // SASS-TODO: Rename this class following Eui conventions
&.index {
border-left: $euiSizeXS solid $euiColorSuccess;
- &.red {
+
+ &.monChild--danger {
border-left: $euiSizeXS solid $euiColorDanger;
}
- &.yellow {
+
+ &.monChild--warning {
border-left: $euiSizeXS solid $euiColorWarning;
}
}
- background-color: $euiColorDarkShade;
- margin: 5px;
- .title {
- padding: 5px 7px;
- display: inline-block;
+
+ .monChild__title {
+ padding: $euiSizeXS $euiSizeS;
text-align: center;
- font-size: 12px;
- font: 10px sans-serif;
+ font-size: $euiFontSizeXS;
color: $euiColorGhost;
- a {
- color: $euiColorGhost;
- text-decoration: none;
- }
- i {
- margin-left: 5px;
- }
+ display: flex;
+ flex-direction: row;
+ align-items: center;
}
- &.unassigned {
+
+ &.monClusterUnassigned {
.title {
display: none;
}
@@ -73,30 +60,12 @@ monitoring-shard-allocation {
td:first-child {
width: 200px;
}
-
+ // SASS-TODO: Rename this class following Eui conventions
.shard {
align-self: center;
- padding: 5px 7px;
- font: 10px sans-serif;
- border-left: 1px solid $euiColorEmptyShade;
+ padding: $euiSizeXS $euiSizeS;
+ font-size: $euiFontSizeXS;
position: relative;
display: inline-block;
}
-
- .legend {
- font-size: 12px;
- background-color: $euiColorEmptyShade;
- .title {
- margin-left: 5px;
- font-weight: bold;
- }
- color: $euiColorDarkestShade;
- padding: 5px;
- span.shard {
- float: none;
- display: inline-block;
- margin: 0 5px 0 10px;
- padding: 0 4px;
- }
- }
}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
index ec1b36837af923..012bc81135e341 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
@@ -4,39 +4,40 @@
* you may not use this file except in compliance with the Elastic License.
*/
-
-
import { get, sortBy } from 'lodash';
import React from 'react';
import { Shard } from './shard';
import { calculateClass } from '../lib/calculate_class';
import { generateQueryAndLink } from '../lib/generate_query_and_link';
-import {
- EuiKeyboardAccessible,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiKeyboardAccessible } from '@elastic/eui';
function sortByName(item) {
if (item.type === 'node') {
- return [ !item.master, item.name];
+ return [!item.master, item.name];
}
- return [ item.name ];
+ return [item.name];
}
export class Assigned extends React.Component {
- createShard = (shard) => {
+ createShard = shard => {
const type = shard.primary ? 'primary' : 'replica';
const key = `${shard.index}.${shard.node}.${type}.${shard.state}.${shard.shard}`;
- return (
-
- );
+ return
+
+
+ {name}
+ {master}
+
+
+
+ {shards}
+
+
+
);
};
render() {
const data = sortBy(this.props.data, sortByName).map(this.createChild);
return (
-
-
+
- )
+ ),
},
{
name: i18n.translate('xpack.monitoring.elasticsearch.indices.documentCountTitle', {
@@ -62,10 +60,8 @@ const columns = [
field: 'doc_count',
sortable: true,
render: value => (
-
- {formatMetric(value, LARGE_ABBREVIATED)}
-
- )
+ {formatMetric(value, LARGE_ABBREVIATED)}
+ ),
},
{
name: i18n.translate('xpack.monitoring.elasticsearch.indices.dataTitle', {
@@ -73,11 +69,7 @@ const columns = [
}),
field: 'data_size',
sortable: true,
- render: value => (
-
- {formatMetric(value, LARGE_BYTES)}
-
- )
+ render: value => {formatMetric(value, LARGE_BYTES)}
,
},
{
name: i18n.translate('xpack.monitoring.elasticsearch.indices.indexRateTitle', {
@@ -85,11 +77,7 @@ const columns = [
}),
field: 'index_rate',
sortable: true,
- render: value => (
-
- {formatMetric(value, LARGE_FLOAT, '/s')}
-
- )
+ render: value => {formatMetric(value, LARGE_FLOAT, '/s')}
,
},
{
name: i18n.translate('xpack.monitoring.elasticsearch.indices.searchRateTitle', {
@@ -98,10 +86,8 @@ const columns = [
field: 'search_rate',
sortable: true,
render: value => (
-
- {formatMetric(value, LARGE_FLOAT, '/s')}
-
- )
+ {formatMetric(value, LARGE_FLOAT, '/s')}
+ ),
},
{
name: i18n.translate('xpack.monitoring.elasticsearch.indices.unassignedShardsTitle', {
@@ -109,12 +95,8 @@ const columns = [
}),
field: 'unassigned_shards',
sortable: true,
- render: value => (
-
- {formatMetric(value, '0')}
-
- )
- }
+ render: value => {formatMetric(value, '0')}
,
+ },
];
const getNoDataMessage = () => {
@@ -154,16 +136,16 @@ export const ElasticsearchIndices = ({
- {extractIp(node.transport_address)}
-
+ {extractIp(node.transport_address)}
{setupModeStatus}
-
);
- }
+ },
});
cols.push({
@@ -138,8 +133,10 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
{value}
- ) : - {i18n.translate('xpack.monitoring.elasticsearch.nodes.metricbeatMigration.detectedNodeDescription', { - defaultMessage: `The following nodes are not monitored. Click 'Monitor with Metricbeat' below to start monitoring.`, - })} + {i18n.translate( + 'xpack.monitoring.elasticsearch.nodes.metricbeatMigration.detectedNodeDescription', + { + defaultMessage: `The following nodes are not monitored. Click 'Monitor with Metricbeat' below to start monitoring.`, + } + )}
- {i18n.translate('xpack.monitoring.elasticsearch.nodes.metricbeatMigration.disableInternalCollectionDescription', { - defaultMessage: `Disable self monitoring to finish the migration.` - })} + {i18n.translate( + 'xpack.monitoring.elasticsearch.nodes.metricbeatMigration.disableInternalCollectionDescription', + { + defaultMessage: `Disable self monitoring to finish the migration.`, + } + )}
-
+ {name}{master}
- {shards}
-
+
+
{data}
-
+
);
}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/unassigned.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/unassigned.js
index e350e3b037712a..728165386cd181 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/unassigned.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/unassigned.js
@@ -4,30 +4,44 @@
* you may not use this file except in compliance with the Elastic License.
*/
-
-
import _ from 'lodash';
import React from 'react';
import { Shard } from './shard';
import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup } from '@elastic/eui';
export class Unassigned extends React.Component {
- static displayName = i18n.translate('xpack.monitoring.elasticsearch.shardAllocation.unassignedDisplayName', {
- defaultMessage: 'Unassigned',
- });
+ static displayName = i18n.translate(
+ 'xpack.monitoring.elasticsearch.shardAllocation.unassignedDisplayName',
+ {
+ defaultMessage: 'Unassigned',
+ }
+ );
- createShard = (shard) => {
+ createShard = shard => {
const type = shard.primary ? 'primary' : 'replica';
const additionId = shard.state === 'UNASSIGNED' ? Math.random() : '';
- const key = shard.index + '.' + shard.node + '.' + type + '.' + shard.state + '.' + shard.shard + additionId;
- return (
-
+
+ {shards}
+
);
}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.js
index 50ab2653ced37f..5e93e698a33a90 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.js
@@ -66,7 +66,7 @@ export const ShardAllocation = ({
+
{
types.map(type => (
diff --git a/x-pack/legacy/plugins/monitoring/public/components/status_icon/index.js b/x-pack/legacy/plugins/monitoring/public/components/status_icon/index.js
index a054f837041761..a31823ef2e7732 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/status_icon/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/status_icon/index.js
@@ -5,25 +5,18 @@
*/
import React from 'react';
+import { EuiIcon } from '@elastic/eui';
export function StatusIcon({ type, label }) {
const typeToIconMap = {
- [StatusIcon.TYPES.RED]: 'health-red.svg',
- [StatusIcon.TYPES.YELLOW]: 'health-yellow.svg',
- [StatusIcon.TYPES.GREEN]: 'health-green.svg',
- [StatusIcon.TYPES.GRAY]: 'health-gray.svg',
+ [StatusIcon.TYPES.RED]: 'danger',
+ [StatusIcon.TYPES.YELLOW]: 'warning',
+ [StatusIcon.TYPES.GREEN]: 'success',
+ [StatusIcon.TYPES.GRAY]: 'subdued',
};
const icon = typeToIconMap[type];
- return (
-
- 
-
- );
+ return 
-
+
Yellow
{shards}
+
-
+
Yellow
Status:
-
- 
-
+
Green
{
it('should handle incomplete shardStats data', () => {
const clusterState = {
nodes: {
- fooNode: {}
- }
+ fooNode: {},
+ },
};
const shardStats = {
nodes: {
- fooNode: {}
- }
+ fooNode: {},
+ },
};
const resolver = 'fooNode';
@@ -62,7 +62,7 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
totalSpace: undefined,
usedHeap: undefined,
nodeTypeLabel: 'Node',
- nodeTypeClass: 'fa-server',
+ nodeTypeClass: 'storage',
node_ids: [],
status: 'Online',
isOnline: true,
@@ -72,17 +72,17 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
it('should handle incomplete shardStats data, master node', () => {
const clusterState = {
nodes: {
- 'fooNode-Uuid': {}
+ 'fooNode-Uuid': {},
},
- master_node: 'fooNode-Uuid'
+ master_node: 'fooNode-Uuid',
};
const shardStats = {
nodes: {
'fooNode-Uuid': {
shardCount: 22,
- indexCount: 11
- }
- }
+ indexCount: 11,
+ },
+ },
};
const resolver = 'fooNode-Uuid';
@@ -101,28 +101,28 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
node_stats: {
indices: {
docs: {
- count: 11000
+ count: 11000,
},
store: {
- size_in_bytes: 35000
- }
+ size_in_bytes: 35000,
+ },
},
fs: {
total: {
available_in_bytes: 8700,
- total_in_bytes: 10000
- }
+ total_in_bytes: 10000,
+ },
},
jvm: {
mem: {
- heap_used_percent: 33
- }
- }
- }
- }
- }
- ]
- }
+ heap_used_percent: 33,
+ },
+ },
+ },
+ },
+ },
+ ],
+ },
};
const result = handleFn(response);
@@ -140,10 +140,8 @@ describe('Elasticsearch Node Summary get_node_summary handleResponse', () => {
totalSpace: 10000,
usedHeap: 33,
nodeTypeLabel: 'Master Node',
- nodeTypeClass: 'fa-star',
- node_ids: [
- 'fooNode-Uuid'
- ],
+ nodeTypeClass: 'starFilled',
+ node_ids: ['fooNode-Uuid'],
status: 'Online',
isOnline: true,
});
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
index 4c21391a9ae624..2dc30a57db3d9e 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
@@ -11,12 +11,12 @@ describe('Node Type and Label', () => {
describe('when master node', () => {
it('type is indicated by boolean flag', () => {
const node = {
- master: true
+ master: true,
};
const { nodeType, nodeTypeLabel, nodeTypeClass } = getNodeTypeClassLabel(node);
expect(nodeType).to.be('master');
expect(nodeTypeLabel).to.be('Master Node');
- expect(nodeTypeClass).to.be('fa-star');
+ expect(nodeTypeClass).to.be('starFilled');
});
it('type is indicated by string', () => {
const node = {};
@@ -24,7 +24,7 @@ describe('Node Type and Label', () => {
const { nodeType, nodeTypeLabel, nodeTypeClass } = getNodeTypeClassLabel(node, type);
expect(nodeType).to.be('master');
expect(nodeTypeLabel).to.be('Master Node');
- expect(nodeTypeClass).to.be('fa-star');
+ expect(nodeTypeClass).to.be('starFilled');
});
});
it('when type is generic node', () => {
@@ -33,6 +33,6 @@ describe('Node Type and Label', () => {
const { nodeType, nodeTypeLabel, nodeTypeClass } = getNodeTypeClassLabel(node, type);
expect(nodeType).to.be('node');
expect(nodeTypeLabel).to.be('Node');
- expect(nodeTypeClass).to.be('fa-server');
+ expect(nodeTypeClass).to.be('storage');
});
});
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
index ba72d697388c6f..db74cc5e330a16 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
@@ -5,7 +5,7 @@ Array [
Object {
"isOnline": false,
"name": "hello01",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"resolver": "_x_V2YzPQU-a9KRRBxUxZQ",
"shardCount": 6,
@@ -15,7 +15,7 @@ Array [
Object {
"isOnline": false,
"name": "hello02",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"resolver": "DAiX7fFjS3Wii7g2HYKrOg",
"shardCount": 6,
@@ -32,7 +32,7 @@ Array [
Object {
"isOnline": true,
"name": "hello01",
- "nodeTypeClass": "fa-star",
+ "nodeTypeClass": "starFilled",
"nodeTypeLabel": "Master Node",
"node_cgroup_quota": Object {
"metric": Object {
@@ -160,7 +160,7 @@ Array [
Object {
"isOnline": true,
"name": "hello02",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"node_cgroup_quota": undefined,
"node_cgroup_throttled": Object {
@@ -274,7 +274,7 @@ Array [
Object {
"isOnline": true,
"name": "hello01",
- "nodeTypeClass": "fa-star",
+ "nodeTypeClass": "starFilled",
"nodeTypeLabel": "Master Node",
"node_cgroup_quota": null,
"node_cgroup_throttled": null,
@@ -290,7 +290,7 @@ Array [
Object {
"isOnline": true,
"name": "hello02",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"node_cgroup_quota": null,
"node_cgroup_throttled": null,
@@ -311,7 +311,7 @@ Array [
Object {
"isOnline": true,
"name": "hello01",
- "nodeTypeClass": "fa-star",
+ "nodeTypeClass": "starFilled",
"nodeTypeLabel": "Master Node",
"node_cgroup_quota": Object {
"metric": Object {
@@ -439,7 +439,7 @@ Array [
Object {
"isOnline": true,
"name": "hello02",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"node_cgroup_quota": undefined,
"node_cgroup_throttled": Object {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
index 9f75dd1f1ee0fd..7eb22b00637459 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
@@ -5,7 +5,7 @@ Object {
"ENVgDIKRSdCVJo-YqY4kUQ": Object {
"isOnline": true,
"name": "node01",
- "nodeTypeClass": "fa-star",
+ "nodeTypeClass": "starFilled",
"nodeTypeLabel": "Master Node",
"shardCount": 57,
"transport_address": "127.0.0.1:9300",
@@ -14,7 +14,7 @@ Object {
"t9J9jvHpQ2yDw9c1LJ0tHA": Object {
"isOnline": false,
"name": "node02",
- "nodeTypeClass": "fa-server",
+ "nodeTypeClass": "storage",
"nodeTypeLabel": "Node",
"shardCount": 0,
"transport_address": "127.0.0.1:9301",
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
index f8d97acf792c36..23b4021ee7c0c5 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
@@ -12,25 +12,31 @@
import { i18n } from '@kbn/i18n';
export const nodeTypeClass = {
- invalid: 'fa-exclamation-triangle',
- node: 'fa-server',
- master: 'fa-star',
- master_only: 'fa-star-o',
- data: 'fa-database',
- client: 'fa-binoculars'
+ invalid: 'alert',
+ node: 'storage',
+ master: 'starFilled',
+ master_only: 'starEmpty',
+ data: 'database',
+ client: 'glasses',
};
export const nodeTypeLabel = {
invalid: i18n.translate('xpack.monitoring.es.nodeType.invalidNodeLabel', {
- defaultMessage: 'Invalid Node' }),
+ defaultMessage: 'Invalid Node',
+ }),
node: i18n.translate('xpack.monitoring.es.nodeType.nodeLabel', {
- defaultMessage: 'Node' }),
+ defaultMessage: 'Node',
+ }),
master: i18n.translate('xpack.monitoring.es.nodeType.masterNodeLabel', {
- defaultMessage: 'Master Node' }),
+ defaultMessage: 'Master Node',
+ }),
master_only: i18n.translate('xpack.monitoring.es.nodeType.masterOnlyNodeLabel', {
- defaultMessage: 'Master Only Node' }),
+ defaultMessage: 'Master Only Node',
+ }),
data: i18n.translate('xpack.monitoring.es.nodeType.dataOnlyNodeLabel', {
- defaultMessage: 'Data Only Node' }),
+ defaultMessage: 'Data Only Node',
+ }),
client: i18n.translate('xpack.monitoring.es.nodeType.clientNodeLabel', {
- defaultMessage: 'Client Node' })
+ defaultMessage: 'Client Node',
+ }),
};
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.css b/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.css
index 9e8415a1ff18c1..ab88e4780936ea 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.css
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/preserve_layout.css
@@ -92,11 +92,6 @@ visualize-app .visEditor__canvas {
display: none;
}
-/* slightly increate legend text size for readability */
-.visualize visualize-legend .visLegend__valueTitle {
- font-size: 1.2em;
-}
-
/* Ensure the min-height of the small breakpoint isn't used */
.vis-editor visualization {
min-height: 0 !important;
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print.css b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print.css
index 30c253f36840af..8aca042144b3b4 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/layouts/print.css
+++ b/x-pack/legacy/plugins/reporting/export_types/common/layouts/print.css
@@ -91,11 +91,6 @@ visualize-app .visEditor__canvas {
display: none;
}
-/* slightly increate legend text size for readability */
-.visualize visualize-legend .visLegend__valueTitle {
- font-size: 1.2em;
-}
-
/* Ensure the min-height of the small breakpoint isn't used */
.vis-editor visualization {
min-height: 0 !important;
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_clone.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_clone.test.js
index 29d2d00163ad8c..204bab5c497be2 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_clone.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_clone.test.js
@@ -8,7 +8,6 @@ import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { JOB_TO_CLONE, JOB_CLONE_INDEX_PATTERN_CHECK } from './helpers/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_date_histogram.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_date_histogram.test.js
index 59814474396feb..b7b555d986597e 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_date_histogram.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_date_histogram.test.js
@@ -9,7 +9,6 @@ import moment from 'moment-timezone';
import { setupEnvironment, pageHelpers } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_histogram.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_histogram.test.js
index 09417fa8ed3072..dbbd7501b15181 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_histogram.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_histogram.test.js
@@ -7,7 +7,6 @@
import { setupEnvironment, pageHelpers } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
index 99a0aa09351520..a853ef36e01cde 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
@@ -9,7 +9,6 @@ import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/
import { setupEnvironment, pageHelpers } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_metrics.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_metrics.test.js
index 2f26d2a7475de3..d2f63983a3e369 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_metrics.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_metrics.test.js
@@ -7,7 +7,6 @@
import { setupEnvironment, pageHelpers } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_review.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_review.test.js
index 8ca736e62be7f1..c89d37f4e0ac3e 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_review.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_review.test.js
@@ -9,7 +9,6 @@ import { first } from 'lodash';
import { JOBS } from './helpers/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_terms.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_terms.test.js
index 78e8d9ec0c53a5..c27b9d0e4ef0fe 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_terms.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_terms.test.js
@@ -7,7 +7,6 @@
import { setupEnvironment, pageHelpers } from './helpers';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list.test.js
index 05272bf2226123..db7dddad4e3c13 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list.test.js
@@ -9,7 +9,6 @@ import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { JOBS } from './helpers/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('../../public/crud_app/services', () => {
const services = require.requireActual('../../public/crud_app/services');
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list_clone.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list_clone.test.js
index ce62f6c67ae033..6feabe7f772eef 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list_clone.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_list_clone.test.js
@@ -10,7 +10,6 @@ import { getRouter } from '../../public/crud_app/services/routing';
import { CRUD_APP_BASE_PATH } from '../../public/crud_app/constants';
jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
jest.mock('lodash/function/debounce', () => fn => fn);
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/drag_n_drop/helpers.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/drag_n_drop/helpers.ts
index e42a01f4ad8c12..39a61401c15b3c 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/drag_n_drop/helpers.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/lib/drag_n_drop/helpers.ts
@@ -23,19 +23,23 @@ export const drag = (subject: JQuery
@@ -109,13 +130,12 @@ export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: Ad
aria-label={I18n.DELETE}
/>
}
- value={item}
onChange={e => updateItem(e, index)}
compressed
fullWidth
{...euiFieldProps}
/>
- {items.length - 1 !== index &&
);
})}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx
new file mode 100644
index 00000000000000..15844f50122910
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { memo } from 'react';
+import { EuiTextColor } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { esFilters } from '../../../../../../../../../../src/plugins/data/public';
+import { existsOperator, isOneOfOperator } from './filter_operator';
+
+interface Props {
+ filter: esFilters.Filter;
+ valueLabel?: string;
+}
+
+export const FilterLabel = memo