Skip to content

Commit 636ff99

Browse files
committed
Merge branch 'master' into alerting/deleted-alert-error
* master: (29 commits) Add test:jest_integration npm script (elastic#62938) [data.search.aggs] Remove service getters from agg types (AggConfig part) (elastic#62548) [Discover] Fix broken setting of bucketInterval (elastic#62939) Disable adding conditions when in alert management context. (elastic#63514) [Alerting] fixes to allow pre-configured actions to be executed (elastic#63432) adding useMemo (elastic#63504) [Maps] fix double fetch when filter pill is added (elastic#63024) [Lens] Fix missing formatting bug in "break down by" (elastic#63288) [SIEM] [Cases] Removed double pasted line (elastic#63507) [Reporting] Improve functional test steps (elastic#63259) [SIEM][CASE] Tests for server's configuration API (elastic#63099) [SIEM] [Cases] Case container unit tests (elastic#63376) [ML] Improving parsing of large uploaded files (elastic#62970) [ML] Listing global calendars on the job management page (elastic#63124) [Ingest][Endpoint] Add Ingest rest api response types for use in Endpoint (elastic#63373) Add help text to form fields (elastic#63165) [ML] Converts utils Mocha tests to Jest (elastic#63132) [Metrics UI] Refactor With* containers to hooks (elastic#59503) [NP] Migrate logstash server side code to NP (elastic#63135) Clicking cancel in saved query save modal doesn't close it (elastic#62774) ...
2 parents 435b487 + cf87efb commit 636ff99

File tree

458 files changed

+13602
-10885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+13602
-10885
lines changed

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export declare class Field implements IFieldType
2929
| [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) | | <code>any</code> | |
3030
| [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) | | <code>string</code> | |
3131
| [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) | | <code>string</code> | |
32-
| [routes](./kibana-plugin-plugins-data-public.indexpatternfield.routes.md) | | <code>Record&lt;string, string&gt;</code> | |
3332
| [script](./kibana-plugin-plugins-data-public.indexpatternfield.script.md) | | <code>string</code> | |
3433
| [scripted](./kibana-plugin-plugins-data-public.indexpatternfield.scripted.md) | | <code>boolean</code> | |
3534
| [searchable](./kibana-plugin-plugins-data-public.indexpatternfield.searchable.md) | | <code>boolean</code> | |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.routes.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfieldlist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ export declare class FieldList extends Array<Field> implements IFieldList
2424
| [getByName](./kibana-plugin-plugins-data-public.indexpatternfieldlist.getbyname.md) | | <code>(name: string) =&gt; Field &#124; undefined</code> | |
2525
| [getByType](./kibana-plugin-plugins-data-public.indexpatternfieldlist.getbytype.md) | | <code>(type: string) =&gt; any[]</code> | |
2626
| [remove](./kibana-plugin-plugins-data-public.indexpatternfieldlist.remove.md) | | <code>(field: IFieldType) =&gt; void</code> | |
27-
| [update](./kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md) | | <code>(field: Field) =&gt; void</code> | |
27+
| [update](./kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md) | | <code>(field: Record&lt;string, any&gt;) =&gt; void</code> | |
2828

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfieldlist.update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
update: (field: Field) => void;
10+
update: (field: Record<string, any>) => void;
1111
```

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"test:karma": "grunt test:karma",
4444
"test:karma:debug": "grunt test:karmaDebug",
4545
"test:jest": "node scripts/jest",
46+
"test:jest_integration": "node scripts/jest_integration",
4647
"test:mocha": "node scripts/mocha",
4748
"test:mocha:coverage": "grunt test:mochaCoverage",
4849
"test:ftr": "node scripts/functional_tests",
@@ -376,7 +377,7 @@
376377
"@types/recompose": "^0.30.6",
377378
"@types/redux-actions": "^2.6.1",
378379
"@types/request": "^2.48.2",
379-
"@types/selenium-webdriver": "4.0.9",
380+
"@types/selenium-webdriver": "^4.0.5",
380381
"@types/semver": "^5.5.0",
381382
"@types/sinon": "^7.0.13",
382383
"@types/strip-ansi": "^3.0.0",
@@ -462,7 +463,6 @@
462463
"load-grunt-config": "^3.0.1",
463464
"mocha": "^7.1.1",
464465
"mock-http-server": "1.3.0",
465-
"ms-chromium-edge-driver": "^0.2.0",
466466
"multistream": "^2.1.1",
467467
"murmurhash3js": "3.0.1",
468468
"mutation-observer": "^1.0.3",
@@ -481,7 +481,7 @@
481481
"react-textarea-autosize": "^7.1.2",
482482
"regenerate": "^1.4.0",
483483
"sass-lint": "^1.12.1",
484-
"selenium-webdriver": "^4.0.0-alpha.7",
484+
"selenium-webdriver": "^4.0.0-alpha.5",
485485
"simple-git": "1.116.0",
486486
"simplebar-react": "^2.1.0",
487487
"sinon": "^7.4.2",

0 commit comments

Comments
 (0)