Merge branch 'dev'

appbaseio · Aug 3, 2017 · f492f5b · f492f5b
2 parents 04da6d7 + f56d2c4
commit f492f5b
Show file tree

Hide file tree

Showing 29 changed files with 458 additions and 202 deletions.
diff --git a/app/sensors/GeoDistanceDropdown.js b/app/sensors/GeoDistanceDropdown.js
@@ -225,6 +225,16 @@ export default class GeoDistanceDropdown extends Component {
 					unit: this.unit
 				}
 			};
+
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.selectedSensor.setSortInfo(sortObj);
+				helper.URLParams.update(this.props.componentId, this.setURLValue(), this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			};
+
 			const sortObj = {
 				key: this.props.componentId,
 				value: {
@@ -235,19 +245,42 @@ export default class GeoDistanceDropdown extends Component {
 					}
 				}
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.selectedSensor.setSortInfo(sortObj);
-			helper.URLParams.update(this.props.componentId, this.setURLValue(), this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
 		} else if(this.state.selected === null && this.state.currentValue === "") {
-			const obj = {
-				key: this.props.componentId,
-				value: null
-			};
-			helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
+			const execNullQuery = () => {
+				const obj = {
+					key: this.props.componentId,
+					value: null
+				};
+				if(this.props.onValueChange) {
+					this.props.onValueChange(null);
+				}
+				helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			}
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execNullQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execNullQuery();
+			}
 		}
 	}
 
@@ -274,11 +307,26 @@ export default class GeoDistanceDropdown extends Component {
 				key: this.props.componentId,
 				value: null
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			};
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
 		}
 	}
 
@@ -401,6 +449,7 @@ GeoDistanceDropdown.propTypes = {
 			label: React.PropTypes.string.isRequired
 		})
 	),
+	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
 	componentStyle: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,

diff --git a/app/sensors/GeoDistanceSlider.js b/app/sensors/GeoDistanceSlider.js
@@ -205,6 +205,7 @@ export default class GeoDistanceSlider extends Component {
 					location: this.locString
 				}
 			};
+
 			const sortObj = {
 				key: this.props.componentId,
 				value: {
@@ -215,19 +216,51 @@ export default class GeoDistanceSlider extends Component {
 					}
 				}
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.selectedSensor.setSortInfo(sortObj);
+				helper.URLParams.update(this.props.componentId, this.setURLValue(), this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			};
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.selectedSensor.setSortInfo(sortObj);
-			helper.URLParams.update(this.props.componentId, this.setURLValue(), this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
 		} else if(this.state.currentDistance === null && this.state.currentValue === "") {
-			const obj = {
-				key: this.props.componentId,
-				value: null
-			};
-			helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
+			const execNullQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(null);
+				}
+				const obj = {
+					key: this.props.componentId,
+					value: null
+				};
+				helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			}
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execNullQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execNullQuery();
+			}
 		}
 	}
 
@@ -252,14 +285,30 @@ export default class GeoDistanceSlider extends Component {
 			this.setState({
 				currentValue: ""
 			});
+
 			const obj = {
 				key: this.props.componentId,
 				value: null
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.selectedSensor.set(obj, true);
+			};
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.selectedSensor.set(obj, true);
 		}
 	}
 
@@ -361,10 +410,10 @@ export default class GeoDistanceSlider extends Component {
 					<div className="rbc-rangeslider-container col s12 col-xs-12">
 						<Slider
 							tipFormatter={this.unitFormatter}
-							value={this.state.value}
+							defaultValue={this.state.value}
 							min={this.props.range.start}
 							max={this.props.range.end}
-							onChange={this.handleResults}
+							onAfterChange={this.handleResults}
 							marks={marks}
 							step={this.props.stepValue}
 						/>
@@ -399,6 +448,7 @@ GeoDistanceSlider.propTypes = {
 		end: React.PropTypes.string
 	}),
 	autoLocation: React.PropTypes.bool,
+	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
 	componentStyle: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,

diff --git a/app/sensors/PlacesSearch.js b/app/sensors/PlacesSearch.js
@@ -184,11 +184,26 @@ export default class PlacesSearch extends Component {
 					location: this.locString
 				}
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.URLParams.update(this.props.componentId, this.state.currentValue, this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			};
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.URLParams.update(this.props.componentId, this.state.currentValue, this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
 		}
 	}
 
@@ -208,11 +223,25 @@ export default class PlacesSearch extends Component {
 				key: this.props.componentId,
 				value: null
 			};
-			if(this.props.onValueChange) {
-				this.props.onValueChange(obj.value);
+			const execQuery = () => {
+				if(this.props.onValueChange) {
+					this.props.onValueChange(obj.value);
+				}
+				helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
+				helper.selectedSensor.set(obj, true);
+			};
+
+			if (this.props.beforeValueChange) {
+				this.props.beforeValueChange(obj.value)
+				.then(() => {
+					execQuery();
+				})
+				.catch((e) => {
+					console.warn(`${this.props.componentId} - beforeValueChange rejected the promise with`, e);
+				});
+			} else {
+				execQuery();
 			}
-			helper.URLParams.update(this.props.componentId, null, this.props.URLParams);
-			helper.selectedSensor.set(obj, true);
 		}
 	}
 
@@ -309,6 +338,7 @@ PlacesSearch.propTypes = {
 	customQuery: React.PropTypes.func,
 	placeholder: React.PropTypes.string,
 	autoLocation: React.PropTypes.bool,
+	beforeValueChange: React.PropTypes.func,
 	onValueChange: React.PropTypes.func,
 	componentStyle: React.PropTypes.object,
 	URLParams: React.PropTypes.bool,

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/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
@@ -59,6 +59,7 @@ class Main extends Component {
 								{ start: 501, end: 1000, label: "Above 500 miles" }]
 							}
 							placeholder="Search Location"
+							beforeValueChange={() => new Promise((resolve, reject) => resolve())}
 						/>
 					</div>
 					<div className="col s6 col-xs-6">

diff --git a/examples/GeoDistanceSlider/main.js b/examples/GeoDistanceSlider/main.js
@@ -61,6 +61,7 @@ class Main extends Component {
 							unit="mi"
 							placeholder="Search Location"
 							URLParams={true}
+							beforeValueChange={() => new Promise((resolve, reject) => resolve())}
 						/>
 					</div>
 					<div className="col s6 col-xs-6">