eslint: use as-needed for arrow-body-style

When a function that is introduced by an arrow, don't insert a return
statement and its required curly braces when not needed.

Bad:

    const f = () => {
        return 1;
    }

Good:

    const f = () => 1

This patch consists of a change to .eslintrc, and automatically fixed
files (via eslint --fix).

Change-Id: I6afc3f91ee2cc44ae149e482d5633876c85c3cff

.eslintrc

@@ -1,5 +1,6 @@
 {
   "rules": {
+    "arrow-body-style": [2, "as-needed"],
     "default-case": 0,
     "linebreak-style": [2, "unix"],
     "no-cond-assign": [2, "except-parens"],

src/__tests__/actions/EnvironmentConfigurationActions.tests.js

@@ -121,8 +121,8 @@ describe('updateEnvironmentConfiguration', () => {
     NotificationActions.notify = jest.fn(() => ({ type: 'NOTIFY' }));
   });
 
-  it('dispatches actions', () => {
+  it('dispatches actions', () =>
-    return store
+    store
       .dispatch(
         EnvironmentConfigurationActions.updateEnvironmentConfiguration('myPlan')
       )
@@ -140,6 +140,5 @@ describe('updateEnvironmentConfiguration', () => {
           stopSubmit('environmentConfigurationForm'),
           NotificationActions.notify({ type: 'NOTIFY' })
         ]);
-      });
+      }));
-  });
 });

src/__tests__/actions/NodesActions.tests.js

@@ -177,18 +177,15 @@ describe('Fetching Introspection data success', () => {
       .mockReturnValue(() => Promise.resolve(response));
   });
 
-  it('dispatches fetchNodeIntrospectionDataSuccess', () => {
+  it('dispatches fetchNodeIntrospectionDataSuccess', () =>
-    return store
+    store.dispatch(NodesActions.fetchNodeIntrospectionData(nodeId)).then(() => {
-      .dispatch(NodesActions.fetchNodeIntrospectionData(nodeId))
-      .then(() => {
       expect(
         IronicInspectorApiService.getIntrospectionData
       ).toHaveBeenCalledWith(nodeId);
       expect(store.getActions()).toEqual([
         NodesActions.fetchNodeIntrospectionDataSuccess(nodeId, response)
       ]);
-      });
+    }));
-  });
 });
 
 describe('Fetching Introspection data error', () => {
@@ -208,18 +205,15 @@ describe('Fetching Introspection data error', () => {
     ErrorActions.handleErrors = jest.fn().mockReturnValue(() => {});
   });
 
-  it('dispatches fetchNodeIntrospectionDataFailed', () => {
+  it('dispatches fetchNodeIntrospectionDataFailed', () =>
-    return store
+    store.dispatch(NodesActions.fetchNodeIntrospectionData(nodeId)).then(() => {
-      .dispatch(NodesActions.fetchNodeIntrospectionData(nodeId))
-      .then(() => {
       expect(
         IronicInspectorApiService.getIntrospectionData
       ).toHaveBeenCalledWith(nodeId);
       expect(store.getActions()).toEqual([
         NodesActions.fetchNodeIntrospectionDataFailed(nodeId)
       ]);
-      });
+    }));
-  });
 });
 
 describe('Asynchronous Introspect Nodes Action', () => {
@@ -235,10 +229,8 @@ describe('Asynchronous Introspect Nodes Action', () => {
       .mockReturnValue(() => {});
   });
 
-  it('dispatches startOperation', () => {
+  it('dispatches startOperation', () =>
-    return store
+    store.dispatch(NodesActions.startNodesIntrospection(nodeIds)).then(() => {
-      .dispatch(NodesActions.startNodesIntrospection(nodeIds))
-      .then(() => {
       expect(MistralApiService.runWorkflow).toHaveBeenCalledWith(
         MistralConstants.BAREMETAL_INTROSPECT,
         {
@@ -249,8 +241,7 @@ describe('Asynchronous Introspect Nodes Action', () => {
       expect(store.getActions()).toEqual([
         NodesActions.startOperation(nodeIds)
       ]);
-      });
+    }));
-  });
 });
 
 describe('nodesIntrospectionFinished', () => {
@@ -327,8 +318,8 @@ describe('startProvideNodes Action', () => {
       .mockReturnValue(() => {});
   });
 
-  it('dispatches actions', () => {
+  it('dispatches actions', () =>
-    return store.dispatch(NodesActions.startProvideNodes(nodeIds)).then(() => {
+    store.dispatch(NodesActions.startProvideNodes(nodeIds)).then(() => {
       expect(MistralApiService.runWorkflow).toHaveBeenCalledWith(
         MistralConstants.BAREMETAL_PROVIDE,
         {
@@ -339,8 +330,7 @@ describe('startProvideNodes Action', () => {
       expect(store.getActions()).toEqual([
         NodesActions.startOperation(nodeIds)
       ]);
-    });
+    }));
-  });
 });
 
 describe('provideNodesFinished', () => {
@@ -402,14 +392,13 @@ describe('Update Node thunk action', () => {
       .mockReturnValue(() => Promise.resolve({ uuid: 'someId' }));
   });
 
-  it('dispatches required actions', () => {
+  it('dispatches required actions', () =>
-    return store.dispatch(NodesActions.updateNode(nodePatch)).then(() => {
+    store.dispatch(NodesActions.updateNode(nodePatch)).then(() => {
       expect(store.getActions()).toEqual([
         NodesActions.updateNodePending('someId'),
         NodesActions.updateNodeSuccess({ uuid: 'someId' })
       ]);
-    });
+    }));
-  });
 });
 
 describe('Delete Nodes thunk action', () => {
@@ -422,12 +411,11 @@ describe('Delete Nodes thunk action', () => {
       .mockReturnValue(() => Promise.resolve());
   });
 
-  it('successfully deletes a set of nodes', () => {
+  it('successfully deletes a set of nodes', () =>
-    return store.dispatch(NodesActions.deleteNodes(nodeIds)).then(() => {
+    store.dispatch(NodesActions.deleteNodes(nodeIds)).then(() => {
       expect(store.getActions()).toEqual([
         NodesActions.startOperation(nodeIds),
         NodesActions.deleteNodeSuccess(nodeIds[0])
       ]);
-    });
+    }));
-  });
 });

src/__tests__/actions/ParametersActions.tests.js

@@ -77,8 +77,8 @@ describe('ParametersActions', () => {
         .mockReturnValue(() => Promise.resolve(responseBody));
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store
+      store
         .dispatch(ParametersActions.fetchParameters('overcloud'))
         .then(() => {
           expect(MistralApiService.runAction).toHaveBeenCalled();
@@ -86,8 +86,7 @@ describe('ParametersActions', () => {
             ParametersActions.fetchParametersPending(),
             ParametersActions.fetchParametersSuccess(normalizedResponse)
           ]);
-        });
+        }));
-    });
   });
 
   describe('updateParameters (fail)', () => {
@@ -101,8 +100,8 @@ describe('ParametersActions', () => {
       ErrorActions.handleErrors = jest.fn().mockReturnValue(() => {});
     });
 
-    it('calls required actions', () => {
+    it('calls required actions', () =>
-      return store
+      store
         .dispatch(
           ParametersActions.updateParameters('overcloud', { foo: 'bar' })
         )
@@ -123,7 +122,6 @@ describe('ParametersActions', () => {
               }
             })
           ]);
-        });
+        }));
-    });
   });
 });

src/__tests__/actions/PlansActions.tests.js

@@ -36,8 +36,8 @@ describe('PlansActions', () => {
         .mockReturnValue(() => Promise.resolve());
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store
+      store
         .dispatch(
           PlansActions.updatePlan('somecloud', {
             someFile: { contents: 'file contents' }
@@ -48,8 +48,7 @@ describe('PlansActions', () => {
           expect(store.getActions()).toEqual([
             PlansActions.updatePlanPending('somecloud')
           ]);
-        });
+        }));
-    });
   });
 
   describe('createPlan', () => {
@@ -67,15 +66,10 @@ describe('PlansActions', () => {
         .mockReturnValue(() => Promise.resolve());
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store
+      store.dispatch(PlansActions.createPlan('somecloud', {})).then(() => {
-        .dispatch(PlansActions.createPlan('somecloud', {}))
+        expect(store.getActions()).toEqual([PlansActions.createPlanPending()]);
-        .then(() => {
+      }));
-          expect(store.getActions()).toEqual([
-            PlansActions.createPlanPending()
-          ]);
-        });
-    });
   });
 
   describe('deletePlans', () => {
@@ -87,8 +81,8 @@ describe('PlansActions', () => {
         .mockReturnValue(() => Promise.resolve());
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store
+      store
         .dispatch(PlansActions.deletePlan('somecloud', mockHistory))
         .then(() => {
           expect(store.getActions().map(action => action.type)).toEqual([
@@ -96,8 +90,7 @@ describe('PlansActions', () => {
             'DELETE_PLAN_SUCCESS',
             'NOTIFY'
           ]);
-        });
+        }));
-    });
   });
 
   describe('fetchPlans', () => {
@@ -124,15 +117,14 @@ describe('PlansActions', () => {
         .mockReturnValue(() => Promise.resolve(apiResponseMistral));
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store.dispatch(PlansActions.fetchPlans()).then(() => {
+      store.dispatch(PlansActions.fetchPlans()).then(() => {
         expect(MistralApiService.runAction).toHaveBeenCalled();
         expect(store.getActions()).toEqual([
           PlansActions.requestPlans(),
           PlansActions.receivePlans(expectedPlans)
         ]);
-      });
+      }));
-    });
   });
 
   describe('fetchPlan', () => {
@@ -152,14 +144,13 @@ describe('PlansActions', () => {
         .mockReturnValue(() => Promise.resolve(apiResponse));
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store.dispatch(PlansActions.fetchPlan('overcloud')).then(() => {
+      store.dispatch(PlansActions.fetchPlan('overcloud')).then(() => {
         expect(SwiftApiService.getContainer).toHaveBeenCalled();
         expect(store.getActions()).toEqual([
           PlansActions.requestPlan(),
           PlansActions.receivePlan('overcloud', normalizedResponse)
         ]);
-      });
+      }));
-    });
   });
 });

src/__tests__/actions/StacksActions.tests.js

@@ -35,15 +35,14 @@ describe('StacksActions', () => {
         .mockReturnValue(() => Promise.resolve(serviceResponse));
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store.dispatch(StacksActions.fetchStacks()).then(() => {
+      store.dispatch(StacksActions.fetchStacks()).then(() => {
         expect(HeatApiService.getStacks).toHaveBeenCalled();
         expect(store.getActions()).toEqual([
           StacksActions.fetchStacksPending(),
           StacksActions.fetchStacksSuccess(normalizedStacks)
         ]);
-      });
+      }));
-    });
   });
 
   describe('fetchStacks (failed)', () => {
@@ -56,15 +55,14 @@ describe('StacksActions', () => {
       ErrorActions.handleErrors = jest.fn().mockReturnValue(() => {});
     });
 
-    it('dispatches actions', () => {
+    it('dispatches actions', () =>
-      return store.dispatch(StacksActions.fetchStacks()).then(() => {
+      store.dispatch(StacksActions.fetchStacks()).then(() => {
         expect(HeatApiService.getStacks).toHaveBeenCalled();
         expect(store.getActions()).toEqual([
           StacksActions.fetchStacksPending(),
           StacksActions.fetchStacksFailed()
         ]);
-      });
+      }));
-    });
   });
 
   // describe('fetchStacks (failed)', () => {

src/__tests__/actions/ValidationsActions.tests.js

@@ -81,8 +81,8 @@ describe('FetchValidations action', () => {
       .mockReturnValue(() => Promise.resolve(response));
   });
 
-  it('dispatches appropriate actions and normalizes the response', () => {
+  it('dispatches appropriate actions and normalizes the response', () =>
-    return store.dispatch(ValidationsActions.fetchValidations()).then(() => {
+    store.dispatch(ValidationsActions.fetchValidations()).then(() => {
       expect(MistralApiService.runAction).toHaveBeenCalledWith(
         MistralConstants.VALIDATIONS_LIST
       );
@@ -90,8 +90,7 @@ describe('FetchValidations action', () => {
         ValidationsActions.fetchValidationsPending(),
         ValidationsActions.fetchValidationsSuccess(normalizedResponse)
       ]);
-    });
+    }));
-  });
 });
 
 describe('RunValidation action', () => {
@@ -118,8 +117,8 @@ describe('RunValidation action', () => {
       .mockReturnValue(() => Promise.resolve(addWorkflowExecutionResponse));
   });
 
-  it('dispatches appropriate actions', () => {
+  it('dispatches appropriate actions', () =>
-    return store
+    store
       .dispatch(ValidationsActions.runValidation('512e', 'overcloud'))
       .then(() => {
         expect(MistralApiService.runWorkflow).toHaveBeenCalledWith(
@@ -134,8 +133,7 @@ describe('RunValidation action', () => {
             addWorkflowExecutionResponse
           )
         ]);
-      });
+      }));
-  });
 });
 
 // TODO(jtomasek): this test compares 2 immutable records and even though they're the same

src/__tests__/actions/utils.js

@@ -18,11 +18,9 @@ import configureMockStore from 'redux-mock-store';
 import thunkMiddleware from 'redux-thunk';
 
 export const mockGetIntl = {
-  getIntl: () => {
+  getIntl: () => ({
-    return {
     formatMessage: msgObj => msgObj.defaultMessage
-    };
+  })
-  }
 };
 
 export const mockStore = configureMockStore([

src/__tests__/actions/workflowExecutionActions.tests.js

@@ -45,8 +45,8 @@ describe('fetchWorkflowExecutions action', () => {
       .mockReturnValue(() => Promise.resolve(response));
   });
 
-  it('dispatches appropriate actions and normalizes the response', () => {
+  it('dispatches appropriate actions and normalizes the response', () =>
-    return store
+    store
       .dispatch(WorkflowExecutionsActions.fetchWorkflowExecutions())
       .then(() => {
         expect(MistralApiService.getWorkflowExecutions).toHaveBeenCalled();
@@ -56,8 +56,7 @@ describe('fetchWorkflowExecutions action', () => {
             normalizedResponse
           )
         ]);
-      });
+      }));
-  });
 });
 
 describe('updateWorkflowExecution action', () => {
@@ -69,8 +68,8 @@ describe('updateWorkflowExecution action', () => {
       .mockReturnValue(() => Promise.resolve());
   });
 
-  it('dispatches appropriate actions', () => {
+  it('dispatches appropriate actions', () =>
-    return store
+    store
       .dispatch(
         WorkflowExecutionsActions.updateWorkflowExecution('512e', {
           state: 'PAUSED'
@@ -87,6 +86,5 @@ describe('updateWorkflowExecution action', () => {
           }),
           WorkflowExecutionsActions.addWorkflowExecution()
         ]);
-      });
+      }));
-  });
 });

src/__tests__/components/ui/tables/DataTable.tests.js

@@ -34,9 +34,7 @@ const mockNoRowsRenderer = function() {
   return 'There are no items in data';
 };
 
-const mockOnFilter = () => {
+const mockOnFilter = () => 'Filtering Happened';
-  return 'Filtering Happened';
-};
 
 describe('DataTable component', () => {
   let DataTableVdom, DataTableInstance;

src/__tests__/services/HeatApiService.tests.js

@@ -35,8 +35,8 @@ describe('HeatApiService', () => {
         .mockReturnValue(() => Promise.resolve(apiResponse));
     });
 
-    it('returns a stack object based on <planName>', () => {
+    it('returns a stack object based on <planName>', () =>
-      return store.dispatch(HeatApiService.getStacks()).then(result => {
+      store.dispatch(HeatApiService.getStacks()).then(result => {
         expect(HeatApiService.defaultRequest).toHaveBeenCalled();
         expect(result).toEqual({
           stacks: [
@@ -44,7 +44,6 @@ describe('HeatApiService', () => {
             { stack_name: 'anothercloud', stack_status: 'CREATE_FAILED' }
           ]
         });
-      });
+      }));
-    });
   });
 });

src/js/components/UserAuthenticator.js

@@ -87,13 +87,11 @@ UserAuthenticator.propTypes = {
   location: PropTypes.object.isRequired
 };
 
-const mapStateToProps = state => {
+const mapStateToProps = state => ({
-  return {
   isAuthenticated: state.login.isAuthenticated,
   isAuthenticating: state.login.isAuthenticating,
   keystoneAuthTokenId: state.login.tokenId
-  };
+});
-};
 
 const mapDispatchToProps = dispatch => ({
   authenticateUserViaToken: tokenId =>

src/js/components/deployment/DeploymentConfirmation.js

@@ -134,8 +134,7 @@ ValidationsWarning.propTypes = {
 };
 
 export const DeployButton = injectIntl(
-  ({ deploy, disabled, intl, isRequestingPlanDeploy }) => {
+  ({ deploy, disabled, intl, isRequestingPlanDeploy }) => (
-    return (
     <button
       type="button"
       disabled={disabled}
@@ -149,8 +148,7 @@ export const DeployButton = injectIntl(
         <FormattedMessage {...messages.deployButton} />
       </InlineLoader>
     </button>
-    );
+  )
-  }
 );
 DeployButton.propTypes = {
   deploy: PropTypes.func.isRequired,

src/js/components/deployment/DeploymentDetail.js

@@ -173,8 +173,7 @@ DeploymentDetail.propTypes = {
   stacksLoaded: PropTypes.bool.isRequired
 };
 
-const mapStateToProps = state => {
+const mapStateToProps = state => ({
-  return {
   allPreDeploymentValidationsSuccessful: allPreDeploymentValidationsSuccessful(
     state
   ),
@@ -187,11 +186,9 @@ const mapStateToProps = state => {
   environmentConfigurationSummary: getEnvironmentConfigurationSummary(state),
   overcloudInfo: getOvercloudInfo(state),
   stacksLoaded: state.stacks.isLoaded
-  };
+});
-};
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   deployPlan: planName => dispatch(PlanActions.deployPlan(planName)),
   fetchStackResources: stack =>
     dispatch(StacksActions.fetchResources(stack.stack_name, stack.id)),
@@ -199,8 +196,7 @@ const mapDispatchToProps = dispatch => {
     dispatch(
       ValidationsActions.runValidationGroups(['pre-deployment'], planName)
     )
-  };
+});
-};
 
 export default injectIntl(
   connect(mapStateToProps, mapDispatchToProps)(DeploymentDetail)

src/js/components/deployment/StackResourcesTable.js

@@ -87,11 +87,9 @@ class StackResourcesTable extends React.Component {
     let dataKeys = ['resource_name', 'resource_status'];
     return filterString
       ? data.filter(row => {
-          let result = dataKeys.filter(dataKey => {
+          let result = dataKeys.filter(dataKey =>
-            return row[dataKey]
+            row[dataKey].toLowerCase().includes(filterString.toLowerCase())
-              .toLowerCase()
+          );
-              .includes(filterString.toLowerCase());
-          });
           return result.length > 0;
         })
       : data;

src/js/components/deployment_plan/ConfigurePlanStep.js

@@ -28,8 +28,7 @@ const messages = defineMessages({
   }
 });
 
-const ConfigurePlanStep = props => {
+const ConfigurePlanStep = props => (
-  return (
   <div>
     <DeploymentConfigurationSummary {...props} />
     <br />
@@ -42,7 +41,6 @@ const ConfigurePlanStep = props => {
     </Link>
   </div>
 );
-};
 ConfigurePlanStep.propTypes = {
   fetchEnvironmentConfiguration: PropTypes.func.isRequired,
   isFetching: PropTypes.bool.isRequired,

src/js/components/deployment_plan/DeploymentPlanStep.js

@@ -17,8 +17,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export const DeploymentPlanStep = ({ children, disabled, title, tooltip }) => {
+export const DeploymentPlanStep = ({ children, disabled, title, tooltip }) => (
-  return (
   <li className={disabled ? 'disabled' : null}>
     <h3>
       <span>{title}</span>
@@ -31,7 +30,6 @@ export const DeploymentPlanStep = ({ children, disabled, title, tooltip }) => {
     {children}
   </li>
 );
-};
 
 DeploymentPlanStep.propTypes = {
   children: PropTypes.node,

src/js/components/deployment_plan/HardwareStep.js

@@ -25,12 +25,10 @@ const messages = defineMessages({
   }
 });
 
-const HardwareStep = () => {
+const HardwareStep = () => (
-  return (
   <Link className="btn btn-default" to="/nodes/register">
     <FormattedMessage {...messages.registerNodes} />
   </Link>
 );
-};
 
 export default HardwareStep;

src/js/components/environment_configuration/EnvironmentCheckBox.js

@@ -40,8 +40,7 @@ const EnvironmentCheckBox = ({
   meta,
   required,
   ...rest
-}) => {
+}) => (
-  return (
   <FormGroup
     controlId={id}
     validationState={getValidationState({ ...meta, touched: true })}
@@ -55,7 +54,6 @@ const EnvironmentCheckBox = ({
     </Col>
   </FormGroup>
 );
-};
 EnvironmentCheckBox.propTypes = {
   description: PropTypes.node,
   id: PropTypes.string.isRequired,

src/js/components/i18n/I18nDropdown.js

@@ -71,18 +71,14 @@ I18nDropdown.propTypes = {
   languages: ImmutablePropTypes.map.isRequired
 };
 
-const mapStateToProps = state => {
+const mapStateToProps = state => ({
-  return {
   languages: getEnabledLanguages(state),
   currentLanguage: getCurrentLanguage(state)
-  };
+});
-};
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   chooseLanguage: language => dispatch(I18nActions.chooseLanguage(language))
-  };
+});
-};
 
 export default injectIntl(
   connect(mapStateToProps, mapDispatchToProps)(I18nDropdown)

src/js/components/i18n/I18nProvider.js

@@ -58,17 +58,13 @@ I18nProvider.defaultProps = {
   messages: {}
 };
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   detectLanguage: language => dispatch(I18nActions.detectLanguage(language))
-  };
+});
-};
 
-const mapStateToProps = state => {
+const mapStateToProps = state => ({
-  return {
   language: getCurrentLanguage(state),
   messages: getCurrentLanguageMessages(state)
-  };
+});
-};
 
 export default connect(mapStateToProps, mapDispatchToProps)(I18nProvider);

src/js/components/login/LanguageInput.js

@@ -22,13 +22,11 @@ import { injectIntl } from 'react-intl';
 class LanguageInput extends React.Component {
   _renderOptions() {
     return this.props.languages
-      .map((langName, langKey) => {
+      .map((langName, langKey) => (
-        return (
         <option key={`lang-${langKey}`} value={langKey}>
           {langName}
         </option>
-        );
+      ))
-      })
       .toList();
   }
 

src/js/components/login/Login.js

@@ -226,12 +226,10 @@ function mapStateToProps(state) {
   };
 }
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   chooseLanguage: language => dispatch(I18nActions.chooseLanguage(language)),
   authenticateUser: (formData, formFields, nextPath) =>
     dispatch(LoginActions.authenticateUser(formData, formFields, nextPath))
-  };
+});
-};
 
 export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Login));

src/js/components/nodes/NodesListView/NodeExtendedInfo.js

@@ -118,8 +118,7 @@ class NodeExtendedInfo extends React.Component {
           <dd>
             {node
               .getIn(['introspectionData', 'interfaces'])
-              .map((ifc, k) => {
+              .map((ifc, k) => (
-                return (
                 <div key={k}>
                   {k} -{' '}
                   <span title={intl.formatMessage(messages.macAddress)}>
@@ -131,8 +130,7 @@ class NodeExtendedInfo extends React.Component {
                   </span>
                   {ifc.get('pxe') && '| PXE'}
                 </div>
-                );
+              ))
-              })
               .toList()}
           </dd>
         </dl>

src/js/components/nodes/NodesTable.js

@@ -130,11 +130,9 @@ class NodesTable extends React.Component {
     let dataKeys = ['name'];
     return filterString
       ? data.filter(row => {
-          let result = dataKeys.filter(dataKey => {
+          let result = dataKeys.filter(dataKey =>
-            return row[dataKey]
+            row[dataKey].toLowerCase().includes(filterString.toLowerCase())
-              .toLowerCase()
+          );
-              .includes(filterString.toLowerCase());
-          });
           return result.length > 0;
         })
       : data;

src/js/components/nodes/NodesToolbar/NodesToolbar.js

@@ -183,18 +183,15 @@ NodesToolbar.propTypes = {
   submitNodesToolbarForm: PropTypes.func.isRequired,
   updateFilter: PropTypes.func.isRequired
 };
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   clearActiveFilters: () => dispatch(clearActiveFilters('nodesToolbar')),
   deleteActiveFilter: uuid =>
     dispatch(deleteActiveFilter('nodesToolbar', uuid)),
   submitNodesToolbarForm: () => dispatch(submit('nodesToolbar')),
   addActiveFilter: data => dispatch(addActiveFilter('nodesToolbar', data)),
   updateFilter: data => dispatch(updateFilter('nodesToolbar', data))
-  };
+});
-};
+const mapStateToProps = state => ({
-const mapStateToProps = state => {
-  return {
   activeFilters: getActiveFilters(state, 'nodesToolbar'),
   filteredNodesCount: getFilteredNodes(state).size,
   filteredNodes: getFilteredNodes(state),
@@ -202,8 +199,7 @@ const mapStateToProps = state => {
     'activeFilters'
   ),
   nodesCount: getNodes(state).size
-  };
+});
-};
 export default injectIntl(
   connect(mapStateToProps, mapDispatchToProps)(NodesToolbar)
 );

src/js/components/nodes/registerNodes/NodesFileUpload.js

@@ -65,8 +65,7 @@ class NodesFileUpload extends React.Component {
     const file = event.target.files[0];
     const reader = new FileReader();
 
-    reader.onload = (f => {
+    reader.onload = (f => e => {
-      return e => {
       if (file.name.match(/(\.json)$/)) {
         this.addNodesFromInstackenvJSON(e.target.result);
       } else if (file.name.match(/(\.csv)$/)) {
@@ -82,7 +81,6 @@ class NodesFileUpload extends React.Component {
           message: formatMessage(messages.provideCsvOrInstackenvJson)
         });
       }
-      };
     })(file);
     reader.readAsText(file);
     this.refs.regNodesUploadFileForm.reset();

src/js/components/nodes/registerNodes/RegisterNodeFields.js

@@ -114,8 +114,7 @@ const RegisterNodeFields = ({
   node,
   intl: { formatMessage },
   selectedDriver
-}) => {
+}) => (
-  return (
   <div>
     <h4>
       <FormattedMessage {...messages.nodeDetail} />
@@ -221,7 +220,6 @@ const RegisterNodeFields = ({
     </Fieldset>
   </div>
 );
-};
 RegisterNodeFields.propTypes = {
   intl: PropTypes.object.isRequired,
   node: PropTypes.string.isRequired,

src/js/components/nodes/registerNodes/RegisterNodesForm.js

@@ -36,11 +36,9 @@ const messages = defineMessages({
   }
 });
 
-export const RegisterNodesTabPanes = ({ fields, meta, selectedNodeIndex }) => {
+export const RegisterNodesTabPanes = ({ fields, meta, selectedNodeIndex }) => (
-  return (
   <div className="tab-content">
-      {fields.map((node, index, fields) => {
+    {fields.map((node, index, fields) => (
-        return (
       <TabPane
         key={index}
         isActive={selectedNodeIndex === index}
@@ -48,11 +46,9 @@ export const RegisterNodesTabPanes = ({ fields, meta, selectedNodeIndex }) => {
       >
         <RegisterNodeFields node={node} />
       </TabPane>
-        );
+    ))}
-      })}
   </div>
 );
-};
 RegisterNodesTabPanes.propTypes = {
   fields: PropTypes.object.isRequired,
   meta: PropTypes.object.isRequired,

src/js/components/notifications/NotificationsToaster.js

@@ -42,8 +42,9 @@ class NotificationsToaster extends React.Component {
   }
 
   renderNotifications() {
-    return this.props.notifications.toList().map(notification => {
+    return this.props.notifications
-      return (
+      .toList()
+      .map(notification => (
         <Notification
           key={notification.id}
           title={notification.title}
@@ -55,8 +56,7 @@ class NotificationsToaster extends React.Component {
             this.props.removeNotification(notification.id)
           }
         />
-      );
+      ));
-    });
   }
 
   render() {

src/js/components/parameters/ParameterInputList.js

@@ -36,8 +36,7 @@ class ParameterInputList extends React.Component {
       this.props.emptyParametersMessage ||
       this.props.intl.formatMessage(messages.noParameters);
 
-    const parameters = this.props.parameters.map(parameter => {
+    const parameters = this.props.parameters.map(parameter => (
-      return (
       <ParameterInput
         key={parameter.name}
         name={parameter.name}
@@ -47,8 +46,7 @@ class ParameterInputList extends React.Component {
         value={parameter.value}
         type={parameter.type}
       />
-      );
+    ));
-    });
 
     if (parameters.isEmpty()) {
       return (

src/js/components/parameters/Parameters.js

@@ -66,8 +66,7 @@ class Parameters extends React.Component {
         </TabPane>
       );
     } else {
-      return this.props.enabledEnvironments.toList().map(environment => {
+      return this.props.enabledEnvironments.toList().map(environment => (
-        return (
         <TabPane
           isActive={this.state.activeTab === environment.file}
           key={environment.file}
@@ -75,8 +74,7 @@ class Parameters extends React.Component {
         >
           <EnvironmentParameters environment={environment.file} />
         </TabPane>
-        );
+      ));
-      });
     }
   }
 

src/js/components/parameters/ParametersForm.js

@@ -166,8 +166,8 @@ const convertJsonTypeParameterValueToString = value =>
   // accept empty string as valid value
   ['', undefined].includes(value) ? '' : JSON.stringify(value);
 
-const getFormInitialValues = parameters => {
+const getFormInitialValues = parameters =>
-  return parameters
+  parameters
     .map(p => {
       const value = p.value === undefined ? p.default : p.value;
       if (p.type.toLowerCase() === 'json') {
@@ -177,22 +177,20 @@ const getFormInitialValues = parameters => {
       }
     })
     .toJS();
-};
 
 /**
  * Filter out non updated parameters, so only parameters which have been actually changed
  * get sent to updateparameters
  */
-const filterFormData = (values, initialValues) => {
+const filterFormData = (values, initialValues) =>
-  return pickBy(values, (value, key) => !isEqual(value, initialValues[key]));
+  pickBy(values, (value, key) => !isEqual(value, initialValues[key]));
-};
 
 /**
  * Json parameter values are sent as string, this function parses them and checks if they're object
  * or array. Also, parameters with undefined value are set to null
  */
-const parseJsonTypeValues = (values, parameters) => {
+const parseJsonTypeValues = (values, parameters) =>
-  return mapValues(values, (value, key) => {
+  mapValues(values, (value, key) => {
     if (parameters.get(key).type.toLowerCase() === 'json') {
       try {
         return JSON.parse(value);
@@ -202,7 +200,6 @@ const parseJsonTypeValues = (values, parameters) => {
     }
     return value === undefined ? null : value;
   });
-};
 
 const handleSubmit = (
   { saveAndClose, ...values },

src/js/components/parameters/ParametersSidebar.js

@@ -49,8 +49,7 @@ const ParametersSidebar = ({
         </a>
       </Tab>
       <li className="spacer" />
-      {enabledEnvironments.map(environment => {
+      {enabledEnvironments.map(environment => (
-        return (
         <Tab key={environment.file} isActive={isTabActive(environment.file)}>
           <a
             className="link"
@@ -60,8 +59,7 @@ const ParametersSidebar = ({
             {environment.title}
           </a>
         </Tab>
-        );
+      ))}
-      })}
     </ul>
   </div>
 );

src/js/components/plan/PlanFileInput.js

@@ -52,16 +52,13 @@ class PlanFileInput extends React.Component {
       let reader = new FileReader();
       let file = inputFiles[i];
 
-      reader.onerror = (f => {
+      reader.onerror = (f => e => {
-        return e => {
         this.setState({
           unreadableFile: f.webkitRelativePath
         });
-        };
       })(file);
 
-      reader.onload = (f => {
+      reader.onload = (f => e => {
-        return e => {
         const filePath = f.webkitRelativePath.replace(/^[^\/]*\//, '');
         if (!filePath.match(IGNORED_FILE_PATHS)) {
           let obj = {
@@ -81,7 +78,6 @@ class PlanFileInput extends React.Component {
             }
           }
         );
-        };
       })(file);
       reader.readAsText(file);
     }

src/js/components/roles/NodesAssignment.js

@@ -38,16 +38,16 @@ const NodesAssignment = ({
   nodeCountParametersByRole,
   roles,
   updateNodesAssignment
-}) => {
+}) => (
-  return (
   <NodesAssignmentForm
     currentPlanName={currentPlanName}
     initialValues={assignedNodesCountsByRole.toJS()}
     updateNodesAssignment={updateNodesAssignment}
   >
     <div className="row row-cards-pf">
-        {roles.toList().map(role => {
+      {roles
-          return (
+        .toList()
+        .map(role => (
           <RoleCard
             key={role.name}
             currentPlanName={currentPlanName}
@@ -59,12 +59,10 @@ const NodesAssignment = ({
             )}
             availableNodesCount={availableNodesCountsByRole.get(role.name)}
           />
-          );
+        ))}
-        })}
     </div>
   </NodesAssignmentForm>
 );
-};
 NodesAssignment.propTypes = {
   assignedNodesCountsByRole: ImmutablePropTypes.map.isRequired,
   availableNodesCountsByRole: ImmutablePropTypes.map.isRequired,
@@ -82,12 +80,10 @@ const mapStateToProps = state => ({
   roles: getRoles(state)
 });
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   updateNodesAssignment: (currentPlanName, data) => {
     dispatch(ParametersActions.updateNodesAssignment(currentPlanName, data));
   }
-  };
+});
-};
 
 export default connect(mapStateToProps, mapDispatchToProps)(NodesAssignment);

src/js/components/roles/RoleServices.js

@@ -53,22 +53,17 @@ class RoleServices extends React.Component {
   }
 
   renderServiceTabs() {
-    return this.props.services.toList().map(service => {
+    return this.props.services.toList().map(service => (
-      return (
       <Tab
         key={service.type}
         title={service.description}
         isActive={service.id === this.state.selectedService}
       >
-          <a
+        <a className="link" onClick={this.selectService.bind(this, service.id)}>
-            className="link"
-            onClick={this.selectService.bind(this, service.id)}
-          >
           {service.type.split('::').pop()}
         </a>
       </Tab>
-      );
+    ));
-    });
   }
 
   render() {

src/js/components/ui/NavTab.js

@@ -18,8 +18,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { Link, Route } from 'react-router-dom';
 
-const NavTab = ({ activeClassName, children, to, exact, location, id }) => {
+const NavTab = ({ activeClassName, children, to, exact, location, id }) => (
-  return (
   <Route
     location={location}
     path={typeof to === 'object' ? to.pathname : to}
@@ -31,7 +30,6 @@ const NavTab = ({ activeClassName, children, to, exact, location, id }) => {
     )}
   />
 );
-};
 NavTab.propTypes = {
   activeClassName: PropTypes.string.isRequired,
   children: PropTypes.node,

src/js/components/ui/Toolbar/ToolbarInputs.js

@@ -18,8 +18,7 @@ import { Button } from 'react-bootstrap';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-export const SortDirectionInput = ({ input: { onChange, value }, title }) => {
+export const SortDirectionInput = ({ input: { onChange, value }, title }) => (
-  return (
   <Button
     title={title}
     type="button"
@@ -29,7 +28,6 @@ export const SortDirectionInput = ({ input: { onChange, value }, title }) => {
     <span className={`fa fa-sort-alpha-${value}`} />
   </Button>
 );
-};
 SortDirectionInput.propTypes = {
   children: PropTypes.node,
   input: PropTypes.object.isRequired,
@@ -50,8 +48,7 @@ const getIconClass = optionKey => {
 export const ContentViewSelectorInput = ({
   input: { onChange, value },
   options
-}) => {
+}) => (
-  return (
   <div>
     {Object.keys(options).map(k => (
       <Button
@@ -67,7 +64,6 @@ export const ContentViewSelectorInput = ({
     ))}
   </div>
 );
-};
 ContentViewSelectorInput.propTypes = {
   input: PropTypes.object.isRequired,
   options: PropTypes.object.isRequired

src/js/components/ui/dropdown/DropdownKebab.js

@@ -18,20 +18,14 @@ import { Dropdown } from 'react-bootstrap';
 import PropTypes from 'prop-types';
 import React from 'react';
 
-const DropdownKebab = ({ children, id, pullRight }) => {
+const DropdownKebab = ({ children, id, pullRight }) => (
-  return (
   <Dropdown className="dropdown-kebab-pf" id={id} pullRight={pullRight}>
-      <Dropdown.Toggle
+    <Dropdown.Toggle bsStyle="link" noCaret onClick={e => e.stopPropagation()}>
-        bsStyle="link"
-        noCaret
-        onClick={e => e.stopPropagation()}
-      >
       <span className="fa fa-ellipsis-v" />
     </Dropdown.Toggle>
     <Dropdown.Menu>{children}</Dropdown.Menu>
   </Dropdown>
 );
-};
 DropdownKebab.propTypes = {
   children: PropTypes.node,
   id: PropTypes.string.isRequired,

src/js/components/ui/dropdown/MenuItemLink.js

@@ -18,8 +18,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { Link, Route } from 'react-router-dom';
 
-const MenuItemLink = ({ children, to, exact, location, ...rest }) => {
+const MenuItemLink = ({ children, to, exact, location, ...rest }) => (
-  return (
   <Route
     path={to}
     exact={exact}
@@ -32,7 +31,6 @@ const MenuItemLink = ({ children, to, exact, location, ...rest }) => {
     )}
   />
 );
-};
 
 MenuItemLink.propTypes = {
   children: PropTypes.node,

src/js/components/ui/forms/FormErrorList.js

@@ -22,13 +22,11 @@ export default class FormErrorList extends React.Component {
   renderErrors() {
     const { errors } = this.props;
     if (errors.length > 1) {
-      const errorList = errors.map((error, index) => {
+      const errorList = errors.map((error, index) => (
-        return (
         <li key={index}>
           {error.title} {error.message}
         </li>
-        );
+      ));
-      });
       return (
         <div>
           <strong>{`${errors.length} Errors Found:`}</strong>

src/js/components/ui/reduxForm/HorizontalCheckBox.js

@@ -32,8 +32,7 @@ const HorizontalCheckBox = ({
   meta,
   required,
   ...rest
-}) => {
+}) => (
-  return (
   <FormGroup controlId={id} validationState={getValidationState(meta)}>
     <Col
       componentClass={ControlLabel}
@@ -49,7 +48,6 @@ const HorizontalCheckBox = ({
     </Col>
   </FormGroup>
 );
-};
 HorizontalCheckBox.propTypes = {
   description: PropTypes.node,
   id: PropTypes.string.isRequired,

src/js/components/ui/reduxForm/HorizontalInput.js

@@ -32,8 +32,7 @@ const HorizontalInput = ({
   meta,
   required,
   ...rest
-}) => {
+}) => (
-  return (
   <FormGroup controlId={id} validationState={getValidationState(meta)}>
     <Col
       componentClass={ControlLabel}
@@ -49,7 +48,6 @@ const HorizontalInput = ({
     </Col>
   </FormGroup>
 );
-};
 HorizontalInput.propTypes = {
   description: PropTypes.node,
   id: PropTypes.string.isRequired,

src/js/components/ui/reduxForm/HorizontalSelect.js

@@ -33,8 +33,7 @@ const HorizontalSelect = ({
   meta,
   required,
   ...rest
-}) => {
+}) => (
-  return (
   <FormGroup controlId={id} validationState={getValidationState(meta)}>
     <Col
       componentClass={ControlLabel}
@@ -57,7 +56,6 @@ const HorizontalSelect = ({
     </Col>
   </FormGroup>
 );
-};
 HorizontalSelect.propTypes = {
   children: PropTypes.node,
   description: PropTypes.node,

src/js/components/ui/reduxForm/NodePickerInput.js

@@ -70,8 +70,7 @@ NodePickerInput.defaultProps = {
 };
 export default NodePickerInput;
 
-const PickerArrow = ({ direction, disabled, onClick }) => {
+const PickerArrow = ({ direction, disabled, onClick }) => (
-  return (
   <button
     type="button"
     className={`btn btn-default btn-node-picker btn-node-picker-${direction}`}
@@ -81,7 +80,6 @@ const PickerArrow = ({ direction, disabled, onClick }) => {
     <span className={`fa fa-angle-${direction}`} aria-hidden="true" />
   </button>
 );
-};
 PickerArrow.propTypes = {
   direction: PropTypes.oneOf(['up', 'down']).isRequired,
   disabled: PropTypes.bool.isRequired,

src/js/components/ui/tables/DataTable.js

@@ -83,9 +83,7 @@ class DataTable extends React.Component {
   render() {
     let columns = this._getColumns();
 
-    let headers = columns.map(column => {
+    let headers = columns.map(column => column.props.header);
-      return column.props.header;
-    });
 
     let rows = [];
     for (var i = 0; i < this.props.rowsCount; ++i) {

src/js/components/ui/tables/DataTableRow.js

@@ -19,12 +19,12 @@ import React from 'react';
 
 export default class DataTableRow extends React.Component {
   render() {
-    let cells = this.props.columns.map((column, index) => {
+    let cells = this.props.columns.map((column, index) =>
-      return React.cloneElement(column.props.cell, {
+      React.cloneElement(column.props.cell, {
         rowIndex: this.props.index,
         key: index
-      });
+      })
-    });
+    );
     return <tr>{cells}</tr>;
   }
 }

src/js/components/validations/Validation.js

@@ -50,8 +50,7 @@ export default class Validation extends React.Component {
   }
 
   renderValidationGroups() {
-    return this.props.groups.map(group => {
+    return this.props.groups.map(group => (
-      return (
       <div key={group} className="list-view-pf-additional-info-item">
         <span
           className="label label-default"
@@ -65,8 +64,7 @@ export default class Validation extends React.Component {
           <small>{group}</small>
         </span>
       </div>
-      );
+    ));
-    });
   }
 
   render() {

src/js/components/validations/ValidationDetail.js

@@ -86,14 +86,12 @@ class ValidationDetail extends React.Component {
   }
 
   renderValidationGroups() {
-    return this.props.groups.map(group => {
+    return this.props.groups.map(group => (
-      return (
       <small key={group}>
         <span className="label label-default">{group}</span>
         &nbsp;
       </small>
-      );
+    ));
-    });
   }
 
   renderValidationOutput() {

src/js/components/validations/ValidationsList.js

@@ -117,8 +117,9 @@ class ValidationsList extends React.Component {
         </BlankSlate>
       );
     } else {
-      return validations.toList().map(validation => {
+      return validations
-        return (
+        .toList()
+        .map(validation => (
           <Validation
             key={validation.id}
             name={validation.name}
@@ -139,8 +140,7 @@ class ValidationsList extends React.Component {
             id={validation.id}
             addActiveFilter={this.props.addActiveFilter}
           />
-        );
+        ));
-      });
     }
   }
 
@@ -226,8 +226,7 @@ ValidationsList.propTypes = {
   validationsLoaded: PropTypes.bool.isRequired
 };
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   addActiveFilter: data =>
     dispatch(addActiveFilter('validationsToolbar', data)),
   fetchValidations: () => dispatch(ValidationsActions.fetchValidations()),
@@ -243,19 +242,16 @@ const mapDispatchToProps = dispatch => {
       })
     );
   }
-  };
+});
-};
 
-const mapStateToProps = state => {
+const mapStateToProps = state => ({
-  return {
   executionsLoaded: state.executions.get('executionsLoaded'),
   isFetchingValidations: state.validations.get('isFetching'),
   validations: getFilteredValidations(state),
   validationsLoaded: state.validations.get('validationsLoaded'),
   currentPlanName: getCurrentPlanName(state),
   showValidations: state.validations.showValidations
-  };
+});
-};
 
 export default injectIntl(
   connect(mapStateToProps, mapDispatchToProps)(ValidationsList)

src/js/components/validations/ValidationsToolbar.js

@@ -140,23 +140,18 @@ ValidationsToolbar.propTypes = {
   intl: PropTypes.object,
   validationsCount: PropTypes.number.isRequired
 };
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = dispatch => ({
-  return {
   addActiveFilter: data =>
     dispatch(addActiveFilter('validationsToolbar', data)),
-    clearActiveFilters: () =>
+  clearActiveFilters: () => dispatch(clearActiveFilters('validationsToolbar')),
-      dispatch(clearActiveFilters('validationsToolbar')),
   deleteActiveFilter: uuid =>
     dispatch(deleteActiveFilter('validationsToolbar', uuid))
-  };
+});
-};
+const mapStateToProps = state => ({
-const mapStateToProps = state => {
-  return {
   activeFilters: getActiveFilters(state, 'validationsToolbar'),
   filteredValidationsCount: getFilteredValidations(state).size,
   validationsCount: getValidationsWithResults(state).size
-  };
+});
-};
 export default injectIntl(
   connect(mapStateToProps, mapDispatchToProps)(ValidationsToolbar)
 );

src/js/reducers/environmentConfigurationReducer.js

@@ -50,12 +50,12 @@ export default function environmentConfigurationReducer(
 
     case EnvironmentConfigurationConstants.UPDATE_ENVIRONMENT_CONFIGURATION_SUCCESS: {
       const enabledEnvs = fromJS(action.payload);
-      const updatedEnvs = state.environments.map(environment => {
+      const updatedEnvs = state.environments.map(environment =>
-        return environment.set(
+        environment.set(
           'enabled',
           enabledEnvs.includes(environment.get('file'))
+        )
       );
-      });
       return state.set('environments', updatedEnvs);
     }
 

src/js/reducers/filtersReducer.js

@@ -30,11 +30,12 @@ export default function filtersReducer(state = initialState, action) {
       // Don't add a new filter if there already is one with the same
       // filterBy and filterString.
       if (
-        state.getIn([filter, 'activeFilters']).filter(value => {
+        state
-          return (
+          .getIn([filter, 'activeFilters'])
+          .filter(
+            value =>
               value.filterBy === filterBy && value.filterString === filterString
-          );
+          ).size > 0
-        }).size > 0
       ) {
         return state;
       }

src/js/selectors/environmentConfiguration.js

@@ -30,17 +30,16 @@ export const getEnvironment = (state, environmentFileName) =>
 
 export const getEnabledEnvironments = createSelector(
   getEnvironments,
-  environments => {
+  environments => environments.filter(environment => environment.get('enabled'))
-    return environments.filter(environment => environment.get('enabled'));
-  }
 );
 
 export const getEnvironmentConfigurationSummary = createSelector(
   getEnabledEnvironments,
   environments => {
-    const titlesList = environments.reduce((titlesList, environment) => {
+    const titlesList = environments.reduce(
-      return titlesList.push(environment.get('title'));
+      (titlesList, environment) => titlesList.push(environment.get('title')),
-    }, List());
+      List()
+    );
     return titlesList.toArray().join(', ');
   }
 );
@@ -50,17 +49,16 @@ export const getEnvironmentConfigurationSummary = createSelector(
  */
 export const getTopicsTree = createSelector(
   [topics, environmentGroups, getEnvironments],
-  (topics, environmentGroups, environments) => {
+  (topics, environmentGroups, environments) =>
-    return topics.map(topic => {
+    topics.map(topic =>
-      return topic.update('environment_groups', envGroups => {
+      topic.update('environment_groups', envGroups =>
-        return envGroups.map(envGroup => {
+        envGroups.map(envGroup =>
-          return environmentGroups
+          environmentGroups
             .get(envGroup)
-            .update('environments', envs => {
+            .update('environments', envs =>
-              return environments.filter((p, k) => envs.includes(k));
+              environments.filter((p, k) => envs.includes(k))
-            });
+            )
-        });
+        )
-      });
+      )
-    });
+    )
-  }
 );

src/js/selectors/filters.js

@@ -16,9 +16,7 @@
 
 import { createSelector } from 'reselect';
 
-export const getFilterByName = (state, filterName) => {
+export const getFilterByName = (state, filterName) => state.filters[filterName];
-  return state.filters[filterName];
-};
 
 export const getActiveFilters = createSelector(getFilterByName, filter =>
   filter.get('activeFilters')

src/js/selectors/nodes.js

@@ -103,11 +103,11 @@ export const getFilteredNodes = createSelector(
       .update(nodes =>
         nodesToolbarFilter.get('activeFilters').reduce(
           (filteredNodes, filter) =>
-            filteredNodes.filter(node => {
+            filteredNodes.filter(node =>
-              return getNodePropertyString(node, filter.filterBy)
+              getNodePropertyString(node, filter.filterBy)
                 .toLowerCase()
-                .includes(filter.filterString.toLowerCase());
+                .includes(filter.filterString.toLowerCase())
-            }),
+            ),
           nodes
         )
       )

src/js/selectors/notifications.js

@@ -20,7 +20,5 @@ const notifications = state => state.notifications.get('all');
 
 export const getNonViewedNotifications = createSelector(
   notifications,
-  notifications => {
+  notifications => notifications.filterNot(notification => notification.viewed)
-    return notifications.filterNot(notification => notification.viewed);
-  }
 );

src/js/selectors/parameters.js

@@ -126,8 +126,7 @@ export const getRoleNetworkConfig = createSelector(
 
 export const getEnvironmentParameters = createSelector(
   [getParametersExclInternal, getResources, getEnvironment],
-  (parameters, resources, environment) => {
+  (parameters, resources, environment) =>
-    return (
     resources
       // get list of resources from environment resource_registry
       .filter(r => environment.resourceRegistry.keySeq().includes(r.type))
@@ -149,8 +148,6 @@ export const getEnvironmentParameters = createSelector(
       // convert list of parameter names to map of actual parameter records
       .update(filterParameters(parameters))
 );
-  }
-);
 
 /**
  * Get Parameter list for resource by Id
@@ -195,8 +192,8 @@ export const getResourceParametersDeep = createSelector(
 /**
  * Recursively extracts Parameter names from a Resource and it's nested Resources
  */
-const _extractParameters = (parameters, nestedResources, allResources) => {
+const _extractParameters = (parameters, nestedResources, allResources) =>
-  return nestedResources.reduce((pars, res) => {
+  nestedResources.reduce((pars, res) => {
     const resource = allResources.get(res);
     return _extractParameters(
       pars
@@ -207,4 +204,3 @@ const _extractParameters = (parameters, nestedResources, allResources) => {
       allResources
     );
   }, parameters);
-};

src/js/selectors/plans.js

@@ -40,9 +40,6 @@ export const getPlans = createSelector(plans, plans => plans);
 // TODO(jtomasek): update this to list 3 last used plans
 export const getAllPlansButCurrent = createSelector(
   [plans, getCurrentPlanName],
-  (plans, currentPlanName) => {
+  (plans, currentPlanName) =>
-    return plans
+    plans.filter(plan => plan.name != currentPlanName).sortBy(plan => plan.name)
-      .filter(plan => plan.name != currentPlanName)
-      .sortBy(plan => plan.name);
-  }
 );

src/js/selectors/stacks.js

@@ -41,13 +41,12 @@ export const getCurrentStack = createSelector(
  */
 export const getCurrentStackDeploymentInProgress = createSelector(
   [stacksSelector, getCurrentPlanName],
-  (stacks, currentPlanName) => {
+  (stacks, currentPlanName) =>
-    return [
+    [
       stackStates.CREATE_IN_PROGRESS,
       stackStates.UPDATE_IN_PROGRESS,
       stackStates.DELETE_IN_PROGRESS
-    ].includes(stacks.get(currentPlanName, new Stack()).stack_status);
+    ].includes(stacks.get(currentPlanName, new Stack()).stack_status)
-  }
 );
 
 /**
@@ -58,9 +57,9 @@ export const getCurrentStackDeploymentProgress = createSelector(
   resources => {
     let allResources = resources.size;
     if (allResources > 0) {
-      let completeResources = resources.filter(r => {
+      let completeResources = resources.filter(
-        return r.resource_status === 'CREATE_COMPLETE';
+        r => r.resource_status === 'CREATE_COMPLETE'
-      }).size;
+      ).size;
       return Math.ceil(completeResources / allResources * 100);
     }
     return 0;

src/js/selectors/validations.js

@@ -49,14 +49,13 @@ export const getValidationExecutionsForCurrentPlan = createSelector(
  */
 export const getValidationsWithResults = createSelector(
   [validations, getValidationExecutionsForCurrentPlan],
-  (validations, results) => {
+  (validations, results) =>
-    return validations.map(validation => {
+    validations.map(validation => {
       const validationResults = getValidationResults(validation.id, results);
       return validation
         .set('results', validationResults)
         .set('status', getValidationStatus(validationResults));
-    });
+    })
-  }
 );
 
 /**
@@ -114,8 +113,7 @@ export const getValidationStatusCounts = createSelector(
  * Helper function to get the most recent time a plan has been updated or
  * created.
  */
-export const getMostRecentPlanUpdate = (executions, planName) => {
+export const getMostRecentPlanUpdate = (executions, planName) =>
-  return (
   executions
     .filter(
       execution =>
@@ -125,18 +123,15 @@ export const getMostRecentPlanUpdate = (executions, planName) => {
     )
     .map(execution => execution.get('updated_at'))
     .sort()
-      .last() || 0
+    .last() || 0;
-  );
-};
 
 /**
  * Helper function to get a validation results by validation name
  */
-const getValidationResults = (validationId, results) => {
+const getValidationResults = (validationId, results) =>
-  return results.filter(
+  results.filter(
     result => result.getIn(['input', 'validation_name']) === validationId
   );
-};
 
 /**
  * Helper function to determine validation status based on validation's results

src/js/utils/nodes.js

@@ -29,8 +29,8 @@ export const parseNodeCapabilities = capabilities => {
 /**
  * Convert Node's capabilities object to string
  */
-export const stringifyNodeCapabilities = capabilities => {
+export const stringifyNodeCapabilities = capabilities =>
-  return Object.keys(capabilities)
+  Object.keys(capabilities)
     .reduce((caps, key) => {
       if (!capabilities[key]) {
         return caps;
@@ -40,7 +40,6 @@ export const stringifyNodeCapabilities = capabilities => {
       }
     }, [])
     .join(',');
-};
 
 /**
  * Set or update Node capability