Merge branch '7.x' into backport/7.x/pr-79007

elastic · Oct 5, 2020 · 7d2110c · 7d2110c
2 parents 805252e + 23150c8
commit 7d2110c
Show file tree

Hide file tree

Showing 105 changed files with 2,312 additions and 3,604 deletions.
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
   "dependencies": {
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.1",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@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.0.0",
+    "@elastic/eui": "29.3.0",
     "@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": "23.0.0",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",
@@ -39,6 +39,7 @@
   "devDependencies": {
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "css-loader": "^3.4.2",
     "del": "^5.1.0",
     "loader-utils": "^1.2.3",

diff --git a/packages/kbn-ui-shared-deps/webpack.config.js b/packages/kbn-ui-shared-deps/webpack.config.js
@@ -77,6 +77,25 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
           },
         ],
       },
+      {
+        test: !dev ? /[\\\/]@elastic[\\\/]eui[\\\/].*\.js$/ : () => false,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              plugins: [
+                [
+                  require.resolve('babel-plugin-transform-react-remove-prop-types'),
+                  {
+                    mode: 'remove',
+                    removeImport: true,
+                  },
+                ],
+              ],
+            },
+          },
+        ],
+      },
     ],
   },
 

diff --git a/src/plugins/navigation/public/top_nav_menu/_index.scss b/src/plugins/navigation/public/top_nav_menu/_index.scss
@@ -1,8 +1,3 @@
 .kbnTopNavMenu {
   margin-right: $euiSizeXS;
 }
-
-.kbnTopNavMenu > * > * {
-  // TEMP fix to adjust spacing between EuiHeaderList__list items
-  margin: 0 $euiSizeXS;
-}
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -164,10 +164,6 @@ describe('TopNavMenu', () => {
 
       // menu is rendered outside of the component
       expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
-
-      const buttons = portalTarget.querySelectorAll('button');
-      expect(buttons.length).toBe(menuItems.length + 1); // should be n+1 buttons in mobile for popover button
-      expect(buttons[buttons.length - 1].getAttribute('aria-label')).toBe('Open navigation menu'); // last button should be mobile button
     });
   });
 });
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -88,7 +88,7 @@ export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
   function renderMenu(className: string): ReactElement | null {
     if (!config || config.length === 0) return null;
     return (
-      <EuiHeaderLinks data-test-subj="top-nav" className={className}>
+      <EuiHeaderLinks data-test-subj="top-nav" gutterSize="xs" className={className}>
         {renderItems()}
       </EuiHeaderLinks>
     );

diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -52,7 +52,7 @@ export function TopNavMenuItem(props: TopNavMenuData) {
       {upperFirst(props.label || props.id!)}
     </EuiButton>
   ) : (
-    <EuiHeaderLink size="xs" isActive {...commonButtonProps}>
+    <EuiHeaderLink size="xs" color="primary" {...commonButtonProps}>
       {upperFirst(props.label || props.id!)}
     </EuiHeaderLink>
   );

diff --git a/src/plugins/share/public/types.ts b/src/plugins/share/public/types.ts
@@ -18,7 +18,8 @@
  */
 
 import { ComponentType } from 'react';
-import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
+import { EuiContextMenuPanelDescriptor } from '@elastic/eui';
+import { EuiContextMenuPanelItemDescriptorEntry } from '@elastic/eui/src/components/context_menu/context_menu';
 
 /**
  * @public
@@ -53,7 +54,8 @@ export interface ShareContext {
  * used to order the individual items in a flat list returned by all registered
  * menu providers.
  * */
-export interface ShareContextMenuPanelItem extends Omit<EuiContextMenuPanelItemDescriptor, 'name'> {
+export interface ShareContextMenuPanelItem
+  extends Omit<EuiContextMenuPanelItemDescriptorEntry, 'name'> {
   name: string; // EUI will accept a `ReactNode` for the `name` prop, but `ShareContentMenu` assumes a `string`.
   sortOrder?: number;
 }

diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",

diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
   }

diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -275,7 +275,7 @@
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.10.0",
-    "@elastic/eui": "29.0.0",
+    "@elastic/eui": "29.3.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",

diff --git a/x-pack/plugins/apm/public/components/alerting/ErrorCountAlertTrigger/index.stories.tsx b/x-pack/plugins/apm/public/components/alerting/ErrorCountAlertTrigger/index.stories.tsx
@@ -4,41 +4,44 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { storiesOf } from '@storybook/react';
 import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import { ErrorCountAlertTrigger } from '.';
 import { ApmPluginContextValue } from '../../../context/ApmPluginContext';
 import {
   mockApmPluginContextValue,
   MockApmPluginContextWrapper,
 } from '../../../context/ApmPluginContext/MockApmPluginContext';
 
-storiesOf('app/ErrorCountAlertTrigger', module).add(
-  'example',
-  () => {
-    const params = {
-      threshold: 2,
-      window: '5m',
-    };
-
-    return (
+export default {
+  title: 'app/ErrorCountAlertTrigger',
+  component: ErrorCountAlertTrigger,
+  decorators: [
+    (Story: React.ComponentClass) => (
       <MockApmPluginContextWrapper
         value={(mockApmPluginContextValue as unknown) as ApmPluginContextValue}
       >
-        <div style={{ width: 400 }}>
-          <ErrorCountAlertTrigger
-            alertParams={params as any}
-            setAlertParams={() => undefined}
-            setAlertProperty={() => undefined}
-          />
-        </div>
+        <MemoryRouter>
+          <div style={{ width: 400 }}>
+            <Story />
+          </div>
+        </MemoryRouter>
       </MockApmPluginContextWrapper>
-    );
-  },
-  {
-    info: {
-      propTablesExclude: [ErrorCountAlertTrigger, MockApmPluginContextWrapper],
-      source: false,
-    },
-  }
-);
+    ),
+  ],
+};
+
+export function Example() {
+  const params = {
+    threshold: 2,
+    window: '5m',
+  };
+
+  return (
+    <ErrorCountAlertTrigger
+      alertParams={params as any}
+      setAlertParams={() => undefined}
+      setAlertProperty={() => undefined}
+    />
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/alerting/fields.test.tsx b/x-pack/plugins/apm/public/components/alerting/fields.test.tsx
@@ -9,7 +9,7 @@ import { act, fireEvent, render } from '@testing-library/react';
 import { expectTextsInDocument } from '../../utils/testHelpers';
 
 describe('alerting fields', () => {
-  describe('Service Fiels', () => {
+  describe('Service Field', () => {
     it('renders with value', () => {
       const component = render(<ServiceField value="foo" />);
       expectTextsInDocument(component, ['foo']);

diff --git a/x-pack/plugins/apm/public/components/alerting/fields.tsx b/x-pack/plugins/apm/public/components/alerting/fields.tsx
@@ -43,7 +43,7 @@ export function EnvironmentField({
       })}
     >
       <EuiSelect
-        value={currentValue}
+        defaultValue={currentValue}
         options={options}
         onChange={onChange}
         compressed
@@ -75,7 +75,7 @@ export function TransactionTypeField({
     <PopoverExpression value={currentValue} title={label}>
       <EuiSelect
         data-test-subj="transactionTypeField"
-        value={currentValue}
+        defaultValue={currentValue}
         options={options}
         onChange={onChange}
         compressed

diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
@@ -43,7 +43,6 @@ describe('ErrorGroupOverview -> List', () => {
       <MemoryRouter>
         <MockApmPluginContextWrapper>
           <MockUrlParamsContextProvider>
-            {/* @ts-expect-error invalid json props */}
             <ErrorGroupList items={props.items} serviceName="opbeans-python" />
           </MockUrlParamsContextProvider>
         </MockApmPluginContextWrapper>