location history lint issues fix

gondzo · gondzo · commit c738143255ec · 2016-12-27T12:28:06.000+01:00
diff --git a/src/components/MapHistory/MapHistory.jsx b/src/components/MapHistory/MapHistory.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import moment from 'moment';
@@ -28,7 +28,9 @@ class MapHistory extends React.Component {
   }
 
   componentDidMount() {
-    if (this.props.locations.length === 0) return;
+    if (this.props.locations.length === 0) {
+      return;
+    }
     const bounds = this.getBounds();
     const mapSettings = {
       center: bounds.getCenter(),
@@ -164,7 +166,9 @@ class MapHistory extends React.Component {
 
     // clear exsiting markers
     if (this.markers) {
-      _.each(this.markers, (m) => { m.setMap(null); });
+      _.each(this.markers, (m) => {
+        m.setMap(null);
+      });
     }
 
     // create markers based on filtered locations
@@ -206,7 +210,11 @@ class MapHistory extends React.Component {
       this.props.locations.length === 0 ?
       (<div styleName="no-history">No location history</div>) :
       (<div styleName="history-wrap">
-        <div styleName="map-history" ref={(node) => { this.node = node; }} />
+        <div
+          styleName="map-history" ref={(node) => {
+            this.node = node;
+          }}
+        />
         <div styleName="history-toolbar">
           <div styleName="slider">
             <Slider
diff --git a/src/routes/DronesMap/components/DronesMapView.jsx b/src/routes/DronesMap/components/DronesMapView.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MarkerClusterer from 'node-js-marker-clusterer';
 import MapHistory from 'components/MapHistory';
@@ -20,7 +20,7 @@ const getIcon = (status) => {
 
 const HIDE_INFO_DELAY = 500;
 
-const getLatLng = ({ currentLocation }) => ({ lng: currentLocation[0], lat: currentLocation[1] });
+const getLatLng = ({currentLocation}) => ({lng: currentLocation[0], lat: currentLocation[1]});
 
 const getMarkerPoint = (marker, overlay) => (overlay.getProjection().fromLatLngToContainerPixel(marker.getPosition()));
 
@@ -35,12 +35,14 @@ class DronesMapView extends React.Component {
   }
 
   componentDidMount() {
-    const { drones, mapSettings, showInfo, hideInfo } = this.props;
+    const {drones, mapSettings, showInfo, hideInfo} = this.props;
     this.map = new google.maps.Map(this.node, mapSettings);
     const overlay = new google.maps.OverlayView();
     overlay.draw = () => {};
     overlay.setMap(this.map);
-    const hideInfoWindow = () => { this.props.infoDrone && hideInfo(); };
+    const hideInfoWindow = () => {
+      this.props.infoDrone && hideInfo();
+    };
     this.map.addListener('zoom_changed', hideInfoWindow);
     this.map.addListener('dragstart', hideInfoWindow);
     const id2Marker = {};
@@ -73,11 +75,11 @@ class DronesMapView extends React.Component {
       return marker;
     });
     this.id2Marker = id2Marker;
-    this.markerCluster = new MarkerClusterer(this.map, markers, { imagePath: '/img/m' });
+    this.markerCluster = new MarkerClusterer(this.map, markers, {imagePath: '/img/m'});
   }
 
   componentWillReceiveProps(nextProps) {
-    const { drones } = nextProps;
+    const {drones} = nextProps;
     drones.forEach((drone) => {
       const marker = this.id2Marker[drone.id];
       if (marker) {
@@ -114,7 +116,7 @@ class DronesMapView extends React.Component {
       <div styleName="map-view" ref={(node) => (this.node = node)} />
       {
                 this.props.infoDrone ?
-                (<div styleName="map-popover" onMouseEnter={this.cancelHideInfo} onMouseLeave={this.props.hideInfo} style={{ top: this.props.infoPos.y - 30, left: this.props.infoPos.x }}>
+                (<div styleName="map-popover" onMouseEnter={this.cancelHideInfo} onMouseLeave={this.props.hideInfo} style={{top: this.props.infoPos.y - 30, left: this.props.infoPos.x}}>
                   <Info drone={this.props.infoDrone} showHistory={this.showHistory} />
                 </div>) : null
               }
diff --git a/src/routes/DronesMap/components/Info/Info.jsx b/src/routes/DronesMap/components/Info/Info.jsx
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './Info.scss';
 
-export const Info = ({ drone: { name, serialNumber }, showHistory }) => (
+export const Info = ({drone: {name, serialNumber}, showHistory}) => (
   <div styleName="info">
     <div styleName="group">
       <div styleName="label">Drone Name</div>
diff --git a/src/routes/DronesMap/modules/DronesMap.js b/src/routes/DronesMap/modules/DronesMap.js
@@ -65,23 +65,23 @@ export const disconnect = () => () => {
 
 // get location history of drone
 export const getLocations = (id) => async(dispatch) => {
-  const { body: { items: locations } } = await APIService.getLocations(id, LOCATION_LIMIT);
-  dispatch({ type: LOCATIONS_LOADED, payload: { drone: id, locations: _.reverse(locations) } });
+  const {body: {items: locations}} = await APIService.getLocations(id, LOCATION_LIMIT);
+  dispatch({type: LOCATIONS_LOADED, payload: {drone: id, locations: _.reverse(locations)}});
 };
 
 // clear location history of drone
 export const hideHistory = () => (dispatch) => {
-  dispatch({ type: HIDE_HISTORY });
+  dispatch({type: HIDE_HISTORY});
 };
 
 // show info window of drone
 export const showInfo = (drone, pos) => (dispatch) => {
-  dispatch({ type: SHOW_DRONE_INFO, payload: { drone, pos } });
+  dispatch({type: SHOW_DRONE_INFO, payload: {drone, pos}});
 };
 
 // hide info window of drone
 export const hideInfo = () => (dispatch) => {
-  dispatch({ type: HIDE_DRONE_INFO });
+  dispatch({type: HIDE_DRONE_INFO});
 };
 
 export const actions = {
@@ -105,8 +105,8 @@ export default handleActions({
       return updated || drone;
     }),
   }),
-  [LOCATIONS_LOADED]: (state, { payload: { drone, locations } }) => ({ ...state, historyDrone: drone, locations }),
-  [SHOW_DRONE_INFO]: (state, { payload: { drone, pos } }) => ({
+  [LOCATIONS_LOADED]: (state, {payload: {drone, locations}}) => ({...state, historyDrone: drone, locations}),
+  [SHOW_DRONE_INFO]: (state, {payload: {drone, pos}}) => ({
     ...state,
     infoDrone: drone,
     infoPos: pos,
diff --git a/src/services/APIService.js b/src/services/APIService.js
@@ -586,6 +586,6 @@ export default class APIService {
    * @returns {{total: Number, items: Array}} the result
    */
   static getLocations(id, limit) {
-    return request.get(`${config.api.basePath}/api/v1/droneposition/${id}`).query({ limit }).end();
+    return request.get(`${config.api.basePath}/api/v1/droneposition/${id}`).query({limit}).end();
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -162,7 +162,7 @@ module.exports = {
         loaders: ['style', 'css?modules'],
         include: /flexboxgrid/,
       }),
-	fixStyleLoader({
+      fixStyleLoader({
         test: /\.css$/,
         loaders: ['style', 'css'],
         include: /rc-slider/,

Original file line number	Diff line number	Diff line change
`@@ -586,6 +586,6 @@ export default class APIService {`
`586`	`586`	`* @returns {{total: Number, items: Array}} the result`
`587`	`587`	`*/`
`588`	`588`	`static getLocations(id, limit) {`
`589`		- return request.get(`${config.api.basePath}/api/v1/droneposition/${id}`).query({ limit }).end();
	`589`	+ return request.get(`${config.api.basePath}/api/v1/droneposition/${id}`).query({limit}).end();
`590`	`590`	`}`
`591`	`591`	`}`