WV-2821 ESLint Updates: 'consistent-return'

web/.eslintrc

@@ -88,7 +88,6 @@
         "no-nested-ternary": "off",    // 164 errors across 40 files
         "no-shadow": "warn",           // 110 errors across 40 files
         "max-len": "error",
-        "consistent-return": "off",    // 95 errors across 58 files
         "no-underscore-dangle": "error",
         "no-param-reassign": [         // 198 errors across 46 files
           "warn",

web/js/components/animation-widget/play-queue.js

@@ -137,7 +137,7 @@
   /**
    * Gets the last date that should be added to the queue
    */
   getLastInQueue = function() {
     const { isLoopActive, startDate, endDate } = this.props;
     let currentDate = toDate(this.playingDate);
     const currentBufferSize = util.objectLength(this.bufferObject);
@@ -207,15 +207,15 @@
     const restartLoop = loopStart && currentDate.getTime() === startDate.getTime();
 
     if ((isAnimating || this.hasPlayStarted) && !loopStart) {
-      return;
+      return true;
     }
     if (this.isPreloadSufficient() || restartLoop) {
-      if (this.isBetweenSteps) return;
+      if (this.isBetweenSteps) return true;
       // console.debug('Started: ', Date.now());
       this.hasPlayStarted = true;
       return this.play();
     }
-    this.checkQueue();
+    return this.checkQueue();
   };
 
   checkShouldLoop() {
@@ -313,7 +313,7 @@
         this.fetchTimes.push(fetchTime);
         this.setState({ loadedItems: loadedItems += 1 });
 
-        if (!this.mounted) return;
+        if (!this.mounted) return true;
         this.bufferObject[strDate] = strDate;
         delete this.inQueueObject[strDate];
         const currentBufferSize = util.objectLength(this.bufferObject);
@@ -401,19 +401,19 @@
       if (nextDate > endDate) {
         this.abortController.abort();
         this.checkShouldLoop();
-        return;
+        return true;
       }
 
       // Playback caught up with buffer :(
       if (!this.bufferObject[nextDateStr]) {
         this.stopPlaying();
         this.checkQueue();
-        return;
+        return true;
       }
       if (!isPlaying || !this.mounted) {
         this.stopPlaying();
       }
-      this.checkQueue();
+      return this.checkQueue();
     };
     const animIntervalMS = speed === 0.5 ? 2000 : 1000 / speed;
     this.animationInterval(animIntervalMS, player);

web/js/components/compare/pick.js

@@ -47,6 +47,7 @@ class Pick extends React.Component {
         </text>
       );
     }
+    return false;
   }
 
   render() {

web/js/components/context-menu/context-menu.js

@@ -61,7 +61,7 @@ function RightClickMenu(props) {
       return onToggleUnits(oppositeUnit);
     }
     setShow(false);
-    events.trigger(`measure:${action}`);
+    return events.trigger(`measure:${action}`);
   }
 
   function addPlaceMarkerHandler(coords, olMap, crs) {
@@ -79,7 +79,7 @@ function RightClickMenu(props) {
   };
 
   useEffect(() => {
-    if (isCoordinateSearchActive) return;
+    if (isCoordinateSearchActive) return false;
     events.on(MAP_SINGLE_CLICK, handleClick);
     events.on(MAP_CONTEXT_MENU, handleContextEvent);
     return () => {

web/js/components/dateline/datelines.js

@@ -60,7 +60,7 @@ function DateLines(props) {
 
   useEffect(() => {
     if (proj.id !== 'geographic' || !mapIsRendered) {
-      return;
+      return undefined;
     }
     map.on('movestart', () => {
       setHideLines(true);

web/js/components/dateline/line.js

@@ -56,6 +56,7 @@ export default function Line (props) {
       toggleTextActive(false);
     }
     if (overlay !== '') return overlay.setPosition([lineX, lineY]);
+    return undefined;
   });
 
   const mouseOver = () => {

web/js/components/image-download/image-download-panel.js

@@ -144,6 +144,7 @@ function ImageDownloadPanel(props) {
         </div>
       );
     }
+    return false;
   };
 
   const renderWorldfileSelect = () => {
@@ -169,6 +170,7 @@ function ImageDownloadPanel(props) {
         </div>
       );
     }
+    return false;
   };
 
   const crossesDatelineAlert = () => datelineMessage && (

web/js/components/layer/info/date-ranges.js

@@ -15,7 +15,7 @@ export default function DateRanges ({ layer }) {
   const { ongoing } = layer;
 
   const getDateRanges = async () => {
-    if (dateRanges.length) return;
+    if (dateRanges.length) return undefined;
     if (!ongoing) return setDateRanges(formatDateRanges(layer.dateRanges));
     const worker = new Worker('js/workers/describe-domains.worker.js');
     worker.onmessage = (event) => {
@@ -31,7 +31,7 @@ export default function DateRanges ({ layer }) {
       const parser = new DOMParser();
       const xmlDoc = parser.parseFromString(event.data, 'text/xml');
       const domains = xmlDoc.querySelector('Domain')?.textContent || '';
-      worker.postMessage({ operation: 'mergeDomains', args: [domains, 0] });
+      return worker.postMessage({ operation: 'mergeDomains', args: [domains, 0] });
     };
     worker.onerror = () => {
       worker.terminate();
@@ -48,7 +48,7 @@ export default function DateRanges ({ layer }) {
       id: layer.id,
       proj: 'EPSG:4326',
     };
-    worker.postMessage({ operation: 'requestDescribeDomains', args: [params] });
+    return worker.postMessage({ operation: 'requestDescribeDomains', args: [params] });
   };
 
   const renderListItem = () => dateRanges

web/js/components/layer/product-picker/browse/browse-layers-list.js

@@ -36,6 +36,7 @@ function BrowseLayerList (props) {
                 />
               );
             }
+            return undefined;
           })
         }
       </div>

web/js/components/layer/settings/palette.js

@@ -159,6 +159,7 @@ function PaletteSelect (props) {
         activePalette === target.id,
       );
     }
+    return undefined;
   };
 
   const recommended = layer.palette.recommended || [];
@@ -180,6 +181,7 @@ function PaletteSelect (props) {
                 return item;
               }
             }
+            return undefined;
           })
         }
       </Scrollbar>

web/js/components/layer/settings/vector-style.js

@@ -166,6 +166,7 @@ class VectorStyleSelect extends React.Component {
                 const item = this.customLegend(styleLayerObject);
                 return item;
               }
+              return false;
             })
           }
         </Scrollbar>

web/js/components/measure-tool/measure-tooltip.js

@@ -72,6 +72,7 @@ export default function MeasureTooltip(props) {
         ? `${roundAndLocale(imperialLength, ftPerMile)} mi`
         : `${roundAndLocale(imperialLength)} ft`;
     }
+    return undefined;
   };
 
   /**
@@ -91,6 +92,7 @@ export default function MeasureTooltip(props) {
         ? `${roundAndLocale(imperialArea, sqFtPerSqMile)} mi<sup>2</sup>`
         : `${roundAndLocale(imperialArea)} ft<sup>2</sup>`;
     }
+    return undefined;
   };
 
   const getMeasurementValue = () => {
@@ -103,6 +105,7 @@ export default function MeasureTooltip(props) {
     if (geometry instanceof OlLineString) {
       return getFormattedLength(geometry);
     }
+    return undefined;
   };
 
   const checkGeographicCoordValidity = (val) => val.indexOf('NaN') < 0;

web/js/components/range-selection/dragger.js

@@ -138,6 +138,7 @@ class TimelineDragger extends PureComponent {
         </text>
       );
     }
+    return undefined;
   }
 
   /*

web/js/components/sidebar/event.js

@@ -88,7 +88,7 @@ function Event (props) {
    * @returns Magnitude data output
    */
   function magnitudeOutput({ magnitudeUnit, magnitudeValue }) {
-    if (!magnitudeUnit || !magnitudeValue) return;
+    if (!magnitudeUnit || !magnitudeValue) return undefined;
     const formattedunit = magnitudeUnit === 'kts' ? ' kts' : ' NM';
     return (
       <p className="magnitude">
@@ -143,6 +143,7 @@ function Event (props) {
         </ul>
       );
     }
+    return undefined;
   }
 
   /**
@@ -177,6 +178,7 @@ function Event (props) {
         return `${source.title} `;
       });
     }
+    return undefined;
   }
 
   return (

web/js/components/sidebar/paletteLegend.js

@@ -454,6 +454,7 @@ class PaletteLegend extends React.Component {
       } if (colorMap.type === 'classification') {
         return this.renderClasses(colorMap, index);
       }
+      return undefined;
     });
   }
 
@@ -463,7 +464,7 @@ class PaletteLegend extends React.Component {
     } = this.props;
     const { isHoveringLegend } = this.state;
     const customClass = (showingVectorHand && layer.id.includes('AERONET')) || showingChartingIcon ? ' bottomspace-palette' : isCustomPalette ? ' is_custom' : '';
-    if (!layer.palette) return;
+    if (!layer.palette) return undefined;
     return (
       <div
         className={

web/js/components/timeline/timeline-axis/timeline-axis.js

@@ -1420,7 +1420,7 @@ class TimelineAxis extends Component {
         const xmlDoc = parser.parseFromString(event.data, 'text/xml');
         const domains = xmlDoc.querySelector('Domain')?.textContent;
         if (!domains) worker.terminate();
-        worker.postMessage({ operation: 'mergeDomains', args: [domains, 60_000] });
+        return worker.postMessage({ operation: 'mergeDomains', args: [domains, 60_000] });
       };
       worker.onerror = () => worker.terminate();
       let startDate = new Date(def.startDate);

web/js/components/timeline/timeline-controls/animation-button.js

@@ -43,6 +43,7 @@ function AnimationButton(props) {
     } if (isMobileTablet && isLandscape) {
       return `tablet-landscape${subdailyID}`;
     }
+    return undefined;
   };
 
   const buttonClass = getButtonClassName();

web/js/components/timeline/timeline-coverage/timeline-coverage.js

@@ -294,6 +294,7 @@ class TimelineLayerCoveragePanel extends Component {
         return granuleDateRanges.map(([start, end]) => ({ startDate: start, endDate: end }));
       });
     }
+    return undefined;
   };
 
   stopPropagation = (e) => {

web/js/components/timeline/timeline-draggers/dragger-container.js

@@ -245,13 +245,13 @@ class DraggerContainer extends PureComponent {
             null,
             true,
           );
-          return;
+          return true;
         }
         return false;
       }
 
       // update parent dragger positioning
-      updateDraggerDatePosition(
+      return updateDraggerDatePosition(
         newDraggerTime,
         draggerSelected,
         newDraggerPosition,

web/js/components/timeline/timeline-draggers/timeline-dragger.js

@@ -66,7 +66,7 @@ class Dragger extends PureComponent {
     } if (deltaX > 0 && draggerAtEnd) {
       return false;
     }
-    handleDragDragger(e, d);
+    return handleDragDragger(e, d);
   };
 
   /**

web/js/components/tour/widget-steps.js

@@ -21,7 +21,7 @@ function Steps(props) {
   };
 
   useEffect(() => {
-    if (!isKioskModeActive) return;
+    if (!isKioskModeActive) return undefined;
 
     document.addEventListener('keydown', handleKeyDown);
 

web/js/containers/animation-widget/collapsed-animation-widget.js

@@ -48,6 +48,7 @@ function CollapsedAnimationWidget (props) {
     } if (isMobileTablet && isLandscape) {
       return `-tablet-landscape${subdailyID}`;
     }
+    return undefined;
   };
 
   const widgetIDs = getWidgetIDs();

web/js/containers/animation-widget/mobile-animation-widget.js

@@ -56,6 +56,7 @@ function MobileAnimationWidget (props) {
     } if (isMobileTablet || screenWidth <= breakpoints.small) {
       return 'tablet';
     }
+    return undefined;
   };
 
   const mobileID = getMobileIDs();

web/js/containers/sidebar/layer-row.js

@@ -261,6 +261,7 @@ function LayerRow (props) {
         />
       );
     }
+    return undefined;
   };
 
   useEffect(() => {

web/js/containers/sidebar/sidebar.js

@@ -157,7 +157,7 @@ class Sidebar extends React.Component {
     });
     const storageValue = isNowCollapsed ? 'collapsed' : 'expanded';
     safeLocalStorage.setItem(SIDEBAR_COLLAPSED, storageValue);
-    collapseExpandToggle();
+    return collapseExpandToggle();
   }
 
   getProductsToRender(activeTab, isCompareMode, isChartMode) {
@@ -189,6 +189,7 @@ class Sidebar extends React.Component {
         />
       );
     }
+    return undefined;
   }
 
   handleWorldviewLogoClick(e, permalink) {

web/js/containers/timeline/timeline.js

@@ -970,7 +970,7 @@ class Timeline extends React.Component {
           if (!userIsInteracting && !isAnimationPlaying) {
             return resolve();
           }
-          setTimeout(waitForSafeUpdate, 1000);
+          return setTimeout(waitForSafeUpdate, 1000);
         }());
       });
     };

web/js/map/granule/granule-layer-builder.js

@@ -154,7 +154,7 @@ export default function granuleLayerBuilder(cache, store, createLayerWMTS) {
    * @returns {boolean} - true if date is within a range
   */
   const isWithinRanges = (date, ranges) => {
-    if (!ranges) return;
+    if (!ranges) return undefined;
 
     return ranges.some(([start, end]) => date >= new Date(start) && date <= new Date(end));
   };

web/js/map/granule/util.js

@@ -111,6 +111,7 @@ export const isWithinBounds = (crs, granule) => {
   if (crs === CRS.ARCTIC) {
     return granule.polygon.every(([lat, lon]) => lon > 40);
   }
+  return undefined;
 };
 
 export const getGranuleFootprints = (layer) => {
@@ -186,6 +187,7 @@ export const getParamsForGranuleRequest = (def, date, crs) => {
     } catch (e) {
       console.error(`Could not get shortName for a collection associated with layer ${def.id}`);
     }
+    return undefined;
   };
 
   if (def.conceptIds[0].type === 'NRT') {

web/js/map/layerbuilder.js

@@ -1128,6 +1128,7 @@ export default function mapLayerBuilder(config, cache, store) {
               url.replace('/VectorTileServer', '/VectorTileServer/'),
             );
           }
+          return undefined;
         },
       });
       await applyBackground(layer, vectorStyle.url);