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 index a406483df7247..32f3ea7fbe32e 100644 --- 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 index 981c9a7a706fd..5d976f7cf4d3c 100644 --- 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 index d680f151b915d..0f427d09e39ef 100644 --- 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,7 +4,7 @@ * 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'; @@ -12,13 +12,13 @@ export const setValueActionType = 'setResolvedValue'; export const inFlightActiveActionType = 'inFlightActive'; export const inFlightCompleteActionType = 'inFlightComplete'; -type InFlightActive = Action; -type InFlightComplete = Action; +type InFlightActive = ReduxAction; +type InFlightComplete = ReduxAction; interface SetResolvedLoadingPayload { path: any[]; } -type SetResolvedLoading = Action & { +type SetResolvedLoading = ReduxAction & { payload: SetResolvedLoadingPayload; }; @@ -26,7 +26,7 @@ interface SetResolvedValuePayload { path: any[]; value: any; } -type SetResolvedValue = Action & { +type SetResolvedValue = ReduxAction & { payload: SetResolvedValuePayload; };