Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into fix/unsavedCh…
Browse files Browse the repository at this point in the history 
…angesSpaceSpecific
  • Loading branch information
@ThomThomson
ThomThomson committed Mar 4, 2021
2 parents cc6828b + db3db0c commit 20ebef5
Show file tree
Hide file tree
Showing 223 changed files with 4,330 additions and 1,699 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@ module.exports = {
'no-restricted-imports': [
'error',
{
patterns: ['lodash/*', '!lodash/fp'],
patterns: ['lodash/*', '!lodash/fp', 'rxjs/internal-compatibility'],
},
],
},
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
/x-pack/plugins/runtime_fields @elastic/kibana-app-services
#CC# /src/plugins/bfetch/ @elastic/kibana-app-services
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-services
#CC# /src/plugins/inspector/ @elastic/kibana-app-services
Expand Down Expand Up @@ -207,6 +208,7 @@
#CC# /src/legacy/server/http/ @elastic/kibana-core
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-core
#CC# /src/plugins/legacy_export/ @elastic/kibana-core
#CC# /src/plugins/xpack_legacy/ @elastic/kibana-core
#CC# /src/plugins/saved_objects/ @elastic/kibana-core
#CC# /src/plugins/status_page/ @elastic/kibana-core
#CC# /x-pack/plugins/cloud/ @elastic/kibana-core
Expand Down
127 changes: 81 additions & 46 deletions api_docs/core.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7985,22 +7985,11 @@
"id": "def-server.IContextContainer",
"type": "Interface",
"label": "IContextContainer",
"signature": [
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.IContextContainer",
"text": "IContextContainer"
},
"<THandler>"
],
"description": [
"\nAn object that handles registration of context providers and configuring handlers with context.\n"
],
"tags": [
"remarks",
"typeParam",
"public"
],
"children": [
Expand Down Expand Up @@ -8043,8 +8032,8 @@
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 154,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L154"
"lineNumber": 151,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L151"
}
},
{
Expand All @@ -8059,8 +8048,8 @@
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 155,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L155"
"lineNumber": 152,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L152"
}
},
{
Expand All @@ -8082,8 +8071,8 @@
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 156,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L156"
"lineNumber": 153,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L153"
}
}
],
Expand All @@ -8095,26 +8084,49 @@
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 153,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L153"
"lineNumber": 150,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L150"
}
},
{
"id": "def-server.IContextContainer.createHandler",
"type": "Function",
"label": "createHandler",
"signature": [
"(pluginOpaqueId: symbol, handler: THandler) => (...rest: ",
"(pluginOpaqueId: symbol, handler: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.RequestHandler",
"text": "RequestHandler"
},
"<unknown, unknown, unknown, ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.HandlerParameters",
"text": "HandlerParameters"
"section": "def-server.RequestHandlerContext",
"text": "RequestHandlerContext"
},
", any, { custom: <T extends string | Record<string, any> | Error | { message: string | Error; attributes?: Record<string, any> | undefined; } | Buffer | ",
"Stream",
" | undefined>(options: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.CustomHttpResponseOptions",
"text": "CustomHttpResponseOptions"
},
"<THandler>) => ",
"ShallowPromise",
"<ReturnType<THandler>>"
"<T>) => ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaResponse",
"text": "KibanaResponse"
}
],
"description": [
"\nCreate a new handler function pre-wired to context for the plugin.\n"
Expand All @@ -8132,42 +8144,74 @@
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 168,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L168"
"lineNumber": 165,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L165"
}
},
{
"type": "Function",
"label": "handler",
"isRequired": true,
"signature": [
"THandler"
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.RequestHandler",
"text": "RequestHandler"
},
"<unknown, unknown, unknown, ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.RequestHandlerContext",
"text": "RequestHandlerContext"
},
", any, { custom: <T extends string | Record<string, any> | Error | { message: string | Error; attributes?: Record<string, any> | undefined; } | Buffer | ",
"Stream",
" | undefined>(options: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.CustomHttpResponseOptions",
"text": "CustomHttpResponseOptions"
},
"<T>) => ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.KibanaResponse",
"text": "KibanaResponse"
}
],
"description": [
"- Handler function to pass context object to."
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 169,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L169"
"lineNumber": 166,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L166"
}
}
],
"tags": [],
"returnComment": [
"A function that takes `THandlerParameters`, calls `handler` with a new context, and returns a Promise of\nthe `handler` return value."
"A function that takes `RequestHandler` parameters, calls `handler` with a new context, and returns a Promise of\nthe `handler` return value."
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 167,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L167"
"lineNumber": 164,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L164"
}
}
],
"source": {
"path": "src/core/server/context/container/context.ts",
"lineNumber": 138,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L138"
"lineNumber": 135,
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/context/container/context.ts#L135"
},
"initialIsOpen": false
},
Expand Down Expand Up @@ -16631,23 +16675,14 @@
"type": "Function",
"label": "createContextContainer",
"signature": [
"<THandler extends ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.HandlerFunction",
"text": "HandlerFunction"
},
"<any>>() => ",
"() => ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.IContextContainer",
"text": "IContextContainer"
},
"<THandler>"
}
],
"description": [
"\nCreates a new {@link IContextContainer} for a service owner."
Expand Down
29 changes: 4 additions & 25 deletions api_docs/core_http.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3725,9 +3725,9 @@
{
"pluginId": "core",
"scope": "server",
"docId": "kibCoreHttpPluginApi",
"section": "def-server.RequestHandlerContextContainer",
"text": "RequestHandlerContextContainer"
"docId": "kibCorePluginApi",
"section": "def-server.IContextContainer",
"text": "IContextContainer"
}
]
},
Expand Down Expand Up @@ -6509,28 +6509,7 @@
"link": "https://github.com/elastic/kibana/tree/mastersrc/core/server/http/types.ts#L30"
},
"signature": [
"IContextContainer<RequestHandler<unknown, unknown, unknown, RequestHandlerContext, any, { custom: <T extends string | Record<string, any> | Error | { message: string | Error; attributes?: Record<string, any> | undefined; } | Buffer | ",
"Stream",
" | undefined>(options: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.CustomHttpResponseOptions",
"text": "CustomHttpResponseOptions"
},
"<T>) => ",
"KibanaResponse",
"<T>; badRequest: (options?: ",
{
"pluginId": "core",
"scope": "server",
"docId": "kibCorePluginApi",
"section": "def-server.ErrorHttpResponseOptions",
"text": "ErrorHttpResponseOptions"
},
") => ",
"KibanaResponse"
"IContextContainer"
],
"initialIsOpen": false
},
Expand Down
Loading

0 comments on commit 20ebef5

Please sign in to comment.