Merge branch 'master' into apm-77695-config-max-environments

elastic · Nov 2, 2020 · a9e7736 · a9e7736
2 parents a134078 + a6dc527
commit a9e7736
Show file tree

Hide file tree

Showing 236 changed files with 1,492 additions and 1,261 deletions.
diff --git a/docs/api/saved-objects/rotate_encryption_key.asciidoc b/docs/api/saved-objects/rotate_encryption_key.asciidoc
@@ -25,7 +25,7 @@ Bulk key rotation can consume a considerable amount of resources and hence only
 `type`::
 (Optional, string) Limits encryption key rotation only to the saved objects with the specified type. By default, {kib} tries to rotate the encryption key for all saved object types that may contain encrypted attributes.
 
-`batchSize`::
+`batch_size`::
 (Optional, number) Specifies a maximum number of saved objects that {kib} can process in a single batch. Bulk key rotation is an iterative process since {kib} may not be able to fetch and process all required saved objects in one go and splits processing into consequent batches. By default, the batch size is 10000, which is also a maximum allowed value.
 
 [[saved-objects-api-rotate-encryption-key-response-body]]
@@ -91,7 +91,7 @@ In this example, key rotation is performed for all saved objects with the `alert
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batchSize=5000
+$ curl -X POST /api/encrypted_saved_objects/_rotate_key?type=alert&batch_size=5000
 --------------------------------------------------
 // KIBANA
 

diff --git a/package.json b/package.json
@@ -110,14 +110,16 @@
       "**/grunt-*/**",
       "x-pack/typescript",
       "@elastic/eui/rehype-react",
+      "@elastic/eui/remark-parse",
       "@elastic/eui/remark-rehype",
-      "@elastic/eui/remark-rehype/**"
+      "@elastic/eui/remark-rehype/**",
+      "@elastic/eui/unified"
     ]
   },
   "dependencies": {
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.10.0-rc.1",
-    "@elastic/eui": "29.5.0",
+    "@elastic/eui": "30.1.1",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",

diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@elastic/eui": "29.5.0",
+    "@elastic/eui": "30.1.1",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/optimizer": "1.0.0",
     "babel-loader": "^8.0.6",

diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "24.0.0",
-    "@elastic/eui": "29.5.0",
+    "@elastic/eui": "30.1.1",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",

diff --git a/src/core/public/chrome/ui/header/recent_links.tsx b/src/core/public/chrome/ui/header/recent_links.tsx
diff --git a/src/plugins/charts/public/static/components/number_input.tsx b/src/plugins/charts/public/static/components/number_input.tsx
@@ -54,7 +54,7 @@ function NumberInputOption<ParamName extends string>({
   'data-test-subj': dataTestSubj,
 }: NumberInputOptionProps<ParamName>) {
   return (
-    <EuiFormRow label={label} error={error} isInvalid={isInvalid} fullWidth compressed>
+    <EuiFormRow label={label} error={error} isInvalid={isInvalid} fullWidth display="rowCompressed">
       <EuiFieldNumber
         data-test-subj={dataTestSubj}
         disabled={disabled}

diff --git a/src/plugins/charts/public/static/components/range.tsx b/src/plugins/charts/public/static/components/range.tsx
@@ -65,7 +65,13 @@ function RangeOption<ParamName extends string>({
     }
   };
   return (
-    <EuiFormRow label={label} fullWidth={true} isInvalid={!isValidState} error={error} compressed>
+    <EuiFormRow
+      label={label}
+      fullWidth={true}
+      isInvalid={!isValidState}
+      error={error}
+      display="rowCompressed"
+    >
       <EuiRange
         compressed
         fullWidth

diff --git a/src/plugins/charts/public/static/components/required_number_input.tsx b/src/plugins/charts/public/static/components/required_number_input.tsx
@@ -70,7 +70,7 @@ function RequiredNumberInputOption<ParamName extends string>({
   );
 
   return (
-    <EuiFormRow label={label} error={error} isInvalid={isInvalid} fullWidth compressed>
+    <EuiFormRow label={label} error={error} isInvalid={isInvalid} fullWidth display="rowCompressed">
       <EuiFieldNumber
         compressed
         fullWidth

diff --git a/src/plugins/charts/public/static/components/select.tsx b/src/plugins/charts/public/static/components/select.tsx
@@ -51,7 +51,7 @@ function SelectOption<ParamName extends string, ValidParamValues extends string
 
   return (
     <EuiFormRow
-      compressed
+      display="rowCompressed"
       fullWidth
       helpText={helpText}
       id={id}

diff --git a/src/plugins/charts/public/static/components/switch.tsx b/src/plugins/charts/public/static/components/switch.tsx
@@ -41,7 +41,7 @@ function SwitchOption<ParamName extends string>({
   setValue,
 }: SwitchOptionProps<ParamName>) {
   return (
-    <EuiFormRow fullWidth={true} compressed={true}>
+    <EuiFormRow fullWidth={true} display="rowCompressed">
       <EuiToolTip content={tooltip} delay="long" position="right">
         <EuiSwitch
           compressed={true}

diff --git a/src/plugins/charts/public/static/components/text_input.tsx b/src/plugins/charts/public/static/components/text_input.tsx
@@ -40,7 +40,7 @@ function TextInputOption<ParamName extends string>({
   setValue,
 }: TextInputOptionProps<ParamName>) {
   return (
-    <EuiFormRow helpText={helpText} label={label} fullWidth compressed>
+    <EuiFormRow helpText={helpText} label={label} fullWidth display="rowCompressed">
       <EuiFieldText
         compressed
         fullWidth

diff --git a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap
diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -105,7 +105,6 @@ function FilterBarUI(props: Props) {
           isOpen={isAddFilterPopoverOpen}
           closePopover={() => setIsAddFilterPopoverOpen(false)}
           anchorPosition="downLeft"
-          withTitle
           panelPaddingSize="none"
           ownFocus={true}
           initialFocus=".filterEditor__hiddenItem"

diff --git a/src/plugins/data/public/ui/filter_bar/filter_item.tsx b/src/plugins/data/public/ui/filter_bar/filter_item.tsx
@@ -358,7 +358,6 @@ export function FilterItem(props: Props) {
       }}
       button={badge}
       anchorPosition="downLeft"
-      withTitle={true}
       panelPaddingSize="none"
     >
       <EuiContextMenu initialPanelId={0} panels={getPanels()} />

diff --git a/src/plugins/data/public/ui/filter_bar/filter_options.tsx b/src/plugins/data/public/ui/filter_bar/filter_options.tsx
@@ -166,7 +166,6 @@ class FilterOptionsUI extends Component<Props, State> {
         }
         anchorPosition="rightUp"
         panelPaddingSize="none"
-        withTitle
         repositionOnScroll
       >
         <EuiPopoverTitle>

diff --git a/src/plugins/data/public/ui/query_string_input/language_switcher.tsx b/src/plugins/data/public/ui/query_string_input/language_switcher.tsx
@@ -76,7 +76,6 @@ export function QueryLanguageSwitcher(props: Props) {
       button={button}
       isOpen={isPopoverOpen}
       closePopover={() => setIsPopoverOpen(false)}
-      withTitle
       repositionOnScroll
     >
       <EuiPopoverTitle>

diff --git a/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx b/src/plugins/discover/public/application/angular/context/components/action_bar/action_bar.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import {
@@ -86,7 +86,11 @@ export function ActionBar({
       onChangeCount(newDocCount);
     }
   };
-
+  useEffect(() => {
+    if (newDocCount !== docCount && newDocCount === 0) {
+      setNewDocCount(docCount);
+    }
+  }, [docCount, newDocCount]);
   return (
     <I18nProvider>
       <form onSubmit={onSubmit}>
@@ -145,7 +149,7 @@ export function ActionBar({
             </EuiFormRow>
           </EuiFlexItem>
           <EuiFlexItem>
-            <EuiFormRow displayOnly>
+            <EuiFormRow display="center">
               {isSuccessor ? (
                 <FormattedMessage
                   id="discover.context.olderDocumentsDescription"

diff --git a/src/plugins/discover/public/application/angular/context_app.html b/src/plugins/discover/public/application/angular/context_app.html
@@ -10,33 +10,23 @@
 >
 </kbn-top-nav>
 
-<!-- Error feedback -->
-<context-error-message
+<!-- Context App Legacy -->
+<context-app-legacy
+  filter="contextApp.actions.addFilter"
+  hits="contextApp.state.rows.all"
+  index-pattern="contextApp.indexPattern"
+  sorting="contextApp.state.queryParameters.sort"
+  columns="contextApp.state.queryParameters.columns"
+  minimum-visible-rows="contextApp.state.rows.all.length"
   status="contextApp.state.loadingStatus.anchor.status"
-  reason="contextApp.state.loadingStatus.anchor.reason">
-</context-error-message>
-
-<main
-  class="kuiViewContent kuiViewContentItem"
-  ng-if="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.FAILED"
->
-  <!-- Table -->
-  <context-app-legacy
-    filter="contextApp.actions.addFilter"
-    hits="contextApp.state.rows.all"
-    index-pattern="contextApp.indexPattern"
-    sorting="contextApp.state.queryParameters.sort"
-    columns="contextApp.state.queryParameters.columns"
-    minimum-visible-rows="contextApp.state.rows.all.length"
-    status="contextApp.state.loadingStatus.anchor.status"
-    default-step-size="contextApp.state.queryParameters.defaultStepSize"
-    predecessor-count="contextApp.state.queryParameters.predecessorCount"
-    predecessor-available="contextApp.state.rows.predecessors.length"
-    predecessor-status="contextApp.state.loadingStatus.predecessors.status"
-    on-change-predecessor-count="contextApp.actions.fetchGivenPredecessorRows"
-    successor-count="contextApp.state.queryParameters.successorCount"
-    successor-available="contextApp.state.rows.successors.length"
-    successor-status="contextApp.state.loadingStatus.successors.status"
-    on-change-successor-count="contextApp.actions.fetchGivenSuccessorRows"
-  ></context-app-legacy>
-</main>
+  reason="contextApp.state.loadingStatus.anchor.reason"
+  default-step-size="contextApp.state.queryParameters.defaultStepSize"
+  predecessor-count="contextApp.state.queryParameters.predecessorCount"
+  predecessor-available="contextApp.state.rows.predecessors.length"
+  predecessor-status="contextApp.state.loadingStatus.predecessors.status"
+  on-change-predecessor-count="contextApp.actions.fetchGivenPredecessorRows"
+  successor-count="contextApp.state.queryParameters.successorCount"
+  successor-available="contextApp.state.rows.successors.length"
+  successor-status="contextApp.state.loadingStatus.successors.status"
+  on-change-successor-count="contextApp.actions.fetchGivenSuccessorRows"
+></context-app-legacy>
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy.scss b/src/plugins/discover/public/application/components/context_app/context_app_legacy.scss
@@ -0,0 +1,5 @@
+.dscCxtAppContent {
+  border: none;
+  background-color: transparent;
+  box-shadow: none;
+}
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx b/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx
@@ -24,6 +24,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { DocTableLegacy } from '../../angular/doc_table/create_doc_table_react';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { ActionBar } from '../../angular/context/components/action_bar/action_bar';
+import { ContextErrorMessage } from '../context_error_message';
 
 describe('ContextAppLegacy test', () => {
   const hit = {
@@ -53,6 +54,7 @@ describe('ContextAppLegacy test', () => {
     minimumVisibleRows: 5,
     indexPattern,
     status: 'loaded',
+    reason: 'no reason',
     defaultStepSize: 5,
     predecessorCount: 10,
     successorCount: 10,
@@ -76,9 +78,19 @@ describe('ContextAppLegacy test', () => {
     const props = { ...defaultProps };
     props.status = 'loading';
     const component = mountWithIntl(<ContextAppLegacy {...props} />);
-    expect(component.find('DocTableLegacy').length).toBe(0);
+    expect(component.find(DocTableLegacy).length).toBe(0);
     const loadingIndicator = findTestSubject(component, 'contextApp_loadingIndicator');
     expect(loadingIndicator.length).toBe(1);
     expect(component.find(ActionBar).length).toBe(2);
   });
+
+  it('renders error message', () => {
+    const props = { ...defaultProps };
+    props.status = 'failed';
+    props.reason = 'something went wrong';
+    const component = mountWithIntl(<ContextAppLegacy {...props} />);
+    expect(component.find(DocTableLegacy).length).toBe(0);
+    const errorMessage = component.find(ContextErrorMessage);
+    expect(errorMessage.length).toBe(1);
+  });
 });