Interactive interface for browsing global, full-resolution satellite imagery
WV-2815: Removed 'class-methods-use-this' ESLint override (#6362)
Jason Hurley4a0a79c148d3
diff --git a/web/.eslintrc b/web/.eslintrcindex 8febe5a72..92fed5948 100644--- a/web/.eslintrc+++ b/web/.eslintrc@@ -153,7 +153,6 @@}],"react/require-default-props": "off", // 1644 errors across > 80 files- "class-methods-use-this": "warn", // 15 errors across 13 files"react/no-unused-class-component-methods": "error","react/no-unknown-property": "error","react/jsx-no-useless-fragment": "error",diff --git a/web/js/app.js b/web/js/app.jsindex b19a175da..8d5fd6e3a 100644--- a/web/js/app.js+++ b/web/js/app.js@@ -52,17 +52,22 @@ require('@elastic/react-search-ui-views/lib/styles/styles.css');const { events } = util;class App extends React.Component {+ // https://css-tricks.com/the-trick-to-viewport-units-on-mobile/+ static setVhCSSProperty() {+ const vh = window.innerHeight * 0.01;+ document.documentElement.style.setProperty('--vh', `${vh}px`);+ }+constructor(props) {super(props);this.onload();this.handleKeyPress = this.handleKeyPress.bind(this);- this.setVhCSSProperty = this.setVhCSSProperty.bind(this);}componentDidMount() {document.addEventListener('keydown', this.handleKeyPress);- window.addEventListener('resize', this.setVhCSSProperty);- window.addEventListener('orientationchange', this.setVhCSSProperty);+ window.addEventListener('resize', App.setVhCSSProperty);+ window.addEventListener('orientationchange', App.setVhCSSProperty);}componentDidUpdate(prevProps) {@@ -80,17 +85,10 @@ class App extends React.Component {componentWillUnmount() {document.removeEventListener('keydown', this.handleKeyPress);- window.removeEventListener('resize', this.setVhCSSProperty);- window.removeEventListener('orientationchange', this.setVhCSSProperty);+ window.removeEventListener('resize', App.setVhCSSProperty);+ window.removeEventListener('orientationchange', App.setVhCSSProperty);}-- // https://css-tricks.com/the-trick-to-viewport-units-on-mobile/- setVhCSSProperty = () => {- const vh = window.innerHeight * 0.01;- document.documentElement.style.setProperty('--vh', `${vh}px`);- };-handleKeyPress(event) {const { keyPressAction } = this.props;const ctrlOrCmdKey = event.ctrlKey || event.metaKey;diff --git a/web/js/components/date-selector/date-input-column.js b/web/js/components/date-selector/date-input-column.jsindex 463e419d1..2fd702790 100644--- a/web/js/components/date-selector/date-input-column.js+++ b/web/js/components/date-selector/date-input-column.js@@ -18,6 +18,18 @@ import { MONTH_STRING_ARRAY } from '../../modules/date/constants';* @class DateInputColumn*/class DateInputColumn extends Component {+ static onKeyPress(e) {+ const { keyCode } = e;+ const entered = keyCode === 13;+ const tabbed = keyCode === 9;+ const shiftTab = e.shiftKey && keyCode === 9;++ if (entered || tabbed || shiftTab) {+ e.preventDefault();+ e.stopPropagation();+ }+ }+constructor(props) {super(props);const { type, subDailyMode } = props;@@ -128,18 +140,6 @@ class DateInputColumn extends Component {this.setState({ value });};- onKeyPress = (e) => {- const { keyCode } = e;- const entered = keyCode === 13;- const tabbed = keyCode === 9;- const shiftTab = e.shiftKey && keyCode === 9;-- if (entered || tabbed || shiftTab) {- e.preventDefault();- e.stopPropagation();- }- };-onKeyUp = (e) => {const { type } = this.props;const { keyCode } = e;@@ -320,7 +320,7 @@ class DateInputColumn extends Component {className={inputClassName}value={value}onKeyUp={this.onKeyUp}- onKeyDown={this.onKeyPress}+ onKeyDown={DateInputColumn.onKeyPress}onChange={this.onChange}style={fontSizeStyle}onBlur={this.blur}diff --git a/web/js/components/location-search/location-search-input.js b/web/js/components/location-search/location-search-input.jsindex b9158105d..95b87ff83 100644--- a/web/js/components/location-search/location-search-input.js+++ b/web/js/components/location-search/location-search-input.js@@ -5,6 +5,15 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';import Autocomplete from '../../util/reactAutocomplete';class SearchBox extends Component {+ // render search result menu item container+ static renderMenu(children) {+ return (+ <div className="location-search-results-menu">+ {children}+ </div>+ );+ }+constructor(props) {super(props);this.highlightedItem = null;@@ -70,13 +79,6 @@ class SearchBox extends Component {}};- // render search result menu item container- renderMenu = (children) => (- <div className="location-search-results-menu">- {children}- </div>- );-// render individual menu items with conditional stylingrenderItem = (item, isHighlighted) => {if (isHighlighted) {@@ -241,7 +243,7 @@ class SearchBox extends Component {getItemValue={(item) => item.text}onSelect={onSelect}onChange={onChange}- renderMenu={this.renderMenu}+ renderMenu={SearchBox.renderMenu}renderItem={this.renderItem}/>{this.renderClearInput()}diff --git a/web/js/components/timeline/timeline-axis/timeline-axis.js b/web/js/components/timeline/timeline-axis/timeline-axis.jsindex 95f32bc6c..dcce84034 100644--- a/web/js/components/timeline/timeline-axis/timeline-axis.js+++ b/web/js/components/timeline/timeline-axis/timeline-axis.js@@ -21,6 +21,42 @@ import {} from '../date-util';class TimelineAxis extends Component {+ /**+ * @desc get DOM coverage line+ * @param {Object} lineCoverageOptions+ * @param {Number} transformX+ * @returns {Object} DOM SVG object+ */+ static createMatchingCoverageLineDOMEl(lineCoverageOptions, transformX) {+ return lineCoverageOptions.map(({+ leftOffset,+ visible, width,+ }, i) => (+ <g+ key={`matchingCoverageLine-${crypto.randomUUID()}`}+ className="axis-matching-layer-coverage-line"+ transform={`translate(${-transformX})`}+ clipPath="url(#matchingCoverage)"+ >+ <rect+ style={{+ left: leftOffset,+ visibility: visible ? 'visible' : 'hidden',+ margin: '0 0 6px 0',+ }}+ rx={0}+ ry={0}+ width={width}+ height={10}+ transform={`translate(${transformX + leftOffset})`}+ fill="rgba(0, 119, 212, 0.5)"+ stroke="rgba(0, 69, 123, 0.8)"+ strokeWidth={3}+ />+ </g>+ ));+ }+constructor(props) {super(props);this.state = {@@ -1498,40 +1534,6 @@ class TimelineAxis extends Component {});};- /**- * @desc get DOM coverage line- * @param {Object} lineCoverageOptions- * @param {Number} transformX- * @returns {Object} DOM SVG object- */- createMatchingCoverageLineDOMEl = (lineCoverageOptions, transformX) => lineCoverageOptions.map(({- leftOffset,- visible, width,- }, i) => (- <g- key={`matchingCoverageLine-${crypto.randomUUID()}`}- className="axis-matching-layer-coverage-line"- transform={`translate(${-transformX})`}- clipPath="url(#matchingCoverage)"- >- <rect- style={{- left: leftOffset,- visibility: visible ? 'visible' : 'hidden',- margin: '0 0 6px 0',- }}- rx={0}- ry={0}- width={width}- height={10}- transform={`translate(${transformX + leftOffset})`}- fill="rgba(0, 119, 212, 0.5)"- stroke="rgba(0, 69, 123, 0.8)"- strokeWidth={3}- />- </g>- ));-render() {const {axisWidth,@@ -1622,7 +1624,7 @@ class TimelineAxis extends Component {</pattern></defs>{shouldDisplayMatchingCoverageLine- && this.createMatchingCoverageLineDOMEl(lineCoverageOptions, transformX) }+ && TimelineAxis.createMatchingCoverageLineDOMEl(lineCoverageOptions, transformX) }<Draggableaxis="x"handle=".axis-grid-container"diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change.js b/web/js/components/timeline/timeline-controls/axis-timescale-change.jsindex 59ae27443..7bcd01f3b 100644--- a/web/js/components/timeline/timeline-controls/axis-timescale-change.js+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change.js@@ -12,6 +12,16 @@ import { TIME_SCALE_TO_NUMBER } from '../../../modules/date/constants';* @extends React.Component*/class AxisTimeScaleChange extends PureComponent {+ // Toggle visibility of map scales+ static disableMapScales(disable) {+ const imperialMapScale = document.getElementsByClassName('wv-map-scale-imperial');+ const metricMapScale = document.getElementsByClassName('wv-map-scale-metric');+ const opacity = disable ? '0' : '1';+ for (const el of [...imperialMapScale, ...metricMapScale]) {+ el.style.opacity = opacity;+ }+ }+constructor(props) {super(props);this.state = {@@ -26,7 +36,7 @@ class AxisTimeScaleChange extends PureComponent {} = this.props;// in event of dragging off axis, prevent tooltip displayif (!isDraggerDragging) {- this.disableMapScales(true);+ AxisTimeScaleChange.disableMapScales(true);this.setState({toolTipHovered: true,});@@ -35,22 +45,12 @@ class AxisTimeScaleChange extends PureComponent {// TimeScale select tooltip offtoolTipHoverOff = () => {- this.disableMapScales(false);+ AxisTimeScaleChange.disableMapScales(false);this.setState({toolTipHovered: false,});};- // Toggle visibility of map scales- disableMapScales = (disable) => {- const imperialMapScale = document.getElementsByClassName('wv-map-scale-imperial');- const metricMapScale = document.getElementsByClassName('wv-map-scale-metric');- const opacity = disable ? '0' : '1';- for (const el of [...imperialMapScale, ...metricMapScale]) {- el.style.opacity = opacity;- }- };-// ex: month(2) to day(3)incrementTimeScale = () => {const {diff --git a/web/js/components/timeline/timeline-coverage/coverage-item-list.js b/web/js/components/timeline/timeline-coverage/coverage-item-list.jsindex 72c47b112..6c5730e9c 100644--- a/web/js/components/timeline/timeline-coverage/coverage-item-list.js+++ b/web/js/components/timeline/timeline-coverage/coverage-item-list.js@@ -26,28 +26,6 @@ const ignoredLayer = {* @class CoverageItemList*/class CoverageItemList extends Component {- constructor(props) {- super(props);- this.state = {- hoveredLayer: undefined,- };-- // cache for queried date arrays- this.layerDateArrayCache = {};- }-- componentDidMount() {- events.on(SIDEBAR_LAYER_HOVER, this.layerHoverCallback);- }-- componentWillUnmount() {- events.off(SIDEBAR_LAYER_HOVER, this.layerHoverCallback);- }-- layerHoverCallback = (id, active) => {- this.setState({ hoveredLayer: active ? id : undefined });- };-/*** @desc get layer header with title, subtitle, and full date range* @param {Object} layer@@ -56,7 +34,7 @@ class CoverageItemList extends Component {* @param {String} background color* @returns {DOM Element} header*/- getHeaderDOMEl = (layer, visible, layerItemBackground, inactiveLayers) => {+ static getHeaderDOMEl(layer, visible, layerItemBackground, inactiveLayers) {const titleColor = visible ? '#000' : '#999';const textColor = visible ? '#222' : '#999';const {@@ -105,20 +83,64 @@ class CoverageItemList extends Component {</div></div>);- };+ }++ /**+ * @desc get empty layers message DOM element+ * @returns {DOM Element} div contained message+ */+ static createEmptyLayersDOMEl() {+ return (+ <div className="layer-coverage-list-empty">+ <div className="layer-coverage-item-empty">+ <FontAwesomeIcon icon="exclamation-triangle" className="error-icon" widthAuto />+ <p>+ No visible layers with defined coverage. Add layers or toggle+ "Include Hidden Layers" if current layers are hidden.+ </p>+ </div>+ </div>+ );+ }+/*** @desc get formatted time period name* @param {String} period* @returns {String} formatted period*/- getFormattedTimePeriod = (period) => (period === 'daily'- ? 'day'- : period === 'monthly'- ? 'month'- : period === 'yearly'- ? 'year'- : 'minute');+ static getFormattedTimePeriod (period) {+ return period === 'daily'+ ? 'day'+ : period === 'monthly'+ ? 'month'+ : period === 'yearly'+ ? 'year'+ : 'minute';+ }+++ constructor(props) {+ super(props);+ this.state = {+ hoveredLayer: undefined,+ };++ // cache for queried date arrays+ this.layerDateArrayCache = {};+ }++ componentDidMount() {+ events.on(SIDEBAR_LAYER_HOVER, this.layerHoverCallback);+ }++ componentWillUnmount() {+ events.off(SIDEBAR_LAYER_HOVER, this.layerHoverCallback);+ }++ layerHoverCallback = (id, active) => {+ this.setState({ hoveredLayer: active ? id : undefined });+ };/*** @desc get range date end with added interval based on period@@ -327,22 +349,6 @@ class CoverageItemList extends Component {};};- /**- * @desc get empty layers message DOM element- * @returns {DOM Element} div contained message- */- createEmptyLayersDOMEl = () => (- <div className="layer-coverage-list-empty">- <div className="layer-coverage-item-empty">- <FontAwesomeIcon icon="exclamation-triangle" className="error-icon" widthAuto />- <p>- No visible layers with defined coverage. Add layers or toggle- "Include Hidden Layers" if current layers are hidden.- </p>- </div>- </div>- );-render() {const {activeLayers,@@ -358,7 +364,7 @@ class CoverageItemList extends Component {return (<div className="layer-coverage-layer-list">{/* Empty layer coverage message */- emptyLayers && this.createEmptyLayersDOMEl()+ emptyLayers && CoverageItemList.createEmptyLayersDOMEl()}{/* Build individual layer coverage components */@@ -422,7 +428,7 @@ class CoverageItemList extends Component {}}>{/* Layer Header DOM El */- this.getHeaderDOMEl(layer, visible, layerItemBackground, inactiveLayers)+ CoverageItemList.getHeaderDOMEl(layer, visible, layerItemBackground, inactiveLayers)}<divclassName="layer-coverage-line-container"diff --git a/web/js/components/timeline/timeline-coverage/coverage-line.js b/web/js/components/timeline/timeline-coverage/coverage-line.jsindex 989d2adbe..1e91237cb 100644--- a/web/js/components/timeline/timeline-coverage/coverage-line.js+++ b/web/js/components/timeline/timeline-coverage/coverage-line.js@@ -20,7 +20,7 @@ class CoverageLine extends PureComponent {* @param {String} dateRangeEnd* @param {String} toolTipText*/- getFormattedDisplayDates = (lineType, startDate, endDate, layerPeriod) => {+ static getFormattedDisplayDates(lineType, startDate, endDate, layerPeriod) {let dateRangeStart;let dateRangeEnd;let toolTipText;@@ -55,7 +55,7 @@ class CoverageLine extends PureComponent {dateRangeEnd,toolTipText,};- };+ }/*** @desc get line DOM element from full/partial (interval) date range with tooltip@@ -96,7 +96,7 @@ class CoverageLine extends PureComponent {dateRangeStart,dateRangeEnd,toolTipText,- } = this.getFormattedDisplayDates(lineType, startDate, endDate, layerPeriod);+ } = CoverageLine.getFormattedDisplayDates(lineType, startDate, endDate, layerPeriod);const dateRangeStartEnd = `${id}-${dateRangeStart}-${dateRangeEnd}`;// candy stripe colordiff --git a/web/js/components/timeline/timeline-coverage/timeline-coverage.js b/web/js/components/timeline/timeline-coverage/timeline-coverage.jsindex 3de8eb735..10ca7df4d 100644--- a/web/js/components/timeline/timeline-coverage/timeline-coverage.js+++ b/web/js/components/timeline/timeline-coverage/timeline-coverage.js@@ -26,6 +26,12 @@ import CoverageItemList from './coverage-item-list';*/class TimelineLayerCoveragePanel extends Component {+ static stopPropagation(e) {+ e.nativeEvent.stopImmediatePropagation();+ e.stopPropagation();+ e.preventDefault();+ }+constructor(props) {super(props);this.state = {@@ -297,12 +303,6 @@ class TimelineLayerCoveragePanel extends Component {return undefined;};- stopPropagation = (e) => {- e.nativeEvent.stopImmediatePropagation();- e.stopPropagation();- e.preventDefault();- };-/*** @desc render info button for layer coverage panel coverage info modal* @returns {DOM Object}diff --git a/web/js/containers/sidebar/smart-handoff.js b/web/js/containers/sidebar/smart-handoff.jsindex 8211ff7ea..55c2d45f0 100644--- a/web/js/containers/sidebar/smart-handoff.js+++ b/web/js/containers/sidebar/smart-handoff.js@@ -48,6 +48,24 @@ const STD_NRT_MAP = {* layer data and granule files that are available for download.*/class SmartHandoff extends Component {+ static renderLoadingSpinner() {+ const containerStyle = {+ padding: '30px 107px',+ };++ const spinnerStyle = {+ height: '5rem',+ width: '5rem',+ margin: '40px auto',+ };++ return (+ <div style={containerStyle}>+ <Spinner style={spinnerStyle} color="light" />+ </div>+ );+ }+constructor(props) {super(props);@@ -528,24 +546,6 @@ class SmartHandoff extends Component {);};- renderLoadingSpinner = () => {- const containerStyle = {- padding: '30px 107px',- };-- const spinnerStyle = {- height: '5rem',- width: '5rem',- margin: '40px auto',- };-- return (- <div style={containerStyle}>- <Spinner style={spinnerStyle} color="light" />- </div>- );- };-/*** Default render which displays the download panel*/@@ -574,7 +574,7 @@ class SmartHandoff extends Component {const isValidDownload = selectedLayer && selectedLayer.id && validSelection;if (isLoading) {- return this.renderLoadingSpinner();+ return SmartHandoff.renderLoadingSpinner();}if (!validatedLayers.length) {diff --git a/web/js/containers/tour.js b/web/js/containers/tour.jsindex 0b9c8a571..8bb89a0d7 100644--- a/web/js/containers/tour.js+++ b/web/js/containers/tour.js@@ -64,6 +64,10 @@ const prepareLayersList = function(layersString, config) {};class Tour extends React.Component {+ static getKioskParam(isKioskModeActive) {+ return isKioskModeActive ? '&kiosk=true' : '';+ }+constructor(props) {super(props);const { storyOrder, stories, currentStoryId } = props;@@ -154,7 +158,7 @@ class Tour extends React.Component {isEmbedModeActive, preProcessStepLink, promiseImageryForTour,} = this.props;if (e) e.preventDefault();- const kioskParam = this.getKioskParam(isKioskModeActive);+ const kioskParam = Tour.getKioskParam(isKioskModeActive);this.setState({currentStep: 1,currentStoryIndex,@@ -266,7 +270,7 @@ class Tour extends React.Component {config, renderedPalettes, processStepLink, isKioskModeActive, activeTab,changeTab, isEmbedModeActive, preProcessStepLink, promiseImageryForTour,} = this.props;- const kioskParam = this.getKioskParam(isKioskModeActive);+ const kioskParam = Tour.getKioskParam(isKioskModeActive);if (activeTab === 'events') changeTab('layers');@@ -299,10 +303,6 @@ class Tour extends React.Component {}}- getKioskParam(isKioskModeActive) {- return isKioskModeActive ? '&kiosk=true' : '';- }-decreaseStep(e) {const {config, renderedPalettes, processStepLink,@@ -311,7 +311,7 @@ class Tour extends React.Component {const {currentStep, currentStory, currentStoryId,} = this.state;- const kioskParam = this.getKioskParam(isKioskModeActive);+ const kioskParam = Tour.getKioskParam(isKioskModeActive);if (activeTab === 'events') changeTab('layers');diff --git a/web/js/map/compare/swipe.js b/web/js/map/compare/swipe.jsindex 906dd54b3..771f2d208 100644--- a/web/js/map/compare/swipe.js+++ b/web/js/map/compare/swipe.js@@ -186,6 +186,7 @@ const addLineOverlay = function(map, dateA, dateB) {return lineCaseEl;};+const getSwipeOffset = function() { return swipeOffset; };export default class Swipe {constructor(olMap,@@ -195,6 +196,7 @@ export default class Swipe {) {listenerObj = eventListenerStringObj;this.map = olMap;+ this.getSwipeOffset = getSwipeOffset;percentSwipe = valueOverride / 100;this.create(store);window.addEventListener('resize', () => {@@ -228,8 +230,6 @@ export default class Swipe {layersSideB = [];};- getSwipeOffset = () => swipeOffset;-update(store) {const state = store.getState();const { dateA, dateB } = getCompareDates(state);