Merge branch 'dev'

Author: metagrover

.eslintrc

@@ -26,6 +26,7 @@
 		"comma-dangle": ["error", "never"],
 		"object-curly-spacing": [2, "always"],
 		// "linebreak-style": ["error", "windows"],
+		"react/prop-types": 0,
 		"react/require-default-props": 0,
 		"react/require-extension": 0,
 		"react/jsx-uses-react": 2,

app/actuators/ReactiveMap.js

@@ -9,14 +9,13 @@ import {
 	AppbaseSensorHelper as helper,
 	PoweredBy
 } from "@appbaseio/reactivebase";
-import { SearchAsMove } from "../addons/SearchAsMove";
+import _ from "lodash";
+import SearchAsMove from "../addons/SearchAsMove";
 import { MapStyles, mapStylesCollection } from "../addons/MapStyles";
 import * as ReactiveMapHelper from "../helper/ReactiveMapHelper";
 
-import _ from "lodash";
-
 const MapComponent = (withGoogleMap((props) => {
-	const { children: children, onMapMounted: onMapMounted, ...allProps } = props;
+	const { children, onMapMounted, ...allProps } = props;
 
 	return (
 		<GoogleMap ref={onMapMounted} {...allProps}>
@@ -92,7 +91,7 @@ export default class ReactiveMap extends Component {
 		this.setReact(this.props);
 		this.createChannel(updateExecute);
 		const currentMapStyle = this.getMapStyle(this.props.defaultMapStyle);
-		this.initialMapBoundQuery = this.props.defaultCenter ? true : false;
+		this.initialMapBoundQuery = !!this.props.defaultCenter;
 		this.applyGeoQuery = this.props.applyGeoQuery ? this.props.applyGeoQuery : this.props.setSearchAsMove;
 		this.setState({
 			currentMapStyle
@@ -180,7 +179,7 @@ export default class ReactiveMap extends Component {
 				delete modifiedData.data;
 				modifiedData = helper.prepareResultData(modifiedData, res.data);
 				if (this.props.onAllData) {
-					if(modifiedData.res) {
+					if (modifiedData.res) {
 						modifiedData.res.mapRef = this.mapRef;
 					}
 					const generatedData = this.props.onAllData(modifiedData.res, modifiedData.err);
@@ -252,7 +251,7 @@ export default class ReactiveMap extends Component {
 		this.setState({
 			rerender: true
 		}, () => {
-			if(this.props.popoverTTL) {
+			if (this.props.popoverTTL) {
 				this.watchPopoverTTL(marker);
 			}
 		});
@@ -268,18 +267,18 @@ export default class ReactiveMap extends Component {
 	// watch and close popover on timeout
 	watchPopoverTTL(marker) {
 		this.popoverTTLStore = this.popoverTTLStore ? this.popoverTTLStore : {};
-		if(this.popoverTTLStore[marker._type+marker._id]) {
-			this.clearTTL(marker._type+marker._id);
+		if (this.popoverTTLStore[marker._type + marker._id]) {
+			this.clearTTL(marker._type + marker._id);
 		} else {
-			this.popoverTTLStore[marker._type+marker._id] = setTimeout(() => {
+			this.popoverTTLStore[marker._type + marker._id] = setTimeout(() => {
 				this.handleMarkerClose(marker);
-				this.clearTTL(marker._type+marker._id);
-			}, this.props.popoverTTL*1000);
+				this.clearTTL(marker._type + marker._id);
+			}, this.props.popoverTTL * 1000);
 		}
 	}
 
 	clearTTL(id) {
-		clearTimeout(this.popoverTTLStore[id])
+		clearTimeout(this.popoverTTLStore[id]);
 		delete this.popoverTTLStore[id];
 	}
 
@@ -325,7 +324,7 @@ export default class ReactiveMap extends Component {
 				const flag = this.initialMapBoundQuery ? true : (this.applyGeoQuery ? this.applyGeoQuery : this.searchAsMove);
 				this.setValue(boundingBoxCoordinates, flag);
 			}
-			if (!_.isEqual({mapBounds: this.state.mapBounds}, stateObj)) {
+			if (!_.isEqual({ mapBounds: this.state.mapBounds }, stateObj)) {
 				this.setState(stateObj);
 			}
 		}
@@ -454,9 +453,7 @@ export default class ReactiveMap extends Component {
 			convertedGeo: []
 		};
 		if (markersData && markersData.length) {
-			markersData = markersData.filter((hit) => {
-				return ReactiveMapHelper.identifyGeoData(hit._source[self.props.dataField]);
-			});
+			markersData = markersData.filter(hit => ReactiveMapHelper.identifyGeoData(hit._source[self.props.dataField]));
 			response.markerComponent = markersData.map((hit, index) => {
 				const field = ReactiveMapHelper.identifyGeoData(hit._source[self.props.dataField]);
 				response.convertedGeo.push(field);
@@ -475,7 +472,7 @@ export default class ReactiveMap extends Component {
 					popoverEvent = {};
 					popoverEvent.onClick = this.handleMarkerClick.bind(this, hit);
 				}
-				const defaultFn = function() {};
+				const defaultFn = function () {};
 				const events = {
 					onClick: this.props.markerOnClick ? this.props.markerOnClick : defaultFn,
 					onDblClick: this.props.markerOnDblClick ? this.props.markerOnDblClick : defaultFn,
@@ -598,7 +595,7 @@ export default class ReactiveMap extends Component {
 				{showMapStyles}
 				<MapComponent
 					onMapMounted={(ref) => {
-						this.mapRef = ref
+						this.mapRef = ref;
 					}}
 					containerElement={<div
 						className="rbc-container"
@@ -607,7 +604,7 @@ export default class ReactiveMap extends Component {
 					mapElement={<div style={{ height: "100%" }} />}
 					{...centerComponent}
 					{...ReactiveMapHelper.normalizeProps(this.props)}
-					options = {{
+					options={{
 						styles: this.state.currentMapStyle
 					}}
 					defaultCenter={ReactiveMapHelper.normalizeCenter(this.state.defaultCenter)}

app/addons/ItemCheckboxList.js

@@ -1,24 +1,22 @@
-import { default as React, Component } from "react";
+import React, { Component } from "react";
 
-export class ItemCheckboxList extends Component {
+export default class ItemCheckboxList extends Component {
 	constructor(props) {
 		super(props);
+
 		this.state = {
 			selectedItems: []
 		};
+
 		this.handleListClick = this.handleListClick.bind(this);
-		this.handleTagClick = this.handleTagClick.bind(this);
 		this.handleListClickAll = this.handleListClickAll.bind(this);
-	}
 
-	componentDidMount() {
-		if (this.props.defaultSelected) {
-			this.setState({
-				selectedItems: this.props.defaultSelected
-			}, () => {
-				this.updateAction.bind(this);
-				this.props.onSelect(this.state.selectedItems);
-			});
+		if (props.defaultSelected) {
+			this.state = {
+				selectedItems: props.defaultSelected
+			};
+			this.updateAction();
+			this.props.onSelect(this.state.selectedItems);
 		}
 	}
 
@@ -80,39 +78,11 @@ export class ItemCheckboxList extends Component {
 				this.props.onSelect(this.state.selectedItems);
 			}
 		}
-		// If the checkbox selectedStatus is false
-		// Call handleTagClick to remove it from the selected Items
-		else {
-			this.handleTagClick(value);
-		}
-	}
-
-	// Handler function when a cancel button on tag is clicked to remove it
-	handleTagClick(value) {
-		// Pass the older value props to parent components to remove older list in terms query
-		const isExecutable = this.state.selectedItems.length === 1;
-		this.props.onRemove(this.state.selectedItems, isExecutable);
-		const keyRef = value.toString().replace(/ /g, "_");
-		const ref = `ref${keyRef}`;
-		const checkboxElement = this.refs[ref];
-		checkboxElement.state.status = false;
-		const updated = this.state.selectedItems;
-		const index = updated.indexOf(value);
-		updated.splice(index, 1);
-		this.setState({
-			selectedItems: updated
-		}, this.updateAction.bind(this));
-		// Pass the removed value props to parent components to add updated list in terms query
-		if (this.state.selectedItems.length) {
-			this.props.onSelect(this.state.selectedItems);
-		}
 	}
 
 	render() {
 		const items = this.props.items;
-		const selectedItems = this.state.selectedItems;
 		const ListItemsArray = [];
-		const TagItemsArray = [];
 		// Build the array for the checkboxList items
 		items.forEach((item, index) => {
 			try {
@@ -140,29 +110,12 @@ export class ItemCheckboxList extends Component {
 					countField={false}
 					handleClick={this.handleListClickAll}
 					status={this.props.defaultSelectall || false}
-					ref={"refselectall"}
 				/>
 			);
 		}
-		// Build the array of Tags for selected items
-		if (this.props.showTags && selectedItems) {
-			selectedItems.forEach((item) => {
-				TagItemsArray.push(<Tag
-					key={item}
-					value={item}
-					onClick={this.handleTagClick}
-				/>);
-			});
-		}
+
 		return (
 			<div className="rbc-list-container col s12 col-xs-12">
-				{
-					TagItemsArray.length ?
-						<div className="row">
-							{TagItemsArray}
-						</div> :
-					null
-				}
 				<div className="row">
 					{ListItemsArray}
 				</div>
@@ -171,26 +124,17 @@ export class ItemCheckboxList extends Component {
 	}
 }
 
-ItemCheckboxList.defaultProps = {
-	showTags: true
-};
-
 class ListItem extends Component {
 	constructor(props) {
 		super(props);
+
 		this.state = {
-			initialStatus: this.props.status,
-			status: this.props.status || false
+			initialStatus: props.status,
+			status: props.status || false
 		};
-	}
 
-	componentDidUpdate() {
-		if (this.props.status !== this.state.initialStatus) {
-			this.setState({
-				status: this.props.status,
-				initialStatus: this.props.status
-			});
-		}
+		this.handleClick = this.handleClick.bind(this);
+		this.handleCheckboxChange = this.handleCheckboxChange.bind(this);
 	}
 
 	handleClick() {
@@ -213,29 +157,14 @@ class ListItem extends Component {
 			count = <span> ({this.props.doc_count}) </span>;
 		}
 		return (
-			<div onClick={this.handleClick.bind(this)} className="rbc-list-item rbc-checkbox-item col s12 col-xs-12">
+			<div onClick={this.handleClick} className="rbc-list-item rbc-checkbox-item col s12 col-xs-12">
 				<input
 					type="checkbox"
 					checked={this.state.status}
-					onChange={this.handleCheckboxChange.bind(this)}
+					onChange={this.handleCheckboxChange}
 				/>
 				<label> {this.props.value} {count}</label>
 			</div>
 		);
 	}
 }
-
-class Tag extends Component {
-	constructor(props) {
-		super(props);
-	}
-
-	render() {
-		return (
-			<span onClick={this.props.onClick.bind(null, this.props.value)} className="tag-item col">
-				<a href="javascript:void(0)" className="close"> x </a>
-				<span>{this.props.value}</span>
-			</span>
-		);
-	}
-}

app/addons/MapStyles.js

@@ -1,8 +1,4 @@
-import { default as React, Component } from "react";
-import { render } from "react-dom";
-import {
-	AppbaseSensorHelper
-} from "@appbaseio/reactivebase";
+import React, { Component } from "react";
 
 export const mapStylesCollection = [{
 	key: "Standard",
@@ -28,7 +24,7 @@ export const mapStylesCollection = [{
 }];
 
 export class MapStyles extends Component {
-	constructor(props, context) {
+	constructor(props) {
 		super(props);
 		this.state = {
 			items: []
@@ -60,13 +56,13 @@ export class MapStyles extends Component {
 		});
 	}
 
-	themeChanged(isExecute = false) {
+	themeChanged() {
 		const style = mapStylesCollection[this.state.selectedValue].value;
 		this.props.mapStyleChange(style);
 	}
 
 	render() {
-		const options = this.state.items.map((item, index) => <option value={index} key={index}>{item.key}</option>);
+		const options = this.state.items.map((item, index) => <option value={index} key={item.key}>{item.key}</option>);
 		return (
 			<div className="input-field col rbc-mapstyles pull-right right">
 				<select className="browser-default form-control" onChange={this.handleSelect} value={this.state.selectedValue} name="mapStyles" id="mapStyles">
@@ -77,9 +73,6 @@ export class MapStyles extends Component {
 	}
 }
 
-MapStyles.propTypes = {
-};
-
 // Default props value
 MapStyles.defaultProps = {
 	fieldName: "MapStyles"

app/addons/SearchAsMove.js

@@ -1,25 +1,23 @@
-import { default as React, Component } from "react";
-import { ItemCheckboxList } from "./ItemCheckboxList.js";
+import React, { Component } from "react";
 import { AppbaseSensorHelper } from "@appbaseio/reactivebase";
+import ItemCheckboxList from "./ItemCheckboxList";
 
-export class SearchAsMove extends Component {
-	constructor(props, context) {
+export default class SearchAsMove extends Component {
+	constructor(props) {
 		super(props);
+
 		this.state = {
-			items: []
+			items: [{
+				key: "Search as I move the map",
+				value: true,
+				status: props.searchAsMoveDefault
+			}]
 		};
+
 		this.handleSelect = this.handleSelect.bind(this);
-		this.handleRemove = this.handleRemove.bind(this);
 	}
 
 	componentDidMount() {
-		this.setState({
-			items: [{
-				key: "Search as I move the map",
-				value: true,
-				status: this.props.searchAsMoveDefault
-			}]
-		});
 		if (this.props.searchAsMoveDefault && this.props.searchAsMoveDefault === true) {
 			this.handleSelect(this.props.searchAsMoveDefault);
 		}
@@ -31,17 +29,11 @@ export class SearchAsMove extends Component {
 		this.props.searchAsMoveChange(flag);
 	}
 
-	// Handler function when a value is deselected or removed
-	handleRemove(value) {
-	}
-
 	render() {
-		let listComponent;
-		listComponent = (<ItemCheckboxList
+		const listComponent = (<ItemCheckboxList
 			showTags={false}
 			items={this.state.items}
 			onSelect={this.handleSelect}
-			onRemove={this.handleRemove}
 			showCount={this.props.showCount}
 		/>);