Prepare TS for 3.7 upgrade (elastic#47703)

timroes · Oct 10, 2019 · f40a6cb · f40a6cb
1 parent 7033c32
commit f40a6cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
@@ -106,7 +106,7 @@ export function pie(): ExpressionFunction<'pie', PointSeries, Arguments, Render<
         types: ['string', 'boolean'],
         help: argHelp.legend,
         default: false,
-        options: Object.values(Legend).concat(false),
+        options: [...Object.values(Legend), false],
       },
       palette: {
         types: ['palette'],

diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts
@@ -56,7 +56,7 @@ export function plot(): ExpressionFunction<'plot', PointSeries, Arguments, Rende
         types: ['string', 'boolean'],
         help: argHelp.legend,
         default: 'ne',
-        options: Object.values(Legend).concat(false),
+        options: [...Object.values(Legend), false],
       },
       palette: {
         types: ['palette'],

diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/resolved_args.ts b/x-pack/legacy/plugins/canvas/public/state/actions/resolved_args.ts
@@ -4,29 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Action } from 'redux';
+import { Action as ReduxAction } from 'redux';
 import { createAction } from 'redux-actions';
 
 export const setLoadingActionType = 'setResolvedLoading';
 export const setValueActionType = 'setResolvedValue';
 export const inFlightActiveActionType = 'inFlightActive';
 export const inFlightCompleteActionType = 'inFlightComplete';
 
-type InFlightActive = Action<typeof inFlightActiveActionType>;
-type InFlightComplete = Action<typeof inFlightCompleteActionType>;
+type InFlightActive = ReduxAction<typeof inFlightActiveActionType>;
+type InFlightComplete = ReduxAction<typeof inFlightCompleteActionType>;
 
 interface SetResolvedLoadingPayload {
   path: any[];
 }
-type SetResolvedLoading = Action<typeof setLoadingActionType> & {
+type SetResolvedLoading = ReduxAction<typeof setLoadingActionType> & {
   payload: SetResolvedLoadingPayload;
 };
 
 interface SetResolvedValuePayload {
   path: any[];
   value: any;
 }
-type SetResolvedValue = Action<typeof setValueActionType> & {
+type SetResolvedValue = ReduxAction<typeof setValueActionType> & {
   payload: SetResolvedValuePayload;
 };