Merge branch 'dev'

appbaseio · Sep 21, 2017 · 72ba193 · 72ba193
2 parents 1f011b3 + 7750f9e
commit 72ba193
Show file tree

Hide file tree

Showing 35 changed files with 423 additions and 311 deletions.
diff --git a/app/sensors/GeoDistanceDropdown.js b/app/sensors/GeoDistanceDropdown.js
@@ -47,6 +47,7 @@ export default class GeoDistanceDropdown extends Component {
 
 	// Set query information
 	componentWillMount() {
+		this.previousQuery = null;	// initial value for onQueryChange
 		this.googleMaps = window.google.maps;
 		this.unit = this.props.unit;
 		this.getUserLocation();
@@ -163,12 +164,20 @@ export default class GeoDistanceDropdown extends Component {
 
 	// set the query type and input data
 	setQueryInfo() {
+		const getQuery = (value) => {
+			const currentQuery = this.props.customQuery ? this.props.customQuery(value) : this.customQuery(value);
+			if (this.props.onQueryChange && JSON.stringify(this.previousQuery) !== JSON.stringify(currentQuery)) {
+				this.props.onQueryChange(this.previousQuery, currentQuery);
+			}
+			this.previousQuery = currentQuery;
+			return currentQuery;
+		};
 		const obj = {
 			key: this.props.componentId,
 			value: {
 				queryType: this.type,
 				dataField: this.props.dataField,
-				customQuery: this.props.customQuery ? this.props.customQuery : this.customQuery,
+				customQuery: getQuery,
 				reactiveId: this.context.reactiveId,
 				showFilter: this.props.showFilter,
 				filterLabel: this.props.filterLabel ? this.props.filterLabel : this.props.componentId,
@@ -479,7 +488,8 @@ GeoDistanceDropdown.propTypes = {
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
 	filterLabel: React.PropTypes.string,
-	className: React.PropTypes.string
+	className: React.PropTypes.string,
+	onQueryChange: React.PropTypes.func
 };
 
 // Default props value
@@ -518,5 +528,6 @@ GeoDistanceDropdown.types = {
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
 	filterLabel: TYPES.STRING,
-	className: TYPES.STRING
+	className: TYPES.STRING,
+	onQueryChange: TYPES.FUNCTION
 };
diff --git a/app/sensors/GeoDistanceSlider.js b/app/sensors/GeoDistanceSlider.js
@@ -52,6 +52,7 @@ export default class GeoDistanceSlider extends Component {
 
 	// Set query information
 	componentWillMount() {
+		this.previousQuery = null;	// initial value for onQueryChange
 		this.googleMaps = window.google.maps;
 		this.getUserLocation();
 		this.setQueryInfo();
@@ -148,12 +149,20 @@ export default class GeoDistanceSlider extends Component {
 
 	// set the query type and input data
 	setQueryInfo() {
+		const getQuery = (value) => {
+			const currentQuery = this.props.customQuery ? this.props.customQuery(value) : this.customQuery(value);
+			if (this.props.onQueryChange && JSON.stringify(this.previousQuery) !== JSON.stringify(currentQuery)) {
+				this.props.onQueryChange(this.previousQuery, currentQuery);
+			}
+			this.previousQuery = currentQuery;
+			return currentQuery;
+		};
 		const obj = {
 			key: this.props.componentId,
 			value: {
 				queryType: this.type,
 				dataField: this.props.dataField,
-				customQuery: this.props.customQuery ? this.props.customQuery : this.customQuery,
+				customQuery: getQuery,
 				reactiveId: this.context.reactiveId,
 				showFilter: this.props.showFilter,
 				filterLabel: this.props.filterLabel ? this.props.filterLabel : this.props.componentId,
@@ -476,7 +485,8 @@ GeoDistanceSlider.propTypes = {
 	URLParams: React.PropTypes.bool,
 	showFilter: React.PropTypes.bool,
 	filterLabel: React.PropTypes.string,
-	className: React.PropTypes.string
+	className: React.PropTypes.string,
+	onQueryChange: React.PropTypes.func
 };
 
 // Default props value
@@ -524,5 +534,6 @@ GeoDistanceSlider.types = {
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
 	filterLabel: TYPES.STRING,
-	className: TYPES.STRING
+	className: TYPES.STRING,
+	onQueryChange: TYPES.FUNCTION
 };
diff --git a/app/sensors/PlacesSearch.js b/app/sensors/PlacesSearch.js
@@ -37,6 +37,7 @@ export default class PlacesSearch extends Component {
 	}
 
 	componentWillMount() {
+		this.previousQuery = null;	// initial value for onQueryChange
 		this.googleMaps = window.google.maps;
 		this.setQueryInfo();
 		this.getUserLocation(this.setDefaultLocation);
@@ -122,12 +123,20 @@ export default class PlacesSearch extends Component {
 
 	// set the query type and input data
 	setQueryInfo() {
+		const getQuery = (value) => {
+			const currentQuery = this.props.customQuery ? this.props.customQuery(value) : this.customQuery(value);
+			if (this.props.onQueryChange && JSON.stringify(this.previousQuery) !== JSON.stringify(currentQuery)) {
+				this.props.onQueryChange(this.previousQuery, currentQuery);
+			}
+			this.previousQuery = currentQuery;
+			return currentQuery;
+		};
 		const obj = {
 			key: this.props.componentId,
 			value: {
 				queryType: this.type,
 				inputData: this.props.dataField,
-				customQuery: this.props.customQuery ? this.props.customQuery : this.customQuery,
+				customQuery: getQuery,
 				reactiveId: this.context.reactiveId,
 				showFilter: this.props.showFilter,
 				filterLabel: this.props.filterLabel ? this.props.filterLabel : this.props.componentId,
@@ -361,7 +370,8 @@ PlacesSearch.propTypes = {
 	showFilter: React.PropTypes.bool,
 	filterLabel: React.PropTypes.string,
 	unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"]),
-	className: React.PropTypes.string
+	className: React.PropTypes.string,
+	onQueryChange: React.PropTypes.func
 };
 // Default props value
 PlacesSearch.defaultProps = {
@@ -392,5 +402,6 @@ PlacesSearch.types = {
 	URLParams: TYPES.BOOLEAN,
 	showFilter: TYPES.BOOLEAN,
 	filterLabel: TYPES.STRING,
-	className: TYPES.STRING
+	className: TYPES.STRING,
+	onQueryChange: TYPES.FUNCTION
 };
diff --git a/dist/CustomQuery.bundle.js b/dist/CustomQuery.bundle.js
diff --git a/dist/GeoDistanceDropdown.bundle.js b/dist/GeoDistanceDropdown.bundle.js
diff --git a/dist/GeoDistanceSlider.bundle.js b/dist/GeoDistanceSlider.bundle.js
diff --git a/dist/PlacesSearch.bundle.js b/dist/PlacesSearch.bundle.js
diff --git a/dist/css/style.min.css b/dist/css/style.min.css
diff --git a/dist/direction.bundle.js b/dist/direction.bundle.js
diff --git a/dist/earthquake.bundle.js b/dist/earthquake.bundle.js
diff --git a/dist/events.bundle.js b/dist/events.bundle.js
diff --git a/dist/heatmap.bundle.js b/dist/heatmap.bundle.js
diff --git a/dist/list.bundle.js b/dist/list.bundle.js
diff --git a/dist/meetupblast.bundle.js b/dist/meetupblast.bundle.js
diff --git a/dist/nearby.bundle.js b/dist/nearby.bundle.js
diff --git a/dist/now.bundle.js b/dist/now.bundle.js
diff --git a/dist/transport.bundle.js b/dist/transport.bundle.js
diff --git a/dist/weather.bundle.js b/dist/weather.bundle.js
diff --git a/examples/GeoDistanceDropdown/main.js b/examples/GeoDistanceDropdown/main.js
@@ -60,6 +60,10 @@ class Main extends Component {
 							}
 							placeholder="Search Location"
 							beforeValueChange={() => new Promise((resolve, reject) => resolve())}
+							onQueryChange={(prevQuery, nextQuery) => {
+								console.log("prevQuery", prevQuery);
+								console.log("nextQuery", nextQuery);
+							}}
 						/>
 					</div>
 					<div className="col s6 col-xs-6">

diff --git a/examples/GeoDistanceSlider/main.js b/examples/GeoDistanceSlider/main.js
@@ -68,6 +68,10 @@ class Main extends Component {
 									resolve();
 								})
 							}}
+							onQueryChange={(prevQuery, nextQuery) => {
+								console.log("prevQuery", prevQuery);
+								console.log("nextQuery", nextQuery);
+							}}
 						/>
 					</div>
 					<div className="col s6 col-xs-6">

diff --git a/examples/PlacesSearch/main.js b/examples/PlacesSearch/main.js
@@ -55,7 +55,6 @@ class Main extends Component {
 
 	onIdle(res) {
 		this.mapRef = res.props.map;
-		this.executeQuery();
 	}
 
 	render() {
@@ -66,23 +65,19 @@ class Main extends Component {
 					credentials="y4pVxY2Ok:c92481e2-c07f-4473-8326-082919282c18"
 					type="meetupdata1"
 				>
-					<SelectedFilters componentId="SelectedFilters" />
 					<div className="col s12 m6 col-xs-12 col-sm-6">
 						<div className="row h-100">
 							<div className="col s12 col-xs-12">
+								<SelectedFilters componentId={["OriginSensor", "DestinationSensor"]} />
 								<PlacesSearch
 									dataField={this.props.mapping.venue}
 									componentId="OriginSensor"
 									placeholder="Search Venue"
 									title="Origin"
-									// onValueChange={this.originQuery}
-									URLParams={true}
-									onValueChange={(val) => {console.log(val)}}
-									beforeValueChange={(val) => {
-										return new Promise(resolve => {
-											console.log(val);
-											resolve();
-										})
+									onValueChange={this.originQuery}
+									onQueryChange={(prevQuery, nextQuery) => {
+										console.log("prevQuery", prevQuery);
+										console.log("nextQuery", nextQuery);
 									}}
 								/>
 							</div>
@@ -94,7 +89,6 @@ class Main extends Component {
 									autoLocation={false}
 									title="Destination"
 									onValueChange={this.destinationQuery}
-									URLParams={true}
 								/>
 							</div>
 						</div>