Interactive interface for browsing global, full-resolution satellite imagery
fix story crashes (#4409)
Ryan Weiler69d77eaa0a5b
diff --git a/web/js/containers/tour.js b/web/js/containers/tour.jsindex 34b0414e0..3c5e15b2b 100644--- a/web/js/containers/tour.js+++ b/web/js/containers/tour.js@@ -35,7 +35,7 @@ import {startTour as startTourAction,} from '../modules/tour/actions';import { resetProductPickerState as resetProductPickerStateAction } from '../modules/product-picker/actions';-+import { changeTab as changeTabAction } from '../modules/sidebar/actions';import ErrorBoundary from './error-boundary';import history from '../main';import util from '../util/util';@@ -226,9 +226,12 @@ class Tour extends React.Component {currentStoryId,} = this.state;const {- config, renderedPalettes, processStepLink, isKioskModeActive,+ config, renderedPalettes, processStepLink, isKioskModeActive, activeTab, changeTab,} = this.props;const kioskParam = this.getKioskParam(isKioskModeActive);++ if (activeTab === 'events') changeTab('layers');+if (currentStep + 1 <= totalSteps) {const newStep = currentStep + 1;this.fetchMetadata(currentStory, currentStep);@@ -257,12 +260,15 @@ class Tour extends React.Component {decreaseStep(e) {const {- config, renderedPalettes, processStepLink, isKioskModeActive,+ config, renderedPalettes, processStepLink, isKioskModeActive, activeTab, changeTab,} = this.props;const {currentStep, currentStory, currentStoryId,} = this.state;const kioskParam = this.getKioskParam(isKioskModeActive);++ if (activeTab === 'events') changeTab('layers');+if (currentStep - 1 >= 1) {const newStep = currentStep - 1;this.fetchMetadata(currentStory, newStep - 1);@@ -518,11 +524,14 @@ const mapDispatchToProps = (dispatch) => ({resetProductPicker: () => {dispatch(resetProductPickerStateAction());},+ changeTab: (str) => {+ dispatch(changeTabAction(str));+ },});const mapStateToProps = (state) => {const {- screenSize, config, tour, palettes, models, compare, map,+ screenSize, config, tour, palettes, models, compare, map, sidebar,} = state;const { screenWidth, screenHeight } = screenSize;const { isKioskModeActive } = state.ui;@@ -539,6 +548,7 @@ const mapStateToProps = (state) => {screenWidth,screenHeight,renderedPalettes: palettes.rendered,+ activeTab: sidebar.activeTab,};};@@ -557,6 +567,8 @@ export default connect()(Tour);Tour.propTypes = {+ activeTab: PropTypes.string,+ changeTab: PropTypes.func,config: PropTypes.object.isRequired,map: PropTypes.object,selectTour: PropTypes.func.isRequired,