Merge branch 'ingest-pipelines/editor-dropzone-refinement' into inges…

…t-pipelines/editor-error-messages

* ingest-pipelines/editor-dropzone-refinement: (122 commits)
  Fixes for monaco XJSON grammar parser and update form copy
  Added cancel move button
  Refactor SCSS values to variables
  use classNames as it is intended to be used
  Remove box shadow on all nested tree items
  Rename variables and prefix booleans with "is"
  Fixes bug on color picker defaults on TSVB (elastic#69889)
  [DOCS] Fixes wording in Upload a CSV section (elastic#69969)
  [Discover] Validate timerange before submitting query to ES (elastic#69363)
  [Maps] avoid using MAP_SAVED_OBJECT_TYPE constant when defining URL paths (elastic#69723)
  [Maps] Fix icon palettes are not working (elastic#69937)
  [Ingest Manager] Fix typo in constant name (elastic#69919)
  [test] skip status.allowAnonymous tests on cloud (elastic#69017)
  Fix backport (elastic#70003)
  [Reporting] ReportingStore module (elastic#69426)
  Add reporting assets to the eslint ignore file (elastic#69968)
  [Discover] set minBarHeight for high cardinality data (elastic#69875)
  Add featureUsage API to licensing context provider (elastic#69838)
  Fix uncaught typecheck merge conflict (elastic#70001)
  Use TS to discourage SO mappings with dynamic: false / dynamic: true (elastic#69927)
  ...

.backportrc.json

@@ -25,6 +25,7 @@
  ],
  "targetPRLabels": ["backport"],
  "branchLabelMapping": {
+ "^v8.0.0$": "master",
  "^v7.9.0$": "7.x",
  "^v(\\d+).(\\d+).\\d+$": "$1.$2"
  }

.ci/pipeline-library/build.gradle

@@ -20,6 +20,7 @@ dependencies {
  implementation 'org.jenkins-ci.plugins.workflow:workflow-step-api:2.19@jar'
  testImplementation 'com.lesfurets:jenkins-pipeline-unit:1.4'
  testImplementation 'junit:junit:4.12'
+ testImplementation 'org.mockito:mockito-core:2.+'
  testImplementation 'org.assertj:assertj-core:3.15+' // Temporary https://github.com/jenkinsci/JenkinsPipelineUnit/issues/209
 }
 

.ci/pipeline-library/src/test/KibanaBasePipelineTest.groovy

@@ -19,9 +19,9 @@ class KibanaBasePipelineTest extends BasePipelineTest {
  env.BUILD_DISPLAY_NAME = "#${env.BUILD_ID}"
 
  env.JENKINS_URL = 'http://jenkins.localhost:8080'
- env.BUILD_URL = "${env.JENKINS_URL}/job/elastic+kibana+${env.BRANCH_NAME}/${env.BUILD_ID}/"
+ env.BUILD_URL = "${env.JENKINS_URL}/job/elastic+kibana+${env.BRANCH_NAME}/${env.BUILD_ID}/".toString()
 
- env.JOB_BASE_NAME = "elastic / kibana # ${env.BRANCH_NAME}"
+ env.JOB_BASE_NAME = "elastic / kibana # ${env.BRANCH_NAME}".toString()
  env.JOB_NAME = env.JOB_BASE_NAME
 
  env.WORKSPACE = 'WS'
@@ -31,6 +31,9 @@ class KibanaBasePipelineTest extends BasePipelineTest {
  getBuildStatus: { 'SUCCESS' },
  printStacktrace: { ex -> print ex },
  ],
+ githubPr: [
+ isPr: { false },
+ ],
  jenkinsApi: [ getFailedSteps: { [] } ],
  testUtils: [ getFailures: { [] } ],
  ])

.ci/pipeline-library/src/test/buildState.groovy

@@ -0,0 +1,48 @@
+import org.junit.*
+import static groovy.test.GroovyAssert.*
+
+class BuildStateTest extends KibanaBasePipelineTest {
+ def buildState
+
+ @Before
+ void setUp() {
+ super.setUp()
+
+ buildState = loadScript("vars/buildState.groovy")
+ }
+
+ @Test
+ void 'get() returns existing data'() {
+ buildState.add('test', 1)
+ def actual = buildState.get('test')
+ assertEquals(1, actual)
+ }
+
+ @Test
+ void 'get() returns null for missing data'() {
+ def actual = buildState.get('missing_key')
+ assertEquals(null, actual)
+ }
+
+ @Test
+ void 'add() does not overwrite existing keys'() {
+ assertTrue(buildState.add('test', 1))
+ assertFalse(buildState.add('test', 2))
+
+ def actual = buildState.get('test')
+
+ assertEquals(1, actual)
+ }
+
+ @Test
+ void 'set() overwrites existing keys'() {
+ assertFalse(buildState.has('test'))
+ buildState.set('test', 1)
+ assertTrue(buildState.has('test'))
+ buildState.set('test', 2)
+
+ def actual = buildState.get('test')
+
+ assertEquals(2, actual)
+ }
+}

.ci/pipeline-library/src/test/githubCommitStatus.groovy

@@ -0,0 +1,85 @@
+import org.junit.*
+import static org.mockito.Mockito.*;
+
+class GithubCommitStatusTest extends KibanaBasePipelineTest {
+ def githubCommitStatus
+ def githubApiMock
+ def buildStateMock
+
+ def EXPECTED_STATUS_URL = 'repos/elastic/kibana/statuses/COMMIT_HASH'
+ def EXPECTED_CONTEXT = 'kibana-ci'
+ def EXPECTED_BUILD_URL = 'http://jenkins.localhost:8080/job/elastic+kibana+master/1/'
+
+ interface BuildState {
+ Object get(String key)
+ }
+
+ interface GithubApi {
+ Object post(String url, Map data)
+ }
+
+ @Before
+ void setUp() {
+ super.setUp()
+
+ buildStateMock = mock(BuildState)
+ githubApiMock = mock(GithubApi)
+
+ when(buildStateMock.get('checkoutInfo')).thenReturn([ commit: 'COMMIT_HASH', ])
+ when(githubApiMock.post(any(), any())).thenReturn(null)
+
+ props([
+ buildState: buildStateMock,
+ githubApi: githubApiMock,
+ ])
+
+ githubCommitStatus = loadScript("vars/githubCommitStatus.groovy")
+ }
+
+ void verifyStatusCreate(String state, String description) {
+ verify(githubApiMock).post(
+ EXPECTED_STATUS_URL,
+ [
+ 'state': state,
+ 'description': description,
+ 'context': EXPECTED_CONTEXT,
+ 'target_url': EXPECTED_BUILD_URL,
+ ]
+ )
+ }
+
+ @Test
+ void 'onStart() should create a pending status'() {
+ githubCommitStatus.onStart()
+ verifyStatusCreate('pending', 'Build started.')
+ }
+
+ @Test
+ void 'onFinish() should create a success status'() {
+ githubCommitStatus.onFinish()
+ verifyStatusCreate('success', 'Build completed successfully.')
+ }
+
+ @Test
+ void 'onFinish() should create an error status for failed builds'() {
+ mockFailureBuild()
+ githubCommitStatus.onFinish()
+ verifyStatusCreate('error', 'Build failed.')
+ }
+
+ @Test
+ void 'onStart() should exit early for PRs'() {
+ prop('githubPr', [ isPr: { true } ])
+
+ githubCommitStatus.onStart()
+ verifyZeroInteractions(githubApiMock)
+ }
+
+ @Test
+ void 'onFinish() should exit early for PRs'() {
+ prop('githubPr', [ isPr: { true } ])
+
+ githubCommitStatus.onFinish()
+ verifyZeroInteractions(githubApiMock)
+ }
+}

.eslintignore

@@ -33,6 +33,7 @@ target
 /x-pack/plugins/canvas/shareable_runtime/build
 /x-pack/plugins/canvas/storybook
 /x-pack/plugins/monitoring/public/lib/jquery_flot
+/x-pack/plugins/reporting/server/export_types/printable_pdf/server/lib/pdf/assets/**
 /x-pack/legacy/plugins/infra/common/graphql/types.ts
 /x-pack/legacy/plugins/infra/public/graphql/types.ts
 /x-pack/legacy/plugins/infra/server/graphql/types.ts

Jenkinsfile

@@ -3,7 +3,7 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
+kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
  githubPr.withDefaultPrComments {
  ciStats.trackBuild {
  catchError {

docs/development/core/public/kibana-plugin-core-public.app.exactroute.md

@@ -0,0 +1,30 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [exactRoute](./kibana-plugin-core-public.app.exactroute.md)
+
+## App.exactRoute property
+
+If set to true, the application's route will only be checked against an exact match. Defaults to `false`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+exactRoute?: boolean;
+```
+
+## Example
+
+
+```ts
+core.application.register({
+ id: 'my_app',
+ title: 'My App'
+ exactRoute: true,
+ mount: () => { ... },
+})
+
+// '[basePath]/app/my_app' will be matched
+// '[basePath]/app/my_app/some/path' will not be matched
+
+```
+

docs/development/core/public/kibana-plugin-core-public.app.md

@@ -18,5 +18,6 @@ export interface App<HistoryLocationState = unknown> extends AppBase
 | --- | --- | --- |
 | [appRoute](./kibana-plugin-core-public.app.approute.md) | <code>string</code> | Override the application's routing path from <code>/app/${id}</code>. Must be unique across registered applications. Should not include the base path from HTTP. |
 | [chromeless](./kibana-plugin-core-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
+| [exactRoute](./kibana-plugin-core-public.app.exactroute.md) | <code>boolean</code> | If set to true, the application's route will only be checked against an exact match. Defaults to <code>false</code>. |
 | [mount](./kibana-plugin-core-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt; &#124; AppMountDeprecated&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-core-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-core-public.appmountdeprecated.md)<!-- -->. |
 

docs/development/core/public/kibana-plugin-core-public.chromestart.getcustomnavlink_.md

@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ChromeStart](./kibana-plugin-core-public.chromestart.md) &gt; [getCustomNavLink$](./kibana-plugin-core-public.chromestart.getcustomnavlink_.md)
+
+## ChromeStart.getCustomNavLink$() method
+
+Get an observable of the current custom nav link
+
+<b>Signature:</b>
+
+```typescript
+getCustomNavLink$(): Observable<Partial<ChromeNavLink> | undefined>;
+```
+<b>Returns:</b>
+
+`Observable<Partial<ChromeNavLink> | undefined>`
+

docs/development/core/public/kibana-plugin-core-public.chromestart.md

@@ -55,6 +55,7 @@ core.chrome.setHelpExtension(elem => {
 | [getBadge$()](./kibana-plugin-core-public.chromestart.getbadge_.md) | Get an observable of the current badge |
 | [getBrand$()](./kibana-plugin-core-public.chromestart.getbrand_.md) | Get an observable of the current brand information. |
 | [getBreadcrumbs$()](./kibana-plugin-core-public.chromestart.getbreadcrumbs_.md) | Get an observable of the current list of breadcrumbs |
+| [getCustomNavLink$()](./kibana-plugin-core-public.chromestart.getcustomnavlink_.md) | Get an observable of the current custom nav link |
 | [getHelpExtension$()](./kibana-plugin-core-public.chromestart.gethelpextension_.md) | Get an observable of the current custom help conttent |
 | [getIsNavDrawerLocked$()](./kibana-plugin-core-public.chromestart.getisnavdrawerlocked_.md) | Get an observable of the current locked state of the nav drawer. |
 | [getIsVisible$()](./kibana-plugin-core-public.chromestart.getisvisible_.md) | Get an observable of the current visibility state of the chrome. |
@@ -64,6 +65,7 @@ core.chrome.setHelpExtension(elem => {
 | [setBadge(badge)](./kibana-plugin-core-public.chromestart.setbadge.md) | Override the current badge |
 | [setBrand(brand)](./kibana-plugin-core-public.chromestart.setbrand.md) | Set the brand configuration. |
 | [setBreadcrumbs(newBreadcrumbs)](./kibana-plugin-core-public.chromestart.setbreadcrumbs.md) | Override the current set of breadcrumbs |
+| [setCustomNavLink(newCustomNavLink)](./kibana-plugin-core-public.chromestart.setcustomnavlink.md) | Override the current set of custom nav link |
 | [setHelpExtension(helpExtension)](./kibana-plugin-core-public.chromestart.sethelpextension.md) | Override the current set of custom help content |
 | [setHelpSupportUrl(url)](./kibana-plugin-core-public.chromestart.sethelpsupporturl.md) | Override the default support URL shown in the help menu |
 | [setIsVisible(isVisible)](./kibana-plugin-core-public.chromestart.setisvisible.md) | Set the temporary visibility for the chrome. This does nothing if the chrome is hidden by default and should be used to hide the chrome for things like full-screen modes with an exit button. |

docs/development/core/public/kibana-plugin-core-public.chromestart.setcustomnavlink.md

@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ChromeStart](./kibana-plugin-core-public.chromestart.md) &gt; [setCustomNavLink](./kibana-plugin-core-public.chromestart.setcustomnavlink.md)
+
+## ChromeStart.setCustomNavLink() method
+
+Override the current set of custom nav link
+
+<b>Signature:</b>
+
+```typescript
+setCustomNavLink(newCustomNavLink?: Partial<ChromeNavLink>): void;
+```
+
+## Parameters
+
+| Parameter | Type | Description |
+| --- | --- | --- |
+| newCustomNavLink | <code>Partial&lt;ChromeNavLink&gt;</code> | |
+
+<b>Returns:</b>
+
+`void`
+

docs/development/core/public/kibana-plugin-core-public.coresetup.md

@@ -18,7 +18,6 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
 | --- | --- | --- |
 | [application](./kibana-plugin-core-public.coresetup.application.md) | <code>ApplicationSetup</code> | [ApplicationSetup](./kibana-plugin-core-public.applicationsetup.md) |
 | [context](./kibana-plugin-core-public.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-core-public.contextsetup.md) |
-| [docLinks](./kibana-plugin-core-public.coresetup.doclinks.md) | <code>DocLinksSetup</code> | [DocLinksSetup](./kibana-plugin-core-public.doclinkssetup.md) |
 | [fatalErrors](./kibana-plugin-core-public.coresetup.fatalerrors.md) | <code>FatalErrorsSetup</code> | [FatalErrorsSetup](./kibana-plugin-core-public.fatalerrorssetup.md) |
 | [getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart, TStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) |
 | [http](./kibana-plugin-core-public.coresetup.http.md) | <code>HttpSetup</code> | [HttpSetup](./kibana-plugin-core-public.httpsetup.md) |

docs/development/core/public/kibana-plugin-core-public.doclinksstart.doc_link_version.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [DocLinksStart](./kibana-plugin-core-public.doclinksstart.md) &gt; [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md)
+
+## DocLinksStart.DOC\_LINK\_VERSION property
+
+<b>Signature:</b>
+
+```typescript
+readonly DOC_LINK_VERSION: string;
+```

docs/development/core/public/kibana-plugin-core-public.doclinksstart.elastic_website_url.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [DocLinksStart](./kibana-plugin-core-public.doclinksstart.md) &gt; [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md)
+
+## DocLinksStart.ELASTIC\_WEBSITE\_URL property
+
+<b>Signature:</b>
+
+```typescript
+readonly ELASTIC_WEBSITE_URL: string;
+```

docs/development/core/public/kibana-plugin-core-public.doclinkssetup.links.md → docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [DocLinksSetup](./kibana-plugin-core-public.doclinkssetup.md) &gt; [links](./kibana-plugin-core-public.doclinkssetup.links.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [DocLinksStart](./kibana-plugin-core-public.doclinksstart.md) &gt; [links](./kibana-plugin-core-public.doclinksstart.links.md)
 
-## DocLinksSetup.links property
+## DocLinksStart.links property
 
 <b>Signature:</b>