Merge branch 'master' into exceptions_rule

elastic · Jul 28, 2020 · 397b04a · 397b04a
2 parents 6828e9b + 7a3e800
commit 397b04a
Show file tree

Hide file tree

Showing 40 changed files with 1,255 additions and 776 deletions.
diff --git a/src/dev/run_i18n_integrate.ts b/src/dev/run_i18n_integrate.ts
@@ -108,6 +108,7 @@ run(
       const reporter = new ErrorReporter();
       const messages: Map<string, { message: string }> = new Map();
       await list.run({ messages, reporter });
+      process.exitCode = 0;
     } catch (error) {
       process.exitCode = 1;
       if (error instanceof ErrorReporter) {
@@ -117,6 +118,7 @@ run(
         log.error(error);
       }
     }
+    process.exit();
   },
   {
     flags: {

diff --git a/...nvas/public/components/arg_add/arg_add.js → ...vas/public/components/arg_add/arg_add.tsx b/...nvas/public/components/arg_add/arg_add.js → ...vas/public/components/arg_add/arg_add.tsx
@@ -4,15 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { FC, ReactEventHandler } from 'react';
 import PropTypes from 'prop-types';
 import {
   EuiDescriptionList,
   EuiDescriptionListTitle,
   EuiDescriptionListDescription,
 } from '@elastic/eui';
 
-export const ArgAdd = ({ onValueAdd, displayName, help }) => {
+interface Props {
+  displayName: string;
+  help: string;
+  onValueAdd?: ReactEventHandler;
+}
+
+export const ArgAdd: FC<Props> = ({ onValueAdd = () => {}, displayName, help }) => {
   return (
     <button className="canvasArg__add" onClick={onValueAdd}>
       <EuiDescriptionList compressed>
@@ -26,7 +32,7 @@ export const ArgAdd = ({ onValueAdd, displayName, help }) => {
 };
 
 ArgAdd.propTypes = {
-  displayName: PropTypes.string,
-  help: PropTypes.string,
+  displayName: PropTypes.string.isRequired,
+  help: PropTypes.string.isRequired,
   onValueAdd: PropTypes.func,
 };
diff --git a/...canvas/public/components/arg_add/index.js → ...canvas/public/components/arg_add/index.ts b/...canvas/public/components/arg_add/index.js → ...canvas/public/components/arg_add/index.ts
@@ -4,8 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { pure } from 'recompose';
-
-import { ArgAdd as Component } from './arg_add';
-
-export const ArgAdd = pure(Component);
+export { ArgAdd } from './arg_add';
diff --git a/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx
@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { MouseEventHandler, FC } from 'react';
 import PropTypes from 'prop-types';
 import { EuiButtonIcon } from '@elastic/eui';
 // @ts-expect-error untyped local
 import { Popover, PopoverChildrenProps } from '../popover';
-// @ts-expect-error untyped local
 import { ArgAdd } from '../arg_add';
 // @ts-expect-error untyped local
 import { Arg } from '../../expression_types/arg';
@@ -27,8 +26,8 @@ interface Props {
   options: ArgOptions[];
 }
 
-export const ArgAddPopover = ({ options }: Props) => {
-  const button = (handleClick: React.MouseEventHandler<HTMLButtonElement>) => (
+export const ArgAddPopover: FC<Props> = ({ options }) => {
+  const button = (handleClick: MouseEventHandler<HTMLButtonElement>) => (
     <EuiButtonIcon
       iconType="plusInCircle"
       aria-label={strings.getAddAriaLabel()}

diff --git a/x-pack/plugins/canvas/public/components/arg_add_popover/index.ts b/x-pack/plugins/canvas/public/components/arg_add_popover/index.ts
@@ -4,7 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { pure } from 'recompose';
-import { ArgAddPopover as Component } from './arg_add_popover';
-
-export const ArgAddPopover = pure(Component);
+export { ArgAddPopover } from './arg_add_popover';