Interactive interface for browsing global, full-resolution satellite imagery
WV-4044: Modernizing CategoryLayerRow, SearchLayerRow, and SearchLayerList Components (#6856)
christof-wittreich02c2710108bf
diff --git a/web/js/components/layer/product-picker/browse/category-layer-row.js b/web/js/components/layer/product-picker/browse/category-layer-row.jsindex 9008d40fe..bf2020d5a 100644--- a/web/js/components/layer/product-picker/browse/category-layer-row.js+++ b/web/js/components/layer/product-picker/browse/category-layer-row.js@@ -1,4 +1,4 @@-import React from 'react';+import { useEffect, useRef } from 'react';import { connect } from 'react-redux';import PropTypes from 'prop-types';import {@@ -23,37 +23,39 @@ import {/*** A single category result row- * @class CategoryLayerRow- * @extends React.Component*/-class CategoryLayerRow extends React.Component {- constructor(props) {- super(props);- this.ref = React.createRef();- }+function CategoryLayerRow(props) {+ const {+ measurement,+ selectedMeasurement,+ categoryType,+ layerConfig,+ projection,+ selectSource,+ hasMeasurementSetting,+ isMobile,+ sources,+ selectedMeasurementSourceIndex,+ category,+ selectMeasurement,+ id,+ isSelected,+ } = props;++ const thisRef = useRef();- componentDidMount() {- const {- measurement,- selectedMeasurement,- categoryType,- } = this.props;+ useEffect(() => {if (selectedMeasurement === measurement.id && categoryType !== 'featured') {- this.ref.current.scrollIntoView(true);+ thisRef.current.scrollIntoView(true);}- }+ }, []);/*** Render orbits and layer selections for* selected source* @param {Object} source | Object containing source info*/- renderSourceSettings(source) {- const {- layerConfig,- measurement,- projection,- } = this.props;+ function renderSourceSettings(source) {const OrbitSourceList = [];const LayerSouceList = [];let orbitTitle = '';@@ -121,8 +123,7 @@ class CategoryLayerRow extends React.Component {* @param {Number} index | Index of measurement* @param {Number} activeSourceIndex | Index of active measurement*/- renderSourceTabs(source, index, activeSourceIndex) {- const { selectSource } = this.props;+ function renderSourceTabs(source, index, activeSourceIndex) {return (<NavItemkey={source.id + index}@@ -142,15 +143,7 @@ class CategoryLayerRow extends React.Component {/*** Render content when Active*/- renderContent() {- const {- hasMeasurementSetting,- measurement,- isMobile,- sources,- selectedMeasurementSourceIndex,- } = this.props;-+ function renderContent() {// set first valid index to handle invalid activeSourceIndex indexes after projection changelet minValidIndex = -1;let validActiveIndex = selectedMeasurementSourceIndex;@@ -171,14 +164,14 @@ class CategoryLayerRow extends React.Component {validActiveIndex = minValidIndex > selectedMeasurementSourceIndex? minValidIndex: selectedMeasurementSourceIndex;- return this.renderSourceTabs(source, index, selectedMeasurementSourceIndex);+ return renderSourceTabs(source, index, selectedMeasurementSourceIndex);}return '';})}</Nav><TabContent id={`${measurement.id}-${sources[validActiveIndex].id}`}><TabPane>- {this.renderSourceSettings(sources[validActiveIndex])}+ {renderSourceSettings(sources[validActiveIndex])}{isMobile &&(<MeasurementMetadataDetail@@ -192,39 +185,30 @@ class CategoryLayerRow extends React.Component {);}- render() {- const {- measurement,- category,- selectMeasurement,- id,- isSelected,- } = this.props;- const className = isSelected- ? 'measurement-row layers-all-layer selected'- : 'measurement-row layers-all-layer';- return (- <div- ref={this.ref}- className={className}- id={`accordion-${category.id}-${measurement.id}`}- key={`${category.id}-${measurement.id}`}+ const className = isSelected+ ? 'measurement-row layers-all-layer selected'+ : 'measurement-row layers-all-layer';+ return (+ <div+ ref={thisRef}+ className={className}+ id={`accordion-${category.id}-${measurement.id}`}+ key={`${category.id}-${measurement.id}`}+ >+ <button+ onClick={() => selectMeasurement(id)}+ type="button"+ className="measurement-row-header">- <button- onClick={() => selectMeasurement(id)}- type="button"- className="measurement-row-header"- >- <h3>{measurement.title}</h3>- {measurement.subtitle && !isSelected && <h5>{measurement.subtitle}</h5>}- {isSelected- ? <FontAwesomeIcon icon="chevron-circle-down" className="arrow-icon" widthAuto />- : <FontAwesomeIcon icon="chevron-circle-right" className="arrow-icon" widthAuto />}- </button>- {isSelected ? this.renderContent() : ''}- </div>- );- }+ <h3>{measurement.title}</h3>+ {measurement.subtitle && !isSelected && <h5>{measurement.subtitle}</h5>}+ {isSelected+ ? <FontAwesomeIcon icon="chevron-circle-down" className="arrow-icon" widthAuto />+ : <FontAwesomeIcon icon="chevron-circle-right" className="arrow-icon" widthAuto />}+ </button>+ {isSelected ? renderContent() : ''}+ </div>+ );}CategoryLayerRow.propTypes = {diff --git a/web/js/components/layer/product-picker/search/search-layer-row.js b/web/js/components/layer/product-picker/search/search-layer-row.jsindex 2a98d7e57..f23ccb282 100644--- a/web/js/components/layer/product-picker/search/search-layer-row.js+++ b/web/js/components/layer/product-picker/search/search-layer-row.js@@ -1,4 +1,4 @@-import React from 'react';+import { useState, useEffect, useRef } from 'react';import { connect } from 'react-redux';import PropTypes from 'prop-types';import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';@@ -21,29 +21,34 @@ const { events } = util;/*** A single layer search result row- * @class LayerRow- * @extends React.Component*/-class SearchLayerRow extends React.Component {- constructor(props) {- super(props);- this.state = {- showDeleteIcon: false,- };- this.toggleEnabled = this.toggleEnabled.bind(this);- this.onRowClick = this.onRowClick.bind(this);- this.ref = React.createRef();- }+function SearchLayerRow(props) {+ const {+ layer,+ selectedLayer,+ isEnabled,+ addLayer,+ removeLayer,+ showLayerMetadata,+ scrollIntoView,+ isMobile,+ categoryType,+ clearSingleRecentLayer,+ layerNotices,+ } = props;++ const [showDeleteIcon, setShowDeleteIcon] = useState(false);- componentDidMount() {- const { layer, selectedLayer } = this.props;+ const thisRef = useRef();++ useEffect(() => {if (selectedLayer && selectedLayer.id === layer.id) {- this.ref.current.scrollIntoView(true);+ thisRef.current.scrollIntoView(true);}- }+ }, []);- onRowClick() {- this.toggleShowMetadata();+ function onRowClick() {+ toggleShowMetadata();setTimeout(() => {events.trigger(JOYRIDE_INCREMENT);});@@ -54,10 +59,7 @@ class SearchLayerRow extends React.Component {* @method toggleEnabled* @return {void}*/- toggleEnabled() {- const {- isEnabled, addLayer, removeLayer, layer,- } = this.props;+ function toggleEnabled() {if (isEnabled) removeLayer(layer.id);if (!isEnabled) addLayer(layer.id);}@@ -68,20 +70,13 @@ class SearchLayerRow extends React.Component {* @param {e} event* @return {void}*/- toggleShowMetadata() {- const {- layer,- showLayerMetadata,- selectedLayer,- scrollIntoView,- } = this.props;-+ function toggleShowMetadata() {if (!(selectedLayer && layer.id === selectedLayer.id)) {if (!selectedLayer && scrollIntoView) {// Make sure item doesn't get obscured by the detail view// only at small and x-small viewssetTimeout(() => {- this.ref.current.scrollIntoView(true);+ thisRef.current.scrollIntoView(true);}, 250);}showLayerMetadata(layer.id);@@ -91,134 +86,121 @@ class SearchLayerRow extends React.Component {}}- toggleDeleteIcon(show) {- const { isMobile } = this.props;+ function toggleDeleteIcon(show) {if (!isMobile) {- this.setState({ showDeleteIcon: show });+ setShowDeleteIcon(show);}}- render() {- const {- isEnabled,- isMobile,- layer,- selectedLayer,- categoryType,- clearSingleRecentLayer,- layerNotices,- } = this.props;- const { showDeleteIcon } = this.state;- const { id, analysis } = layer;- const encodedId = util.encodeId(id);- const isMetadataShowing = selectedLayer && id === selectedLayer.id;- const chartableLayer = analysis?.includes('Chartable (Raster-based)');- const rowClass = isMetadataShowing- ? 'search-row layers-all-layer selected'- : 'search-row layers-all-layer';- const checkboxClass = isEnabled ? 'wv-checkbox checked' : 'wv-checkbox';- const recentLayerMode = categoryType === 'recent';- const headerClassName = layerNotices || chartableLayer- ? 'layers-all-header notice'- : 'layers-all-header';+ const { id, analysis } = layer;+ const encodedId = util.encodeId(id);+ const isMetadataShowing = selectedLayer && id === selectedLayer.id;+ const chartableLayer = analysis?.includes('Chartable (Raster-based)');+ const rowClass = isMetadataShowing+ ? 'search-row layers-all-layer selected'+ : 'search-row layers-all-layer';+ const checkboxClass = isEnabled ? 'wv-checkbox checked' : 'wv-checkbox';+ const recentLayerMode = categoryType === 'recent';+ const headerClassName = layerNotices || chartableLayer+ ? 'layers-all-header notice'+ : 'layers-all-header';- return (- <div- id={`${encodedId}-search-row`}- className={rowClass}- ref={this.ref}- onMouseEnter={() => this.toggleDeleteIcon(true)}- onMouseLeave={() => this.toggleDeleteIcon(false)}- >- <div className={checkboxClass + (!isMetadataShowing ? ' gray' : '')}>- <input- type="checkbox"- id={`${encodedId}-checkbox`}- name={`${encodedId}-checkbox`}- checked={isEnabled}- onChange={this.toggleEnabled}- />- {isEnabled && (- <svg- stroke="currentColor"+ return (+ <div+ id={`${encodedId}-search-row`}+ className={rowClass}+ ref={thisRef}+ onMouseEnter={() => toggleDeleteIcon(true)}+ onMouseLeave={() => toggleDeleteIcon(false)}+ >+ <div className={checkboxClass + (!isMetadataShowing ? ' gray' : '')}>+ <input+ type="checkbox"+ id={`${encodedId}-checkbox`}+ name={`${encodedId}-checkbox`}+ checked={isEnabled}+ onChange={toggleEnabled}+ />+ {isEnabled && (+ <svg+ stroke="currentColor"+ fill="currentColor"+ xmlns="http://www.w3.org/2000/svg"+ strokeWidth="0"+ width="15px"+ height="15px"+ viewBox="0 0 20 20"+ role="img"+ className="check"+ >+ <pathfill="currentColor"- xmlns="http://www.w3.org/2000/svg"- strokeWidth="0"- width="15px"- height="15px"- viewBox="0 0 20 20"- role="img"- className="check"- >- <path- fill="currentColor"- fillRule="evenodd"- d="M17.707 5.707 8 15.414 2.293 9.707l1.414-1.414L8 12.586l8.293-8.293z"- clipRule="evenodd"+ fillRule="evenodd"+ d="M17.707 5.707 8 15.414 2.293 9.707l1.414-1.414L8 12.586l8.293-8.293z"+ clipRule="evenodd"+ />+ </svg>+ )}+ </div>+ {(chartableLayer || layerNotices) && (+ <div className="layer-notices">+ {chartableLayer && (+ <div className="layer-notice-wrapper">+ <i+ id={`${encodedId}-chartable-info`}+ className="layer-notice-icon chartable-icon"+ />+ <UncontrolledTooltip+ id="center-align-tooltip"+ className="zot-tooltip"+ placement="top"+ target={`${encodedId}-chartable-info`}+ trigger="hover"+ autohide={isMobile}+ delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}+ >+ <div dangerouslySetInnerHTML={{ __html: 'Create time series charts or get statistics for this layer' }} />+ </UncontrolledTooltip>+ </div>+ )}+ {layerNotices && (+ <div className="layer-notice-wrapper">+ <FontAwesomeIcon+ id={`${encodedId}-notice-info`}+ className="layer-notice-icon"+ icon="exclamation-triangle"+ widthAuto/>- </svg>+ <UncontrolledTooltip+ id="center-align-tooltip"+ className="zot-tooltip"+ placement="top"+ target={`${encodedId}-notice-info`}+ trigger="hover"+ autohide={isMobile}+ delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}+ >+ <div dangerouslySetInnerHTML={{ __html: layerNotices }} />+ </UncontrolledTooltip>+ </div>)}</div>- {(chartableLayer || layerNotices) && (- <div className="layer-notices">- {chartableLayer && (- <div className="layer-notice-wrapper">- <i- id={`${encodedId}-chartable-info`}- className="layer-notice-icon chartable-icon"- />- <UncontrolledTooltip- id="center-align-tooltip"- className="zot-tooltip"- placement="top"- target={`${encodedId}-chartable-info`}- trigger="hover"- autohide={isMobile}- delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}- >- <div dangerouslySetInnerHTML={{ __html: 'Create time series charts or get statistics for this layer' }} />- </UncontrolledTooltip>- </div>- )}- {layerNotices && (- <div className="layer-notice-wrapper">- <FontAwesomeIcon- id={`${encodedId}-notice-info`}- className="layer-notice-icon"- icon="exclamation-triangle"- widthAuto- />- <UncontrolledTooltip- id="center-align-tooltip"- className="zot-tooltip"- placement="top"- target={`${encodedId}-notice-info`}- trigger="hover"- autohide={isMobile}- delay={isMobile ? { show: 300, hide: 300 } : { show: 50, hide: 300 }}- >- <div dangerouslySetInnerHTML={{ __html: layerNotices }} />- </UncontrolledTooltip>- </div>- )}- </div>+ )}+ <button type="button" className={headerClassName} onClick={onRowClick}>+ <RenderSplitLayerTitle layer={layer} />+ {recentLayerMode && showDeleteIcon && (+ <Button+ className="recent-layer-delete"+ color="danger"+ title="Remove from recent layers list."+ onClick={(e) => clearSingleRecentLayer(e, layer)}+ >+ <FontAwesomeIcon icon="trash" widthAuto />+ </Button>)}- <button type="button" className={headerClassName} onClick={this.onRowClick}>- <RenderSplitLayerTitle layer={layer} />- {recentLayerMode && showDeleteIcon && (- <Button- className="recent-layer-delete"- color="danger"- title="Remove from recent layers list."- onClick={(e) => clearSingleRecentLayer(e, layer)}- >- <FontAwesomeIcon icon="trash" widthAuto />- </Button>- )}- </button>- </div>- );- }+ </button>+ </div>+ );}SearchLayerRow.propTypes = {addLayer: PropTypes.func,diff --git a/web/js/components/layer/product-picker/search/search-layers-list.js b/web/js/components/layer/product-picker/search/search-layers-list.jsindex cf9965d81..7a2e0e823 100644--- a/web/js/components/layer/product-picker/search/search-layers-list.js+++ b/web/js/components/layer/product-picker/search/search-layers-list.js@@ -1,4 +1,4 @@-import React from 'react';+import { useState, useEffect, useRef } from 'react';import PropTypes from 'prop-types';import { connect } from 'react-redux';import { withSearch } from '@elastic/react-search-ui';@@ -11,55 +11,71 @@ import {clearSingleRecentLayer as clearSingleRecentLayerAction,} from '../../../../modules/product-picker/actions';import RecentLayersInfo from '../browse/recent-layers-info';+import usePrevious from '../../../../util/customHooks';/** A scrollable list of layers- * @class LayerList- * @extends React.Component*/-class SearchLayerList extends React.Component {- constructor(props) {- super(props);- this.state = {- visibleItems: [],- hasMoreItems: true,- nextIndex: 0,- firstLoadAutoSelect: false,- };- this.loadMoreItems = this.loadMoreItems.bind(this);- }+function SearchLayerList(props) {+ const {+ selectedLayer,+ results,+ selectLayer,+ recentLayerMode,+ isMobile,+ clearSingleRecentLayer,+ } = props;- static getDerivedStateFromProps(props, state) {- if (props.selectedLayer) {- return { firstLoadAutoSelect: true };- }- return null;- }+ const [visibleItems, setVisibleItems] = useState([]);+ const [hasMoreItems, setHasMoreItems] = useState(true);+ const [nextIndex, setNextIndex] = useState(0);+ const [firstLoadAutoSelect, setFirstLoadAutoSelect] = useState(false);++ const scrollParentSelector = '.layer-list-container.search .simplebar-content-wrapper';+ const scrollParentRef = useRef(document.querySelector(scrollParentSelector));+ const isMountedRef = useRef(false);++ const prevResults = usePrevious(results);++ useEffect(() => {+ if (!selectedLayer) return;+ setFirstLoadAutoSelect(true);+ }, [selectedLayer]);/*** Handle selecting/showing metadata when there is only a single search result*/- componentDidUpdate(prevProps, prevState, snapshot) {- const { selectedLayer, results } = this.props;- const { firstLoadAutoSelect } = this.state;+ useEffect(() => {+ if (!isMountedRef.current) {+ isMountedRef.current = true;+ return;+ }const selectedLayerInResults = selectedLayer &&(results || []).find((l) => l.id === selectedLayer.id);// Clear metadata when item no longer in list of resultsif (!selectedLayerInResults && selectedLayer) {- this.showLayerMetadata(null);+ showLayerMetadata(null);}// Select first item in list on initial loadif (!selectedLayer && results && results.length && !firstLoadAutoSelect) {- this.setState({ firstLoadAutoSelect: true }, () => {- const { id } = results[0];- this.showLayerMetadata(id);- });+ setFirstLoadAutoSelect(true);}- if (prevProps.results !== results) {- this.loadMoreItems(0, prevProps);+ if (prevResults !== results) {+ loadMoreItems(0, prevResults);}- }+ }, [selectedLayer, results]);++ useEffect(() => {+ if (!firstLoadAutoSelect || !results[0]) return;+ const { id } = results[0];+ showLayerMetadata(id);+ }, [firstLoadAutoSelect]);++ useEffect(() => {+ if (!hasMoreItems) return;+ loadMoreItems();+ }, [hasMoreItems]);/*** Loads metadata for layer (if not previously loaded) and@@ -68,12 +84,7 @@ class SearchLayerList extends React.Component {* @param {string} layerId - the layer id to show metadata for* @return {void}*/- showLayerMetadata(layerId) {- const {- results,- selectedLayer,- selectLayer,- } = this.props;+ function showLayerMetadata(layerId) {const layer = results.find((l) => l.id === layerId);// No result found, clear the metadata detail view by passing null@@ -90,17 +101,12 @@ class SearchLayerList extends React.Component {selectLayer(layer);}- loadMoreItems(page, prevProps) {- const { results } = this.props;- const { visibleItems, nextIndex, hasMoreItems } = this.state;-+ function loadMoreItems(page, prev) {// If results changed, reset- if (prevProps) {- this.setState({- visibleItems: [],- hasMoreItems: true,- nextIndex: 0,- }, this.loadMoreItems);+ if (prev) {+ setVisibleItems([]);+ setHasMoreItems(true);+ setNextIndex(0);return;}@@ -109,20 +115,15 @@ class SearchLayerList extends React.Component {const newNextIndex = prevIndex + 50;const moreItems = results.slice(prevIndex, newNextIndex);const newItems = [...visibleItems, ...moreItems];- this.setState({- visibleItems: newItems,- nextIndex: newNextIndex,- hasMoreItems: results.length > newItems.length,- });+ setVisibleItems(newItems);+ setNextIndex(newNextIndex);+ setHasMoreItems(results.length > newItems.length);} else {- this.setState({- hasMoreItems: false,- });+ setHasMoreItems(false);}}- renderNoResults() {- const { recentLayerMode } = this.props;+ function renderNoResults() {return recentLayerMode? (<RecentLayersInfo />): (@@ -133,50 +134,41 @@ class SearchLayerList extends React.Component {);}- render() {- const { visibleItems, hasMoreItems } = this.state;- const {- results, isMobile, clearSingleRecentLayer, recentLayerMode,- } = this.props;- const scrollParentSelector = '.layer-list-container.search .simplebar-content-wrapper';- this.scrollParent = this.scrollParent || document.querySelector(scrollParentSelector);-- return !results.length- ? this.renderNoResults()- : (- <InfiniteScroll- pageStart={0}- loadMore={this.loadMoreItems}- hasMore={hasMoreItems}- useWindow={false}- getScrollParent={() => this.scrollParent}- >- <div className="product-outer-list-case layers-all">- {visibleItems.map((layer) => (isMobile && recentLayerMode- ? (- <SwipeToDelete- key={layer.id}- item={layer}- deleteSwipe={0.33}- onDelete={() => clearSingleRecentLayer(layer)}- >- <SearchLayerRow- layer={layer}- showLayerMetadata={(id) => this.showLayerMetadata(id)}- />- </SwipeToDelete>- )- : (+ return !results.length+ ? renderNoResults()+ : (+ <InfiniteScroll+ pageStart={0}+ loadMore={loadMoreItems}+ hasMore={hasMoreItems}+ useWindow={false}+ getScrollParent={scrollParentRef.current}+ >+ <div className="product-outer-list-case layers-all">+ {visibleItems.map((layer) => (isMobile && recentLayerMode+ ? (+ <SwipeToDelete+ key={layer.id}+ item={layer}+ deleteSwipe={0.33}+ onDelete={() => clearSingleRecentLayer(layer)}+ ><SearchLayerRow- key={layer.id}layer={layer}- showLayerMetadata={(id) => this.showLayerMetadata(id)}+ showLayerMetadata={(id) => showLayerMetadata(id)}/>- )))}- </div>- </InfiniteScroll>- );- }+ </SwipeToDelete>+ )+ : (+ <SearchLayerRow+ key={layer.id}+ layer={layer}+ showLayerMetadata={(id) => showLayerMetadata(id)}+ />+ )))}+ </div>+ </InfiniteScroll>+ );}SearchLayerList.propTypes = {