Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

clean up async effects

Jason Kent3dc53a5e08ca
diff --git a/web/js/components/layer/info/info.js b/web/js/components/layer/info/info.js
index d76b3f62b..48e43b2d4 100644
--- a/web/js/components/layer/info/info.js
+++ b/web/js/components/layer/info/info.js
@@ -20,16 +20,24 @@ export default function LayerInfo ({ layer, screenHeight }) {
const [metadata, setMetadata] = useState();
useEffect(() => {
- getSourceMetadata(layer);
+ let controller = new AbortController();
+ (async () => {
+ if (!layer.description) return;
+ try {
+ const options = { signal: controller.signal };
+ const data = await fetch(`config/metadata/layers/${layer.description}.html`, options);
+ const metadataHtml = await data.text();
+ controller = null;
+ setMetadata(metadataHtml || 'No description was found for this layer.');
+ } catch (e) {
+ if (!controller.signal.aborted) {
+ console.error(e);
+ }
+ }
+ })();
+ return () => (controller ? controller.abort() : null);
}, [layer]);
- const getSourceMetadata = async () => {
- if (layer.description) {
- const data = await util.get(`config/metadata/layers/${layer.description}.html`);
- setMetadata(data || 'No description was found for this layer.');
- }
- };
-
const getDateOverlapDateRanges = () => {
const hasLayerDateRange = dateRanges && dateRanges.length > 1;
const overlapDateRanges = hasLayerDateRange
@@ -38,7 +46,6 @@ export default function LayerInfo ({ layer, screenHeight }) {
return hasLayerDateRange && overlapDateRanges.overlap === false;
};
-
const needDateRanges = getDateOverlapDateRanges();
return (
diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
index cd13ac879..70ef217ba 100644
--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
@@ -2,8 +2,6 @@ import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { layer } from '@fortawesome/fontawesome-svg-core';
-import util from '../../../../util/util';
import { getMeasurementSource } from '../../../../modules/product-picker/selectors';
import LayerInfo from '../../info/info';
@@ -19,19 +17,28 @@ function MeasurementMetadataDetail (props) {
const metadataForSource = metadata[metadataPath] && metadata[metadataPath].data;
useEffect(() => {
+ setLoading(true);
+ let controller = new AbortController();
if (metadataPath && !metadataForSource) {
- util
- .get(`config/metadata/layers/${metadataPath}.html`)
- .then((data) => {
- metadata[metadataPath] = { data };
+ try {
+ (async () => {
+ const options = { signal: controller.signal };
+ const data = await fetch(`config/metadata/layers/${metadataPath}.html`, options);
+ metadata[metadataPath] = { data: await data.text() };
+ controller = null;
setMetadata(metadata);
setLoading(false);
- }).finally(() => {
+ })();
+ } catch (e) {
+ if (!controller.signal.aborted) {
setLoading(false);
- });
+ console.error(e);
+ }
+ }
} else {
setLoading(false);
}
+ return () => (controller ? controller.abort() : null);
}, [source]);
const renderMetadataForLayers = () => layers.map((l) => (
@@ -57,7 +64,7 @@ function MeasurementMetadataDetail (props) {
const renderMobile = () => {
const sourceTextLong = metadataForSource && metadataForSource.length >= 1000;
- const manylayers = layers && layer.length > 0;
+ const manylayers = layers && layers.length > 0;
const doesMetaDataNeedExpander = sourceTextLong || manylayers;
const isMetaVisible = isMetadataExpanded || !doesMetaDataNeedExpander;
return (
@@ -109,7 +116,7 @@ function MeasurementMetadataDetail (props) {
}
/* No metadata configured for this source */
- if (!metadataPath && !layer.length) {
+ if (!metadataPath && !layers.length) {
return (
<div className="no-results">
<FontAwesomeIcon icon="meteor" />