Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2118: Handle EONET API failures (#3793)

Jason Kent44310e79190a
diff --git a/web/js/containers/sidebar/events.js b/web/js/containers/sidebar/events.js
index 09c815bb0..a2f55f053 100644
--- a/web/js/containers/sidebar/events.js
+++ b/web/js/containers/sidebar/events.js
@@ -88,46 +88,44 @@ function Events(props) {
);
const renderEventList = () => (
- <Scrollbars
- className="event-scroll-list"
- style={{ maxHeight: `${scrollbarMaxHeight}` }}
- >
- <div id="wv-events">
- {(isLoading || hasRequestError) && (
- <div className="events-loading-text">
- {hasRequestError && (<FontAwesomeIcon icon="exclamation-triangle" fixedWidth />)}
- {errorOrLoadingText}
- </div>
- )}
-
- {eventsData && eventsData.length ? (
- <div className="wv-eventslist sidebar-panel">
- <ul id="wv-eventscontent" className="content map-item-list">
- {sources && eventsData.map((event) => (
- <Event
- showAlert={showAlert}
- key={event.id}
- event={event}
- selectEvent={(id, date) => selectEvent(id, date, isMobile)}
- deselectEvent={deselectEvent}
- isSelected={selected.id === event.id}
- selectedDate={selectedDate}
- sources={sources}
- />
- ))}
- </ul>
- </div>
- ) : !isLoading && (
- <h3 className="no-events"> No events meet current criteria</h3>
- )}
+ eventsData && eventsData.length ? (
+ <div className="wv-eventslist sidebar-panel">
+ <ul id="wv-eventscontent" className="content map-item-list">
+ {sources && eventsData.map((event) => (
+ <Event
+ showAlert={showAlert}
+ key={event.id}
+ event={event}
+ selectEvent={(id, date) => selectEvent(id, date, isMobile)}
+ deselectEvent={deselectEvent}
+ isSelected={selected.id === event.id}
+ selectedDate={selectedDate}
+ sources={sources}
+ />
+ ))}
+ </ul>
</div>
- </Scrollbars>
+ ) : !isLoading && (
+ <h3 className="no-events"> No events meet current criteria</h3>
+ )
);
return (
<div className="event-container">
{renderFilterControls()}
- {renderEventList()}
+ <Scrollbars
+ className="event-scroll-list"
+ style={{ maxHeight: `${scrollbarMaxHeight}` }}
+ >
+ <div id="wv-events">
+ {isLoading || hasRequestError ? (
+ <div className="events-loading-text">
+ {hasRequestError && (<FontAwesomeIcon icon="exclamation-triangle" fixedWidth />)}
+ {errorOrLoadingText}
+ </div>
+ ) : renderEventList()}
+ </div>
+ </Scrollbars>
</div>
);
}
diff --git a/web/js/modules/natural-events/selectors.js b/web/js/modules/natural-events/selectors.js
index 650fa0b95..b8072c211 100644
--- a/web/js/modules/natural-events/selectors.js
+++ b/web/js/modules/natural-events/selectors.js
@@ -21,7 +21,7 @@ const getProjection = ({ proj }) => proj.selected;
export const getFilteredEvents = createSelector(
[getActiveCategories, getEvents, getProjection],
(activeCategories, events, proj) => {
- if (!events) return;
+ if (!events) return [];
return events
.reduce((filteredEvents, event) => {
const { geometry } = event;