{startCase(suggestions[0].type)}
@@ -119,8 +130,12 @@ export class ExpressionInput extends React.Component {
getReference = selectedItem => {
const { fnDef, argDef } = selectedItem || {};
- if (argDef) return ;
- if (fnDef) return ;
+ if (argDef) {
+ return ;
+ }
+ if (fnDef) {
+ return ;
+ }
const { fnDef: fnDefAtPosition, argDef: argDefAtPosition } = getFnArgDefAtPosition(
this.props.functionDefinitions,
@@ -128,8 +143,12 @@ export class ExpressionInput extends React.Component {
this.state.selection.start
);
- if (argDefAtPosition) return ;
- if (fnDefAtPosition) return ;
+ if (argDefAtPosition) {
+ return ;
+ }
+ if (fnDefAtPosition) {
+ return ;
+ }
return '';
};
diff --git a/x-pack/plugins/canvas/public/components/expression_input/function_reference.js b/x-pack/plugins/canvas/public/components/expression_input/function_reference.js
index 0f9076b7613a8..03a1d57cf8590 100644
--- a/x-pack/plugins/canvas/public/components/expression_input/function_reference.js
+++ b/x-pack/plugins/canvas/public/components/expression_input/function_reference.js
@@ -45,9 +45,15 @@ function getHelp(fnDef) {
function getFnListItems(fnDef) {
const { aliases, context, type } = fnDef;
const items = [];
- if (aliases.length) items.push({ title: 'Aliases', description: aliases.join(', ') });
- if (context.types) items.push({ title: 'Accepts', description: context.types.join(', ') });
- if (type) items.push({ title: 'Returns', description: type });
+ if (aliases.length) {
+ items.push({ title: 'Aliases', description: aliases.join(', ') });
+ }
+ if (context.types) {
+ items.push({ title: 'Accepts', description: context.types.join(', ') });
+ }
+ if (type) {
+ items.push({ title: 'Returns', description: type });
+ }
return items;
}
@@ -64,7 +70,9 @@ function getArgItems(args) {
function getArgColumns() {
return ['argument', 'aliases', 'types', 'default', 'description'].map(field => {
const column = { field, name: startCase(field), truncateText: field !== 'description' };
- if (field === 'description') column.width = '50%';
+ if (field === 'description') {
+ column.width = '50%';
+ }
return column;
});
}
diff --git a/x-pack/plugins/canvas/public/components/fullscreen_control/fullscreen_control.js b/x-pack/plugins/canvas/public/components/fullscreen_control/fullscreen_control.js
index 3b56129c27417..7985e468d8f57 100644
--- a/x-pack/plugins/canvas/public/components/fullscreen_control/fullscreen_control.js
+++ b/x-pack/plugins/canvas/public/components/fullscreen_control/fullscreen_control.js
@@ -18,8 +18,9 @@ export class FullscreenControl extends React.PureComponent {
const { children, isFullscreen } = this.props;
const keyHandler = action => {
- if (action === 'FULLSCREEN' || (isFullscreen && action === 'FULLSCREEN_EXIT'))
+ if (action === 'FULLSCREEN' || (isFullscreen && action === 'FULLSCREEN_EXIT')) {
this.toggleFullscreen();
+ }
};
return (
diff --git a/x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js b/x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js
index f70d39e511924..3b43365b5dc8b 100644
--- a/x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js
+++ b/x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js
@@ -30,7 +30,9 @@ export class FunctionFormContextPending extends React.PureComponent {
fetchContext = (props, force = false) => {
// dispatch context update if none is provided
const { expressionType, context, updateContext } = props;
- if (force || (context == null && expressionType.requiresContext)) updateContext();
+ if (force || (context == null && expressionType.requiresContext)) {
+ updateContext();
+ }
};
render() {
diff --git a/x-pack/plugins/canvas/public/components/function_form/index.js b/x-pack/plugins/canvas/public/components/function_form/index.js
index 0f7b348eea78a..fbde896361cb6 100644
--- a/x-pack/plugins/canvas/public/components/function_form/index.js
+++ b/x-pack/plugins/canvas/public/components/function_form/index.js
@@ -96,7 +96,9 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
const existingId = Object.keys(assets).find(
assetId => assets[assetId].type === type && assets[assetId].value === content
);
- if (existingId) return existingId;
+ if (existingId) {
+ return existingId;
+ }
return onAssetAdd(type, content);
},
};
diff --git a/x-pack/plugins/canvas/public/components/function_form_list/index.js b/x-pack/plugins/canvas/public/components/function_form_list/index.js
index 7f60a43835eba..00046c65c947f 100644
--- a/x-pack/plugins/canvas/public/components/function_form_list/index.js
+++ b/x-pack/plugins/canvas/public/components/function_form_list/index.js
@@ -12,7 +12,9 @@ import { modelRegistry, viewRegistry, transformRegistry } from '../../expression
import { FunctionFormList as Component } from './function_form_list';
function normalizeContext(chain) {
- if (!Array.isArray(chain) || !chain.length) return null;
+ if (!Array.isArray(chain) || !chain.length) {
+ return null;
+ }
return {
type: 'expression',
chain,
diff --git a/x-pack/plugins/canvas/public/components/item_grid/item_grid.js b/x-pack/plugins/canvas/public/components/item_grid/item_grid.js
index 063ee849013d9..156d348f38dcd 100644
--- a/x-pack/plugins/canvas/public/components/item_grid/item_grid.js
+++ b/x-pack/plugins/canvas/public/components/item_grid/item_grid.js
@@ -11,11 +11,15 @@ import { last } from 'lodash';
const defaultPerRow = 6;
export const ItemGrid = ({ items, itemsPerRow, children }) => {
- if (!items) return null;
+ if (!items) {
+ return null;
+ }
const rows = items.reduce(
(rows, item) => {
- if (last(rows).length >= (itemsPerRow || defaultPerRow)) rows.push([]);
+ if (last(rows).length >= (itemsPerRow || defaultPerRow)) {
+ rows.push([]);
+ }
last(rows).push(children({ item }));
diff --git a/x-pack/plugins/canvas/public/components/link/link.js b/x-pack/plugins/canvas/public/components/link/link.js
index 5e7810e0db7ab..3f8e65c31f97a 100644
--- a/x-pack/plugins/canvas/public/components/link/link.js
+++ b/x-pack/plugins/canvas/public/components/link/link.js
@@ -24,7 +24,9 @@ export class Link extends React.PureComponent {
};
navigateTo = (name, params) => ev => {
- if (this.props.onClick) this.props.onClick(ev);
+ if (this.props.onClick) {
+ this.props.onClick(ev);
+ }
if (
!ev.defaultPrevented && // onClick prevented default
diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.js b/x-pack/plugins/canvas/public/components/page_manager/page_manager.js
index 922c323545def..0b49998a3d58b 100644
--- a/x-pack/plugins/canvas/public/components/page_manager/page_manager.js
+++ b/x-pack/plugins/canvas/public/components/page_manager/page_manager.js
@@ -46,7 +46,9 @@ export class PageManager extends React.PureComponent {
componentDidUpdate(prevProps) {
// scrolls to the active page on the next tick, otherwise new pages don't scroll completely into view
- if (prevProps.selectedPage !== this.props.selectedPage) setTimeout(this.scrollToActivePage, 0);
+ if (prevProps.selectedPage !== this.props.selectedPage) {
+ setTimeout(this.scrollToActivePage, 0);
+ }
}
componentWillUnmount() {
@@ -57,7 +59,9 @@ export class PageManager extends React.PureComponent {
if (this.activePageRef && this.pageListRef) {
// not all target browsers support element.scrollTo
// TODO: replace this with something more cross-browser, maybe scrollIntoView
- if (!this.pageListRef.scrollTo) return;
+ if (!this.pageListRef.scrollTo) {
+ return;
+ }
const pageOffset = this.activePageRef.offsetLeft;
const {
@@ -95,13 +99,17 @@ export class PageManager extends React.PureComponent {
doDelete = () => {
const { previousPage, removePage, deleteId, selectedPage } = this.props;
this.resetDelete();
- if (deleteId === selectedPage) previousPage();
+ if (deleteId === selectedPage) {
+ previousPage();
+ }
removePage(deleteId);
};
onDragEnd = ({ draggableId: pageId, source, destination }) => {
// dropped outside the list
- if (!destination) return;
+ if (!destination) {
+ return;
+ }
const position = destination.index - source.index;
@@ -128,7 +136,9 @@ export class PageManager extends React.PureComponent {
page.id === selectedPage ? 'canvasPageManager__page-isActive' : ''
}`}
ref={el => {
- if (page.id === selectedPage) this.activePageRef = el;
+ if (page.id === selectedPage) {
+ this.activePageRef = el;
+ }
provided.innerRef(el);
}}
{...provided.draggableProps}
diff --git a/x-pack/plugins/canvas/public/components/paginate/index.js b/x-pack/plugins/canvas/public/components/paginate/index.js
index 2854324c3981a..ce1e525d50c9f 100644
--- a/x-pack/plugins/canvas/public/components/paginate/index.js
+++ b/x-pack/plugins/canvas/public/components/paginate/index.js
@@ -14,7 +14,9 @@ export const Paginate = compose(
totalPages: Math.ceil(rows.length / (perPage || 10)),
})),
withState('currentPage', 'setPage', ({ startPage, totalPages }) => {
- if (totalPages > 0) return Math.min(startPage, totalPages - 1);
+ if (totalPages > 0) {
+ return Math.min(startPage, totalPages - 1);
+ }
return 0;
}),
withProps(({ rows, totalPages, currentPage, perPage }) => {
@@ -36,7 +38,9 @@ export const Paginate = compose(
}),
lifecycle({
componentDidUpdate(prevProps) {
- if (prevProps.perPage !== this.props.perPage) this.props.setPage(0);
+ if (prevProps.perPage !== this.props.perPage) {
+ this.props.setPage(0);
+ }
},
})
)(Component);
diff --git a/x-pack/plugins/canvas/public/components/popover/popover.js b/x-pack/plugins/canvas/public/components/popover/popover.js
index 89de57aa845d9..0c72abe91c96c 100644
--- a/x-pack/plugins/canvas/public/components/popover/popover.js
+++ b/x-pack/plugins/canvas/public/components/popover/popover.js
@@ -31,7 +31,9 @@ export class Popover extends Component {
};
componentDidMount() {
- if (this.props.isOpen) this.setState({ isPopoverOpen: true });
+ if (this.props.isOpen) {
+ this.setState({ isPopoverOpen: true });
+ }
}
handleClick = () => {
diff --git a/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js b/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js
index cdc41e123d89d..d3a22542a5767 100644
--- a/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js
+++ b/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js
@@ -12,13 +12,17 @@ import { AutoRefreshControls } from './auto_refresh_controls';
const getRefreshInterval = (val = '') => {
// if it's a number, just use it directly
- if (!isNaN(Number(val))) return val;
+ if (!isNaN(Number(val))) {
+ return val;
+ }
// if it's a string, try to parse out the shorthand duration value
const match = String(val).match(/^([0-9]{1,})([hmsd])$/);
// TODO: do something better with improper input, like show an error...
- if (!match) return;
+ if (!match) {
+ return;
+ }
switch (match[2]) {
case 's':
diff --git a/x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js b/x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js
index b47424fb5c25e..cb9912e717173 100644
--- a/x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js
+++ b/x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js
@@ -21,7 +21,9 @@ export class RenderToDom extends React.Component {
componentDidUpdate() {
// Calls render function once we have the reference to the DOM element to render into
- if (this.props.domNode) this.props.render(this.props.domNode);
+ if (this.props.domNode) {
+ this.props.render(this.props.domNode);
+ }
}
render() {
diff --git a/x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js b/x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js
index f859c15d1b1ac..3896e604362f5 100644
--- a/x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js
+++ b/x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js
@@ -44,7 +44,9 @@ export class RenderWithFn extends React.Component {
componentWillReceiveProps({ renderFn }) {
const newRenderFunction = renderFn !== this.props.renderFn;
- if (newRenderFunction) this.resetRenderTarget(this.domNode);
+ if (newRenderFunction) {
+ this.resetRenderTarget(this.domNode);
+ }
}
shouldComponentUpdate(prevProps) {
@@ -60,7 +62,9 @@ export class RenderWithFn extends React.Component {
}
// Size changes
- if (!isEqual(size, prevProps.size)) return handlers.resize(size);
+ if (!isEqual(size, prevProps.size)) {
+ return handlers.resize(size);
+ }
}
componentWillUnmount() {
@@ -70,7 +74,9 @@ export class RenderWithFn extends React.Component {
callRenderFn = () => {
const { handlers, config, renderFn, reuseNode, name: functionName } = this.props;
// TODO: We should wait until handlers.done() is called before replacing the element content?
- if (!reuseNode || !this.renderTarget) this.resetRenderTarget(this.domNode);
+ if (!reuseNode || !this.renderTarget) {
+ this.resetRenderTarget(this.domNode);
+ }
// else if (!firstRender) handlers.destroy();
const renderConfig = cloneDeep(config);
@@ -88,12 +94,18 @@ export class RenderWithFn extends React.Component {
resetRenderTarget = domNode => {
const { handlers } = this.props;
- if (!domNode) throw new Error('RenderWithFn can not reset undefined target node');
+ if (!domNode) {
+ throw new Error('RenderWithFn can not reset undefined target node');
+ }
// call destroy on existing element
- if (!this.firstRender) handlers.destroy();
+ if (!this.firstRender) {
+ handlers.destroy();
+ }
- while (domNode.firstChild) domNode.removeChild(domNode.firstChild);
+ while (domNode.firstChild) {
+ domNode.removeChild(domNode.firstChild);
+ }
this.firstRender = true;
this.renderTarget = this.createRenderTarget();
diff --git a/x-pack/plugins/canvas/public/components/router/router.js b/x-pack/plugins/canvas/public/components/router/router.js
index 800c01079fcec..44df1f2b7b842 100644
--- a/x-pack/plugins/canvas/public/components/router/router.js
+++ b/x-pack/plugins/canvas/public/components/router/router.js
@@ -47,8 +47,9 @@ export class Router extends React.PureComponent {
if (!component) {
// TODO: render some kind of 404 page, maybe from a prop?
- if (process.env.NODE_ENV !== 'production')
+ if (process.env.NODE_ENV !== 'production') {
console.warn(`No component defined on route: ${route.name}`);
+ }
return;
}
@@ -73,8 +74,9 @@ export class Router extends React.PureComponent {
render() {
// show loading
- if (this.props.showLoading)
+ if (this.props.showLoading) {
return React.createElement(CanvasLoading, { msg: this.props.loadingMessage });
+ }
// show the activeComponent
return isClassComponent(this.state.activeComponent)
diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.js b/x-pack/plugins/canvas/public/components/toolbar/toolbar.js
index b05f027f1c334..ad41219ca367f 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.js
+++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.js
@@ -41,7 +41,9 @@ export const Toolbar = props => {
const done = () => setTray(null);
const showHideTray = exp => {
- if (tray && tray === exp) return done();
+ if (tray && tray === exp) {
+ return done();
+ }
setTray(exp);
};
diff --git a/x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.js b/x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.js
index 9afdf5e06138d..207e7156393fe 100644
--- a/x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.js
+++ b/x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.js
@@ -16,7 +16,9 @@ export const TooltipIcon = ({ icon = 'info', ...rest }) => {
info: { type: 'iInCircle', color: 'default' },
};
- if (!Object.keys(icons).includes(icon)) throw new Error(`Unsupported icon type: ${icon}`);
+ if (!Object.keys(icons).includes(icon)) {
+ throw new Error(`Unsupported icon type: ${icon}`);
+ }
return ;
};
diff --git a/x-pack/plugins/canvas/public/components/workpad/index.js b/x-pack/plugins/canvas/public/components/workpad/index.js
index f99af9679c4b0..40ae5e1d1a664 100644
--- a/x-pack/plugins/canvas/public/components/workpad/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad/index.js
@@ -46,8 +46,12 @@ export const Workpad = compose(
withState('prevSelectedPageNumber', 'setPrevSelectedPageNumber', 0),
withProps(({ selectedPageNumber, prevSelectedPageNumber, transition }) => {
function getAnimation(pageNumber) {
- if (!transition || !transition.name) return null;
- if (![selectedPageNumber, prevSelectedPageNumber].includes(pageNumber)) return null;
+ if (!transition || !transition.name) {
+ return null;
+ }
+ if (![selectedPageNumber, prevSelectedPageNumber].includes(pageNumber)) {
+ return null;
+ }
const { enter, exit } = transitionsRegistry.get(transition.name);
const laterPageNumber = Math.max(selectedPageNumber, prevSelectedPageNumber);
const name = pageNumber === laterPageNumber ? enter : exit;
@@ -59,11 +63,15 @@ export const Workpad = compose(
}),
withHandlers({
onPageChange: props => pageNumber => {
- if (pageNumber === props.selectedPageNumber) return;
+ if (pageNumber === props.selectedPageNumber) {
+ return;
+ }
props.setPrevSelectedPageNumber(props.selectedPageNumber);
const transitionPage = Math.max(props.selectedPageNumber, pageNumber) - 1;
const { transition } = props.workpad.pages[transitionPage];
- if (transition) props.setTransition(transition);
+ if (transition) {
+ props.setTransition(transition);
+ }
props.router.navigateTo('loadWorkpad', { id: props.workpad.id, page: pageNumber });
},
}),
diff --git a/x-pack/plugins/canvas/public/components/workpad/workpad.js b/x-pack/plugins/canvas/public/components/workpad/workpad.js
index b424212257638..dcdbed0ecea65 100644
--- a/x-pack/plugins/canvas/public/components/workpad/workpad.js
+++ b/x-pack/plugins/canvas/public/components/workpad/workpad.js
@@ -39,16 +39,28 @@ export const Workpad = props => {
const keyHandler = action => {
// handle keypress events for editor and presentation events
// this exists in both contexts
- if (action === 'REFRESH') return fetchAllRenderables();
+ if (action === 'REFRESH') {
+ return fetchAllRenderables();
+ }
// editor events
- if (action === 'UNDO') return undoHistory();
- if (action === 'REDO') return redoHistory();
- if (action === 'GRID') return setGrid(!grid);
+ if (action === 'UNDO') {
+ return undoHistory();
+ }
+ if (action === 'REDO') {
+ return redoHistory();
+ }
+ if (action === 'GRID') {
+ return setGrid(!grid);
+ }
// presentation events
- if (action === 'PREV') return previousPage();
- if (action === 'NEXT') return nextPage();
+ if (action === 'PREV') {
+ return previousPage();
+ }
+ if (action === 'NEXT') {
+ return nextPage();
+ }
};
setDocTitle(workpad.name);
diff --git a/x-pack/plugins/canvas/public/components/workpad_export/index.js b/x-pack/plugins/canvas/public/components/workpad_export/index.js
index eaa4691b71839..a54acaca01404 100644
--- a/x-pack/plugins/canvas/public/components/workpad_export/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad_export/index.js
@@ -24,7 +24,9 @@ const mapStateToProps = state => ({
const getAbsoluteUrl = path => {
const { location } = getWindow();
- if (!location) return path; // fallback for mocked window object
+ if (!location) {
+ return path;
+ } // fallback for mocked window object
const { protocol, hostname, port } = location;
return `${protocol}//${hostname}:${port}${path}`;
@@ -34,13 +36,16 @@ export const WorkpadExport = compose(
connect(mapStateToProps),
withProps(({ workpad, pageCount }) => ({
getExportUrl: type => {
- if (type === 'pdf') return getAbsoluteUrl(getPdfUrl(workpad, { pageCount }));
+ if (type === 'pdf') {
+ return getAbsoluteUrl(getPdfUrl(workpad, { pageCount }));
+ }
throw new Error(`Unknown export type: ${type}`);
},
onCopy: type => {
- if (type === 'pdf')
+ if (type === 'pdf') {
return notify.info('The PDF generation URL was copied to your clipboard.');
+ }
throw new Error(`Unknown export type: ${type}`);
},
diff --git a/x-pack/plugins/canvas/public/components/workpad_export/utils.js b/x-pack/plugins/canvas/public/components/workpad_export/utils.js
index be2e7e6d8114c..9fefaef09b9ab 100644
--- a/x-pack/plugins/canvas/public/components/workpad_export/utils.js
+++ b/x-pack/plugins/canvas/public/components/workpad_export/utils.js
@@ -28,8 +28,9 @@ export function getPdfUrl({ id, name: title, width, height }, { pageCount }) {
// build a list of all page urls for exporting, they are captured one at a time
const workpadUrls = [];
- for (let i = 1; i <= pageCount; i++)
+ for (let i = 1; i <= pageCount; i++) {
workpadUrls.push(rison.encode(`${canvasEntry}/export/workpad/pdf/${id}/page/${i}`));
+ }
const jobParams = {
browserTimezone: 'America/Phoenix', // TODO: get browser timezone, or Kibana setting?
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js
index 0e8e209d31411..c4fa1ce706229 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js
+++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js
@@ -33,7 +33,9 @@ export const WorkpadHeader = ({
showElementModal,
}) => {
const keyHandler = action => {
- if (action === 'EDITING') toggleWriteable();
+ if (action === 'EDITING') {
+ toggleWriteable();
+ }
};
const elementAdd = (
@@ -61,8 +63,11 @@ export const WorkpadHeader = ({
let readOnlyToolTip = '';
- if (!canUserWrite) readOnlyToolTip = "You don't have permission to edit this workpad";
- else readOnlyToolTip = isWriteable ? 'Hide editing controls' : 'Show editing controls';
+ if (!canUserWrite) {
+ readOnlyToolTip = "You don't have permission to edit this workpad";
+ } else {
+ readOnlyToolTip = isWriteable ? 'Hide editing controls' : 'Show editing controls';
+ }
return (
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/index.js
index 6229fd340813a..8e83819054fdb 100644
--- a/x-pack/plugins/canvas/public/components/workpad_loader/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad_loader/index.js
@@ -46,7 +46,9 @@ export const WorkpadLoader = compose(
notify.error(err, { title: `Couldn't upload workpad` });
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
- if (err.response.status === 403) props.setCanUserWrite(false);
+ if (err.response.status === 403) {
+ props.setCanUserWrite(false);
+ }
}
return;
}
@@ -87,7 +89,9 @@ export const WorkpadLoader = compose(
notify.error(err, { title: `Couldn't clone workpad` });
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
- if (err.response.status === 403) props.setCanUserWrite(false);
+ if (err.response.status === 403) {
+ props.setCanUserWrite(false);
+ }
}
},
@@ -110,13 +114,17 @@ export const WorkpadLoader = compose(
const [passes, errors] = results.reduce(
([passes, errors], result) => {
- if (result.id === loadedWorkpad && !result.err) redirectHome = true;
+ if (result.id === loadedWorkpad && !result.err) {
+ redirectHome = true;
+ }
if (result.err) {
errors.push(result.id);
// TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced
// https://github.com/elastic/kibana/issues/20277
- if (result.err.response.status === 403) props.setCanUserWrite(false);
+ if (result.err.response.status === 403) {
+ props.setCanUserWrite(false);
+ }
} else {
passes.push(result.id);
}
@@ -133,11 +141,15 @@ export const WorkpadLoader = compose(
workpads: remainingWorkpads,
};
- if (errors.length > 0) notify.error("Couldn't delete all workpads");
+ if (errors.length > 0) {
+ notify.error("Couldn't delete all workpads");
+ }
setWorkpads(workpadState);
- if (redirectHome) props.router.navigateTo('home');
+ if (redirectHome) {
+ props.router.navigateTo('home');
+ }
return errors.map(({ id }) => id);
});
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js b/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js
index c09ea63280cef..f304377535f02 100644
--- a/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js
+++ b/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js
@@ -9,7 +9,9 @@ import { getId } from '../../lib/get_id';
import { notify } from '../../lib/notify';
export const uploadWorkpad = (file, onUpload) => {
- if (!file) return;
+ if (!file) {
+ return;
+ }
if (get(file, 'type') !== 'application/json') {
return notify.warning('Only JSON files are accepted', {
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
index 70a951c892eb3..66def18abaf8f 100644
--- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
+++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
@@ -62,7 +62,9 @@ export class WorkpadLoader extends React.PureComponent {
componentWillReceiveProps(newProps) {
// the workpadId prop will change when a is created or loaded, close the toolbar when it does
const { workpadId, onClose } = this.props;
- if (workpadId !== newProps.workpadId) onClose();
+ if (workpadId !== newProps.workpadId) {
+ onClose();
+ }
}
componentWillUnmount() {
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js b/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js
index 4771221f8b169..e37c703de4ba6 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js
+++ b/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js
@@ -7,10 +7,15 @@
import { withHandlers } from 'recompose';
const ancestorElement = element => {
- if (!element) return element;
+ if (!element) {
+ return element;
+ }
// IE11 has no classList on SVG elements, but we're not interested in SVG elements
- do if (element.classList && element.classList.contains('canvasPage')) return element;
- while ((element = element.parentElement || element.parentNode)); // no IE11 SVG parentElement
+ do {
+ if (element.classList && element.classList.contains('canvasPage')) {
+ return element;
+ }
+ } while ((element = element.parentElement || element.parentNode)); // no IE11 SVG parentElement
};
const localMousePosition = (box, clientX, clientY) => {
@@ -29,7 +34,9 @@ const setupHandler = (commit, target) => {
// Ancestor has to be identified on setup, rather than 1st interaction, otherwise events may be triggered on
// DOM elements that had been removed: kibana-canvas github issue #1093
const canvasPage = ancestorElement(target);
- if (!canvasPage) return;
+ if (!canvasPage) {
+ return;
+ }
const canvasOrigin = canvasPage.getBoundingClientRect();
window.onmousemove = ({ clientX, clientY, altKey, metaKey, shiftKey, ctrlKey }) => {
const { x, y } = localMousePosition(canvasOrigin, clientX, clientY);
@@ -78,7 +85,9 @@ const handleMouseDown = (commit, e, isEditable) => {
return; // left-click and edit mode only
}
const ancestor = ancestorElement(target);
- if (!ancestor) return;
+ if (!ancestor) {
+ return;
+ }
const { x, y } = localMousePosition(ancestor, clientX, clientY);
setupHandler(commit, ancestor);
commit('mouseEvent', { event: 'mouseDown', x, y, altKey, metaKey, shiftKey, ctrlKey });
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/index.js
index 58bc2bc06ebd4..be63a36409e6e 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad_page/index.js
@@ -32,7 +32,9 @@ const mapDispatchToProps = dispatch => {
};
const getRootElementId = (lookup, id) => {
- if (!lookup.has(id)) return null;
+ if (!lookup.has(id)) {
+ return null;
+ }
const element = lookup.get(id);
return element.parent && element.parent.subtype !== 'adHocGroup'
@@ -47,12 +49,16 @@ export const WorkpadPage = compose(
),
withProps(({ isSelected, animation }) => {
function getClassName() {
- if (animation) return animation.name;
+ if (animation) {
+ return animation.name;
+ }
return isSelected ? 'canvasPage--isActive' : 'canvasPage--isInactive';
}
function getAnimationStyle() {
- if (!animation) return {};
+ if (!animation) {
+ return {};
+ }
return {
animationDirection: animation.direction,
// TODO: Make this configurable
@@ -85,8 +91,9 @@ export const WorkpadPage = compose(
let element = null;
if (elementLookup.has(shape.id)) {
element = elementLookup.get(shape.id);
- if (selectedElementIds.indexOf(shape.id) > -1)
+ if (selectedElementIds.indexOf(shape.id) > -1) {
selectedElements.push({ ...element, id: shape.id });
+ }
}
// instead of just combining `element` with `shape`, we make property transfer explicit
return element ? { ...shape, filter: element.filter } : shape;
@@ -101,7 +108,9 @@ export const WorkpadPage = compose(
},
remove: () => {
// currently, handle the removal of one element, exploiting multiselect subsequently
- if (selectedElementIds.length) removeElements(page.id)(selectedElementIds);
+ if (selectedElementIds.length) {
+ removeElements(page.id)(selectedElementIds);
+ }
},
copyElements: () => {
if (selectedElements.length) {
@@ -118,7 +127,9 @@ export const WorkpadPage = compose(
},
pasteElements: () => {
const elements = JSON.parse(getClipboardData());
- if (elements) elements.map(element => duplicateElement(page.id)(element));
+ if (elements) {
+ elements.map(element => duplicateElement(page.id)(element));
+ }
},
};
}
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js
index 3ee13a4070b7a..30cccb1d398c5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js
+++ b/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js
@@ -125,7 +125,9 @@ export class WorkpadPage extends PureComponent {
{elements
.map(element => {
if (element.type === 'annotation') {
- if (!isEditable) return;
+ if (!isEditable) {
+ return;
+ }
const props = {
key: element.id,
type: element.type,
diff --git a/x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js b/x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js
index 8752d7be19612..ae50b5a843da5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js
+++ b/x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js
@@ -52,9 +52,13 @@ export class WorkpadTemplates extends React.PureComponent {
clauses.forEach(clause => {
const { type, field, value } = clause;
// extract terms from the query AST
- if (type === 'term') searchTerms.push(value);
+ if (type === 'term') {
+ searchTerms.push(value);
+ }
// extracts tags from the query AST
- else if (field === 'tags') filterTags.push(value);
+ else if (field === 'tags') {
+ filterTags.push(value);
+ }
});
this.setState({ searchTerm: searchTerms.join(' '), filterTags });
@@ -101,7 +105,9 @@ export class WorkpadTemplates extends React.PureComponent {
dataType: 'string',
width: '30%',
render: tags => {
- if (!tags) return 'No tags';
+ if (!tags) {
+ return 'No tags';
+ }
return tags.map(tag => (
{tag}
diff --git a/x-pack/plugins/canvas/public/expression_types/arg.js b/x-pack/plugins/canvas/public/expression_types/arg.js
index 341bd1e3953fa..6213fc2d44131 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg.js
+++ b/x-pack/plugins/canvas/public/expression_types/arg.js
@@ -12,8 +12,12 @@ import { argTypeRegistry } from './arg_type';
export class Arg {
constructor(props) {
const argType = argTypeRegistry.get(props.argType);
- if (!argType) throw new Error(`Invalid arg type: ${props.argType}`);
- if (!props.name) throw new Error('Args must have a name property');
+ if (!argType) {
+ throw new Error(`Invalid arg type: ${props.argType}`);
+ }
+ if (!props.name) {
+ throw new Error('Args must have a name property');
+ }
// properties that can be overridden
const defaultProps = {
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js
index 0ef8cef2a50bc..5a8b3ce96a114 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js
@@ -23,7 +23,9 @@ export const AppearanceForm = ({ padding, opacity, overflow, onChange }) => {
const paddingVal = padding ? padding.replace('px', '') : '';
const namedChange = name => ev => {
- if (name === 'padding') return onChange(name, `${ev.target.value}px`);
+ if (name === 'padding') {
+ return onChange(name, `${ev.target.value}px`);
+ }
onChange(name, ev.target.value);
};
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js
index 7884640831ffe..841158a8fe5d1 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js
@@ -34,12 +34,18 @@ export const BorderForm = ({ value, radius, onChange, colors }) => {
const radiusVal = radius ? radius.replace('px', '') : '';
const namedChange = name => val => {
- if (name === 'borderWidth') return onChange('border', `${val}px ${borderStyle} ${borderColor}`);
+ if (name === 'borderWidth') {
+ return onChange('border', `${val}px ${borderStyle} ${borderColor}`);
+ }
if (name === 'borderStyle') {
- if (val === '') return onChange('border', `0px`);
+ if (val === '') {
+ return onChange('border', `0px`);
+ }
return onChange('border', `${borderWidth} ${val} ${borderColor}`);
}
- if (name === 'borderRadius') return onChange('borderRadius', `${val}px`);
+ if (name === 'borderRadius') {
+ return onChange('borderRadius', `${val}px`);
+ }
onChange(name, val);
};
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js
index 8661413c0b1e4..da751fb5bc59b 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js
@@ -13,17 +13,22 @@ import { ExtendedTemplate } from './extended_template';
const EnhancedExtendedTemplate = lifecycle({
formatLabel(label) {
- if (typeof label !== 'string') this.props.renderError();
+ if (typeof label !== 'string') {
+ this.props.renderError();
+ }
return `Style: ${label}`;
},
componentWillMount() {
const label = get(this.props.argValue, 'chain.0.arguments.label.0', '');
- if (label) this.props.setLabel(this.formatLabel(label));
+ if (label) {
+ this.props.setLabel(this.formatLabel(label));
+ }
},
componentWillReceiveProps(newProps) {
const newLabel = get(newProps.argValue, 'chain.0.arguments.label.0', '');
- if (newLabel && this.props.label !== this.formatLabel(newLabel))
+ if (newLabel && this.props.label !== this.formatLabel(newLabel)) {
this.props.setLabel(this.formatLabel(newLabel));
+ }
},
})(ExtendedTemplate);
diff --git a/x-pack/plugins/canvas/public/expression_types/base_form.js b/x-pack/plugins/canvas/public/expression_types/base_form.js
index 4b97f6204a355..a9082529585dd 100644
--- a/x-pack/plugins/canvas/public/expression_types/base_form.js
+++ b/x-pack/plugins/canvas/public/expression_types/base_form.js
@@ -6,7 +6,9 @@
export class BaseForm {
constructor(props) {
- if (!props.name) throw new Error('Expression specs require a name property');
+ if (!props.name) {
+ throw new Error('Expression specs require a name property');
+ }
this.name = props.name;
this.displayName = props.displayName || this.name;
diff --git a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js
index a2436f0e92681..2a3a25f49fa3c 100644
--- a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js
+++ b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js
@@ -25,8 +25,12 @@ const EsdocsDatasource = ({ args, updateArgs }) => {
// TODO: This is a terrible way of doing defaults. We need to find a way to read the defaults for the function
// and set them for the data source UI.
const getArgName = () => {
- if (getSimpleArg('_', args)[0]) return '_';
- if (getSimpleArg('q', args)[0]) return 'q';
+ if (getSimpleArg('_', args)[0]) {
+ return '_';
+ }
+ if (getSimpleArg('q', args)[0]) {
+ return 'q';
+ }
return 'query';
};
@@ -40,7 +44,9 @@ const EsdocsDatasource = ({ args, updateArgs }) => {
const getFields = () => {
const commas = getSimpleArg('fields', args)[0] || '';
- if (commas.length === 0) return [];
+ if (commas.length === 0) {
+ return [];
+ }
return commas.split(',').map(str => str.trim());
};
diff --git a/x-pack/plugins/canvas/public/expression_types/function_form.js b/x-pack/plugins/canvas/public/expression_types/function_form.js
index ba58424b7b8c3..299b57e4854c1 100644
--- a/x-pack/plugins/canvas/public/expression_types/function_form.js
+++ b/x-pack/plugins/canvas/public/expression_types/function_form.js
@@ -28,7 +28,9 @@ export class FunctionForm extends BaseForm {
const { argType, expressionIndex } = passedProps;
// TODO: show some information to the user than an argument was skipped
- if (!arg || skipRender) return null;
+ if (!arg || skipRender) {
+ return null;
+ }
const renderArgWithProps = (argValue, valueIndex) =>
arg.render({
@@ -43,7 +45,9 @@ export class FunctionForm extends BaseForm {
// render the argument's template, wrapped in a remove control
// if the argument is required but not included, render the control anyway
- if (!argValues && arg.required) return renderArgWithProps({ type: undefined, value: '' }, 0);
+ if (!argValues && arg.required) {
+ return renderArgWithProps({ type: undefined, value: '' }, 0);
+ }
// render all included argument controls
return argValues && argValues.map(renderArgWithProps);
@@ -55,8 +59,12 @@ export class FunctionForm extends BaseForm {
const { arg, argValues, skipRender } = dataArg;
// skip arguments that aren't defined in the expression type schema
- if (!arg || arg.required || skipRender) return null;
- if (argValues && !arg.multi) return null;
+ if (!arg || arg.required || skipRender) {
+ return null;
+ }
+ if (argValues && !arg.multi) {
+ return null;
+ }
const value = arg.default == null ? null : fromExpression(arg.default, 'argument');
@@ -74,7 +82,9 @@ export class FunctionForm extends BaseForm {
// Don't instaniate these until render time, to give the registries a chance to populate.
const argInstances = this.args.map(argSpec => new Arg(argSpec));
- if (!isPlainObject(args)) throw new Error(`Form "${this.name}" expects "args" object`);
+ if (!isPlainObject(args)) {
+ throw new Error(`Form "${this.name}" expects "args" object`);
+ }
// get a mapping of arg values from the expression and from the renderable's schema
const argNames = uniq(argInstances.map(arg => arg.name).concat(Object.keys(args)));
@@ -99,7 +109,9 @@ export class FunctionForm extends BaseForm {
const argumentForms = compact(resolvedDataArgs.map(d => this.renderArg(props, d)));
const addableArgs = compact(resolvedDataArgs.map(d => this.getAddableArg(props, d)));
- if (!addableArgs.length && !argumentForms.length) return null;
+ if (!addableArgs.length && !argumentForms.length) {
+ return null;
+ }
return (
diff --git a/x-pack/plugins/canvas/public/expression_types/model.js b/x-pack/plugins/canvas/public/expression_types/model.js
index 1bdcbdeefb50a..812ccab9cc104 100644
--- a/x-pack/plugins/canvas/public/expression_types/model.js
+++ b/x-pack/plugins/canvas/public/expression_types/model.js
@@ -12,8 +12,12 @@ const NO_NEXT_EXP = 'no next expression';
const MISSING_MODEL_ARGS = 'missing model args';
function getModelArgs(expressionType) {
- if (!expressionType) return NO_NEXT_EXP;
- if (!expressionType.modelArgs) return MISSING_MODEL_ARGS;
+ if (!expressionType) {
+ return NO_NEXT_EXP;
+ }
+ if (!expressionType.modelArgs) {
+ return MISSING_MODEL_ARGS;
+ }
return expressionType.modelArgs.length > 0 ? expressionType.modelArgs : MISSING_MODEL_ARGS;
}
@@ -45,12 +49,16 @@ export class Model extends FunctionForm {
}
// if there is no following expression, argument is skipped
- if (modelArgs === NO_NEXT_EXP) return { skipRender: true };
+ if (modelArgs === NO_NEXT_EXP) {
+ return { skipRender: true };
+ }
// if argument is missing from modelArgs, mark it as skipped
const argName = get(dataArg, 'arg.name');
const modelArg = modelArgs.find(modelArg => {
- if (Array.isArray(modelArg)) return modelArg[0] === argName;
+ if (Array.isArray(modelArg)) {
+ return modelArg[0] === argName;
+ }
return modelArg === argName;
});
diff --git a/x-pack/plugins/canvas/public/expression_types/view.js b/x-pack/plugins/canvas/public/expression_types/view.js
index 6d0b6cd7a2817..166a242d2bae8 100644
--- a/x-pack/plugins/canvas/public/expression_types/view.js
+++ b/x-pack/plugins/canvas/public/expression_types/view.js
@@ -22,8 +22,9 @@ export class View extends FunctionForm {
this.modelArgs = this.modelArgs || [];
- if (!Array.isArray(this.modelArgs))
+ if (!Array.isArray(this.modelArgs)) {
throw new Error(`${this.name} element is invalid, modelArgs must be an array`);
+ }
}
}
diff --git a/x-pack/plugins/canvas/public/functions/asset.js b/x-pack/plugins/canvas/public/functions/asset.js
index 52c9d45e9fd09..115bdc2ab257d 100644
--- a/x-pack/plugins/canvas/public/functions/asset.js
+++ b/x-pack/plugins/canvas/public/functions/asset.js
@@ -26,7 +26,9 @@ export const asset = () => ({
fn: (context, args) => {
const assetId = args.id;
const asset = getAssetById(getState(), assetId);
- if (asset !== undefined) return asset.value;
+ if (asset !== undefined) {
+ return asset.value;
+ }
throw new Error('Could not get the asset by ID: ' + assetId);
},
diff --git a/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js b/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js
index c9f89763435d1..68c45d0eb7e4b 100644
--- a/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js
+++ b/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js
@@ -112,7 +112,9 @@ describe.skip('historyProvider', () => {
describe('onChange', () => {
const createOnceHandler = (history, done, fn) => {
const teardown = history.onChange((location, prevLocation) => {
- if (typeof fn === 'function') fn(location, prevLocation);
+ if (typeof fn === 'function') {
+ fn(location, prevLocation);
+ }
teardown();
done();
});
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js b/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js
index d7ad63032c8a8..2df87fecdb562 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js
@@ -68,9 +68,17 @@ const disjunctiveUnion = (keyFun, set1, set2) =>
const mean = (a, b) => (a + b) / 2;
const shallowEqual = (a, b) => {
- if (a === b) return true;
- if (a.length !== b.length) return false;
- for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
+ if (a === b) {
+ return true;
+ }
+ if (a.length !== b.length) {
+ return false;
+ }
+ for (let i = 0; i < a.length; i++) {
+ if (a[i] !== b[i]) {
+ return false;
+ }
+ }
return true;
};
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js b/x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js
index 284cf34212d2f..d527ad3c16587 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js
@@ -57,10 +57,15 @@ const cursorPosition = selectReduce((previous, position) => position || previous
const mouseButton = selectReduce(
(prev, next) => {
- if (!next) return prev;
+ if (!next) {
+ return prev;
+ }
const { event, uid } = next;
- if (event === 'mouseDown') return { down: true, uid };
- else return event === 'mouseUp' ? { down: false, uid } : prev;
+ if (event === 'mouseDown') {
+ return { down: true, uid };
+ } else {
+ return event === 'mouseUp' ? { down: false, uid } : prev;
+ }
},
{ down: false, uid: null }
)(mouseButtonEvent);
@@ -97,8 +102,11 @@ const mouseButtonStateTransitions = (state, mouseIsDown, movedAlready) => {
case 'up':
return mouseIsDown ? 'downed' : 'up';
case 'downed':
- if (mouseIsDown) return movedAlready ? 'dragging' : 'downed';
- else return 'up';
+ if (mouseIsDown) {
+ return movedAlready ? 'dragging' : 'downed';
+ } else {
+ return 'up';
+ }
case 'dragging':
return mouseIsDown ? 'dragging' : 'up';
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js
index 93bd4ed8c8648..8994eab961d34 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js
@@ -273,9 +273,13 @@ const selectionState = select(
down: prev.down,
};
}
- if (selectedShapeObjects) prev.shapes = selectedShapeObjects.slice();
+ if (selectedShapeObjects) {
+ prev.shapes = selectedShapeObjects.slice();
+ }
// take action on mouse down only, and if the uid changed (except with directSelect), ie. bail otherwise
- if (mouseButtonUp || (uidUnchanged && !directSelect)) return { ...prev, down, uid, metaHeld };
+ if (mouseButtonUp || (uidUnchanged && !directSelect)) {
+ return { ...prev, down, uid, metaHeld };
+ }
const selectFunction = config.singleSelect || !multiselect ? singleSelect : multiSelect;
return selectFunction(prev, hoveredShapes, metaHeld, uid, selectedShapeObjects);
}
@@ -307,7 +311,9 @@ const rotationManipulation = ({
alterSnapGesture,
}) => {
// rotate around a Z-parallel line going through the shape center (ie. around the center)
- if (!shape || !directShape) return { transforms: [], shapes: [] };
+ if (!shape || !directShape) {
+ return { transforms: [], shapes: [] };
+ }
const center = shape.transformMatrix;
const centerPosition = matrix.mvMultiply(center, matrix.ORIGIN);
const vector = matrix.mvMultiply(
@@ -371,7 +377,9 @@ const minimumSize = ({ a, b, baseAB }, vector) => {
const centeredResizeManipulation = ({ gesture, shape, directShape }) => {
const transform = gesture.cumulativeTransform;
// scaling such that the center remains in place (ie. the other side of the shape can grow/shrink)
- if (!shape || !directShape) return { transforms: [], shapes: [] };
+ if (!shape || !directShape) {
+ return { transforms: [], shapes: [] };
+ }
// transform the incoming `transform` so that resizing is aligned with shape orientation
const vector = matrix.mvMultiply(
matrix.multiply(
@@ -397,7 +405,9 @@ const centeredResizeManipulation = ({ gesture, shape, directShape }) => {
const asymmetricResizeManipulation = ({ gesture, shape, directShape }) => {
const transform = gesture.cumulativeTransform;
// scaling such that the center remains in place (ie. the other side of the shape can grow/shrink)
- if (!shape || !directShape) return { transforms: [], shapes: [] };
+ if (!shape || !directShape) {
+ return { transforms: [], shapes: [] };
+ }
// transform the incoming `transform` so that resizing is aligned with shape orientation
const compositeComponent = matrix.compositeComponent(shape.localTransformMatrix);
const inv = matrix.invert(compositeComponent); // rid the translate component
@@ -640,7 +650,9 @@ const shapeCascadeProperties = shapes => shape => {
const cascadeProperties = shapes => shapes.map(shapeCascadeProperties(shapes));
const nextShapes = select((preexistingShapes, restated) => {
- if (restated && restated.newShapes) return restated.newShapes;
+ if (restated && restated.newShapes) {
+ return restated.newShapes;
+ }
// this is the per-shape model update at the current PoC level
return preexistingShapes;
@@ -657,12 +669,18 @@ const alignmentGuides = (shapes, guidedShapes, draggedShape) => {
// todo switch to informative variable names
for (let i = 0; i < guidedShapes.length; i++) {
const d = guidedShapes[i];
- if (d.type === 'annotation') continue; // fixme avoid this by not letting annotations get in here
+ if (d.type === 'annotation') {
+ continue;
+ } // fixme avoid this by not letting annotations get in here
// key points of the dragged shape bounding box
for (let j = 0; j < shapes.length; j++) {
const referenceShape = shapes[j];
- if (referenceShape.type === 'annotation') continue; // fixme avoid this by not letting annotations get in here
- if (referenceShape.parent) continue; // for now, don't snap to grouped elements fixme could snap, but make sure transform is gloabl
+ if (referenceShape.type === 'annotation') {
+ continue;
+ } // fixme avoid this by not letting annotations get in here
+ if (referenceShape.parent) {
+ continue;
+ } // for now, don't snap to grouped elements fixme could snap, but make sure transform is gloabl
const s =
d.id === referenceShape.id
? {
@@ -675,7 +693,9 @@ const alignmentGuides = (shapes, guidedShapes, draggedShape) => {
// key points of the stationery shape
for (let k = -1; k < 2; k++) {
for (let l = -1; l < 2; l++) {
- if ((k && !l) || (!k && l)) continue; // don't worry about midpoints of the edges, only the center
+ if ((k && !l) || (!k && l)) {
+ continue;
+ } // don't worry about midpoints of the edges, only the center
if (
draggedShape.subtype === config.resizeHandleName &&
!(
@@ -685,12 +705,15 @@ const alignmentGuides = (shapes, guidedShapes, draggedShape) => {
// moved midpoint on vertical border
(extremeVertical === 0 && l !== 0 && extremeHorizontal === k)
)
- )
+ ) {
continue;
+ }
const D = landmarkPoint(d, k, l);
for (let m = -1; m < 2; m++) {
for (let n = -1; n < 2; n++) {
- if ((m && !n) || (!m && n)) continue; // don't worry about midpoints of the edges, only the center
+ if ((m && !n) || (!m && n)) {
+ continue;
+ } // don't worry about midpoints of the edges, only the center
const S = landmarkPoint(s, m, n);
for (let dim = 0; dim < 2; dim++) {
const orthogonalDimension = 1 - dim;
@@ -797,7 +820,9 @@ const hoverAnnotations = select((hoveredShape, selectedPrimaryShapeIds, draggedS
const rotationAnnotation = (shapes, selectedShapes, shape, i) => {
const foundShape = shapes.find(s => shape.id === s.id);
- if (!foundShape) return false;
+ if (!foundShape) {
+ return false;
+ }
if (foundShape.type === 'annotation') {
return rotationAnnotation(
@@ -894,7 +919,9 @@ function resizeAnnotation(shapes, selectedShapes, shape) {
(foundShape.subtype === config.resizeHandleName
? shapes.find(s => shape.parent === s.id)
: foundShape);
- if (!foundShape) return [];
+ if (!foundShape) {
+ return [];
+ }
if (foundShape.subtype === config.resizeHandleName) {
// preserve any interactive annotation when handling
@@ -906,8 +933,9 @@ function resizeAnnotation(shapes, selectedShapes, shape) {
: [];
return result;
}
- if (foundShape.type === 'annotation')
+ if (foundShape.type === 'annotation') {
return resizeAnnotation(shapes, selectedShapes, shapes.find(s => foundShape.parent === s.id));
+ }
// fixme left active: snap wobble. right active: opposite side wobble.
const a = snappedA(properShape);
@@ -980,7 +1008,9 @@ const translateShapeSnap = (horizontalConstraint, verticalConstraint, draggedEle
const snapOffsetX = constrainedX ? -horizontalConstraint.signedDistance : 0;
const snapOffsetY = constrainedY ? -verticalConstraint.signedDistance : 0;
if (constrainedX || constrainedY) {
- if (!snapOffsetX && !snapOffsetY) return shape;
+ if (!snapOffsetX && !snapOffsetY) {
+ return shape;
+ }
const snapOffset = matrix.translateComponent(
matrix.multiply(
matrix.rotateZ((matrix.matrixToAngle(draggedElement.localTransformMatrix) / 180) * Math.PI),
@@ -1057,8 +1087,9 @@ const snappedShapes = select(
const subtype = draggedShape && draggedShape.subtype;
// snapping doesn't come into play if there's no dragging, or it's not a resize drag or translate drag on a
// leaf element or a group element:
- if (subtype && [config.resizeHandleName, config.adHocGroupName].indexOf(subtype) === -1)
+ if (subtype && [config.resizeHandleName, config.adHocGroupName].indexOf(subtype) === -1) {
return contentShapes;
+ }
const constraints = alignmentGuideAnnotations; // fixme split concept of snap constraints and their annotations
const relaxed = alterSnapGesture.indexOf('relax') !== -1;
const constrained = config.snapConstraint && !relaxed;
@@ -1183,9 +1214,13 @@ const axisAlignedBoundingBoxShape = shapesToBox => {
};
const resizeGroup = (shapes, selectedShapes, elements) => {
- if (!elements.length) return { shapes, selectedShapes };
+ if (!elements.length) {
+ return { shapes, selectedShapes };
+ }
const e = elements[0];
- if (e.subtype !== 'adHocGroup') return { shapes, selectedShapes };
+ if (e.subtype !== 'adHocGroup') {
+ return { shapes, selectedShapes };
+ }
if (!e.baseAB) {
return {
shapes: shapes.map(s => ({ ...s, childBaseAB: null, baseLocalTransformMatrix: null })),
@@ -1197,7 +1232,9 @@ const resizeGroup = (shapes, selectedShapes, elements) => {
const groupScale = matrix.scale(groupScaleX, groupScaleY, 1);
return {
shapes: shapes.map(s => {
- if (s.parent !== e.id || s.type === 'annotation') return s;
+ if (s.parent !== e.id || s.type === 'annotation') {
+ return s;
+ }
const childBaseAB = s.childBaseAB || [s.a, s.b];
const impliedScale = matrix.scale(...childBaseAB, 1);
const inverseImpliedScale = matrix.invert(impliedScale);
@@ -1346,7 +1383,9 @@ const bidirectionalCursors = {
};
const cursor = select((shape, draggedPrimaryShape) => {
- if (!shape) return 'auto';
+ if (!shape) {
+ return 'auto';
+ }
switch (shape.subtype) {
case config.rotationHandleName:
return 'crosshair';
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js
index 53c5652c02497..ae9120c9ecd9b 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js
@@ -227,7 +227,9 @@ const invert = ([a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p]) => {
} else {
const recDet = 1 / det;
- for (let index = 0; index < 16; index++) inv[index] *= recDet;
+ for (let index = 0; index < 16; index++) {
+ inv[index] *= recDet;
+ }
return inv;
}
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/state.js b/x-pack/plugins/canvas/public/lib/aeroelastic/state.js
index 448c8b161f7c2..7922784442caf 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/state.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/state.js
@@ -23,12 +23,15 @@ const selectReduce = (fun, previousValue, mapFun = d => d, logFun) => (...inputs
if (
shallowEqual(argumentValues, (argumentValues = inputs.map(input => input(state)))) &&
value === prevValue
- )
+ ) {
return mappedValue;
+ }
prevValue = value;
value = fun(prevValue, ...argumentValues);
- if (logFun) logFun(value, argumentValues);
+ if (logFun) {
+ logFun(value, argumentValues);
+ }
mappedValue = mapFun(value);
return mappedValue;
};
@@ -45,12 +48,15 @@ const select = (fun, logFun) => (...inputs) => {
if (
actionId === lastActionId ||
shallowEqual(argumentValues, (argumentValues = inputs.map(input => input(state))))
- )
+ ) {
return value;
+ }
value = fun(...argumentValues);
actionId = lastActionId;
- if (logFun) logFun(value, argumentValues);
+ if (logFun) {
+ logFun(value, argumentValues);
+ }
return value;
};
};
@@ -70,7 +76,9 @@ const createStore = (initialState, onChangeCallback = () => {}) => {
payload: { ...payload, uid: makeUid() },
},
});
- if (!meta.silent) onChangeCallback({ type, state: currentState }, meta);
+ if (!meta.silent) {
+ onChangeCallback({ type, state: currentState }, meta);
+ }
};
const dispatch = (type, payload) => setTimeout(() => commit(type, payload));
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic_kibana.js b/x-pack/plugins/canvas/public/lib/aeroelastic_kibana.js
index 9e00538ab37d8..0363736d8b3b1 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic_kibana.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic_kibana.js
@@ -16,7 +16,9 @@ export const aeroelastic = {
},
createStore(initialState, onChangeCallback = () => {}, page) {
- if (stores.has(page)) throw new Error('Only a single aeroelastic store per page should exist');
+ if (stores.has(page)) {
+ throw new Error('Only a single aeroelastic store per page should exist');
+ }
stores.set(page, aero.state.createStore(initialState, onChangeCallback));
@@ -30,12 +32,16 @@ export const aeroelastic = {
},
removeStore(page) {
- if (stores.has(page)) stores.delete(page);
+ if (stores.has(page)) {
+ stores.delete(page);
+ }
},
getStore(page) {
const store = stores.get(page);
- if (!store) throw new Error('An aeroelastic store should exist for page ' + page);
+ if (!store) {
+ throw new Error('An aeroelastic store should exist for page ' + page);
+ }
return store.getCurrentState();
},
diff --git a/x-pack/plugins/canvas/public/lib/arg_helpers.js b/x-pack/plugins/canvas/public/lib/arg_helpers.js
index 5640a218170e8..b674e158f3e34 100644
--- a/x-pack/plugins/canvas/public/lib/arg_helpers.js
+++ b/x-pack/plugins/canvas/public/lib/arg_helpers.js
@@ -23,14 +23,20 @@ const isAllowed = type => includes(allowedTypes, type);
export function validateArg(value) {
const type = getType(value);
- if (!isAllowed(type)) throw badType();
+ if (!isAllowed(type)) {
+ throw badType();
+ }
return value;
}
export function getSimpleArg(name, args) {
- if (!args[name]) return [];
+ if (!args[name]) {
+ return [];
+ }
return args[name].map(astVal => {
- if (!isAllowed(getType(astVal))) throw badType();
+ if (!isAllowed(getType(astVal))) {
+ throw badType();
+ }
return astVal;
});
}
diff --git a/x-pack/plugins/canvas/public/lib/element.js b/x-pack/plugins/canvas/public/lib/element.js
index f2ebe9af8702b..8955002d2b414 100644
--- a/x-pack/plugins/canvas/public/lib/element.js
+++ b/x-pack/plugins/canvas/public/lib/element.js
@@ -19,7 +19,9 @@ export function Element(config) {
// A sentence or few about what this element does
this.help = config.help;
- if (!config.expression) throw new Error('Element types must have a default expression');
+ if (!config.expression) {
+ throw new Error('Element types must have a default expression');
+ }
this.expression = config.expression;
this.filter = config.filter;
this.width = config.width || 500;
diff --git a/x-pack/plugins/canvas/public/lib/find_expression_type.js b/x-pack/plugins/canvas/public/lib/find_expression_type.js
index c70a1ec719fe8..d6d395feade8b 100644
--- a/x-pack/plugins/canvas/public/lib/find_expression_type.js
+++ b/x-pack/plugins/canvas/public/lib/find_expression_type.js
@@ -36,6 +36,8 @@ export function findExpressionType(name, type) {
}
}, []);
- if (matches.length > 1) throw new Error(`Found multiple expressions with name "${name}"`);
+ if (matches.length > 1) {
+ throw new Error(`Found multiple expressions with name "${name}"`);
+ }
return matches[0] || null;
}
diff --git a/x-pack/plugins/canvas/public/lib/fullscreen.js b/x-pack/plugins/canvas/public/lib/fullscreen.js
index e367ae08ea851..bb9990d4f5457 100644
--- a/x-pack/plugins/canvas/public/lib/fullscreen.js
+++ b/x-pack/plugins/canvas/public/lib/fullscreen.js
@@ -12,6 +12,9 @@ export function setFullscreen(fullscreen, doc = document) {
const bodyClassList = body.classList;
const isFullscreen = bodyClassList.contains(fullscreenClass);
- if (enabled && !isFullscreen) bodyClassList.add(fullscreenClass);
- else if (!enabled && isFullscreen) bodyClassList.remove(fullscreenClass);
+ if (enabled && !isFullscreen) {
+ bodyClassList.add(fullscreenClass);
+ } else if (!enabled && isFullscreen) {
+ bodyClassList.remove(fullscreenClass);
+ }
}
diff --git a/x-pack/plugins/canvas/public/lib/history_provider.js b/x-pack/plugins/canvas/public/lib/history_provider.js
index 65a5acc78526d..024e1f244ed91 100644
--- a/x-pack/plugins/canvas/public/lib/history_provider.js
+++ b/x-pack/plugins/canvas/public/lib/history_provider.js
@@ -63,12 +63,16 @@ function wrapHistoryInstance(history) {
},
getPath(path) {
- if (path != null) return createPath(parsePath(path));
+ if (path != null) {
+ return createPath(parsePath(path));
+ }
return createPath(this.getLocation());
},
getFullPath(path) {
- if (path != null) return history.createHref(parsePath(path));
+ if (path != null) {
+ return history.createHref(parsePath(path));
+ }
return history.createHref(this.getLocation());
},
@@ -82,7 +86,9 @@ function wrapHistoryInstance(history) {
onChange(fn) {
// if no handler fn passed, do nothing
- if (fn == null) return;
+ if (fn == null) {
+ return;
+ }
// push onChange function onto listener stack and return a function to remove it
const pushedIndex = historyState.onChange.push(fn) - 1;
@@ -90,7 +96,9 @@ function wrapHistoryInstance(history) {
// only allow the unlisten function to be called once
let called = false;
return () => {
- if (called) return;
+ if (called) {
+ return;
+ }
historyState.onChange.splice(pushedIndex, 1);
called = true;
};
@@ -129,14 +137,18 @@ const instances = new WeakMap();
const getHistoryInstance = win => {
// if no window object, use memory module
- if (typeof win === 'undefined' || !win.history) return createMemoryHistory();
+ if (typeof win === 'undefined' || !win.history) {
+ return createMemoryHistory();
+ }
return createHashStateHistory();
};
export const historyProvider = (win = getWindow()) => {
// return cached instance if one exists
const instance = instances.get(win);
- if (instance) return instance;
+ if (instance) {
+ return instance;
+ }
// create and cache wrapped history instance
const historyInstance = getHistoryInstance(win);
diff --git a/x-pack/plugins/canvas/public/lib/notify.js b/x-pack/plugins/canvas/public/lib/notify.js
index e824868f9541f..426cf687d54e4 100644
--- a/x-pack/plugins/canvas/public/lib/notify.js
+++ b/x-pack/plugins/canvas/public/lib/notify.js
@@ -14,7 +14,9 @@ const getToast = (err, opts = {}) => {
const { title, ...rest } = opts;
let text = null;
- if (title) text = errMsg;
+ if (title) {
+ text = errMsg;
+ }
return {
...rest,
diff --git a/x-pack/plugins/canvas/public/lib/parse_single_function_chain.js b/x-pack/plugins/canvas/public/lib/parse_single_function_chain.js
index f9a560f2cfb12..fb67379550b1d 100644
--- a/x-pack/plugins/canvas/public/lib/parse_single_function_chain.js
+++ b/x-pack/plugins/canvas/public/lib/parse_single_function_chain.js
@@ -13,7 +13,9 @@ export function parseSingleFunctionChain(filterString) {
// Check if the current column is what we expect it to be. If the user changes column this will be called again,
// but we don't want to run setFilter() unless we have to because it will cause a data refresh
const name = get(ast, 'chain[0].function');
- if (!name) throw new Error('Could not find function name in chain');
+ if (!name) {
+ throw new Error('Could not find function name in chain');
+ }
const args = mapValues(get(ast, 'chain[0].arguments'), val => {
// TODO Check for literals only
diff --git a/x-pack/plugins/canvas/public/lib/resolved_arg.js b/x-pack/plugins/canvas/public/lib/resolved_arg.js
index 5dc83625a7387..8a9da8e466f7e 100644
--- a/x-pack/plugins/canvas/public/lib/resolved_arg.js
+++ b/x-pack/plugins/canvas/public/lib/resolved_arg.js
@@ -15,6 +15,8 @@ export function getValue(resolvedArg) {
}
export function getError(resolvedArg) {
- if (getState(resolvedArg) !== 'error') return null;
+ if (getState(resolvedArg) !== 'error') {
+ return null;
+ }
return get(resolvedArg, 'error', null);
}
diff --git a/x-pack/plugins/canvas/public/lib/router_provider.js b/x-pack/plugins/canvas/public/lib/router_provider.js
index eac87fd51a2a7..1e0117cf2ba2f 100644
--- a/x-pack/plugins/canvas/public/lib/router_provider.js
+++ b/x-pack/plugins/canvas/public/lib/router_provider.js
@@ -12,7 +12,9 @@ import { historyProvider } from './history_provider';
let router;
export function routerProvider(routes) {
- if (router) return router;
+ if (router) {
+ return router;
+ }
const baseRouter = createRouter(routes);
const history = historyProvider(getWindow());
@@ -22,7 +24,9 @@ export function routerProvider(routes) {
const getState = (name, params, state) => {
// given a path, assuming params is the state
- if (isPath(name)) return params || history.getLocation().state;
+ if (isPath(name)) {
+ return params || history.getLocation().state;
+ }
return state || history.getLocation().state;
};
@@ -31,7 +35,9 @@ export function routerProvider(routes) {
const method = replace ? 'replace' : 'push';
// given a path, go there directly
- if (isPath(name)) return history[method](currentState, name);
+ if (isPath(name)) {
+ return history[method](currentState, name);
+ }
history[method](currentState, baseRouter.create(name, params));
};
@@ -51,8 +57,9 @@ export function routerProvider(routes) {
updateLocation(name, params, state, true);
},
onPathChange(fn) {
- if (componentListener != null)
+ if (componentListener != null) {
throw new Error('Only one route component listener is allowed');
+ }
const execOnMatch = location => {
const { pathname } = location;
@@ -69,7 +76,9 @@ export function routerProvider(routes) {
// on path changes, fire the path change handler
componentListener = history.onChange((locationObj, prevLocationObj) => {
- if (locationObj.pathname !== prevLocationObj.pathname) execOnMatch(locationObj);
+ if (locationObj.pathname !== prevLocationObj.pathname) {
+ execOnMatch(locationObj);
+ }
});
// initially fire the path change handler
diff --git a/x-pack/plugins/canvas/public/lib/run_interpreter.js b/x-pack/plugins/canvas/public/lib/run_interpreter.js
index 3c193130c1fe1..f9a890b77f148 100644
--- a/x-pack/plugins/canvas/public/lib/run_interpreter.js
+++ b/x-pack/plugins/canvas/public/lib/run_interpreter.js
@@ -21,7 +21,9 @@ import { notify } from './notify';
export function runInterpreter(ast, context = null, options = {}) {
return interpretAst(ast, context)
.then(renderable => {
- if (getType(renderable) === 'render') return renderable;
+ if (getType(renderable) === 'render') {
+ return renderable;
+ }
if (options.castToRender) {
return runInterpreter(fromExpression('render'), renderable, {
diff --git a/x-pack/plugins/canvas/public/lib/template.js b/x-pack/plugins/canvas/public/lib/template.js
index 232e47e86c4a1..b7bf4c608d18d 100644
--- a/x-pack/plugins/canvas/public/lib/template.js
+++ b/x-pack/plugins/canvas/public/lib/template.js
@@ -26,7 +26,9 @@ export function Template(config) {
this.tags = config.tags || [];
this.tags.forEach(tag => {
- if (!tagsRegistry.get(tag)) tagsRegistry.register(() => ({ name: tag, color: '#666666' }));
+ if (!tagsRegistry.get(tag)) {
+ tagsRegistry.register(() => ({ name: tag, color: '#666666' }));
+ }
});
this.width = config.width || defaultWorkpad.width;
diff --git a/x-pack/plugins/canvas/public/lib/time_duration.js b/x-pack/plugins/canvas/public/lib/time_duration.js
index 46d73fb02100b..5c65ea3970fd3 100644
--- a/x-pack/plugins/canvas/public/lib/time_duration.js
+++ b/x-pack/plugins/canvas/public/lib/time_duration.js
@@ -12,10 +12,15 @@ export const timeDuration = (time, format) => {
const hours = minutes / 60;
const days = hours / 24;
- if (format === 'days' || days >= 1) return { length: days, format: getLabel('day', days) };
- if (format === 'hours' || hours >= 1) return { length: hours, format: getLabel('hour', hours) };
- if (format === 'minutes' || minutes >= 1)
+ if (format === 'days' || days >= 1) {
+ return { length: days, format: getLabel('day', days) };
+ }
+ if (format === 'hours' || hours >= 1) {
+ return { length: hours, format: getLabel('hour', hours) };
+ }
+ if (format === 'minutes' || minutes >= 1) {
return { length: seconds / 60, format: getLabel('minute', minutes) };
+ }
return { length: seconds, format: getLabel('second', seconds) };
};
diff --git a/x-pack/plugins/canvas/public/lib/window_error_handler.js b/x-pack/plugins/canvas/public/lib/window_error_handler.js
index b0b1c14a336d6..bf97928452c71 100644
--- a/x-pack/plugins/canvas/public/lib/window_error_handler.js
+++ b/x-pack/plugins/canvas/public/lib/window_error_handler.js
@@ -50,7 +50,9 @@ window.canvasInitErrorHandler = () => {
const isKnownError = Object.keys(knownErrors).find(errorName => {
return err.constructor.name === errorName || message.indexOf(errorName) >= 0;
});
- if (isKnownError) return;
+ if (isKnownError) {
+ return;
+ }
// uncaught errors are silenced in dev mode
// NOTE: react provides no way I can tell to distingish that an error came from react, it just
diff --git a/x-pack/plugins/canvas/public/state/actions/elements.js b/x-pack/plugins/canvas/public/state/actions/elements.js
index 20ce10f52c1d2..f45e09390ec6f 100644
--- a/x-pack/plugins/canvas/public/state/actions/elements.js
+++ b/x-pack/plugins/canvas/public/state/actions/elements.js
@@ -32,7 +32,9 @@ export function getSiblingContext(state, elementId, checkIndex) {
// check previous index while we're still above 0
const prevContextIndex = checkIndex - 1;
- if (prevContextIndex < 0) return {};
+ if (prevContextIndex < 0) {
+ return {};
+ }
// walk back up to find the closest cached context available
return getSiblingContext(state, elementId, prevContextIndex);
@@ -40,7 +42,9 @@ export function getSiblingContext(state, elementId, checkIndex) {
function getBareElement(el, includeId = false) {
const props = ['position', 'expression', 'filter'];
- if (includeId) return pick(el, props.concat('id'));
+ if (includeId) {
+ return pick(el, props.concat('id'));
+ }
return cloneDeep(pick(el, props));
}
@@ -59,7 +63,9 @@ export const fetchContext = createThunk(
const chain = get(element, ['ast', 'chain']);
const invalidIndex = chain ? index >= chain.length : true;
- if (!element || !chain || invalidIndex) throw new Error(`Invalid argument index: ${index}`);
+ if (!element || !chain || invalidIndex) {
+ throw new Error(`Invalid argument index: ${index}`);
+ }
// cache context as the previous index
const contextIndex = index - 1;
@@ -79,7 +85,9 @@ export const fetchContext = createThunk(
// modify the ast chain passed to the interpreter
const astChain = element.ast.chain.filter((exp, i) => {
- if (prevContextValue != null) return i > prevContextIndex && i < index;
+ if (prevContextValue != null) {
+ return i > prevContextIndex && i < index;
+ }
return i < index;
});
@@ -194,8 +202,11 @@ export const duplicateElement = createThunk(
dispatch(_duplicateElement({ pageId, element: newElement }));
// refresh all elements if there's a filter, otherwise just render the new element
- if (element.filter) dispatch(fetchAllRenderables());
- else dispatch(fetchRenderable(newElement));
+ if (element.filter) {
+ dispatch(fetchAllRenderables());
+ } else {
+ dispatch(fetchRenderable(newElement));
+ }
// select the new element
dispatch(selectElement(newElement.id));
@@ -217,7 +228,9 @@ export const removeElements = createThunk(
}));
dispatch(_removeElements(elementIds, pageId));
- if (shouldRefresh) dispatch(fetchAllRenderables());
+ if (shouldRefresh) {
+ dispatch(fetchAllRenderables());
+ }
}
);
@@ -227,7 +240,9 @@ export const setFilter = createThunk(
const _setFilter = createAction('setFilter');
dispatch(_setFilter({ filter, elementId, pageId }));
- if (doRender === true) dispatch(fetchAllRenderables());
+ if (doRender === true) {
+ dispatch(fetchAllRenderables());
+ }
}
);
@@ -239,7 +254,9 @@ function setExpressionFn({ dispatch, getState }, expression, elementId, pageId,
// read updated element from state and fetch renderable
const updatedElement = getElementById(getState(), elementId, pageId);
- if (doRender === true) dispatch(fetchRenderable(updatedElement));
+ if (doRender === true) {
+ dispatch(fetchRenderable(updatedElement));
+ }
}
const setAst = createThunk('setAst', ({ dispatch }, ast, element, pageId, doRender = true) => {
@@ -281,7 +298,9 @@ export const setAstAtIndex = createThunk(
const partialAst = {
...newAst,
chain: newAst.chain.filter((exp, i) => {
- if (contextValue) return i > contextIndex;
+ if (contextValue) {
+ return i > contextIndex;
+ }
return i >= index;
}),
};
@@ -300,7 +319,9 @@ export const setAstAtIndex = createThunk(
export const setArgumentAtIndex = createThunk('setArgumentAtIndex', ({ dispatch }, args) => {
const { index, argName, value, valueIndex, element, pageId } = args;
const selector = ['ast', 'chain', index, 'arguments', argName];
- if (valueIndex != null) selector.push(valueIndex);
+ if (valueIndex != null) {
+ selector.push(valueIndex);
+ }
const newElement = set(element, selector, value);
const newAst = get(newElement, ['ast', 'chain', index]);
@@ -349,14 +370,21 @@ export const deleteArgumentAtIndex = createThunk('deleteArgumentAtIndex', ({ dis
*/
export const addElement = createThunk('addElement', ({ dispatch }, pageId, element) => {
const newElement = { ...getDefaultElement(), ...getBareElement(element) };
- if (element.width) newElement.position.width = element.width;
- if (element.height) newElement.position.height = element.height;
+ if (element.width) {
+ newElement.position.width = element.width;
+ }
+ if (element.height) {
+ newElement.position.height = element.height;
+ }
const _addElement = createAction('addElement');
dispatch(_addElement({ pageId, element: newElement }));
// refresh all elements if there's a filter, otherwise just render the new element
- if (element.filter) dispatch(fetchAllRenderables());
- else dispatch(fetchRenderable(newElement));
+ if (element.filter) {
+ dispatch(fetchAllRenderables());
+ } else {
+ dispatch(fetchRenderable(newElement));
+ }
// select the new element
dispatch(selectElement(newElement.id));
diff --git a/x-pack/plugins/canvas/public/state/actions/workpad.js b/x-pack/plugins/canvas/public/state/actions/workpad.js
index f7d0052f4e77b..af9206018c297 100644
--- a/x-pack/plugins/canvas/public/state/actions/workpad.js
+++ b/x-pack/plugins/canvas/public/state/actions/workpad.js
@@ -23,7 +23,9 @@ export const initializeWorkpad = createThunk('initializeWorkpad', ({ dispatch })
export const addColor = createThunk('addColor', ({ dispatch, getState }, color) => {
const colors = getWorkpadColors(getState()).slice(0);
- if (!includes(colors, color)) colors.push(color);
+ if (!includes(colors, color)) {
+ colors.push(color);
+ }
dispatch(setColors(colors));
});
@@ -36,6 +38,8 @@ export const setWorkpad = createThunk(
({ dispatch, type }, workpad, { loadPages = true } = {}) => {
dispatch(setRefreshInterval(0)); // disable refresh interval
dispatch(createAction(type)(workpad)); // set the workpad object in state
- if (loadPages) dispatch(initializeWorkpad()); // load all the elements on the workpad
+ if (loadPages) {
+ dispatch(initializeWorkpad());
+ } // load all the elements on the workpad
}
);
diff --git a/x-pack/plugins/canvas/public/state/initial_state.js b/x-pack/plugins/canvas/public/state/initial_state.js
index e2e553946b308..1dd9d59609786 100644
--- a/x-pack/plugins/canvas/public/state/initial_state.js
+++ b/x-pack/plugins/canvas/public/state/initial_state.js
@@ -31,7 +31,9 @@ export const getInitialState = path => {
},
};
- if (!path) return state;
+ if (!path) {
+ return state;
+ }
return get(state, path);
};
diff --git a/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js b/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js
index e3f781ffe4ef6..ca50952a7acfb 100644
--- a/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js
+++ b/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js
@@ -95,7 +95,9 @@ const updateGlobalPositions = (setMultiplePositions, { shapes, gestureEnd }, uns
angle: Math.round(matrixToAngle(shape.transformMatrix)),
};
- if (1 / newProps.angle === -Infinity) newProps.angle = 0; // recompose.shallowEqual discerns between 0 and -0
+ if (1 / newProps.angle === -Infinity) {
+ newProps.angle = 0;
+ } // recompose.shallowEqual discerns between 0 and -0
return shallowEqual(oldProps, newProps)
? null
@@ -103,7 +105,9 @@ const updateGlobalPositions = (setMultiplePositions, { shapes, gestureEnd }, uns
}
})
.filter(identity);
- if (repositionings.length) setMultiplePositions(repositionings);
+ if (repositionings.length) {
+ setMultiplePositions(repositionings);
+ }
};
const id = element => element.id;
@@ -113,7 +117,9 @@ export const aeroelastic = ({ dispatch, getState }) => {
const onChangeCallback = ({ state }) => {
const nextScene = state.currentScene;
- if (!nextScene.gestureEnd) return; // only update redux on gesture end
+ if (!nextScene.gestureEnd) {
+ return;
+ } // only update redux on gesture end
// TODO: check for gestureEnd on element selection
// read current data out of redux
@@ -130,8 +136,9 @@ export const aeroelastic = ({ dispatch, getState }) => {
// set the selected element on the global store, if one element is selected
const selectedShape = nextScene.selectedPrimaryShapes[0];
if (nextScene.selectedShapes.length === 1) {
- if (selectedShape && selectedShape !== selectedElement)
+ if (selectedShape && selectedShape !== selectedElement) {
dispatch(selectElement(selectedShape));
+ }
} else {
// otherwise, clear the selected element state
dispatch(selectElement(null));
@@ -188,7 +195,9 @@ export const aeroelastic = ({ dispatch, getState }) => {
let lastPageRemoved = false;
if (action.type === removePage.toString()) {
const preRemoveState = getState();
- if (getPages(preRemoveState).length <= 1) lastPageRemoved = true;
+ if (getPages(preRemoveState).length <= 1) {
+ lastPageRemoved = true;
+ }
aero.removeStore(action.payload);
}
@@ -209,7 +218,9 @@ export const aeroelastic = ({ dispatch, getState }) => {
case duplicatePage.toString():
const newPage = getSelectedPage(getState());
createStore(newPage);
- if (action.type === duplicatePage.toString()) dispatch(fetchAllRenderables());
+ if (action.type === duplicatePage.toString()) {
+ dispatch(fetchAllRenderables());
+ }
populateWithElements(newPage);
break;
@@ -225,8 +236,11 @@ export const aeroelastic = ({ dispatch, getState }) => {
case selectElement.toString():
// without this condition, a mouse release anywhere will trigger it, leading to selection of whatever is
// underneath the pointer (maybe nothing) when the mouse is released
- if (action.payload) selectShape(prevPage, action.payload);
- else unselectShape(prevPage);
+ if (action.payload) {
+ selectShape(prevPage, action.payload);
+ } else {
+ unselectShape(prevPage);
+ }
break;
@@ -241,9 +255,13 @@ export const aeroelastic = ({ dispatch, getState }) => {
// TODO: add a better check for elements changing, including their position, ids, etc.
const shouldResetState =
prevPage !== page || !shallowEqual(prevElements.map(id), elements.map(id));
- if (shouldResetState) populateWithElements(page);
+ if (shouldResetState) {
+ populateWithElements(page);
+ }
- if (action.type !== setMultiplePositions.toString()) unselectShape(prevPage);
+ if (action.type !== setMultiplePositions.toString()) {
+ unselectShape(prevPage);
+ }
break;
}
diff --git a/x-pack/plugins/canvas/public/state/middleware/app_ready.js b/x-pack/plugins/canvas/public/state/middleware/app_ready.js
index af3d713d762c7..a86f67b5e1cc4 100644
--- a/x-pack/plugins/canvas/public/state/middleware/app_ready.js
+++ b/x-pack/plugins/canvas/public/state/middleware/app_ready.js
@@ -15,8 +15,12 @@ export const appReady = ({ dispatch, getState }) => next => action => {
const state = getState();
// if app is already ready, there's nothing more to do here
- if (state.app.ready) return;
+ if (state.app.ready) {
+ return;
+ }
// check for all conditions in the state that indicate that the app is ready
- if (isAppReady(state)) dispatch(readyAction());
+ if (isAppReady(state)) {
+ dispatch(readyAction());
+ }
};
diff --git a/x-pack/plugins/canvas/public/state/middleware/es_persist.js b/x-pack/plugins/canvas/public/state/middleware/es_persist.js
index 52e23a5d6195e..34af6b4fc8394 100644
--- a/x-pack/plugins/canvas/public/state/middleware/es_persist.js
+++ b/x-pack/plugins/canvas/public/state/middleware/es_persist.js
@@ -37,7 +37,9 @@ export const esPersistMiddleware = ({ getState }) => {
return next => action => {
// if the action is in the skipped list, do not persist
- if (skippedActions.indexOf(action.type) >= 0) return next(action);
+ if (skippedActions.indexOf(action.type) >= 0) {
+ return next(action);
+ }
// capture state before and after the action
const curState = getState();
@@ -45,7 +47,9 @@ export const esPersistMiddleware = ({ getState }) => {
const newState = getState();
// skips the update request if user doesn't have write permissions
- if (!canUserWrite(newState)) return;
+ if (!canUserWrite(newState)) {
+ return;
+ }
// if the workpad changed, save it to elasticsearch
if (workpadChanged(curState, newState) || assetsChanged(curState, newState)) {
diff --git a/x-pack/plugins/canvas/public/state/middleware/history.js b/x-pack/plugins/canvas/public/state/middleware/history.js
index 2bb089a706e5f..206c86e93de91 100644
--- a/x-pack/plugins/canvas/public/state/middleware/history.js
+++ b/x-pack/plugins/canvas/public/state/middleware/history.js
@@ -31,7 +31,9 @@ export const historyMiddleware = ({ dispatch, getState }) => {
};
}
- if (!route.action) return route;
+ if (!route.action) {
+ return route;
+ }
return {
...route,
@@ -75,7 +77,9 @@ export const historyMiddleware = ({ dispatch, getState }) => {
}
// execute route action on pushState and popState events
- if (isUrlChange) return await router.parse(pathname);
+ if (isUrlChange) {
+ return await router.parse(pathname);
+ }
};
history.onChange(async (...args) => {
@@ -114,7 +118,9 @@ export const historyMiddleware = ({ dispatch, getState }) => {
const newState = getState();
// if the app is not ready, don't persist anything
- if (!isAppReady(newState)) return;
+ if (!isAppReady(newState)) {
+ return;
+ }
// if app switched from not ready to ready, replace current state
// this allows the back button to work correctly all the way to first page load
diff --git a/x-pack/plugins/canvas/public/state/middleware/in_flight.js b/x-pack/plugins/canvas/public/state/middleware/in_flight.js
index e8b7105b43e82..2e48ee5b72621 100644
--- a/x-pack/plugins/canvas/public/state/middleware/in_flight.js
+++ b/x-pack/plugins/canvas/public/state/middleware/in_flight.js
@@ -23,7 +23,9 @@ export const inFlight = ({ dispatch }) => next => {
} else if (isSetting) {
const idx = pendingCache.indexOf(cacheKey);
pendingCache.splice(idx, 1);
- if (pendingCache.length === 0) dispatch(inFlightComplete());
+ if (pendingCache.length === 0) {
+ dispatch(inFlightComplete());
+ }
}
}
diff --git a/x-pack/plugins/canvas/public/state/middleware/index.js b/x-pack/plugins/canvas/public/state/middleware/index.js
index 15bea92d5e321..ffacfaa82afee 100644
--- a/x-pack/plugins/canvas/public/state/middleware/index.js
+++ b/x-pack/plugins/canvas/public/state/middleware/index.js
@@ -31,7 +31,8 @@ const middlewares = [
];
// intitialize redux devtools if extension is installed
-if (getWindow().__REDUX_DEVTOOLS_EXTENSION__)
+if (getWindow().__REDUX_DEVTOOLS_EXTENSION__) {
middlewares.push(getWindow().__REDUX_DEVTOOLS_EXTENSION__());
+}
export const middleware = compose(...middlewares);
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.js b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.js
index 12752ab08734a..1c99b35353e96 100644
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.js
+++ b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.js
@@ -14,7 +14,9 @@ export const workpadRefresh = ({ dispatch, getState }) => next => {
let refreshInterval = 0;
function updateWorkpad() {
- if (refreshInterval === 0) return;
+ if (refreshInterval === 0) {
+ return;
+ }
// check the request in flight status
const inFlightActive = getInFlight(getState());
@@ -38,7 +40,9 @@ export const workpadRefresh = ({ dispatch, getState }) => next => {
next(action);
// when in-flight requests are finished, update the workpad after a given delay
- if (action.type === inFlightComplete.toString() && refreshInterval > 0) startDelayedUpdate(); // create new update request
+ if (action.type === inFlightComplete.toString() && refreshInterval > 0) {
+ startDelayedUpdate();
+ } // create new update request
// This middleware creates or destroys an interval that will cause workpad elements to update
if (action.type === setRefreshInterval.toString()) {
@@ -49,7 +53,9 @@ export const workpadRefresh = ({ dispatch, getState }) => next => {
clearTimeout(refreshTimeout);
// if interval is larger than 0, start the delayed update
- if (refreshInterval > 0) startDelayedUpdate();
+ if (refreshInterval > 0) {
+ startDelayedUpdate();
+ }
}
};
};
diff --git a/x-pack/plugins/canvas/public/state/reducers/assets.js b/x-pack/plugins/canvas/public/state/reducers/assets.js
index 587f40dbe186f..9aa3cd225ac2c 100644
--- a/x-pack/plugins/canvas/public/state/reducers/assets.js
+++ b/x-pack/plugins/canvas/public/state/reducers/assets.js
@@ -24,7 +24,9 @@ export const assetsReducer = handleActions(
[setAssetValue]: (assetState, { payload }) => {
const { id, value } = payload;
const asset = get(assetState, [id]);
- if (!asset) throw new Error(`Can not set asset data, id not found: ${id}`);
+ if (!asset) {
+ throw new Error(`Can not set asset data, id not found: ${id}`);
+ }
return assign(assetState, id, { value });
},
diff --git a/x-pack/plugins/canvas/public/state/reducers/elements.js b/x-pack/plugins/canvas/public/state/reducers/elements.js
index e17c09639e2e9..d000e5bd8efdc 100644
--- a/x-pack/plugins/canvas/public/state/reducers/elements.js
+++ b/x-pack/plugins/canvas/public/state/reducers/elements.js
@@ -24,7 +24,9 @@ function assignElementProperties(workpadState, pageId, elementId, props) {
element => element.id === elementId
);
- if (pageIndex === -1 || elementIndex === -1) return workpadState;
+ if (pageIndex === -1 || elementIndex === -1) {
+ return workpadState;
+ }
// remove any AST value from the element caused by https://github.com/elastic/kibana-canvas/issues/260
// TODO: remove this after a bit of time
@@ -40,13 +42,21 @@ function moveElementLayer(workpadState, pageId, elementId, movement) {
const from = elementIndex;
const to = (function() {
- if (movement < Infinity && movement > -Infinity) return elementIndex + movement;
- if (movement === Infinity) return elements.length - 1;
- if (movement === -Infinity) return 0;
+ if (movement < Infinity && movement > -Infinity) {
+ return elementIndex + movement;
+ }
+ if (movement === Infinity) {
+ return elements.length - 1;
+ }
+ if (movement === -Infinity) {
+ return 0;
+ }
throw new Error('Invalid element layer movement');
})();
- if (to > elements.length - 1 || to < 0) return workpadState;
+ if (to > elements.length - 1 || to < 0) {
+ return workpadState;
+ }
// Common
const newElements = elements.slice(0);
@@ -77,19 +87,25 @@ export const elementsReducer = handleActions(
},
[actions.addElement]: (workpadState, { payload: { pageId, element } }) => {
const pageIndex = getPageIndexById(workpadState, pageId);
- if (pageIndex < 0) return workpadState;
+ if (pageIndex < 0) {
+ return workpadState;
+ }
return push(workpadState, ['pages', pageIndex, 'elements'], element);
},
[actions.duplicateElement]: (workpadState, { payload: { pageId, element } }) => {
const pageIndex = getPageIndexById(workpadState, pageId);
- if (pageIndex < 0) return workpadState;
+ if (pageIndex < 0) {
+ return workpadState;
+ }
return push(workpadState, ['pages', pageIndex, 'elements'], element);
},
[actions.removeElements]: (workpadState, { payload: { pageId, elementIds } }) => {
const pageIndex = getPageIndexById(workpadState, pageId);
- if (pageIndex < 0) return workpadState;
+ if (pageIndex < 0) {
+ return workpadState;
+ }
const elementIndices = elementIds
.map(elementId => getElementIndexById(workpadState.pages[pageIndex], elementId))
diff --git a/x-pack/plugins/canvas/public/state/reducers/pages.js b/x-pack/plugins/canvas/public/state/reducers/pages.js
index 8be944f253d30..c58e078b37f9c 100644
--- a/x-pack/plugins/canvas/public/state/reducers/pages.js
+++ b/x-pack/plugins/canvas/public/state/reducers/pages.js
@@ -12,7 +12,9 @@ import { getDefaultPage } from '../defaults';
import * as actions from '../actions/pages';
function setPageIndex(workpadState, index) {
- if (index < 0 || !workpadState.pages[index]) return workpadState;
+ if (index < 0 || !workpadState.pages[index]) {
+ return workpadState;
+ }
return set(workpadState, 'page', index);
}
@@ -52,7 +54,9 @@ export const pagesReducer = handleActions(
const srcPage = workpadState.pages.find(page => page.id === payload);
// if the page id is invalid, don't change the state
- if (!srcPage) return workpadState;
+ if (!srcPage) {
+ return workpadState;
+ }
const srcIndex = workpadState.pages.indexOf(srcPage);
const newPageIndex = srcIndex + 1;
@@ -86,10 +90,14 @@ export const pagesReducer = handleActions(
const newIndex = pageIndex + position;
// TODO: do something better when given an invalid page id
- if (pageIndex < 0) return workpadState;
+ if (pageIndex < 0) {
+ return workpadState;
+ }
// don't move pages past the first or last position
- if (newIndex < 0 || newIndex >= workpadState.pages.length) return workpadState;
+ if (newIndex < 0 || newIndex >= workpadState.pages.length) {
+ return workpadState;
+ }
// remove and re-insert the page
const page = { ...workpadState.pages[pageIndex] };
@@ -118,7 +126,9 @@ export const pagesReducer = handleActions(
const newSelectedPage = curIndex >= delIndex ? curIndex - 1 : curIndex;
// if we removed the only page, create a new empty one
- if (wasOnlyPage) newState = addPage(newState);
+ if (wasOnlyPage) {
+ newState = addPage(newState);
+ }
if (wasOnlyPage || wasSelected) {
// if we removed the only page or the selected one, select the first one
diff --git a/x-pack/plugins/canvas/public/state/reducers/resolved_args.js b/x-pack/plugins/canvas/public/state/reducers/resolved_args.js
index 7404ece39136a..93c674a478619 100644
--- a/x-pack/plugins/canvas/public/state/reducers/resolved_args.js
+++ b/x-pack/plugins/canvas/public/state/reducers/resolved_args.js
@@ -30,13 +30,19 @@ import { flushContext, flushContextAfterIndex } from '../actions/elements';
*/
function _getState(hasError, loading) {
- if (hasError) return 'error';
- if (Boolean(loading)) return 'pending';
+ if (hasError) {
+ return 'error';
+ }
+ if (Boolean(loading)) {
+ return 'pending';
+ }
return 'ready';
}
function _getValue(hasError, value, oldVal) {
- if (hasError || value == null) return oldVal && oldVal.value;
+ if (hasError || value == null) {
+ return oldVal && oldVal.value;
+ }
return value;
}
@@ -52,7 +58,9 @@ function getContext(value, loading = false, oldVal = null) {
function getFullPath(path) {
const isArray = Array.isArray(path);
const isString = typeof path === 'string';
- if (!isArray && !isString) throw new Error(`Resolved argument path is invalid: ${path}`);
+ if (!isArray && !isString) {
+ throw new Error(`Resolved argument path is invalid: ${path}`);
+ }
return prepend(path, 'resolvedArgs');
}
@@ -108,12 +116,15 @@ export const resolvedArgsReducer = handleActions(
const expressionContext = get(transientState, getFullPath([elementId, 'expressionContext']));
// if there is not existing context, there's nothing to do here
- if (!expressionContext) return transientState;
+ if (!expressionContext) {
+ return transientState;
+ }
return Object.keys(expressionContext).reduce((state, indexKey) => {
const indexAsNum = parseInt(indexKey, 10);
- if (indexAsNum >= index)
+ if (indexAsNum >= index) {
return del(state, getFullPath([elementId, 'expressionContext', indexKey]));
+ }
return state;
}, transientState);
diff --git a/x-pack/plugins/canvas/public/state/selectors/workpad.js b/x-pack/plugins/canvas/public/state/selectors/workpad.js
index 1e767b847c460..3e291d68bc224 100644
--- a/x-pack/plugins/canvas/public/state/selectors/workpad.js
+++ b/x-pack/plugins/canvas/public/state/selectors/workpad.js
@@ -91,30 +91,42 @@ export function getSelectedElement(state) {
export function getElements(state, pageId, withAst = true) {
const id = pageId || getSelectedPage(state);
- if (!id) return [];
+ if (!id) {
+ return [];
+ }
const page = getPageById(state, id);
const elements = get(page, 'elements');
- if (!elements) return [];
+ if (!elements) {
+ return [];
+ }
// explicitely strip the ast, basically a fix for corrupted workpads
// due to https://github.com/elastic/kibana-canvas/issues/260
// TODO: remove this once it's been in the wild a bit
- if (!withAst) return elements.map(el => omit(el, ['ast']));
+ if (!withAst) {
+ return elements.map(el => omit(el, ['ast']));
+ }
return elements.map(appendAst);
}
export function getElementById(state, id, pageId) {
const element = getElements(state, pageId, []).find(el => el.id === id);
- if (element) return appendAst(element);
+ if (element) {
+ return appendAst(element);
+ }
}
export function getResolvedArgs(state, elementId, path) {
- if (!elementId) return;
+ if (!elementId) {
+ return;
+ }
const args = get(state, ['transient', 'resolvedArgs', elementId]);
- if (path) return get(args, path);
+ if (path) {
+ return get(args, path);
+ }
return args;
}
diff --git a/x-pack/plugins/canvas/public/state/store.js b/x-pack/plugins/canvas/public/state/store.js
index f8d548e335de8..760e7a8609978 100644
--- a/x-pack/plugins/canvas/public/state/store.js
+++ b/x-pack/plugins/canvas/public/state/store.js
@@ -12,9 +12,13 @@ import { getRootReducer } from './reducers';
let store;
export function createStore(initialState) {
- if (typeof store !== 'undefined') throw new Error('Redux store can only be initialized once');
+ if (typeof store !== 'undefined') {
+ throw new Error('Redux store can only be initialized once');
+ }
- if (!isPlainObject(initialState)) throw new Error('Initial state must be a plain object');
+ if (!isPlainObject(initialState)) {
+ throw new Error('Initial state must be a plain object');
+ }
const rootReducer = getRootReducer(initialState);
store = createReduxStore(rootReducer, initialState, middleware);
diff --git a/x-pack/plugins/canvas/server/lib/build_es_request.js b/x-pack/plugins/canvas/server/lib/build_es_request.js
index 037138cc11576..08c682d04df89 100644
--- a/x-pack/plugins/canvas/server/lib/build_es_request.js
+++ b/x-pack/plugins/canvas/server/lib/build_es_request.js
@@ -7,9 +7,13 @@
import { buildBoolArray } from './build_bool_array';
export function buildESRequest(esRequest, canvasQuery) {
- if (canvasQuery.size) esRequest = { ...esRequest, size: canvasQuery.size };
+ if (canvasQuery.size) {
+ esRequest = { ...esRequest, size: canvasQuery.size };
+ }
- if (canvasQuery.and) esRequest.body.query.bool.must = buildBoolArray(canvasQuery.and);
+ if (canvasQuery.and) {
+ esRequest.body.query.bool.must = buildBoolArray(canvasQuery.and);
+ }
return esRequest;
}
diff --git a/x-pack/plugins/canvas/server/lib/filters.js b/x-pack/plugins/canvas/server/lib/filters.js
index 5e4c2c64845c6..afa58c7ee30c2 100644
--- a/x-pack/plugins/canvas/server/lib/filters.js
+++ b/x-pack/plugins/canvas/server/lib/filters.js
@@ -9,7 +9,9 @@
*/
export function time(filter) {
- if (!filter.column) throw new Error('column is required for Elasticsearch range filters');
+ if (!filter.column) {
+ throw new Error('column is required for Elasticsearch range filters');
+ }
return {
range: {
[filter.column]: { gte: filter.from, lte: filter.to },
diff --git a/x-pack/plugins/canvas/server/lib/get_es_filter.js b/x-pack/plugins/canvas/server/lib/get_es_filter.js
index ccc296bc550f9..e8a4d704118e8 100644
--- a/x-pack/plugins/canvas/server/lib/get_es_filter.js
+++ b/x-pack/plugins/canvas/server/lib/get_es_filter.js
@@ -14,7 +14,9 @@
import * as filters from './filters';
export function getESFilter(filter) {
- if (!filters[filter.type]) throw new Error(`Unknown filter type: ${filter.type}`);
+ if (!filters[filter.type]) {
+ throw new Error(`Unknown filter type: ${filter.type}`);
+ }
try {
return filters[filter.type](filter);
diff --git a/x-pack/plugins/canvas/server/lib/normalize_type.js b/x-pack/plugins/canvas/server/lib/normalize_type.js
index 7dd20b94096ba..be2deeecc9a21 100644
--- a/x-pack/plugins/canvas/server/lib/normalize_type.js
+++ b/x-pack/plugins/canvas/server/lib/normalize_type.js
@@ -26,6 +26,8 @@ export function normalizeType(type) {
const normalizedType = Object.keys(normalTypes).find(t => normalTypes[t].includes(type));
- if (normalizedType) return normalizedType;
+ if (normalizedType) {
+ return normalizedType;
+ }
throw new Error(`Canvas does not yet support type: ${type}`);
}
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/get_es_field_types.js b/x-pack/plugins/canvas/server/routes/es_fields/get_es_field_types.js
index 8e454a595f99c..36f7399ecd031 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/get_es_field_types.js
+++ b/x-pack/plugins/canvas/server/routes/es_fields/get_es_field_types.js
@@ -13,11 +13,15 @@ export function getESFieldTypes(index, fields, elasticsearchClient) {
fields: fields || '*',
};
- if (fields && fields.length === 0) return Promise.resolve({});
+ if (fields && fields.length === 0) {
+ return Promise.resolve({});
+ }
return elasticsearchClient('fieldCaps', config).then(resp => {
return mapValues(resp.fields, types => {
- if (keys(types).length > 1) return 'conflict';
+ if (keys(types).length > 1) {
+ return 'conflict';
+ }
try {
return normalizeType(keys(types)[0]);
diff --git a/x-pack/plugins/canvas/server/routes/es_fields/index.js b/x-pack/plugins/canvas/server/routes/es_fields/index.js
index 8c6b53fb2610b..235b2b0bc69e3 100644
--- a/x-pack/plugins/canvas/server/routes/es_fields/index.js
+++ b/x-pack/plugins/canvas/server/routes/es_fields/index.js
@@ -16,7 +16,9 @@ export function esFields(server) {
path: '/api/canvas/es_fields',
handler: function(request, h) {
const { index, fields } = request.query;
- if (!index) return h.response({ error: '"index" query is required' }).code(400);
+ if (!index) {
+ return h.response({ error: '"index" query is required' }).code(400);
+ }
return getESFieldTypes(index, fields, partial(callWithRequest, request));
},
diff --git a/x-pack/plugins/canvas/server/routes/workpad.js b/x-pack/plugins/canvas/server/routes/workpad.js
index e873f99efa74f..8042a82aedbd6 100644
--- a/x-pack/plugins/canvas/server/routes/workpad.js
+++ b/x-pack/plugins/canvas/server/routes/workpad.js
@@ -14,16 +14,25 @@ export function workpad(server) {
const routePrefix = API_ROUTE_WORKPAD;
function formatResponse(resp) {
- if (resp.isBoom) return resp; // can't wrap it if it's already a boom error
+ if (resp.isBoom) {
+ return resp;
+ } // can't wrap it if it's already a boom error
- if (resp instanceof esErrors['400']) return boom.badRequest(resp);
+ if (resp instanceof esErrors['400']) {
+ return boom.badRequest(resp);
+ }
- if (resp instanceof esErrors['401']) return boom.unauthorized();
+ if (resp instanceof esErrors['401']) {
+ return boom.unauthorized();
+ }
- if (resp instanceof esErrors['403'])
+ if (resp instanceof esErrors['403']) {
return boom.forbidden("Sorry, you don't have access to that");
+ }
- if (resp instanceof esErrors['404']) return boom.boomify(resp, { statusCode: 404 });
+ if (resp instanceof esErrors['404']) {
+ return boom.boomify(resp, { statusCode: 404 });
+ }
return resp;
}
@@ -31,7 +40,9 @@ export function workpad(server) {
function createWorkpad(req, id) {
const savedObjectsClient = req.getSavedObjectsClient();
- if (!req.payload) return Promise.resolve(boom.badRequest('A workpad payload is required'));
+ if (!req.payload) {
+ return Promise.resolve(boom.badRequest('A workpad payload is required'));
+ }
const now = new Date().toISOString();
return savedObjectsClient.create(
diff --git a/x-pack/plugins/canvas/server/usage/collector.js b/x-pack/plugins/canvas/server/usage/collector.js
index a73ab069638b0..b2ebe1f333bea 100644
--- a/x-pack/plugins/canvas/server/usage/collector.js
+++ b/x-pack/plugins/canvas/server/usage/collector.js
@@ -20,7 +20,9 @@ const collectFns = (ast, cb) => {
// recurse the argumetns and update the set along the way
Object.keys(cArguments).forEach(argName => {
cArguments[argName].forEach(subAst => {
- if (subAst != null) collectFns(subAst, cb);
+ if (subAst != null) {
+ collectFns(subAst, cb);
+ }
});
});
});
@@ -29,7 +31,9 @@ const collectFns = (ast, cb) => {
export function handleResponse({ hits }) {
const workpadDocs = get(hits, 'hits', null);
- if (workpadDocs == null) return;
+ if (workpadDocs == null) {
+ return;
+ }
const functionSet = new Set();
@@ -142,7 +146,9 @@ export function registerCanvasUsageCollector(server) {
};
const esResponse = await callCluster('search', searchParams);
- if (get(esResponse, 'hits.hits.length') > 0) return handleResponse(esResponse);
+ if (get(esResponse, 'hits.hits.length') > 0) {
+ return handleResponse(esResponse);
+ }
},
});
diff --git a/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js b/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js
index e87ee70bdc9cc..4204761af9dba 100644
--- a/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js
+++ b/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js
@@ -61,10 +61,15 @@ export function getWebpackConfig({ devtool, watch } = {}) {
// bails on error, including loader errors
// see https://github.com/webpack/webpack/issues/708, which does not fix loader errors
this.hooks.done.tapPromise('LoaderFailHandlerPlugin', async stats => {
- if (!stats.hasErrors()) return;
+ if (!stats.hasErrors()) {
+ return;
+ }
const errorMessage = stats.toString('errors-only');
- if (watch) console.error(errorMessage);
- else throw new Error(errorMessage);
+ if (watch) {
+ console.error(errorMessage);
+ } else {
+ throw new Error(errorMessage);
+ }
});
},
new CopyWebpackPlugin([
diff --git a/x-pack/plugins/canvas/tasks/test.js b/x-pack/plugins/canvas/tasks/test.js
index df9aecd9dc398..9857e9c774e06 100644
--- a/x-pack/plugins/canvas/tasks/test.js
+++ b/x-pack/plugins/canvas/tasks/test.js
@@ -12,8 +12,12 @@ export default function testTasks(gulp, { mocha }) {
function runMocha(globs, { withEnzyme = false, withDOM = false } = {}) {
const requires = [join(canvasRoot, 'tasks/helpers/babelhook')];
- if (withDOM) requires.push(join(canvasRoot, 'tasks/helpers/dom_setup'));
- if (withEnzyme) requires.push(join(canvasRoot, 'tasks/helpers/enzyme_setup'));
+ if (withDOM) {
+ requires.push(join(canvasRoot, 'tasks/helpers/dom_setup'));
+ }
+ if (withEnzyme) {
+ requires.push(join(canvasRoot, 'tasks/helpers/enzyme_setup'));
+ }
return gulp.src(globs, { read: false }).pipe(
mocha({