Interactive interface for browsing global, full-resolution satellite imagery
use LayerInfo to combine metadata info
Jason Kent052499c0747d
diff --git a/web/js/components/layer/info/info-modal.js b/web/js/components/layer/info/info-modal.jsnew file mode 100644index 000000000..afc46bbb2--- /dev/null+++ b/web/js/components/layer/info/info-modal.js@@ -0,0 +1,22 @@+import React from 'react';+import PropTypes from 'prop-types';+import LayerInfo from './info';+import Scrollbars from '../../util/scrollbar';++export default function LayerInfoModal(props) {+ const { screenHeight, layer } = props;++ return (+ <Scrollbars style={{ maxHeight: `${screenHeight - 200}px` }}>+ <LayerInfo layer={layer} />+ {/*+ Put the source specific metadata here as well+ */}+ </Scrollbars>+ );+}++LayerInfoModal.propTypes = {+ screenHeight: PropTypes.number,+ layer: PropTypes.object,+};diff --git a/web/js/components/layer/info/info.js b/web/js/components/layer/info/info.jsindex 449f2b3a6..a5bcdc874 100644--- a/web/js/components/layer/info/info.js+++ b/web/js/components/layer/info/info.js@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';import { dateOverlap } from '../../../modules/layers/util';import DateRanges from './date-ranges';import util from '../../../util/util';-import Scrollbars from '../../util/scrollbar';function configureTemporalDate(dateType, date, period) {return util.coverageDateFormatter(dateType, date, period);@@ -82,13 +81,12 @@ class LayerInfo extends React.Component {): ''}{metaData ? (- <Scrollbars style={{ maxHeight: `${screenHeight - 200}px` }}>- <div- id="layer-metadata"- className="layer-metadata"- dangerouslySetInnerHTML={{ __html: metaData }}- />- </Scrollbars>++ <div+ id="layer-metadata"+ className="layer-metadata"+ dangerouslySetInnerHTML={{ __html: metaData }}+ />) : (<div id="layer-metadata" className="layer-metadata">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.jsindex 9650ea609..85a3020c6 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@@ -4,6 +4,7 @@ import { connect } from 'react-redux';import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';import util from '../../../../util/util';import { getMeasurementSource } from '../../../../modules/product-picker/selectors';+import LayerInfo from '../../info/info';class MeasurementMetadataDetail extends React.Component {constructor(props) {@@ -63,7 +64,7 @@ class MeasurementMetadataDetail extends React.Component {}renderDesktop(data) {- const { source } = this.props;+ const { source, layers } = this.props;const { title } = source;return (<div className="layers-all-layer">@@ -71,6 +72,12 @@ class MeasurementMetadataDetail extends React.Component {<h3>{title}</h3></div><div className="source-metadata">+ {layers.map((layer) => (+ <div key={layer.id}>+ <h3>{layer.title}</h3>+ <LayerInfo key={layer.id} layer={layer} />+ </div>+ ))}<div dangerouslySetInnerHTML={{ __html: data }} /></div></div>@@ -118,18 +125,25 @@ class MeasurementMetadataDetail extends React.Component {MeasurementMetadataDetail.propTypes = {categoryTitle: PropTypes.string,isMobile: PropTypes.bool,+ layers: PropTypes.array,source: PropTypes.object,};const mapStateToProps = (state) => {- const { category } = state.productPicker;+ const { productPicker, layers } = state;+ const source = getMeasurementSource(state);+ const { category } = productPicker;+ const { layerConfig } = layers;+ const settings = source ? source.settings : [];+ const layersForSource = settings.map((id) => layerConfig[id]);+return {categoryTitle: category && category.title,- source: getMeasurementSource(state),+ source,+ layers: layersForSource,};};export default connect(mapStateToProps,- () => ({}),)(MeasurementMetadataDetail);diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.jsindex fed4d3634..860c2dda2 100644--- a/web/js/containers/sidebar/layer-row.js+++ b/web/js/containers/sidebar/layer-row.js@@ -17,7 +17,7 @@ import {getPaletteLegends,} from '../../modules/palettes/selectors';import { toggleCustomContent, openCustomContent } from '../../modules/modal/actions';-import LayerInfo from '../../components/layer/info/info';+import LayerInfoModal from '../../components/layer/info/info-modal';import LayerSettings from '../../components/layer/settings/layer-settings';import { requestPalette } from '../../modules/palettes/actions';import {@@ -419,7 +419,7 @@ const mapDispatchToProps = (dispatch) => ({toggleCustomContent(key, {headerText: title || 'Layer Description',backdrop: false,- bodyComponent: LayerInfo,+ bodyComponent: LayerInfoModal,// Using clickableBehindModal: true here causes an issue where switching sidebar// tabs does not close this modalwrapClassName: 'clickable-behind-modal',