Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-47746
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 21, 2019
2 parents 25bc4ea + 354973e commit 9f3461c
Show file tree
Hide file tree
Showing 291 changed files with 5,527 additions and 6,347 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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> | |

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,5 +21,5 @@ response?(httpResponse: HttpResponse, controller: IHttpInterceptController): Pro
<b>Returns:</b>
`Promise<HttpResponse> | HttpResponse | void`
`Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void`
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,5 +21,5 @@ responseError?(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptC
<b>Returns:</b>
`Promise<HttpResponse> | HttpResponse | void`
`Promise<InterceptedHttpResponse> | InterceptedHttpResponse | void`

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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> | |
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<b>Signature:</b>

```typescript
request?: Request;
request: Readonly<Request>;
```

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
```
Original file line number Diff line number Diff line change
@@ -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> | |

Original file line number Diff line number Diff line change
@@ -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;
```
1 change: 1 addition & 0 deletions docs/development/core/public/kibana-plugin-public.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) | |
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"dependencies": {
"@babel/core": "^7.5.5",
"@babel/register": "^7.5.5",
"@elastic/charts": "^13.5.1",
"@elastic/charts": "^13.5.4",
"@elastic/datemath": "5.0.2",
"@elastic/ems-client": "1.0.5",
"@elastic/eui": "14.5.0",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-dev-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-dev-utils/src/proc_runner/proc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
26 changes: 26 additions & 0 deletions packages/kbn-es-query/src/es_query/__tests__/from_filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-es-query/src/es_query/from_filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
22 changes: 18 additions & 4 deletions src/core/public/chrome/ui/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
Loading

0 comments on commit 9f3461c

Please sign in to comment.