Merge branch 'master' into 72402-manage-jobs-links

Author: afgomez

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=10.21.0
+ARG NODE_VERSION=10.22.0
 
 FROM node:${NODE_VERSION} AS base
 

.node-version

@@ -1 +1 @@
-10.21.0
+10.22.0

.nvmrc

@@ -1 +1 @@
-10.21.0
+10.22.0

docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.md

@@ -19,6 +19,6 @@ export interface RouteConfigOptions<Method extends RouteMethod>
 |  [authRequired](./kibana-plugin-core-server.routeconfigoptions.authrequired.md) | <code>boolean &#124; 'optional'</code> | Defines authentication mode for a route: - true. A user has to have valid credentials to access a resource - false. A user can access a resource without any credentials. - 'optional'. A user can access a resource if has valid credentials or no credentials at all. Can be useful when we grant access to a resource but want to identify a user if possible.<!-- -->Defaults to <code>true</code> if an auth mechanism is registered. |
 |  [body](./kibana-plugin-core-server.routeconfigoptions.body.md) | <code>Method extends 'get' &#124; 'options' ? undefined : RouteConfigOptionsBody</code> | Additional body options [RouteConfigOptionsBody](./kibana-plugin-core-server.routeconfigoptionsbody.md)<!-- -->. |
 |  [tags](./kibana-plugin-core-server.routeconfigoptions.tags.md) | <code>readonly string[]</code> | Additional metadata tag strings to attach to the route. |
-|  [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md) | <code>number</code> | Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes |
+|  [timeout](./kibana-plugin-core-server.routeconfigoptions.timeout.md) | <code>{</code><br/><code>        payload?: Method extends 'get' &#124; 'options' ? undefined : number;</code><br/><code>        idleSocket?: number;</code><br/><code>    }</code> | Defines per-route timeouts. |
 |  [xsrfRequired](./kibana-plugin-core-server.routeconfigoptions.xsrfrequired.md) | <code>Method extends 'get' ? never : boolean</code> | Defines xsrf protection requirements for a route: - true. Requires an incoming POST/PUT/DELETE request to contain <code>kbn-xsrf</code> header. - false. Disables xsrf protection.<!-- -->Set to true by default |
 

docs/development/core/server/kibana-plugin-core-server.routeconfigoptions.timeout.md

@@ -4,10 +4,13 @@
 
 ## RouteConfigOptions.timeout property
 
-Timeouts for processing durations. Response timeout is in milliseconds. Default value: 2 minutes
+Defines per-route timeouts.
 
 <b>Signature:</b>
 
 ```typescript
-timeout?: number;
+timeout?: {
+        payload?: Method extends 'get' | 'options' ? undefined : number;
+        idleSocket?: number;
+    };
 ```

docs/settings/reporting-settings.asciidoc

@@ -129,7 +129,7 @@ control the capturing process.
   | Specify how long to allow the Reporting browser to wait for the "Loading..." screen
   to dismiss and find the initial data for the Kibana page.  If the time is
   exceeded, a page screenshot is captured showing the current state, and the download link shows a warning message.
-  Defaults to `30000` (30 seconds).
+  Defaults to `60000` (1 minute).
 
 | `xpack.reporting.capture.timeouts.waitForElements`
   | Specify how long to allow the Reporting browser to wait for all visualization

examples/embeddable_examples/public/book/add_book_to_library_action.tsx

@@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
 import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
+import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
@@ -41,6 +42,8 @@ export const createAddBookToLibraryAction = () =>
       return (
         embeddable.type === BOOK_EMBEDDABLE &&
         embeddable.getInput().viewMode === ViewMode.EDIT &&
+        embeddable.getRoot().isContainer &&
+        embeddable.getRoot().type !== DASHBOARD_CONTAINER_TYPE &&
         isReferenceOrValueEmbeddable(embeddable) &&
         !embeddable.inputIsRefType(embeddable.getInput())
       );

examples/embeddable_examples/public/book/book_embeddable.tsx

@@ -26,6 +26,7 @@ import {
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
+  Container,
 } from '../../../../src/plugins/embeddable/public';
 import { BookSavedObjectAttributes } from '../../common';
 import { BookEmbeddableComponent } from './book_component';
@@ -103,7 +104,12 @@ export class BookEmbeddable extends Embeddable<BookEmbeddableInput, BookEmbeddab
   };
 
   getInputAsValueType = async (): Promise<BookByValueInput> => {
-    return this.attributeService.getInputAsValueType(this.input);
+    const input =
+      this.getRoot() && (this.getRoot() as Container).getInput().panels[this.id].explicitInput
+        ? ((this.getRoot() as Container).getInput().panels[this.id]
+            .explicitInput as BookEmbeddableInput)
+        : this.input;
+    return this.attributeService.getInputAsValueType(input);
   };
 
   getInputAsRefType = async (): Promise<BookByReferenceInput> => {

examples/embeddable_examples/public/book/unlink_book_from_library_action.tsx

@@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { createAction, IncompatibleActionError } from '../../../../src/plugins/ui_actions/public';
 import { BookEmbeddable, BOOK_EMBEDDABLE } from './book_embeddable';
 import { ViewMode, isReferenceOrValueEmbeddable } from '../../../../src/plugins/embeddable/public';
+import { DASHBOARD_CONTAINER_TYPE } from '../../../../src/plugins/dashboard/public';
 
 interface ActionContext {
   embeddable: BookEmbeddable;
@@ -41,6 +42,8 @@ export const createUnlinkBookFromLibraryAction = () =>
       return (
         embeddable.type === BOOK_EMBEDDABLE &&
         embeddable.getInput().viewMode === ViewMode.EDIT &&
+        embeddable.getRoot().isContainer &&
+        embeddable.getRoot().type !== DASHBOARD_CONTAINER_TYPE &&
         isReferenceOrValueEmbeddable(embeddable) &&
         embeddable.inputIsRefType(embeddable.getInput())
       );

package.json

@@ -90,11 +90,13 @@
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
+    "**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
     "**/image-diff/gm/debug": "^2.6.9",
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/react-dom": "^16.12.0",
     "**/react": "^16.12.0",
     "**/react-test-renderer": "^16.12.0",
+    "**/request": "^2.88.2",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1"
   },
@@ -479,7 +481,7 @@
     "zlib": "^1.0.5"
   },
   "engines": {
-    "node": "10.21.0",
+    "node": "10.22.0",
     "yarn": "^1.21.1"
   }
 }