Merge branch '7.x' into backport/7.x/commit-7c18a02e

elastic · Oct 21, 2019 · a112a6f · a112a6f
2 parents bfe7c0e + e28ea61
commit a112a6f
Show file tree

Hide file tree

Showing 249 changed files with 4,808 additions and 5,584 deletions.
diff --git a/docs/development/core/public/kibana-plugin-public.httperrorresponse.body.md b/docs/development/core/public/kibana-plugin-public.httperrorresponse.body.md
diff --git a/docs/development/core/public/kibana-plugin-public.httperrorresponse.md b/docs/development/core/public/kibana-plugin-public.httperrorresponse.md
@@ -8,15 +8,12 @@
 <b>Signature:</b>
 
 ```typescript
-export interface HttpErrorResponse 
+export interface HttpErrorResponse extends HttpResponse 
 ```
 
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [body](./kibana-plugin-public.httperrorresponse.body.md) | <code>HttpBody</code> |  |
 |  [error](./kibana-plugin-public.httperrorresponse.error.md) | <code>Error &#124; IHttpFetchError</code> |  |
-|  [request](./kibana-plugin-public.httperrorresponse.request.md) | <code>Request</code> |  |
-|  [response](./kibana-plugin-public.httperrorresponse.response.md) | <code>Response</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-public.httperrorresponse.request.md b/docs/development/core/public/kibana-plugin-public.httperrorresponse.request.md
diff --git a/docs/development/core/public/kibana-plugin-public.httperrorresponse.response.md b/docs/development/core/public/kibana-plugin-public.httperrorresponse.response.md
diff --git a/docs/development/core/public/kibana-plugin-public.httpinterceptor.response.md b/docs/development/core/public/kibana-plugin-public.httpinterceptor.response.md
@@ -9,7 +9,7 @@ Define an interceptor to be executed after a response is received.
 <b>Signature:</b>
 
 ```typescript
-response?(httpResponse: HttpResponse, controller: IHttpInterceptController): Promise<HttpResponse> | HttpResponse | void;
+response?(httpResponse: HttpResponse, controller: IHttpInterceptController): Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void;
 ```
 
 ## Parameters
@@ -21,5 +21,5 @@ response?(httpResponse: HttpResponse, controller: IHttpInterceptController): Pro
 
 <b>Returns:</b>
 
-`Promise<HttpResponse> | HttpResponse | void`
+`Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void`
 
diff --git a/docs/development/core/public/kibana-plugin-public.httpinterceptor.responseerror.md b/docs/development/core/public/kibana-plugin-public.httpinterceptor.responseerror.md
@@ -9,7 +9,7 @@ Define an interceptor to be executed if a response interceptor throws an error o
 <b>Signature:</b>
 
 ```typescript
-responseError?(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptController): Promise<HttpResponse> | HttpResponse | void;
+responseError?(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptController): Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void;
 ```
 
 ## Parameters
@@ -21,5 +21,5 @@ responseError?(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptC
 
 <b>Returns:</b>
 
-`Promise<HttpResponse> | HttpResponse | void`
+`Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void`
 
diff --git a/docs/development/core/public/kibana-plugin-public.httpresponse.body.md b/docs/development/core/public/kibana-plugin-public.httpresponse.body.md
diff --git a/docs/development/core/public/kibana-plugin-public.httpresponse.md b/docs/development/core/public/kibana-plugin-public.httpresponse.md
@@ -8,14 +8,12 @@
 <b>Signature:</b>
 
 ```typescript
-export interface HttpResponse 
+export interface HttpResponse extends InterceptedHttpResponse 
 ```
 
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [body](./kibana-plugin-public.httpresponse.body.md) | <code>HttpBody</code> |  |
-|  [request](./kibana-plugin-public.httpresponse.request.md) | <code>Request</code> |  |
-|  [response](./kibana-plugin-public.httpresponse.response.md) | <code>Response</code> |  |
+|  [request](./kibana-plugin-public.httpresponse.request.md) | <code>Readonly&lt;Request&gt;</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-public.httpresponse.request.md b/docs/development/core/public/kibana-plugin-public.httpresponse.request.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-request?: Request;
+request: Readonly<Request>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.httpresponse.response.md b/docs/development/core/public/kibana-plugin-public.httpresponse.response.md
diff --git a/docs/development/core/public/kibana-plugin-public.interceptedhttpresponse.body.md b/docs/development/core/public/kibana-plugin-public.interceptedhttpresponse.body.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [InterceptedHttpResponse](./kibana-plugin-public.interceptedhttpresponse.md) &gt; [body](./kibana-plugin-public.interceptedhttpresponse.body.md)
+
+## InterceptedHttpResponse.body property
+
+<b>Signature:</b>
+
+```typescript
+body?: HttpBody;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.interceptedhttpresponse.md b/docs/development/core/public/kibana-plugin-public.interceptedhttpresponse.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [InterceptedHttpResponse](./kibana-plugin-public.interceptedhttpresponse.md)
+
+## InterceptedHttpResponse interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface InterceptedHttpResponse 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [body](./kibana-plugin-public.interceptedhttpresponse.body.md) | <code>HttpBody</code> |  |
+|  [response](./kibana-plugin-public.interceptedhttpresponse.response.md) | <code>Response</code> |  |
+
diff --git a/...evelopment/core/public/kibana-plugin-public.interceptedhttpresponse.response.md b/...evelopment/core/public/kibana-plugin-public.interceptedhttpresponse.response.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [InterceptedHttpResponse](./kibana-plugin-public.interceptedhttpresponse.md) &gt; [response](./kibana-plugin-public.interceptedhttpresponse.response.md)
+
+## InterceptedHttpResponse.response property
+
+<b>Signature:</b>
+
+```typescript
+response?: Response;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
@@ -61,6 +61,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [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) |  |
 |  [IHttpInterceptController](./kibana-plugin-public.ihttpinterceptcontroller.md) | Used to halt a request Promise chain in a [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md)<!-- -->. |
+|  [InterceptedHttpResponse](./kibana-plugin-public.interceptedhttpresponse.md) |  |
 |  [LegacyCoreSetup](./kibana-plugin-public.legacycoresetup.md) | Setup interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
 |  [LegacyCoreStart](./kibana-plugin-public.legacycorestart.md) | Start interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
 |  [LegacyNavLink](./kibana-plugin-public.legacynavlink.md) |  |

diff --git a/package.json b/package.json
@@ -171,7 +171,7 @@
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
     "history": "^4.9.0",
-    "hjson": "3.1.2",
+    "hjson": "3.2.0",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.2",
@@ -443,7 +443,7 @@
     "strip-ansi": "^3.0.1",
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",
-    "tree-kill": "^1.1.0",
+    "tree-kill": "^1.2.1",
     "typescript": "3.5.3",
     "typings-tester": "^0.3.2",
     "vinyl-fs": "^3.0.3",

diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
@@ -17,7 +17,7 @@
     "getopts": "^2.2.5",
     "moment": "^2.20.1",
     "rxjs": "^6.2.1",
-    "tree-kill": "^1.2.0",
+    "tree-kill": "^1.2.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.ts b/packages/kbn-dev-utils/src/proc_runner/proc.ts
@@ -26,7 +26,7 @@ import chalk from 'chalk';
 
 import treeKill from 'tree-kill';
 import { promisify } from 'util';
-const treeKillAsync = promisify(treeKill);
+const treeKillAsync = promisify((...args: [number, string, any]) => treeKill(...args));
 
 import { ToolingLog } from '../tooling_log';
 import { observeLines } from './observe_lines';

diff --git a/packages/kbn-es-query/src/es_query/__tests__/from_filters.js b/packages/kbn-es-query/src/es_query/__tests__/from_filters.js
@@ -55,6 +55,32 @@ describe('build query', function () {
       expect(result.filter).to.eql(expectedESQueries);
     });
 
+    it('should remove disabled filters', function () {
+      const filters = [
+        {
+          match_all: {},
+          meta: { type: 'match_all', negate: true, disabled: true },
+        },
+      ];
+
+      const expectedESQueries = [];
+
+      const result = buildQueryFromFilters(filters);
+
+      expect(result.must_not).to.eql(expectedESQueries);
+    });
+
+    it('should remove falsy filters', function () {
+      const filters = [null, undefined];
+
+      const expectedESQueries = [];
+
+      const result = buildQueryFromFilters(filters);
+
+      expect(result.must_not).to.eql(expectedESQueries);
+      expect(result.must).to.eql(expectedESQueries);
+    });
+
     it('should place negated filters in the must_not clause', function () {
       const filters = [
         {

diff --git a/packages/kbn-es-query/src/es_query/from_filters.js b/packages/kbn-es-query/src/es_query/from_filters.js
@@ -60,6 +60,7 @@ const cleanFilter = function (filter) {
 };
 
 export function buildQueryFromFilters(filters = [], indexPattern, ignoreFilterIfFieldNotInIndex) {
+  filters = filters.filter(filter => filter && !_.get(filter, ['meta', 'disabled']));
   return {
     must: [],
     filter: filters

diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json
@@ -17,7 +17,7 @@
     "node-fetch": "^2.6.0",
     "simple-git": "^1.91.0",
     "tar-fs": "^1.16.3",
-    "tree-kill": "^1.1.0",
+    "tree-kill": "^1.2.1",
     "yauzl": "^2.10.0"
   }
 }
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
@@ -406,12 +406,26 @@ class HeaderUI extends Component<Props, State> {
           data-test-subj="navDrawer"
           isLocked={isLocked}
           onIsLockedUpdate={onIsLockedUpdate}
+          aria-label={i18n.translate('core.ui.primaryNav.screenReaderLabel', {
+            defaultMessage: 'Primary',
+          })}
         >
-          <nav>
-            <EuiNavDrawerGroup listItems={recentLinksArray} />
+          <>
+            <EuiNavDrawerGroup
+              listItems={recentLinksArray}
+              aria-label={i18n.translate('core.ui.recentLinks.screenReaderLabel', {
+                defaultMessage: 'Recently viewed links, navigation',
+              })}
+            />
             <EuiHorizontalRule margin="none" />
-            <EuiNavDrawerGroup data-test-subj="navDrawerAppsMenu" listItems={navLinksArray} />
-          </nav>
+            <EuiNavDrawerGroup
+              data-test-subj="navDrawerAppsMenu"
+              listItems={navLinksArray}
+              aria-label={i18n.translate('core.ui.primaryNavList.screenReaderLabel', {
+                defaultMessage: 'Primary navigation links',
+              })}
+            />
+          </>
         </EuiNavDrawer>
       </header>
     );