string | string[] | |
+
+Returns:
+
+`void`
+
+## Example
+
+How to change the title of the document
+
+```ts
+chrome.docTitle.change('My application title')
+chrome.docTitle.change(['My application', 'My section'])
+
+```
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
new file mode 100644
index 0000000000000..3c6cfab486288
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
@@ -0,0 +1,39 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md)
+
+## ChromeDocTitle interface
+
+APIs for accessing and updating the document title.
+
+Signature:
+
+```typescript
+export interface ChromeDocTitle
+```
+
+## Methods
+
+| Method | Description |
+| --- | --- |
+| [change(newTitle)](./kibana-plugin-public.chromedoctitle.change.md) | Changes the current document title. |
+| [reset()](./kibana-plugin-public.chromedoctitle.reset.md) | Resets the document title to it's initial value. (meaning the one present in the title meta at application load.) |
+
+## Example 1
+
+How to change the title of the document
+
+```ts
+chrome.docTitle.change('My application')
+
+```
+
+## Example 2
+
+How to reset the title of the document to it's initial value
+
+```ts
+chrome.docTitle.reset()
+
+```
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md
new file mode 100644
index 0000000000000..4b4c6f573e006
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.reset.md
@@ -0,0 +1,17 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md) > [reset](./kibana-plugin-public.chromedoctitle.reset.md)
+
+## ChromeDocTitle.reset() method
+
+Resets the document title to it's initial value. (meaning the one present in the title meta at application load.)
+
+Signature:
+
+```typescript
+reset(): void;
+```
+Returns:
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md b/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md
new file mode 100644
index 0000000000000..71eda64c24646
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.chromestart.doctitle.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [ChromeStart](./kibana-plugin-public.chromestart.md) > [docTitle](./kibana-plugin-public.chromestart.doctitle.md)
+
+## ChromeStart.docTitle property
+
+APIs for accessing and updating the document title.
+
+Signature:
+
+```typescript
+docTitle: ChromeDocTitle;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.chromestart.md b/docs/development/core/public/kibana-plugin-public.chromestart.md
index bc41aa10cce8f..153e06d591404 100644
--- a/docs/development/core/public/kibana-plugin-public.chromestart.md
+++ b/docs/development/core/public/kibana-plugin-public.chromestart.md
@@ -16,6 +16,7 @@ export interface ChromeStart
| Property | Type | Description |
| --- | --- | --- |
+| [docTitle](./kibana-plugin-public.chromestart.doctitle.md) | ChromeDocTitle | APIs for accessing and updating the document title. |
| [navControls](./kibana-plugin-public.chromestart.navcontrols.md) | ChromeNavControls | [APIs](./kibana-plugin-public.chromenavcontrols.md) for registering new controls to be displayed in the navigation bar. |
| [navLinks](./kibana-plugin-public.chromestart.navlinks.md) | ChromeNavLinks | [APIs](./kibana-plugin-public.chromenavlinks.md) for manipulating nav links. |
| [recentlyAccessed](./kibana-plugin-public.chromestart.recentlyaccessed.md) | ChromeRecentlyAccessed | [APIs](./kibana-plugin-public.chromerecentlyaccessed.md) for recently accessed history. |
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md
new file mode 100644
index 0000000000000..e94757c5eb031
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) > [anonymousPaths](./kibana-plugin-public.httpservicebase.anonymouspaths.md)
+
+## HttpServiceBase.anonymousPaths property
+
+APIs for denoting certain paths for not requiring authentication
+
+Signature:
+
+```typescript
+anonymousPaths: IAnonymousPaths;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.md
index a1eef3db42b7d..9ea77c95b343e 100644
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.md
+++ b/docs/development/core/public/kibana-plugin-public.httpservicebase.md
@@ -15,6 +15,7 @@ export interface HttpServiceBase
| Property | Type | Description |
| --- | --- | --- |
+| [anonymousPaths](./kibana-plugin-public.httpservicebase.anonymouspaths.md) | IAnonymousPaths | APIs for denoting certain paths for not requiring authentication |
| [basePath](./kibana-plugin-public.httpservicebase.basepath.md) | IBasePath | APIs for manipulating the basePath on URL segments. |
| [delete](./kibana-plugin-public.httpservicebase.delete.md) | HttpHandler | Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
| [fetch](./kibana-plugin-public.httpservicebase.fetch.md) | HttpHandler | Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md
new file mode 100644
index 0000000000000..92a87668b6ef0
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.isanonymous.md
@@ -0,0 +1,24 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) > [isAnonymous](./kibana-plugin-public.ianonymouspaths.isanonymous.md)
+
+## IAnonymousPaths.isAnonymous() method
+
+Determines whether the provided path doesn't require authentication
+
+Signature:
+
+```typescript
+isAnonymous(path: string): boolean;
+```
+
+## Parameters
+
+| Parameter | Type | Description |
+| --- | --- | --- |
+| path | string | |
+
+Returns:
+
+`boolean`
+
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md
new file mode 100644
index 0000000000000..3e5caf49695c2
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.md
@@ -0,0 +1,21 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md)
+
+## IAnonymousPaths interface
+
+APIs for denoting paths as not requiring authentication
+
+Signature:
+
+```typescript
+export interface IAnonymousPaths
+```
+
+## Methods
+
+| Method | Description |
+| --- | --- |
+| [isAnonymous(path)](./kibana-plugin-public.ianonymouspaths.isanonymous.md) | Determines whether the provided path doesn't require authentication |
+| [register(path)](./kibana-plugin-public.ianonymouspaths.register.md) | Register path as not requiring authentication |
+
diff --git a/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md
new file mode 100644
index 0000000000000..88c615da05155
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.ianonymouspaths.register.md
@@ -0,0 +1,24 @@
+
+
+[Home](./index.md) > [kibana-plugin-public](./kibana-plugin-public.md) > [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) > [register](./kibana-plugin-public.ianonymouspaths.register.md)
+
+## IAnonymousPaths.register() method
+
+Register `path` as not requiring authentication
+
+Signature:
+
+```typescript
+register(path: string): void;
+```
+
+## Parameters
+
+| Parameter | Type | Description |
+| --- | --- | --- |
+| path | string | |
+
+Returns:
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index e787621c3aaf9..253e50f0f2c2e 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -32,6 +32,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [Capabilities](./kibana-plugin-public.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
| [ChromeBadge](./kibana-plugin-public.chromebadge.md) | |
| [ChromeBrand](./kibana-plugin-public.chromebrand.md) | |
+| [ChromeDocTitle](./kibana-plugin-public.chromedoctitle.md) | APIs for accessing and updating the document title. |
| [ChromeNavControl](./kibana-plugin-public.chromenavcontrol.md) | |
| [ChromeNavControls](./kibana-plugin-public.chromenavcontrols.md) | [APIs](./kibana-plugin-public.chromenavcontrols.md) for registering new controls to be displayed in the navigation bar. |
| [ChromeNavLink](./kibana-plugin-public.chromenavlink.md) | |
@@ -57,6 +58,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [HttpResponse](./kibana-plugin-public.httpresponse.md) | |
| [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) | |
| [I18nStart](./kibana-plugin-public.i18nstart.md) | I18nStart.Context is required by any localizable React component from @kbn/i18n and @elastic/eui packages and is supposed to be used as the topmost component for any i18n-compatible React tree. |
+| [IAnonymousPaths](./kibana-plugin-public.ianonymouspaths.md) | APIs for denoting paths as not requiring authentication |
| [IBasePath](./kibana-plugin-public.ibasepath.md) | APIs for manipulating the basePath on URL segments. |
| [IContextContainer](./kibana-plugin-public.icontextcontainer.md) | An object that handles registration of context providers and configuring handlers with context. |
| [IHttpFetchError](./kibana-plugin-public.ihttpfetcherror.md) | |
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index 60187d14b2cc3..e14991484746d 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -90,10 +90,12 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [SavedObjectsBulkGetObject](./kibana-plugin-server.savedobjectsbulkgetobject.md) | |
| [SavedObjectsBulkResponse](./kibana-plugin-server.savedobjectsbulkresponse.md) | |
| [SavedObjectsBulkUpdateObject](./kibana-plugin-server.savedobjectsbulkupdateobject.md) | |
+| [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md) | |
| [SavedObjectsBulkUpdateResponse](./kibana-plugin-server.savedobjectsbulkupdateresponse.md) | |
| [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) | |
+| [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 |
| [SavedObjectsFindOptions](./kibana-plugin-server.savedobjectsfindoptions.md) | |
@@ -150,6 +152,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [LifecycleResponseFactory](./kibana-plugin-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
| [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-server.migration_assistance_index_action.md) | |
| [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-server.migration_deprecation_level.md) | |
+| [MutatingOperationRefreshSetting](./kibana-plugin-server.mutatingoperationrefreshsetting.md) | Elasticsearch Refresh setting for mutating operation |
| [OnPostAuthHandler](./kibana-plugin-server.onpostauthhandler.md) | See [OnPostAuthToolkit](./kibana-plugin-server.onpostauthtoolkit.md). |
| [OnPreAuthHandler](./kibana-plugin-server.onpreauthhandler.md) | See [OnPreAuthToolkit](./kibana-plugin-server.onpreauthtoolkit.md). |
| [PluginInitializer](./kibana-plugin-server.plugininitializer.md) | The plugin export at the root of a plugin's server directory should conform to this interface. |
diff --git a/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md b/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md
new file mode 100644
index 0000000000000..94c8fa8c22ef6
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.mutatingoperationrefreshsetting.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [MutatingOperationRefreshSetting](./kibana-plugin-server.mutatingoperationrefreshsetting.md)
+
+## MutatingOperationRefreshSetting type
+
+Elasticsearch Refresh setting for mutating operation
+
+Signature:
+
+```typescript
+export declare type MutatingOperationRefreshSetting = boolean | 'wait_for';
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md
new file mode 100644
index 0000000000000..920a6ca224df4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.md
@@ -0,0 +1,19 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md)
+
+## SavedObjectsBulkUpdateOptions interface
+
+
+Signature:
+
+```typescript
+export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [refresh](./kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md) | MutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md
new file mode 100644
index 0000000000000..35e9e6483da10
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsBulkUpdateOptions](./kibana-plugin-server.savedobjectsbulkupdateoptions.md) > [refresh](./kibana-plugin-server.savedobjectsbulkupdateoptions.refresh.md)
+
+## SavedObjectsBulkUpdateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
index 107e71959f706..30db524ffa02c 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.bulkupdate.md
@@ -9,7 +9,7 @@ Bulk Updates multiple SavedObject at once
Signature:
```typescript
-bulkUpdateSavedObjectsBaseOptions | |
+| options | SavedObjectsBulkUpdateOptions | |
Returns:
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
index 657f56d591e77..c20c7e886490a 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.delete.md
@@ -9,7 +9,7 @@ Deletes a SavedObject
Signature:
```typescript
-delete(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<{}>;
+delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
```
## Parameters
@@ -18,7 +18,7 @@ delete(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<{}>
| --- | --- | --- |
| type | string | |
| id | string | |
-| options | SavedObjectsBaseOptions | |
+| options | SavedObjectsDeleteOptions | |
Returns:
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
index 16549e420ac01..e4ad636056915 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.md
@@ -19,4 +19,5 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
| [migrationVersion](./kibana-plugin-server.savedobjectscreateoptions.migrationversion.md) | SavedObjectsMigrationVersion | 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. |
| [overwrite](./kibana-plugin-server.savedobjectscreateoptions.overwrite.md) | boolean | Overwrite existing documents (defaults to false) |
| [references](./kibana-plugin-server.savedobjectscreateoptions.references.md) | SavedObjectReference[] | |
+| [refresh](./kibana-plugin-server.savedobjectscreateoptions.refresh.md) | MutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md
new file mode 100644
index 0000000000000..785874a12c8c4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectscreateoptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsCreateOptions](./kibana-plugin-server.savedobjectscreateoptions.md) > [refresh](./kibana-plugin-server.savedobjectscreateoptions.refresh.md)
+
+## SavedObjectsCreateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md
new file mode 100644
index 0000000000000..2c641ba5cc8d8
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.md
@@ -0,0 +1,19 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md)
+
+## SavedObjectsDeleteOptions interface
+
+
+Signature:
+
+```typescript
+export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [refresh](./kibana-plugin-server.savedobjectsdeleteoptions.refresh.md) | MutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md
new file mode 100644
index 0000000000000..782c52956f297
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsdeleteoptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsDeleteOptions](./kibana-plugin-server.savedobjectsdeleteoptions.md) > [refresh](./kibana-plugin-server.savedobjectsdeleteoptions.refresh.md)
+
+## SavedObjectsDeleteOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
index 7fcd362e937a0..49e8946ad2826 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.md
@@ -16,5 +16,6 @@ export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions
| Property | Type | Description |
| --- | --- | --- |
| [references](./kibana-plugin-server.savedobjectsupdateoptions.references.md) | SavedObjectReference[] | A reference to another saved object. |
+| [refresh](./kibana-plugin-server.savedobjectsupdateoptions.refresh.md) | MutatingOperationRefreshSetting | The Elasticsearch Refresh setting for this operation |
| [version](./kibana-plugin-server.savedobjectsupdateoptions.version.md) | string | An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control. |
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md
new file mode 100644
index 0000000000000..bb1142c242012
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsupdateoptions.refresh.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [SavedObjectsUpdateOptions](./kibana-plugin-server.savedobjectsupdateoptions.md) > [refresh](./kibana-plugin-server.savedobjectsupdateoptions.refresh.md)
+
+## SavedObjectsUpdateOptions.refresh property
+
+The Elasticsearch Refresh setting for this operation
+
+Signature:
+
+```typescript
+refresh?: MutatingOperationRefreshSetting;
+```
diff --git a/docs/getting-started/tutorial-full-experience.asciidoc b/docs/getting-started/tutorial-full-experience.asciidoc
index 08f65b0a24091..eafbb7d8f7c91 100644
--- a/docs/getting-started/tutorial-full-experience.asciidoc
+++ b/docs/getting-started/tutorial-full-experience.asciidoc
@@ -183,7 +183,7 @@ At this point, you're ready to use the Elasticsearch {ref}/docs-bulk.html[bulk]
API to load the data sets:
[source,shell]
-curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '+ {i18n.translate('console.pageHeading', { + defaultMessage: 'Console', + })} +
+
+
+
+
+
`;
+
+ aceEditor = initializeEditor($('#ConAppEditor'), $('#ConAppEditorActions'));
+
+ aceEditor.$el.show();
+ aceEditor.autocomplete._test.removeChangeListener();
+ tokenProvider = new AceTokensProvider(aceEditor.session);
+ });
+ afterEach(done => {
+ aceEditor.$el.hide();
+ aceEditor.autocomplete._test.addChangeListener();
+ aceEditor.update('', done);
+ });
+
+ describe('#getTokens', () => {
+ const runTest = ({
+ input,
+ expectedTokens,
+ done,
+ lineNumber = 1,
+ }: RunTestArgs & { expectedTokens: Token[] | null; lineNumber?: number }) => {
+ aceEditor.update(input, function() {
+ const tokens = tokenProvider.getTokens(lineNumber);
+ expect(tokens).toEqual(expectedTokens);
+ if (done) done();
+ });
+ };
+
+ describe('base cases', () => {
+ test('case 1 - only url', done => {
+ runTest({
+ input: `GET http://somehost/_search`,
+ expectedTokens: [
+ { type: 'method', value: 'GET', position: { lineNumber: 1, column: 1 } },
+ { type: 'whitespace', value: ' ', position: { lineNumber: 1, column: 4 } },
+ {
+ type: 'url.protocol_host',
+ value: 'http://somehost',
+ position: { lineNumber: 1, column: 5 },
+ },
+ { type: 'url.slash', value: '/', position: { lineNumber: 1, column: 20 } },
+ { type: 'url.part', value: '_search', position: { lineNumber: 1, column: 21 } },
+ ],
+ done,
+ });
+ });
+
+ test('case 2 - basic auth in host name', done => {
+ runTest({
+ input: `GET http://test:user@somehost/`,
+ expectedTokens: [
+ { type: 'method', value: 'GET', position: { lineNumber: 1, column: 1 } },
+ { type: 'whitespace', value: ' ', position: { lineNumber: 1, column: 4 } },
+ {
+ type: 'url.protocol_host',
+ value: 'http://test:user@somehost',
+ position: { lineNumber: 1, column: 5 },
+ },
+ { type: 'url.slash', value: '/', position: { lineNumber: 1, column: 30 } },
+ ],
+ done,
+ });
+ });
+
+ test('case 3 - handles empty lines', done => {
+ runTest({
+ input: `POST abc
+
+
+{
+`,
+ expectedTokens: [
+ { type: 'method', value: 'POST', position: { lineNumber: 1, column: 1 } },
+ { type: 'whitespace', value: ' ', position: { lineNumber: 1, column: 5 } },
+ { type: 'url.part', value: 'abc', position: { lineNumber: 1, column: 6 } },
+ ],
+ done,
+ lineNumber: 1,
+ });
+ });
+ });
+
+ describe('with newlines', () => {
+ test('case 1 - newlines base case', done => {
+ runTest({
+ input: `GET http://test:user@somehost/
+{
+ "wudup": "!"
+}`,
+ expectedTokens: [
+ { type: 'whitespace', value: ' ', position: { lineNumber: 3, column: 1 } },
+ { type: 'variable', value: '"wudup"', position: { lineNumber: 3, column: 3 } },
+ { type: 'punctuation.colon', value: ':', position: { lineNumber: 3, column: 10 } },
+ { type: 'whitespace', value: ' ', position: { lineNumber: 3, column: 11 } },
+ { type: 'string', value: '"!"', position: { lineNumber: 3, column: 12 } },
+ ],
+ done,
+ lineNumber: 3,
+ });
+ });
+ });
+
+ describe('edge cases', () => {
+ test('case 1 - getting token outside of document', done => {
+ runTest({
+ input: `GET http://test:user@somehost/
+{
+ "wudup": "!"
+}`,
+ expectedTokens: null,
+ done,
+ lineNumber: 100,
+ });
+ });
+
+ test('case 2 - empty lines', done => {
+ runTest({
+ input: `GET http://test:user@somehost/
+
+
+
+
+{
+ "wudup": "!"
+}`,
+ expectedTokens: [],
+ done,
+ lineNumber: 5,
+ });
+ });
+ });
+ });
+
+ describe('#getTokenAt', () => {
+ const runTest = ({
+ input,
+ expectedToken,
+ done,
+ position,
+ }: RunTestArgs & { expectedToken: Token | null; position: Position }) => {
+ aceEditor.update(input, function() {
+ const tokens = tokenProvider.getTokenAt(position);
+ expect(tokens).toEqual(expectedToken);
+ if (done) done();
+ });
+ };
+
+ describe('base cases', () => {
+ it('case 1 - gets a token from the url', done => {
+ const input = `GET http://test:user@somehost/`;
+ runTest({
+ input,
+ expectedToken: {
+ position: { lineNumber: 1, column: 4 },
+ type: 'whitespace',
+ value: ' ',
+ },
+ position: { lineNumber: 1, column: 5 },
+ });
+
+ runTest({
+ input,
+ expectedToken: {
+ position: { lineNumber: 1, column: 5 },
+ type: 'url.protocol_host',
+ value: 'http://test:user@somehost',
+ },
+ position: { lineNumber: 1, column: input.length },
+ done,
+ });
+ });
+ });
+
+ describe('special cases', () => {
+ it('case 1 - handles input outside of range', done => {
+ runTest({
+ input: `GET abc`,
+ expectedToken: null,
+ done,
+ position: { lineNumber: 1, column: 99 },
+ });
+ });
+ });
+ });
+});
diff --git a/src/legacy/core_plugins/console/np_ready/public/lib/ace_token_provider/token_provider.ts b/src/legacy/core_plugins/console/np_ready/public/lib/ace_token_provider/token_provider.ts
new file mode 100644
index 0000000000000..761eb1d206cfe
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/lib/ace_token_provider/token_provider.ts
@@ -0,0 +1,91 @@
+/*
+ * 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 { IEditSession, TokenInfo as BraceTokenInfo } from 'brace';
+import { TokensProvider, Token, Position } from '../../types';
+
+// Brace's token information types are not accurate.
+interface TokenInfo extends BraceTokenInfo {
+ type: string;
+}
+
+const toToken = (lineNumber: number, column: number, token: TokenInfo): Token => ({
+ type: token.type,
+ value: token.value,
+ position: {
+ lineNumber,
+ column,
+ },
+});
+
+const toTokens = (lineNumber: number, tokens: TokenInfo[]): Token[] => {
+ let acc = '';
+ return tokens.map(token => {
+ const column = acc.length + 1;
+ acc += token.value;
+ return toToken(lineNumber, column, token);
+ });
+};
+
+const extractTokenFromAceTokenRow = (
+ lineNumber: number,
+ column: number,
+ aceTokens: TokenInfo[]
+) => {
+ let acc = '';
+ for (const token of aceTokens) {
+ const start = acc.length + 1;
+ acc += token.value;
+ const end = acc.length;
+ if (column < start) continue;
+ if (column > end + 1) continue;
+ return toToken(lineNumber, start, token);
+ }
+ return null;
+};
+
+export class AceTokensProvider implements TokensProvider {
+ constructor(private readonly session: IEditSession) {}
+
+ getTokens(lineNumber: number): Token[] | null {
+ if (lineNumber < 1) return null;
+
+ const lineCount = this.session.doc.getAllLines().length;
+ if (lineNumber > lineCount) {
+ return null;
+ }
+
+ const tokens: TokenInfo[] = this.session.getTokens(lineNumber - 1) as any;
+ if (!tokens || !tokens.length) {
+ // We are inside of the document but have no tokens for this line. Return an empty
+ // array to represent this empty line.
+ return [];
+ }
+
+ return toTokens(lineNumber, tokens);
+ }
+
+ getTokenAt(pos: Position): Token | null {
+ const tokens: TokenInfo[] = this.session.getTokens(pos.lineNumber - 1) as any;
+ if (tokens) {
+ return extractTokenFromAceTokenRow(pos.lineNumber, pos.column, tokens);
+ }
+ return null;
+ }
+}
diff --git a/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/index.ts b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/index.ts
new file mode 100644
index 0000000000000..fe35625523bf1
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { TokenIterator } from './token_iterator';
diff --git a/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.test.ts b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.test.ts
new file mode 100644
index 0000000000000..4e215f1fc3596
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.test.ts
@@ -0,0 +1,184 @@
+/*
+ * 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 { TokenIterator } from './token_iterator';
+import { Position, Token, TokensProvider } from '../../types';
+
+const mockTokensProviderFactory = (tokenMtx: Token[][]): TokensProvider => {
+ return {
+ getTokens(lineNumber: number): Token[] | null {
+ return tokenMtx[lineNumber - 1] || null;
+ },
+ getTokenAt(pos: Position): Token | null {
+ return null as any;
+ },
+ };
+};
+
+describe('Token Iterator', () => {
+ const tokensProvider = mockTokensProviderFactory([
+ [
+ { type: 'method', value: 'POST', position: { lineNumber: 1, column: 1 } },
+ { type: 'whitespace', value: ' ', position: { lineNumber: 1, column: 5 } },
+ { type: 'url.part', value: 'abc', position: { lineNumber: 1, column: 6 } },
+ ],
+ [],
+ [],
+ [
+ { type: 'whitespace', value: ' ', position: { lineNumber: 4, column: 1 } },
+ {
+ position: { lineNumber: 4, column: 3 },
+ type: 'paren.lparen',
+ value: '{',
+ },
+ ],
+ ]);
+
+ it('iterates forwards', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 1, column: 1 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { column: 1, lineNumber: 1 },
+ type: 'method',
+ value: 'POST',
+ });
+ expect(it.stepForward()).toEqual({
+ position: { column: 5, lineNumber: 1 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ expect(it.stepForward()).toEqual({
+ position: { column: 6, lineNumber: 1 },
+ type: 'url.part',
+ value: 'abc',
+ });
+ });
+
+ it('iterates backwards', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 1, column: 8 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { lineNumber: 1, column: 6 },
+ type: 'url.part',
+ value: 'abc',
+ });
+ expect(it.stepBackward()).toEqual({
+ position: { column: 5, lineNumber: 1 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ expect(it.stepBackward()).toEqual({
+ position: { column: 1, lineNumber: 1 },
+ type: 'method',
+ value: 'POST',
+ });
+ });
+
+ it('iterates forwards and backwards', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 1, column: 8 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { lineNumber: 1, column: 6 },
+ type: 'url.part',
+ value: 'abc',
+ });
+ expect(it.stepBackward()).toEqual({
+ position: { column: 5, lineNumber: 1 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ expect(it.stepForward()).toEqual({
+ position: { column: 6, lineNumber: 1 },
+ type: 'url.part',
+ value: 'abc',
+ });
+ });
+
+ describe('iterating across lines', () => {
+ it('iterates forwards over lines', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 1, column: 1 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { lineNumber: 1, column: 1 },
+ type: 'method',
+ value: 'POST',
+ });
+ it.stepForward();
+ it.stepForward();
+ expect(it.stepForward()).toBeNull();
+ expect(it.stepForward()).toBeNull();
+ expect(it.stepForward()).toEqual({
+ position: { lineNumber: 4, column: 1 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ expect(it.stepForward()).toEqual({
+ position: { lineNumber: 4, column: 3 },
+ value: '{',
+ type: 'paren.lparen',
+ });
+ // Double step forward to try and mess with internal state
+ expect(it.stepForward()).toBeNull();
+ expect(it.stepForward()).toBeNull();
+ expect(it.stepBackward()).toEqual({
+ position: { lineNumber: 4, column: 1 },
+ value: ' ',
+ type: 'whitespace',
+ });
+ });
+
+ it('iterates backwards over lines', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 4, column: 1 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { lineNumber: 4, column: 1 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ // Double step backward to try and mess with internal state
+ expect(it.stepBackward()).toBeNull();
+ expect(it.stepBackward()).toBeNull();
+ expect(it.stepBackward()).toEqual({
+ position: { lineNumber: 1, column: 6 },
+ type: 'url.part',
+ value: 'abc',
+ });
+ it.stepBackward();
+ expect(it.stepBackward()).toEqual({
+ position: { lineNumber: 1, column: 1 },
+ type: 'method',
+ value: 'POST',
+ });
+ // Walk over the end of the file.
+ expect(it.stepBackward()).toBeNull();
+ expect(it.stepForward()).toEqual({
+ position: { lineNumber: 1, column: 5 },
+ value: ' ',
+ type: 'whitespace',
+ });
+ });
+ });
+
+ describe('detecting current position', () => {
+ it('knows what is at the current position #1', () => {
+ const it = new TokenIterator(tokensProvider, { lineNumber: 1, column: 6 });
+ expect(it.getCurrentPosition()).toEqual({ lineNumber: 1, column: 5 });
+ expect(it.getCurrentToken()).toEqual({
+ position: { lineNumber: 1, column: 5 },
+ type: 'whitespace',
+ value: ' ',
+ });
+ });
+ });
+});
diff --git a/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.ts b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.ts
new file mode 100644
index 0000000000000..643938536b306
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/lib/token_iterator/token_iterator.ts
@@ -0,0 +1,165 @@
+/*
+ * 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 { Position, Token, TokensProvider } from '../../types';
+
+function isColumnInTokenRange(column: number, token: Token) {
+ if (column < token.position.column) {
+ return false;
+ }
+ return column <= token.position.column + token.value.length;
+}
+
+export class TokenIterator {
+ private currentTokenIdx = -1;
+ private currentPosition: Position = { lineNumber: -1, column: -1 };
+ private tokensLineCache: Token[];
+
+ constructor(private readonly provider: TokensProvider, startPosition: Position) {
+ this.tokensLineCache = this.provider.getTokens(startPosition.lineNumber) || [];
+ const tokenIdx = this.tokensLineCache.findIndex(token =>
+ isColumnInTokenRange(startPosition.column, token)
+ );
+ if (tokenIdx > -1) {
+ this.updatePosition({
+ tokenIdx,
+ position: this.tokensLineCache[tokenIdx].position,
+ });
+ } else {
+ this.updatePosition({ tokenIdx: -1, position: startPosition });
+ }
+ }
+
+ private updateLineTokens(tokens: Token[]) {
+ this.tokensLineCache = tokens;
+ }
+
+ private updatePosition(info: { tokenIdx: number; position: Position }) {
+ this.currentTokenIdx = info.tokenIdx;
+ this.currentPosition = { ...info.position };
+ }
+
+ private step(direction: 1 | -1): Token | null {
+ const nextIdx = this.currentTokenIdx + direction;
+
+ let nextToken = this.tokensLineCache[nextIdx];
+ // Check current row
+ if (nextToken) {
+ this.updatePosition({
+ tokenIdx: nextIdx,
+ position: nextToken.position,
+ });
+ return nextToken;
+ }
+
+ // Check next line
+ const nextLineNumber = this.currentPosition.lineNumber + direction;
+ const nextLineTokens = this.provider.getTokens(nextLineNumber);
+ if (nextLineTokens) {
+ this.updateLineTokens(nextLineTokens);
+ let idx: number;
+ if (direction > 0) {
+ nextToken = nextLineTokens[0];
+ idx = 0;
+ } else {
+ nextToken = nextLineTokens[nextLineTokens.length - 1];
+ idx = nextToken ? nextLineTokens.length - 1 : 0;
+ }
+
+ const nextPosition = nextToken
+ ? nextToken.position
+ : { column: 1, lineNumber: nextLineNumber };
+ this.updatePosition({ tokenIdx: idx, position: nextPosition });
+ return nextToken || null;
+ }
+
+ // We have reached the beginning or the end
+ return null;
+ }
+
+ /**
+ * Report the token under the iterator's internal cursor.
+ */
+ public getCurrentToken(): Token | null {
+ return this.tokensLineCache[this.currentTokenIdx] || null;
+ }
+
+ /**
+ * Return the current position in the document.
+ *
+ * This will correspond to the position of a token.
+ *
+ * Note: this method may not be that useful given {@link getCurrentToken}.
+ */
+ public getCurrentPosition(): Position {
+ return this.currentPosition;
+ }
+
+ /**
+ * Go to the previous token in the document.
+ *
+ * Stepping to the previous token can return null under the following conditions:
+ *
+ * 1. We are at the beginning of the document.
+ * 2. The preceding line is empty - no tokens.
+ * 3. We are in an empty document - not text, so no tokens.
+ */
+ public stepBackward(): Token | null {
+ return this.step(-1);
+ }
+
+ /**
+ * See documentation for {@link stepBackward}.
+ *
+ * Steps forward.
+ */
+ public stepForward(): Token | null {
+ return this.step(1);
+ }
+
+ /**
+ * Get the line number of the current token.
+ *
+ * Can be considered a convenience method for:
+ *
+ * ```ts
+ * it.getCurrentToken().lineNumber;
+ * ```
+ */
+ public getCurrentTokenLineNumber(): number | null {
+ const currentToken = this.getCurrentToken();
+ if (currentToken) {
+ return currentToken.position.lineNumber;
+ }
+ return null;
+ }
+
+ /**
+ * See documentation for {@link getCurrentTokenLineNumber}.
+ *
+ * Substitutes `column` for `lineNumber`.
+ */
+ public getCurrentTokenColumn(): number | null {
+ const currentToken = this.getCurrentToken();
+ if (currentToken) {
+ return currentToken.position.column;
+ }
+ return null;
+ }
+}
diff --git a/src/legacy/core_plugins/console/np_ready/public/types/core_editor.ts b/src/legacy/core_plugins/console/np_ready/public/types/core_editor.ts
new file mode 100644
index 0000000000000..fdd2e2639e554
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/types/core_editor.ts
@@ -0,0 +1,155 @@
+/*
+ * 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 { TokensProvider } from './tokens_provider';
+import { Token } from './token';
+
+export interface Position {
+ /**
+ * The line number, not zero-indexed.
+ *
+ * E.g., if given line number 1, this would refer to the first line visible.
+ */
+ lineNumber: number;
+
+ /**
+ * The column number, not zero-indexed.
+ *
+ * E.g., if given column number 1, this would refer to the first character of a column.
+ */
+ column: number;
+}
+
+export interface Range {
+ /**
+ * The start point of the range.
+ */
+ start: Position;
+
+ /**
+ * The end point of the range.
+ */
+ end: Position;
+}
+
+/**
+ * Enumeration of the different states the current position can be in.
+ *
+ * Current implementation uses low-level binary operations OR ('|') and AND ('&') to, respectively:
+ *
+ * - Create a combination of acceptable states.
+ * - Extract the states from the acceptable combination.
+ *
+ * E.g.
+ * ```ts
+ * const acceptableStates = LINE_MODE.REQUEST_START | LINE_MODE.IN_REQUEST; // binary '110'
+ *
+ * // Is MULTI_DOC_CUR_DOC_END ('1000') acceptable?
+ * Boolean(acceptableStates & LINE_MODE.MULTI_DOC_CUR_DOC_END) // false
+ *
+ * // Is REQUEST_START ('10') acceptable?
+ * Boolean(acceptableStates & LINE_MODE.REQUEST_START) // true
+ * ```
+ *
+ * This implementation will probably be changed to something more accessible in future but is documented
+ * here for reference.
+ */
+export enum LINE_MODE {
+ REQUEST_START = 2,
+ IN_REQUEST = 4,
+ MULTI_DOC_CUR_DOC_END = 8,
+ REQUEST_END = 16,
+ BETWEEN_REQUESTS = 32,
+ UNKNOWN = 64,
+}
+
+/**
+ * The CoreEditor is a component separate from the Editor implementation that provides Console
+ * app specific business logic. The CoreEditor is an interface to the lower-level editor implementation
+ * being used which is usually vendor code such as Ace or Monaco.
+ */
+export interface CoreEditor {
+ /**
+ * Get the current position of the cursor.
+ */
+ getCurrentPosition(): Position;
+
+ /**
+ * Get the contents of the editor.
+ */
+ getValue(): string;
+
+ /**
+ * Get the contents of the editor at a specific line.
+ */
+ getLineValue(lineNumber: number): string;
+
+ /**
+ * Insert a string value at the current cursor position.
+ */
+ insert(value: string): void;
+
+ /**
+ * Insert a string value at the indicated position.
+ */
+ insert(pos: Position, value: string): void;
+
+ /**
+ * Replace a range of text.
+ */
+ replace(rangeToReplace: Range, value: string): void;
+
+ /**
+ * Clear the selected range.
+ */
+ clearSelection(): void;
+
+ /**
+ * Move the cursor to the indicated position.
+ */
+ moveCursorToPosition(pos: Position): void;
+
+ /**
+ * Get the token at the indicated position. The token considered "at" the position is the
+ * one directly preceding the position.
+ *
+ * Returns null if there is no such token.
+ */
+ getTokenAt(pos: Position): Token | null;
+
+ /**
+ * Get an iterable token provider.
+ */
+ getTokenProvider(): TokensProvider;
+
+ /**
+ * Get the contents of the editor between two points.
+ */
+ getValueInRange(range: Range): string;
+
+ /**
+ * Get the lexer state at the end of a specific line.
+ */
+ getLineState(lineNumber: number): string;
+
+ /**
+ * Get line content between and including the start and end lines provided.
+ */
+ getLines(startLine: number, endLine: number): string[];
+}
diff --git a/src/legacy/core_plugins/console/np_ready/public/types/index.ts b/src/legacy/core_plugins/console/np_ready/public/types/index.ts
new file mode 100644
index 0000000000000..9d82237d667b3
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/types/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './core_editor';
+export * from './token';
+export * from './tokens_provider';
diff --git a/src/legacy/core_plugins/console/np_ready/public/types/token.ts b/src/legacy/core_plugins/console/np_ready/public/types/token.ts
new file mode 100644
index 0000000000000..d5c59d363876c
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/types/token.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { Position } from './core_editor';
+
+export interface Token {
+ /**
+ * The value of the token.
+ *
+ * Can be an empty string.
+ */
+ value: string;
+
+ /**
+ * The type of the token. E.g., "whitespace". All of the types are
+ * enumerated by the token lexer.
+ */
+ type: string;
+
+ /**
+ * The position of the first character of the token.
+ */
+ position: Position;
+}
diff --git a/src/legacy/core_plugins/console/np_ready/public/types/tokens_provider.ts b/src/legacy/core_plugins/console/np_ready/public/types/tokens_provider.ts
new file mode 100644
index 0000000000000..befe85a0cb1c3
--- /dev/null
+++ b/src/legacy/core_plugins/console/np_ready/public/types/tokens_provider.ts
@@ -0,0 +1,44 @@
+/*
+ * 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 { Token } from './token';
+import { Position } from './core_editor';
+
+/**
+ * Describes a kind of object that provides tokens.
+ */
+export interface TokensProvider {
+ /**
+ * Special values in this interface are `null` and an empty array `[]`.
+ * - `null` means that we are outside of the document range (i.e., have requested tokens for a non-existent line).
+ * - An empty array means that we are on an empty line.
+ */
+ getTokens(lineNumber: number): Token[] | null;
+
+ /**
+ * Get the token at the specified position.
+ *
+ * The token "at" the position is considered to the token directly preceding
+ * the indicated cursor position.
+ *
+ * Returns null if there is not a token that meets this criteria or if the position is outside
+ * of the document range.
+ */
+ getTokenAt(pos: Position): Token | null;
+}
diff --git a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.js b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
similarity index 62%
rename from src/legacy/core_plugins/console/public/quarantined/src/autocomplete.js
rename to src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
index cec82e9690ead..47edf42f0eec5 100644
--- a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.js
+++ b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete.ts
@@ -17,24 +17,31 @@
* under the License.
*/
+import _ from 'lodash';
+import ace, { Editor as AceEditor, IEditSession, Position as AcePosition } from 'brace';
+import { i18n } from '@kbn/i18n';
+
import {
getTopLevelUrlCompleteComponents,
getEndpointBodyCompleteComponents,
getGlobalAutocompleteComponents,
- getUnmatchedEndpointComponents
+ getUnmatchedEndpointComponents,
+ // @ts-ignore
} from './kb';
+// @ts-ignore
import utils from './utils';
+// @ts-ignore
import { populateContext } from './autocomplete/engine';
+// @ts-ignore
import { URL_PATH_END_MARKER } from './autocomplete/components';
-import _ from 'lodash';
-import ace from 'brace';
-import { i18n } from '@kbn/i18n';
+import { createTokenIterator } from '../../../np_ready/public/application/factories';
-const AceRange = ace.acequire('ace/range').Range;
+import { Position, Token, Range } from '../../../np_ready/public/types';
+import { LegacyEditor } from '../../../np_ready/public/application/models';
-let LAST_EVALUATED_TOKEN = null;
+let LAST_EVALUATED_TOKEN: any = null;
-function isUrlParamsToken(token) {
+function isUrlParamsToken(token: any) {
switch ((token || {}).type) {
case 'url.param':
case 'url.equal':
@@ -46,31 +53,38 @@ function isUrlParamsToken(token) {
return false;
}
}
-function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
- const tokenIter = editor.iterForPosition(pos.row, pos.column);
+function getCurrentMethodAndTokenPaths(
+ editor: LegacyEditor,
+ pos: Position,
+ parser: any,
+ forceEndOfUrl?: boolean
+) {
+ const tokenIter = createTokenIterator({
+ editor,
+ position: pos,
+ });
const startPos = pos;
- let bodyTokenPath = [];
- const ret = {};
+ let bodyTokenPath: any = [];
+ const ret: any = {};
const STATES = {
looking_for_key: 0, // looking for a key but without jumping over anything but white space and colon.
looking_for_scope_start: 1, // skip everything until scope start
- start: 3
+ start: 3,
};
let state = STATES.start;
// initialization problems -
let t = tokenIter.getCurrentToken();
if (t) {
- if (startPos.column === 0) {
+ if (startPos.column === 1) {
// if we are at the beginning of the line, the current token is the one after cursor, not before which
// deviates from the standard.
t = tokenIter.stepBackward();
state = STATES.looking_for_scope_start;
}
- }
- else {
- if (startPos.column === 0) {
+ } else {
+ if (startPos.column === 1) {
// empty lines do no have tokens, move one back
t = tokenIter.stepBackward();
state = STATES.start;
@@ -81,7 +95,6 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
// climb one scope at a time and get the scope key
for (; t && t.type.indexOf('url') === -1 && t.type !== 'method'; t = tokenIter.stepBackward()) {
-
if (t.type !== 'whitespace') {
walkedSomeBody = true;
} // marks we saw something
@@ -120,8 +133,8 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
t = tokenIter.stepBackward();
}
}
- if (!t) // oops we run out.. we don't know what's up return null;
- {
+ if (!t) {
+ // oops we run out.. we don't know what's up return null;
return {};
}
continue;
@@ -134,16 +147,15 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
break;
}
}
- if (!t) // oops we run out.. we don't know what's up return null;
- {
+ if (!t) {
+ // oops we run out.. we don't know what's up return null;
return {};
}
continue;
case 'punctuation.start_triple_quote':
if (state === STATES.start) {
state = STATES.looking_for_key;
- }
- else if (state === STATES.looking_for_key) {
+ } else if (state === STATES.looking_for_key) {
state = STATES.looking_for_scope_start;
}
bodyTokenPath.unshift('"""');
@@ -154,8 +166,7 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
case 'text':
if (state === STATES.start) {
state = STATES.looking_for_key;
- }
- else if (state === STATES.looking_for_key) {
+ } else if (state === STATES.looking_for_key) {
state = STATES.looking_for_scope_start;
}
@@ -171,7 +182,6 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
state = STATES.looking_for_key;
}
break; // skip white space
-
}
}
@@ -179,8 +189,9 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
// we had some content and still no path -> the cursor is position after a closed body -> no auto complete
return {};
}
+
ret.urlTokenPath = [];
- if (tokenIter.getCurrentTokenRow() === startPos.row) {
+ if (tokenIter.getCurrentPosition().lineNumber === startPos.lineNumber) {
if (t && (t.type === 'url.part' || t.type === 'url.param' || t.type === 'url.value')) {
// we are forcing the end of the url for the purposes of determining an endpoint
if (forceEndOfUrl && t.type === 'url.part') {
@@ -190,7 +201,7 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
// we are on the same line as cursor and dealing with a url. Current token is not part of the context
t = tokenIter.stepBackward();
// This will force method parsing
- while (t.type === 'whitespace') {
+ while (t!.type === 'whitespace') {
t = tokenIter.stepBackward();
}
}
@@ -200,27 +211,24 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
ret.bodyTokenPath = bodyTokenPath;
ret.urlParamsTokenPath = null;
- ret.requestStartRow = tokenIter.getCurrentTokenRow();
- let curUrlPart;
+ ret.requestStartRow = tokenIter.getCurrentPosition().lineNumber;
+ let curUrlPart: any;
while (t && isUrlParamsToken(t)) {
switch (t.type) {
case 'url.value':
if (Array.isArray(curUrlPart)) {
curUrlPart.unshift(t.value);
- }
- else if (curUrlPart) {
+ } else if (curUrlPart) {
curUrlPart = [t.value, curUrlPart];
- }
- else {
+ } else {
curUrlPart = t.value;
}
break;
case 'url.comma':
if (!curUrlPart) {
curUrlPart = [];
- }
- else if (!Array.isArray(curUrlPart)) {
+ } else if (!Array.isArray(curUrlPart)) {
curUrlPart = [curUrlPart];
}
break;
@@ -247,19 +255,16 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
case 'url.part':
if (Array.isArray(curUrlPart)) {
curUrlPart.unshift(t.value);
- }
- else if (curUrlPart) {
+ } else if (curUrlPart) {
curUrlPart = [t.value, curUrlPart];
- }
- else {
+ } else {
curUrlPart = t.value;
}
break;
case 'url.comma':
if (!curUrlPart) {
curUrlPart = [];
- }
- else if (!Array.isArray(curUrlPart)) {
+ } else if (!Array.isArray(curUrlPart)) {
curUrlPart = [curUrlPart];
}
break;
@@ -270,7 +275,7 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
}
break;
}
- t = editor.parser.prevNonEmptyToken(tokenIter);
+ t = parser.prevNonEmptyToken(tokenIter);
}
if (curUrlPart) {
@@ -278,13 +283,11 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
}
if (!ret.bodyTokenPath && !ret.urlParamsTokenPath) {
-
if (ret.urlTokenPath.length > 0) {
- // // started on the url, first token is current token
+ // // started on the url, first token is current token
ret.otherTokenValues = ret.urlTokenPath[0];
}
- }
- else {
+ } else {
// mark the url as completed.
ret.urlTokenPath.push(URL_PATH_END_MARKER);
}
@@ -294,16 +297,41 @@ function getCurrentMethodAndTokenPaths(editor, pos, forceEndOfUrl) {
}
return ret;
}
-export function getEndpointFromPosition(editor, pos) {
- const context = { ...getCurrentMethodAndTokenPaths(editor, pos, true) };
+export function getEndpointFromPosition(aceEditor: AceEditor, pos: AcePosition, parser: any) {
+ const editor = new LegacyEditor(aceEditor);
+ const context = {
+ ...getCurrentMethodAndTokenPaths(
+ editor,
+ { column: pos.column + 1, lineNumber: pos.row + 1 },
+ parser,
+ true
+ ),
+ };
const components = getTopLevelUrlCompleteComponents(context.method);
populateContext(context.urlTokenPath, context, editor, true, components);
return context.endpoint;
}
-export default function (editor) {
- function isUrlPathToken(token) {
- switch ((token || {}).type) {
+// eslint-disable-next-line
+export default function({
+ coreEditor: editor,
+ parser,
+ execCommand,
+ getCursorPosition,
+ isCompleterActive,
+ addChangeListener,
+ removeChangeListener,
+}: {
+ coreEditor: LegacyEditor;
+ parser: any;
+ execCommand: (cmd: string) => void;
+ getCursorPosition: () => Position | null;
+ isCompleterActive: () => boolean;
+ addChangeListener: (fn: any) => void;
+ removeChangeListener: (fn: any) => void;
+}) {
+ function isUrlPathToken(token: Token | null) {
+ switch ((token || ({} as any)).type) {
case 'url.slash':
case 'url.comma':
case 'url.part':
@@ -313,31 +341,29 @@ export default function (editor) {
}
}
- function addMetaToTermsList(list, meta, template) {
- return _.map(list, function (t) {
+ function addMetaToTermsList(list: any, meta: any, template?: string) {
+ return _.map(list, function(t: any) {
if (typeof t !== 'object') {
t = { name: t };
}
- return _.defaults(t, { meta: meta, template: template });
+ return _.defaults(t, { meta, template });
});
}
- function applyTerm(term) {
- const session = editor.getSession();
-
+ function applyTerm(term: any) {
const context = term.context;
// make sure we get up to date replacement info.
- addReplacementInfoToContext(context, editor.getCursorPosition(), term.insertValue);
+ addReplacementInfoToContext(context, editor.getCurrentPosition(), term.insertValue);
let termAsString;
if (context.autoCompleteType === 'body') {
- termAsString = typeof term.insertValue === 'string' ? '"' + term.insertValue + '"' : term.insertValue + '';
+ termAsString =
+ typeof term.insertValue === 'string' ? '"' + term.insertValue + '"' : term.insertValue + '';
if (term.insertValue === '[' || term.insertValue === '{') {
termAsString = '';
}
- }
- else {
+ } else {
termAsString = term.insertValue + '';
}
@@ -352,23 +378,25 @@ export default function (editor) {
} else {
indentedTemplateLines = utils.jsonToString(term.template, true).split('\n');
}
- let currentIndentation = session.getLine(context.rangeToReplace.start.row);
- currentIndentation = currentIndentation.match(/^\s*/)[0];
- for (let i = 1; i < indentedTemplateLines.length; i++) // skip first line
- {indentedTemplateLines[i] = currentIndentation + indentedTemplateLines[i];}
+ let currentIndentation = editor.getLineValue(context.rangeToReplace.start.lineNumber);
+ currentIndentation = currentIndentation.match(/^\s*/)![0];
+ for (
+ let i = 1;
+ i < indentedTemplateLines.length;
+ i++ // skip first line
+ ) {
+ indentedTemplateLines[i] = currentIndentation + indentedTemplateLines[i];
+ }
valueToInsert += ': ' + indentedTemplateLines.join('\n');
templateInserted = true;
- }
- else {
+ } else {
templateInserted = true;
if (term.value === '[') {
valueToInsert += '[]';
- }
- else if (term.value === '{') {
+ } else if (term.value === '{') {
valueToInsert += '{}';
- }
- else {
+ } else {
templateInserted = false;
}
}
@@ -376,12 +404,11 @@ export default function (editor) {
valueToInsert = context.prefixToAdd + valueToInsert + context.suffixToAdd;
// disable listening to the changes we are making.
- removeChangeListener();
+ removeChangeListener(editorChangeListener);
if (context.rangeToReplace.start.column !== context.rangeToReplace.end.column) {
- session.replace(context.rangeToReplace, valueToInsert);
- }
- else {
+ editor.replace(context.rangeToReplace, valueToInsert);
+ } else {
editor.insert(valueToInsert);
}
@@ -389,25 +416,31 @@ export default function (editor) {
// go back to see whether we have one of ( : { & [ do not require a comma. All the rest do.
let newPos = {
- row: context.rangeToReplace.start.row,
- column: context.rangeToReplace.start.column + termAsString.length + context.prefixToAdd.length
- + (templateInserted ? 0 : context.suffixToAdd.length)
+ lineNumber: context.rangeToReplace.start.lineNumber,
+ column:
+ context.rangeToReplace.start.column +
+ termAsString.length +
+ context.prefixToAdd.length +
+ (templateInserted ? 0 : context.suffixToAdd.length),
};
- const tokenIter = editor.iterForPosition(newPos.row, newPos.column);
+ const tokenIter = createTokenIterator({
+ editor,
+ position: newPos,
+ });
if (context.autoCompleteType === 'body') {
// look for the next place stand, just after a comma, {
- let nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
+ let nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
switch (nonEmptyToken ? nonEmptyToken.type : 'NOTOKEN') {
case 'paren.rparen':
- newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
+ newPos = tokenIter.getCurrentPosition();
break;
case 'punctuation.colon':
- nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
- if ((nonEmptyToken || {}).type === 'paren.lparen') {
- nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
- newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
+ nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
+ if ((nonEmptyToken || ({} as any)).type === 'paren.lparen') {
+ nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
+ newPos = tokenIter.getCurrentPosition();
if (nonEmptyToken && nonEmptyToken.value.indexOf('"') === 0) {
newPos.column++;
} // don't stand on "
@@ -416,25 +449,25 @@ export default function (editor) {
case 'paren.lparen':
case 'punctuation.comma':
tokenIter.stepForward();
- newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
+ newPos = tokenIter.getCurrentPosition();
break;
}
editor.moveCursorToPosition(newPos);
}
// re-enable listening to typing
- addChangeListener();
+ addChangeListener(editorChangeListener);
}
- function getAutoCompleteContext(editor, session, pos) {
+ function getAutoCompleteContext(ctxEditor: LegacyEditor, pos: Position) {
// deduces all the parameters need to position and insert the auto complete
- const context = {
+ const context: any = {
autoCompleteSet: null, // instructions for what can be here
endpoint: null,
urlPath: null,
method: null,
activeScheme: null,
- editor: editor
+ editor: ctxEditor,
};
// context.updatedForToken = session.getTokenAt(pos.row, pos.column);
@@ -453,7 +486,7 @@ export default function (editor) {
addUrlParamsAutoCompleteSetToContext(context, pos);
break;
case 'method':
- addMethodAutoCompleteSetToContext(context, pos);
+ addMethodAutoCompleteSetToContext(context);
break;
case 'body':
addBodyAutoCompleteSetToContext(context, pos);
@@ -473,31 +506,34 @@ export default function (editor) {
return context;
}
- function getAutoCompleteType(pos) {
+ function getAutoCompleteType(pos: Position) {
// return "method", "path" or "body" to determine auto complete type.
- let rowMode = editor.parser.getRowParseMode();
+ let rowMode = parser.getRowParseMode();
- //noinspection JSBitwiseOperatorUsage
- if (rowMode & editor.parser.MODE.IN_REQUEST) {
+ // eslint-disable-next-line no-bitwise
+ if (rowMode & parser.MODE.IN_REQUEST) {
return 'body';
}
- //noinspection JSBitwiseOperatorUsage
- if (rowMode & editor.parser.MODE.REQUEST_START) {
+ // eslint-disable-next-line no-bitwise
+ if (rowMode & parser.MODE.REQUEST_START) {
// on url path, url params or method.
- const tokenIter = editor.iterForPosition(pos.row, pos.column);
+ const tokenIter = createTokenIterator({
+ editor,
+ position: pos,
+ });
let t = tokenIter.getCurrentToken();
- while (t.type === 'url.comma') {
+ while (t!.type === 'url.comma') {
t = tokenIter.stepBackward();
}
- switch (t.type) {
+ switch (t!.type) {
case 'method':
return 'method';
case 'whitespace':
- t = editor.parser.prevNonEmptyToken(tokenIter);
+ t = parser.prevNonEmptyToken(tokenIter);
- switch ((t || {}).type) {
+ switch ((t || ({} as any)).type) {
case 'method':
// we moved one back
return 'path';
@@ -524,27 +560,34 @@ export default function (editor) {
}
// after start to avoid single line url only requests
- //noinspection JSBitwiseOperatorUsage
- if (rowMode & editor.parser.MODE.REQUEST_END) {
+ // eslint-disable-next-line no-bitwise
+ if (rowMode & parser.MODE.REQUEST_END) {
return 'body';
}
// in between request on an empty
- if ((editor.getSession().getLine(pos.row) || '').trim() === '') {
+ if (editor.getLineValue(pos.lineNumber).trim() === '') {
// check if the previous line is a single line begging of a new request
- rowMode = editor.parser.getRowParseMode(pos.row - 1);
- //noinspection JSBitwiseOperatorUsage
- if ((rowMode & editor.parser.MODE.REQUEST_START) && (rowMode & editor.parser.MODE.REQUEST_END)) {
+ rowMode = parser.getRowParseMode(
+ pos.lineNumber - 1 - 1 /* see RowParser for why the added -1, for now */
+ );
+ // eslint-disable-next-line no-bitwise
+ if (
+ // eslint-disable-next-line no-bitwise
+ rowMode & parser.MODE.REQUEST_START &&
+ // eslint-disable-next-line no-bitwise
+ rowMode & parser.MODE.REQUEST_END
+ ) {
return 'body';
}
- //o.w suggest a method
+ // o.w suggest a method
return 'method';
}
return null;
}
- function addReplacementInfoToContext(context, pos, replacingTerm) {
+ function addReplacementInfoToContext(context: any, pos: Position, replacingTerm?: any) {
// extract the initial value, rangeToReplace & textBoxPosition
// Scenarios for current token:
@@ -554,11 +597,15 @@ export default function (editor) {
// - Broken scenario { , bla|
// - Nice token, broken before: {, "bla"
- const session = editor.getSession();
-
- context.updatedForToken = _.clone(session.getTokenAt(pos.row, pos.column));
+ context.updatedForToken = _.clone(
+ editor.getTokenAt({ lineNumber: pos.lineNumber, column: pos.column })
+ );
if (!context.updatedForToken) {
- context.updatedForToken = { value: '', start: pos.column };
+ context.updatedForToken = {
+ value: '',
+ type: '',
+ position: { column: pos.column, lineNumber: pos.lineNumber },
+ };
} // empty line
let anchorToken = context.createdWithToken;
@@ -581,31 +628,41 @@ export default function (editor) {
case 'url.part':
case 'url.param':
case 'url.value':
- context.rangeToReplace = new AceRange(
- pos.row, anchorToken.start, pos.row,
- context.updatedForToken.start + context.updatedForToken.value.length
- );
+ context.rangeToReplace = {
+ start: { lineNumber: pos.lineNumber, column: anchorToken.position.column },
+ end: {
+ lineNumber: pos.lineNumber,
+ column: context.updatedForToken.position.column + context.updatedForToken.value.length,
+ },
+ } as Range;
context.replacingToken = true;
break;
default:
if (replacingTerm && context.updatedForToken.value === replacingTerm) {
- context.rangeToReplace = new AceRange(
- pos.row, anchorToken.start, pos.row,
- context.updatedForToken.start + context.updatedForToken.value.length
- );
+ context.rangeToReplace = {
+ start: { lineNumber: pos.lineNumber, column: anchorToken.column },
+ end: {
+ lineNumber: pos.lineNumber,
+ column:
+ context.updatedForToken.position.column + context.updatedForToken.value.length,
+ },
+ } as Range;
context.replacingToken = true;
- }
- else {
+ } else {
// standing on white space, quotes or another punctuation - no replacing
- context.rangeToReplace = new AceRange(
- pos.row, pos.column, pos.row, pos.column
- );
+ context.rangeToReplace = {
+ start: { lineNumber: pos.lineNumber, column: pos.column },
+ end: { lineNumber: pos.lineNumber, column: pos.column },
+ } as Range;
context.replacingToken = false;
}
break;
}
- context.textBoxPosition = { row: context.rangeToReplace.start.row, column: context.rangeToReplace.start.column };
+ context.textBoxPosition = {
+ lineNumber: context.rangeToReplace.start.lineNumber,
+ column: context.rangeToReplace.start.column,
+ };
switch (context.autoCompleteType) {
case 'path':
@@ -623,7 +680,7 @@ export default function (editor) {
}
}
- function addBodyPrefixSuffixToContext(context) {
+ function addBodyPrefixSuffixToContext(context: any) {
// Figure out what happens next to the token to see whether it needs trailing commas etc.
// Templates will be used if not destroying existing structure.
@@ -632,8 +689,11 @@ export default function (editor) {
context.prefixToAdd = '';
context.suffixToAdd = '';
- let tokenIter = editor.iterForCurrentLoc();
- let nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
+ let tokenIter = createTokenIterator({
+ editor,
+ position: editor.getCurrentPosition()!,
+ });
+ let nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
switch (nonEmptyToken ? nonEmptyToken.type : 'NOTOKEN') {
case 'NOTOKEN':
case 'paren.lparen':
@@ -645,21 +705,22 @@ export default function (editor) {
// test if there is an empty object - if so we replace it
context.addTemplate = false;
- nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
+ nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
if (!(nonEmptyToken && nonEmptyToken.value === '{')) {
break;
}
- nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
+ nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
if (!(nonEmptyToken && nonEmptyToken.value === '}')) {
break;
}
context.addTemplate = true;
// extend range to replace to include all up to token
- context.rangeToReplace.end.row = tokenIter.getCurrentTokenRow();
- context.rangeToReplace.end.column = tokenIter.getCurrentTokenColumn() + nonEmptyToken.value.length;
+ context.rangeToReplace.end.lineNumber = tokenIter.getCurrentTokenLineNumber();
+ context.rangeToReplace.end.column =
+ tokenIter.getCurrentTokenColumn() + nonEmptyToken.value.length;
// move one more time to check if we need a trailing comma
- nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
+ nonEmptyToken = parser.nextNonEmptyToken(tokenIter);
switch (nonEmptyToken ? nonEmptyToken.type : 'NOTOKEN') {
case 'NOTOKEN':
case 'paren.rparen':
@@ -678,28 +739,27 @@ export default function (editor) {
}
// go back to see whether we have one of ( : { & [ do not require a comma. All the rest do.
- tokenIter = editor.iterForCurrentLoc();
+ tokenIter = createTokenIterator({ editor, position: editor.getCurrentPosition() });
nonEmptyToken = tokenIter.getCurrentToken();
let insertingRelativeToToken; // -1 is before token, 0 middle, +1 after token
if (context.replacingToken) {
insertingRelativeToToken = 0;
- }
- else {
- const pos = editor.getCursorPosition();
- if (pos.column === context.updatedForToken.start) {
+ } else {
+ const pos = editor.getCurrentPosition();
+ if (pos.column === context.updatedForToken.position.column) {
insertingRelativeToToken = -1;
- }
- else if (pos.column < context.updatedForToken.start + context.updatedForToken.value.length) {
+ } else if (
+ pos.column <
+ context.updatedForToken.position.column + context.updatedForToken.value.length
+ ) {
insertingRelativeToToken = 0;
- }
- else {
+ } else {
insertingRelativeToToken = 1;
}
-
}
// we should actually look at what's happening before this token
- if (editor.parser.isEmptyToken(nonEmptyToken) || insertingRelativeToToken <= 0) {
- nonEmptyToken = editor.parser.prevNonEmptyToken(tokenIter);
+ if (parser.isEmptyToken(nonEmptyToken) || insertingRelativeToToken <= 0) {
+ nonEmptyToken = parser.prevNonEmptyToken(tokenIter);
}
switch (nonEmptyToken ? nonEmptyToken.type : 'NOTOKEN') {
@@ -718,30 +778,30 @@ export default function (editor) {
return context;
}
- function addUrlParamsPrefixSuffixToContext(context) {
+ function addUrlParamsPrefixSuffixToContext(context: any) {
context.prefixToAdd = '';
context.suffixToAdd = '';
}
- function addMethodPrefixSuffixToContext(context) {
+ function addMethodPrefixSuffixToContext(context: any) {
context.prefixToAdd = '';
context.suffixToAdd = '';
- const tokenIter = editor.iterForCurrentLoc();
- const row = tokenIter.getCurrentTokenRow();
- const t = editor.parser.nextNonEmptyToken(tokenIter);
+ const tokenIter = createTokenIterator({ editor, position: editor.getCurrentPosition() });
+ const lineNumber = tokenIter.getCurrentPosition().lineNumber;
+ const t = parser.nextNonEmptyToken(tokenIter);
- if (tokenIter.getCurrentTokenRow() !== row || !t) {
+ if (tokenIter.getCurrentPosition().lineNumber !== lineNumber || !t) {
// we still have nothing next to the method, add a space..
context.suffixToAdd = ' ';
}
}
- function addPathPrefixSuffixToContext(context) {
+ function addPathPrefixSuffixToContext(context: any) {
context.prefixToAdd = '';
context.suffixToAdd = '';
}
- function addMethodAutoCompleteSetToContext(context) {
+ function addMethodAutoCompleteSetToContext(context: any) {
context.autoCompleteSet = ['GET', 'PUT', 'POST', 'DELETE', 'HEAD'].map((m, i) => ({
name: m,
score: -i,
@@ -749,9 +809,8 @@ export default function (editor) {
}));
}
-
- function addPathAutoCompleteSetToContext(context, pos) {
- const ret = getCurrentMethodAndTokenPaths(editor, pos);
+ function addPathAutoCompleteSetToContext(context: any, pos: Position) {
+ const ret = getCurrentMethodAndTokenPaths(editor, pos, parser);
context.method = ret.method;
context.token = ret.token;
context.otherTokenValues = ret.otherTokenValues;
@@ -759,62 +818,81 @@ export default function (editor) {
const components = getTopLevelUrlCompleteComponents(context.method);
populateContext(ret.urlTokenPath, context, editor, true, components);
-
context.autoCompleteSet = addMetaToTermsList(context.autoCompleteSet, 'endpoint');
}
- function addUrlParamsAutoCompleteSetToContext(context, pos) {
- const ret = getCurrentMethodAndTokenPaths(editor, pos);
+ function addUrlParamsAutoCompleteSetToContext(context: any, pos: Position) {
+ const ret = getCurrentMethodAndTokenPaths(editor, pos, parser);
context.method = ret.method;
context.otherTokenValues = ret.otherTokenValues;
context.urlTokenPath = ret.urlTokenPath;
- if (!ret.urlTokenPath) { // zero length tokenPath is true
+ if (!ret.urlTokenPath) {
+ // zero length tokenPath is true
- console.log('Can\'t extract a valid url token path.');
+ // console.log("Can't extract a valid url token path.");
return context;
}
- populateContext(ret.urlTokenPath, context, editor, false, getTopLevelUrlCompleteComponents(context.method));
+ populateContext(
+ ret.urlTokenPath,
+ context,
+ editor,
+ false,
+ getTopLevelUrlCompleteComponents(context.method)
+ );
if (!context.endpoint) {
- console.log('couldn\'t resolve an endpoint.');
+ // console.log("couldn't resolve an endpoint.");
return context;
}
- if (!ret.urlParamsTokenPath) { // zero length tokenPath is true
- console.log('Can\'t extract a valid urlParams token path.');
+ if (!ret.urlParamsTokenPath) {
+ // zero length tokenPath is true
+ // console.log("Can't extract a valid urlParams token path.");
return context;
}
- let tokenPath = [];
+ let tokenPath: any[] = [];
const currentParam = ret.urlParamsTokenPath.pop();
if (currentParam) {
tokenPath = Object.keys(currentParam); // single key object
context.otherTokenValues = currentParam[tokenPath[0]];
}
- populateContext(tokenPath, context, editor, true,
- context.endpoint.paramsAutocomplete.getTopLevelComponents(context.method));
+ populateContext(
+ tokenPath,
+ context,
+ editor,
+ true,
+ context.endpoint.paramsAutocomplete.getTopLevelComponents(context.method)
+ );
return context;
}
- function addBodyAutoCompleteSetToContext(context, pos) {
-
- const ret = getCurrentMethodAndTokenPaths(editor, pos);
+ function addBodyAutoCompleteSetToContext(context: any, pos: Position) {
+ const ret = getCurrentMethodAndTokenPaths(editor, pos, parser);
context.method = ret.method;
context.otherTokenValues = ret.otherTokenValues;
context.urlTokenPath = ret.urlTokenPath;
context.requestStartRow = ret.requestStartRow;
- if (!ret.urlTokenPath) { // zero length tokenPath is true
- console.log('Can\'t extract a valid url token path.');
+ if (!ret.urlTokenPath) {
+ // zero length tokenPath is true
+ // console.log("Can't extract a valid url token path.");
return context;
}
- populateContext(ret.urlTokenPath, context, editor, false, getTopLevelUrlCompleteComponents(context.method));
+ populateContext(
+ ret.urlTokenPath,
+ context,
+ editor,
+ false,
+ getTopLevelUrlCompleteComponents(context.method)
+ );
context.bodyTokenPath = ret.bodyTokenPath;
- if (!ret.bodyTokenPath) { // zero length tokenPath is true
+ if (!ret.bodyTokenPath) {
+ // zero length tokenPath is true
- console.log('Can\'t extract a valid body token path.');
+ // console.log("Can't extract a valid body token path.");
return context;
}
@@ -824,8 +902,7 @@ export default function (editor) {
let components;
if (context.endpoint) {
components = context.endpoint.bodyAutocompleteRootComponents;
- }
- else {
+ } else {
components = getUnmatchedEndpointComponents();
}
populateContext(ret.bodyTokenPath, context, editor, true, components);
@@ -833,31 +910,29 @@ export default function (editor) {
return context;
}
-
-
- const evaluateCurrentTokenAfterAChange = _.debounce(function evaluateCurrentTokenAfterAChange(pos) {
- const session = editor.getSession();
- let currentToken = session.getTokenAt(pos.row, pos.column);
+ const evaluateCurrentTokenAfterAChange = _.debounce(function evaluateCurrentTokenAfterAChange(
+ pos: Position
+ ) {
+ let currentToken = editor.getTokenAt(pos)!;
if (!currentToken) {
- if (pos.row === 0) {
+ if (pos.lineNumber === 1) {
LAST_EVALUATED_TOKEN = null;
return;
}
- currentToken = { start: 0, value: '' }; // empty row
+ currentToken = { position: { column: 0, lineNumber: 0 }, value: '', type: '' }; // empty row
}
- currentToken.row = pos.row; // extend token with row. Ace doesn't supply it by default
- if (editor.parser.isEmptyToken(currentToken)) {
+ currentToken.position.lineNumber = pos.lineNumber; // extend token with row. Ace doesn't supply it by default
+ if (parser.isEmptyToken(currentToken)) {
// empty token. check what's coming next
- const nextToken = session.getTokenAt(pos.row, pos.column + 1);
- if (editor.parser.isEmptyToken(nextToken)) {
+ const nextToken = editor.getTokenAt({ ...pos, column: pos.column + 1 })!;
+ if (parser.isEmptyToken(nextToken)) {
// Empty line, or we're not on the edge of current token. Save the current position as base
- currentToken.start = pos.column;
+ currentToken.position.column = pos.column;
LAST_EVALUATED_TOKEN = currentToken;
- }
- else {
- nextToken.row = pos.row;
+ } else {
+ nextToken.position.lineNumber = pos.lineNumber;
LAST_EVALUATED_TOKEN = nextToken;
}
return;
@@ -868,8 +943,11 @@ export default function (editor) {
return; // wait for the next typing.
}
- if (LAST_EVALUATED_TOKEN.start !== currentToken.start || LAST_EVALUATED_TOKEN.row !== currentToken.row
- || LAST_EVALUATED_TOKEN.value === currentToken.value) {
+ if (
+ LAST_EVALUATED_TOKEN.position.column !== currentToken.position.column ||
+ LAST_EVALUATED_TOKEN.position.lineNumber !== currentToken.position.lineNumber ||
+ LAST_EVALUATED_TOKEN.value === currentToken.value
+ ) {
// not on the same place or nothing changed, cache and wait for the next time
LAST_EVALUATED_TOKEN = currentToken;
return;
@@ -886,63 +964,62 @@ export default function (editor) {
}
LAST_EVALUATED_TOKEN = currentToken;
- editor.execCommand('startAutocomplete');
- }, 100);
+ execCommand('startAutocomplete');
+ },
+ 100);
function editorChangeListener() {
- const cursor = editor.selection.lead;
- if (editor.__ace.completer && editor.__ace.completer.activated) {
- return;
+ const position = getCursorPosition();
+ if (position && !isCompleterActive()) {
+ evaluateCurrentTokenAfterAChange(position);
}
- evaluateCurrentTokenAfterAChange(cursor);
- }
-
- function addChangeListener() {
- editor.on('changeSelection', editorChangeListener);
- }
-
- function removeChangeListener() {
- editor.off('changeSelection', editorChangeListener);
}
- function getCompletions(aceEditor, session, pos, prefix, callback) {
+ function getCompletions(
+ DO_NOT_USE: AceEditor,
+ session: IEditSession,
+ pos: any,
+ prefix: any,
+ callback: any
+ ) {
+ const position: Position = {
+ lineNumber: pos.row + 1,
+ column: pos.column + 1,
+ };
try {
-
- const context = getAutoCompleteContext(editor, session, pos);
+ const context = getAutoCompleteContext(editor, position);
if (!context) {
callback(null, []);
- }
- else {
+ } else {
const terms = _.map(
- context
- .autoCompleteSet
- .filter(term => Boolean(term) && term.name != null),
- function (term) {
+ context.autoCompleteSet.filter((term: any) => Boolean(term) && term.name != null),
+ function(term: any) {
if (typeof term !== 'object') {
term = {
- name: term
+ name: term,
};
} else {
term = _.clone(term);
}
- const defaults = {
+ const defaults: any = {
value: term.name,
meta: 'API',
score: 0,
- context: context,
+ context,
};
// we only need out custom insertMatch behavior for the body
if (context.autoCompleteType === 'body') {
defaults.completer = {
- insertMatch: function () {
+ insertMatch() {
return applyTerm(term);
- }
+ },
};
}
return _.defaults(term, defaults);
- });
+ }
+ );
- terms.sort(function (t1, t2) {
+ terms.sort(function(t1: any, t2: any) {
/* score sorts from high to low */
if (t1.score > t2.score) {
return -1;
@@ -960,51 +1037,61 @@ export default function (editor) {
return 1;
});
- callback(null, _.map(terms, function (t, i) {
- t.insertValue = t.insertValue || t.value;
- t.value = '' + t.value; // normalize to strings
- t.score = -i;
- return t;
- }));
+ callback(
+ null,
+ _.map(terms, function(t: any, i: any) {
+ t.insertValue = t.insertValue || t.value;
+ t.value = '' + t.value; // normalize to strings
+ t.score = -i;
+ return t;
+ })
+ );
}
- }
- catch (e) {
- console.log('error while getting completion terms', e);
+ } catch (e) {
+ // eslint-disable-next-line no-console
+ console.error(e);
callback(e, null);
}
}
- addChangeListener();
+ addChangeListener(editorChangeListener);
// Hook into Ace
// disable standard context based autocompletion.
- ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function (require, exports) {
- exports.getCompletions = function (editor, session, pos, prefix, callback) {
+ // @ts-ignore
+ ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function(
+ require: any,
+ exports: any
+ ) {
+ exports.getCompletions = function(
+ innerEditor: any,
+ session: any,
+ pos: any,
+ prefix: any,
+ callback: any
+ ) {
callback(null, []);
};
});
const langTools = ace.acequire('ace/ext/language_tools');
- langTools.setCompleters([{
- identifierRegexps: [
- /[a-zA-Z_0-9\.\$\-\u00A2-\uFFFF]/ // adds support for dot character
- ],
- getCompletions: getCompletions
- }]);
+ langTools.setCompleters([
+ {
+ identifierRegexps: [
+ /[a-zA-Z_0-9\.\$\-\u00A2-\uFFFF]/, // adds support for dot character
+ ],
+ getCompletions,
+ },
+ ]);
- editor.setOptions({
- enableBasicAutocompletion: true
- });
- editor.$blockScrolling = Infinity;
return {
-
_test: {
- getCompletions: getCompletions,
- addReplacementInfoToContext: addReplacementInfoToContext,
- addChangeListener: addChangeListener,
- removeChangeListener: removeChangeListener
- }
+ getCompletions,
+ addReplacementInfoToContext,
+ addChangeListener: () => addChangeListener(editorChangeListener),
+ removeChangeListener: () => removeChangeListener(editorChangeListener),
+ },
};
}
diff --git a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete/body_completer.js b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete/body_completer.js
index e377a749aaf78..567971b8c3504 100644
--- a/src/legacy/core_plugins/console/public/quarantined/src/autocomplete/body_completer.js
+++ b/src/legacy/core_plugins/console/public/quarantined/src/autocomplete/body_completer.js
@@ -274,8 +274,7 @@ function compileCondition(description, compiledObject) {
if (description.lines_regex) {
return new ConditionalProxy(function (context, editor) {
const lines = editor
- .getSession()
- .getLines(context.requestStartRow, editor.getCursorPosition().row)
+ .getLines(context.requestStartRow, editor.getCurrentPosition().lineNumber)
.join('\n');
return new RegExp(description.lines_regex, 'm').test(lines);
}, compiledObject);
diff --git a/src/legacy/core_plugins/console/public/quarantined/src/input.ts b/src/legacy/core_plugins/console/public/quarantined/src/input.ts
new file mode 100644
index 0000000000000..eb93f8e165cb5
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/quarantined/src/input.ts
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+// @ts-ignore
+import Autocomplete from './autocomplete';
+
+import { LegacyEditor } from '../../../np_ready/public/application/models';
+
+// @ts-ignore
+import SenseEditor from './sense_editor/editor';
+import { Position } from '../../../np_ready/public/types';
+
+let input: any;
+export function initializeEditor($el: JQuery';
- input = initializeInput(
+ input = initializeEditor(
$('#ConAppEditor'),
- $('#ConAppEditorActions'),
- {},
- { applyCurrentSettings: () => {} },
- null,
+ $('#ConAppEditorActions')
);
input.$el.show();
input.autocomplete._test.removeChangeListener();
@@ -150,9 +147,10 @@ describe('Integration', () => {
}
const context = terms[0].context;
+ const { cursor: { row, column } } = testToRun;
input.autocomplete._test.addReplacementInfoToContext(
context,
- testToRun.cursor,
+ { lineNumber: row + 1, column: column + 1 },
terms[0].value
);
@@ -167,7 +165,7 @@ describe('Integration', () => {
}
function posCompare(actual, expected) {
- expect(actual.row).toEqual(expected.row + rowOffset);
+ expect(actual.lineNumber).toEqual(expected.lineNumber + rowOffset);
expect(actual.column).toEqual(expected.column);
}
@@ -244,8 +242,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 0, column: 1 },
- end: { row: 0, column: 1 },
+ start: { lineNumber: 1, column: 2 },
+ end: { lineNumber: 1, column: 2 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -304,8 +302,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 1, column: 3 },
- end: { row: 1, column: 10 },
+ start: { lineNumber: 2, column: 4 },
+ end: { lineNumber: 2, column: 11 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -317,8 +315,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 2, column: 6 },
- end: { row: 2, column: 13 },
+ start: { lineNumber: 3, column: 7 },
+ end: { lineNumber: 3, column: 14 },
},
autoCompleteSet: ['match_all', 'term'],
},
@@ -330,8 +328,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 4, column: 3 },
- end: { row: 4, column: 15 },
+ start: { lineNumber: 5, column: 4 },
+ end: { lineNumber: 5, column: 16 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -343,6 +341,7 @@ describe('Integration', () => {
]
);
+
contextTests(
'{\n' +
' "query": {\n' +
@@ -363,8 +362,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: ', ',
rangeToReplace: {
- start: { row: 4, column: 16 },
- end: { row: 4, column: 16 },
+ start: { lineNumber: 5, column: 17 },
+ end: { lineNumber: 5, column: 17 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -376,8 +375,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: ', ',
rangeToReplace: {
- start: { row: 5, column: 1 },
- end: { row: 5, column: 1 },
+ start: { lineNumber: 6, column: 2 },
+ end: { lineNumber: 6, column: 2 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -389,8 +388,8 @@ describe('Integration', () => {
prefixToAdd: ', ',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 6, column: 0 },
- end: { row: 6, column: 0 },
+ start: { lineNumber: 7, column: 1 },
+ end: { lineNumber: 7, column: 1 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -402,14 +401,15 @@ describe('Integration', () => {
prefixToAdd: ', ',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 5, column: 14 },
- end: { row: 5, column: 14 },
+ start: { lineNumber: 6, column: 15 },
+ end: { lineNumber: 6, column: 15 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
]
);
+
contextTests(
{
object: 1,
@@ -490,8 +490,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 5, column: 15 },
- end: { row: 5, column: 15 },
+ start: { lineNumber: 6, column: 16 },
+ end: { lineNumber: 6, column: 16 },
},
autoCompleteSet: [{ name: 'terms', meta: 'API' }],
},
@@ -575,6 +575,7 @@ describe('Integration', () => {
]
);
+
contextTests(
{
string: 'value',
@@ -900,8 +901,8 @@ describe('Integration', () => {
name: 'Replace an empty string',
cursor: { row: 1, column: 4 },
rangeToReplace: {
- start: { row: 1, column: 3 },
- end: { row: 1, column: 9 },
+ start: { lineNumber: 2, column: 4 },
+ end: { lineNumber: 2, column: 10 },
},
},
]
@@ -1210,8 +1211,8 @@ describe('Integration', () => {
name: 'Params on existing param',
cursor: { row: 0, column: 26 },
rangeToReplace: {
- start: { row: 0, column: 24 },
- end: { row: 0, column: 30 },
+ start: { lineNumber: 1, column: 25 },
+ end: { lineNumber: 1, column: 31 },
},
autoCompleteSet: [
{ name: 'filter_path', meta: 'param', insertValue: 'filter_path=' },
@@ -1235,8 +1236,8 @@ describe('Integration', () => {
name: 'Params on existing value',
cursor: { row: 0, column: 37 },
rangeToReplace: {
- start: { row: 0, column: 36 },
- end: { row: 0, column: 39 },
+ start: { lineNumber: 1, column: 37 },
+ end: { lineNumber: 1, column: 40 },
},
autoCompleteSet: [
{ name: 'count', meta: 'search_type' },
@@ -1247,6 +1248,7 @@ describe('Integration', () => {
},
]
);
+
contextTests(
null,
MAPPING,
@@ -1257,8 +1259,8 @@ describe('Integration', () => {
name: 'Params on just after = with existing value',
cursor: { row: 0, column: 36 },
rangeToReplace: {
- start: { row: 0, column: 36 },
- end: { row: 0, column: 36 },
+ start: { lineNumber: 1, column: 37 },
+ end: { lineNumber: 1, column: 37 },
},
autoCompleteSet: [
{ name: 'count', meta: 'search_type' },
@@ -1290,8 +1292,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 1, column: 3 },
- end: { row: 1, column: 10 },
+ start: { lineNumber: 2, column: 4 },
+ end: { lineNumber: 2, column: 11 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
@@ -1303,8 +1305,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 2, column: 6 },
- end: { row: 2, column: 13 },
+ start: { lineNumber: 3, column: 7 },
+ end: { lineNumber: 3, column: 14 },
},
autoCompleteSet: ['match_all', 'term'],
},
@@ -1316,8 +1318,8 @@ describe('Integration', () => {
prefixToAdd: '',
suffixToAdd: '',
rangeToReplace: {
- start: { row: 4, column: 3 },
- end: { row: 4, column: 15 },
+ start: { lineNumber: 5, column: 4 },
+ end: { lineNumber: 5, column: 16 },
},
autoCompleteSet: ['facets', 'query', 'size'],
},
diff --git a/src/legacy/core_plugins/console/public/quarantined/tests/src/setup_mocks.js b/src/legacy/core_plugins/console/public/quarantined/tests/src/setup_mocks.js
index e0a4a04638178..203d8a20b1055 100644
--- a/src/legacy/core_plugins/console/public/quarantined/tests/src/setup_mocks.js
+++ b/src/legacy/core_plugins/console/public/quarantined/tests/src/setup_mocks.js
@@ -20,6 +20,15 @@
jest.mock('../../src/sense_editor/mode/worker', () => {
return { workerModule: { id: 'sense_editor/mode/worker', src: '' } };
});
+
+jest.mock('ui/chrome', () => {
+ return {
+ getInjected() {
+ return 'http://localhost:9200';
+ }
+ };
+});
+
window.Worker = function () {
this.postMessage = () => {};
this.terminate = () => {};
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
index cbbbd41827853..1dad1b488590e 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/index.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { PluginInitializerContext } from 'kibana/public';
+import { PluginInitializerContext } from '../../../../../../core/public';
import { DashboardEmbeddableContainerPublicPlugin } from './plugin';
export * from './lib';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
index b0707610cf21b..6c0db82fbbc5b 100644
--- a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/index.ts
@@ -18,3 +18,4 @@
*/
export { ExpandPanelAction, EXPAND_PANEL_ACTION } from './expand_panel_action';
+export { ReplacePanelAction, REPLACE_PANEL_ACTION } from './replace_panel_action';
diff --git a/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx
new file mode 100644
index 0000000000000..b6652caf3ab83
--- /dev/null
+++ b/src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public/lib/actions/open_replace_panel_flyout.tsx
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { CoreStart } from 'src/core/public';
+import { ReplacePanelFlyout } from './replace_panel_flyout';
+
+import {
+ IEmbeddable,
+ EmbeddableInput,
+ EmbeddableOutput,
+} from '../../../../../../embeddable_api/public/np_ready/public';
+
+import { IContainer } from '../../../../../../embeddable_api/public/np_ready/public';
+import { NotificationsStart } from '../../../../../../../../core/public';
+
+export async function openReplacePanelFlyout(options: {
+ embeddable: IContainer;
+ core: CoreStart;
+ savedObjectFinder: React.ComponentType
+ {panelToReplace} +
+
+ {state.isEmpty ?
+ );
};
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
index 428b431d298ad..2ff71a6df60cf 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/index.ts
@@ -22,7 +22,7 @@ import { ExpressionsPublicPlugin } from './plugin';
export * from './plugin';
export { ExpressionRenderer, ExpressionRendererProps } from './expression_renderer';
-export { IInterpreterRenderFunction } from './types';
+export { IInterpreterRenderFunction, IInterpreterRenderHandlers } from './types';
export function plugin(initializerContext: PluginInitializerContext) {
return new ExpressionsPublicPlugin(initializerContext);
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
index 6cb27827cffb6..36917bf4e8384 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.test.ts
@@ -19,6 +19,7 @@
import { first } from 'rxjs/operators';
import { loader, ExpressionLoader } from './loader';
+import { ExpressionDataHandler } from './execute';
import { fromExpression } from '@kbn/interpreter/common';
import { IInterpreterRenderHandlers } from './types';
import { Observable } from 'rxjs';
@@ -48,27 +49,37 @@ jest.mock('./services', () => {
};
});
+jest.mock('./execute', () => {
+ const actual = jest.requireActual('./execute');
+ return {
+ ExpressionDataHandler: jest
+ .fn()
+ .mockImplementation((...args) => new actual.ExpressionDataHandler(...args)),
+ execute: jest.fn().mockReturnValue(actual.execute),
+ };
+});
+
describe('execute helper function', () => {
- it('returns ExpressionDataHandler instance', () => {
+ it('returns ExpressionLoader instance', () => {
const response = loader(element, '', {});
expect(response).toBeInstanceOf(ExpressionLoader);
});
});
-describe('ExpressionDataHandler', () => {
+describe('ExpressionLoader', () => {
const expressionString = '';
describe('constructor', () => {
it('accepts expression string', () => {
- const expressionDataHandler = new ExpressionLoader(element, expressionString, {});
- expect(expressionDataHandler.getExpression()).toEqual(expressionString);
+ const expressionLoader = new ExpressionLoader(element, expressionString, {});
+ expect(expressionLoader.getExpression()).toEqual(expressionString);
});
it('accepts expression AST', () => {
const expressionAST = fromExpression(expressionString) as ExpressionAST;
- const expressionDataHandler = new ExpressionLoader(element, expressionAST, {});
- expect(expressionDataHandler.getExpression()).toEqual(expressionString);
- expect(expressionDataHandler.getAst()).toEqual(expressionAST);
+ const expressionLoader = new ExpressionLoader(element, expressionAST, {});
+ expect(expressionLoader.getExpression()).toEqual(expressionString);
+ expect(expressionLoader.getAst()).toEqual(expressionAST);
});
it('creates observables', () => {
@@ -86,6 +97,22 @@ describe('ExpressionDataHandler', () => {
expect(response).toEqual({ type: 'render', as: 'test' });
});
+ it('emits on loading$ when starting to load', async () => {
+ const expressionLoader = new ExpressionLoader(element, expressionString, {});
+ let loadingPromise = expressionLoader.loading$.pipe(first()).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();
+ });
+
it('emits on render$ when rendering is done', async () => {
const expressionLoader = new ExpressionLoader(element, expressionString, {});
const response = await expressionLoader.render$.pipe(first()).toPromise();
@@ -96,14 +123,91 @@ describe('ExpressionDataHandler', () => {
const expressionLoader = new ExpressionLoader(element, expressionString, {});
let response = await expressionLoader.render$.pipe(first()).toPromise();
expect(response).toBe(1);
- expressionLoader.update('', {});
+ expressionLoader.update('test');
response = await expressionLoader.render$.pipe(first()).toPromise();
expect(response).toBe(2);
});
- it('cancel() aborts request', () => {
- const expressionDataHandler = new ExpressionLoader(element, expressionString, {});
- expressionDataHandler.cancel();
+ it('cancels the previous request when the expression is updated', () => {
+ const cancelMock = jest.fn();
+
+ (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+ getData: () => true,
+ cancel: cancelMock,
+ }));
+
+ const expressionLoader = new ExpressionLoader(element, expressionString, {});
+ expressionLoader.update('new', {});
+
+ expect(cancelMock).toHaveBeenCalledTimes(1);
+ });
+
+ it('does not send an observable message if a request was aborted', () => {
+ const cancelMock = jest.fn();
+
+ const getData = jest
+ .fn()
+ .mockResolvedValueOnce({
+ type: 'error',
+ error: {
+ name: 'AbortError',
+ },
+ })
+ .mockResolvedValueOnce({
+ type: 'real',
+ });
+
+ (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+ getData,
+ cancel: cancelMock,
+ }));
+ (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+ getData,
+ cancel: cancelMock,
+ }));
+
+ const expressionLoader = new ExpressionLoader(element, expressionString, {});
+
+ expect.assertions(2);
+ expressionLoader.data$.subscribe({
+ next(data) {
+ expect(data).toEqual({
+ type: 'real',
+ });
+ },
+ error() {
+ expect(false).toEqual('Should not be called');
+ },
+ });
+
+ expressionLoader.update('new expression', {});
+
+ expect(getData).toHaveBeenCalledTimes(2);
+ });
+
+ it('sends an observable error if the data fetching failed', () => {
+ const cancelMock = jest.fn();
+
+ const getData = jest.fn().mockResolvedValue('rejected');
+
+ (ExpressionDataHandler as jest.Mock).mockImplementationOnce(() => ({
+ getData,
+ cancel: cancelMock,
+ }));
+
+ const expressionLoader = new ExpressionLoader(element, expressionString, {});
+
+ expect.assertions(2);
+ expressionLoader.data$.subscribe({
+ next(data) {
+ expect(data).toEqual('Should not be called');
+ },
+ error(error) {
+ expect(error.message).toEqual('Could not fetch data');
+ },
+ });
+
+ expect(getData).toHaveBeenCalledTimes(1);
});
it('inspect() returns correct inspector adapters', () => {
diff --git a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
index a2893ab854ceb..709fbc78a9b52 100644
--- a/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
+++ b/src/legacy/core_plugins/expressions/public/np_ready/public/loader.ts
@@ -18,11 +18,11 @@
*/
import { Observable, Subject } from 'rxjs';
-import { first, share } from 'rxjs/operators';
+import { share } from 'rxjs/operators';
import { Adapters, InspectorSession } from '../../../../../../plugins/inspector/public';
-import { execute, ExpressionDataHandler } from './execute';
+import { ExpressionDataHandler } from './execute';
import { ExpressionRenderHandler } from './render';
-import { RenderId, Data, IExpressionLoaderParams, ExpressionAST } from './types';
+import { Data, IExpressionLoaderParams, ExpressionAST } from './types';
import { getInspector } from './services';
export class ExpressionLoader {
@@ -30,11 +30,14 @@ export class ExpressionLoader {
update$: ExpressionRenderHandler['update$'];
render$: ExpressionRenderHandler['render$'];
events$: ExpressionRenderHandler['events$'];
+ loading$: Observable{state.error.message}
+ )
+ ) : null}
+
+ -
- <% defPairs.forEach(function (def) { %>
-
- <%- def[0] %>: -
- <%= def[1] %> - <%= ' ' %> - <% }); %> -