Skip to content

Commit

Permalink
Merge branch 'master' into 74111-migrate-es-client
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibanamachine
kibanamachine authored Mar 3, 2021
2 parents 0198e02 + e2fb476 commit f6f094a
Show file tree
Hide file tree
Showing 24 changed files with 488 additions and 240 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,12 @@
/x-pack/plugins/ml/ @elastic/ml-ui
/x-pack/test/functional/apps/ml/ @elastic/ml-ui
/x-pack/test/functional/services/ml/ @elastic/ml-ui
/x-pack/test/accessibility/apps/ml.ts @elastic/ml-ui
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
/x-pack/plugins/transform/ @elastic/ml-ui
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
/x-pack/test/functional/services/transform/ @elastic/ml-ui
/x-pack/test/accessibility/apps/transform.ts @elastic/ml-ui
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui

Expand Down
100 changes: 0 additions & 100 deletions api_docs/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26207,106 +26207,6 @@
"returnComment": [],
"initialIsOpen": false
},
{
"id": "def-common.getConvertedValueForField",
"type": "Function",
"children": [
{
"type": "Object",
"label": "field",
"isRequired": true,
"signature": [
{
"pluginId": "data",
"scope": "common",
"docId": "kibDataIndexPatternsPluginApi",
"section": "def-common.IFieldType",
"text": "IFieldType"
}
],
"description": [],
"source": {
"path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
"lineNumber": 107,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/es_query/filters/phrase_filter.ts#L107"
}
},
{
"type": "Any",
"label": "value",
"isRequired": true,
"signature": [
"any"
],
"description": [],
"source": {
"path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
"lineNumber": 107,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/es_query/filters/phrase_filter.ts#L107"
}
}
],
"signature": [
"(field: ",
{
"pluginId": "data",
"scope": "common",
"docId": "kibDataIndexPatternsPluginApi",
"section": "def-common.IFieldType",
"text": "IFieldType"
},
", value: any) => any"
],
"description": [
"\nSee issues bellow for the reason behind this change.\nValues need to be converted to correct types for boolean \\ numeric fields.\nhttps://github.com/elastic/kibana/issues/74301\nhttps://github.com/elastic/kibana/issues/8677\nhttps://github.com/elastic/elasticsearch/issues/20941\nhttps://github.com/elastic/elasticsearch/pull/22201"
],
"label": "getConvertedValueForField",
"source": {
"path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
"lineNumber": 107,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/es_query/filters/phrase_filter.ts#L107"
},
"tags": [],
"returnComment": [],
"initialIsOpen": false
},
{
"id": "def-common.buildInlineScriptForPhraseFilter",
"type": "Function",
"children": [
{
"type": "Any",
"label": "scriptedField",
"isRequired": true,
"signature": [
"any"
],
"description": [],
"source": {
"path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
"lineNumber": 132,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/es_query/filters/phrase_filter.ts#L132"
}
}
],
"signature": [
"(scriptedField: any) => string"
],
"description": [
"\nTakes a scripted field and returns an inline script appropriate for use in a script query.\nHandles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid\nscripts.\n"
],
"label": "buildInlineScriptForPhraseFilter",
"source": {
"path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
"lineNumber": 132,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/es_query/filters/phrase_filter.ts#L132"
},
"tags": [],
"returnComment": [
"The inline script string"
],
"initialIsOpen": false
},
{
"id": "def-common.isPhrasesFilter",
"type": "Function",
Expand Down
102 changes: 60 additions & 42 deletions api_docs/data_search.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 70,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L70"
"lineNumber": 75,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L75"
}
}
],
"tags": [],
"returnComment": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 70,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L70"
"lineNumber": 75,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L75"
}
},
{
Expand All @@ -67,8 +67,8 @@
"returnComment": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 86,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L86"
"lineNumber": 91,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L91"
}
},
{
Expand Down Expand Up @@ -128,8 +128,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 95,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L95"
"lineNumber": 100,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L100"
}
},
{
Expand All @@ -142,8 +142,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 96,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L96"
"lineNumber": 101,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L101"
}
},
{
Expand All @@ -163,17 +163,17 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 97,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L97"
"lineNumber": 102,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L102"
}
}
],
"tags": [],
"returnComment": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 94,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L94"
"lineNumber": 99,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L99"
}
},
{
Expand Down Expand Up @@ -230,8 +230,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 233,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L233"
"lineNumber": 247,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L247"
}
},
{
Expand All @@ -251,8 +251,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 234,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L234"
"lineNumber": 248,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L248"
}
}
],
Expand All @@ -264,8 +264,8 @@
],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 232,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L232"
"lineNumber": 246,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L246"
}
},
{
Expand All @@ -287,24 +287,24 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 261,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L261"
"lineNumber": 275,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L275"
}
}
],
"tags": [],
"returnComment": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 261,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L261"
"lineNumber": 275,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L275"
}
}
],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 45,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L45"
"lineNumber": 50,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L50"
},
"initialIsOpen": false
},
Expand Down Expand Up @@ -990,8 +990,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 36,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L36"
"lineNumber": 41,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L41"
},
"signature": [
{
Expand All @@ -1011,8 +1011,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 37,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L37"
"lineNumber": 42,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L42"
},
"signature": [
{
Expand All @@ -1032,8 +1032,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 38,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L38"
"lineNumber": 43,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L43"
},
"signature": [
{
Expand All @@ -1053,8 +1053,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 39,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L39"
"lineNumber": 44,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L44"
},
"signature": [
"Promise<[",
Expand All @@ -1076,8 +1076,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 40,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L40"
"lineNumber": 45,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L45"
},
"signature": [
"Pick<",
Expand All @@ -1099,8 +1099,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 41,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L41"
"lineNumber": 46,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L46"
},
"signature": [
{
Expand All @@ -1121,8 +1121,8 @@
"description": [],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 42,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L42"
"lineNumber": 47,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L47"
},
"signature": [
"Pick<",
Expand All @@ -1139,8 +1139,8 @@
],
"source": {
"path": "src/plugins/data/public/search/search_interceptor.ts",
"lineNumber": 35,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L35"
"lineNumber": 40,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/public/search/search_interceptor.ts#L40"
},
"initialIsOpen": false
},
Expand Down Expand Up @@ -19191,6 +19191,24 @@
" | undefined) => Promise<void>"
],
"initialIsOpen": false
},
{
"id": "def-common.ISearchOptionsSerializable",
"type": "Type",
"label": "ISearchOptionsSerializable",
"tags": [],
"description": [
"\nSame as `ISearchOptions`, but contains only serializable fields, which can\nbe sent over the network."
],
"source": {
"path": "src/plugins/data/common/search/types.ts",
"lineNumber": 127,
"link": "https://github.com/elastic/kibana/tree/mastersrc/plugins/data/common/search/types.ts#L127"
},
"signature": [
"{ isStored?: boolean | undefined; isRestore?: boolean | undefined; sessionId?: string | undefined; strategy?: string | undefined; legacyHitsTotal?: boolean | undefined; }"
],
"initialIsOpen": false
}
],
"objects": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"graphql-fields": "^1.0.2",
"graphql-tag": "^2.10.3",
"graphql-tools": "^3.0.2",
"handlebars": "4.7.6",
"handlebars": "4.7.7",
"history": "^4.9.0",
"hjson": "3.2.1",
"http-proxy-agent": "^2.1.0",
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/data/common/es_query/filters/phrase_filter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export const getPhraseScript = (field: IFieldType, value: string) => {
};

/**
* @internal
* See issues bellow for the reason behind this change.
* Values need to be converted to correct types for boolean \ numeric fields.
* https://github.com/elastic/kibana/issues/74301
Expand All @@ -122,6 +123,7 @@ export const getConvertedValueForField = (field: IFieldType, value: any) => {
};

/**
* @internal
* Takes a scripted field and returns an inline script appropriate for use in a script query.
* Handles lucene expression and Painless scripts. Other langs aren't guaranteed to generate valid
* scripts.
Expand Down
Loading

0 comments on commit f6f094a

Please sign in to comment.