Merge pull request #7287 from pjonsson/enable-more-lint

Enable some more @typescript-eslint rules

.eslintrc

@@ -33,6 +33,10 @@
     }
   },
   "rules": {
+    /* ban-types is split in ESLint v8:
+       https://typescript-eslint.io/rules/ban-types/ */
+    "@typescript-eslint/ban-types": "error",
+    "@typescript-eslint/unified-signatures": "error",
     "react-hooks/exhaustive-deps": "error",
     "react/jsx-boolean-value": ["error", "never", { "always": [] }],
     "react/no-arrow-function-lifecycle": "error",
@@ -113,6 +117,10 @@
     {
       "files": ["**/*.ts", "**/*.tsx"],
       "rules": {
+        /* The no-useless-constructor needs to be disabled for
+            the @typescript-eslint-rule. */
+        "no-useless-constructor": "off",
+        "@typescript-eslint/no-useless-constructor": "error",
         // @TODO: revise these rules
         "@typescript-eslint/consistent-type-assertions": "error",
         "no-unused-vars": "off",

lib/Models/Catalog/CatalogReferences/ThreddsItemReference.ts

@@ -3,17 +3,14 @@ import { runInAction } from "mobx";
 import ReferenceMixin from "../../../ModelMixins/ReferenceMixin";
 import UrlMixin from "../../../ModelMixins/UrlMixin";
 import ThreddsItemReferenceTraits from "../../../Traits/TraitsClasses/ThreddsItemReferenceTraits";
-import ModelTraits from "../../../Traits/ModelTraits";
 import ThreddsCatalogGroup, {
   ThreddsDataset
 } from "../CatalogGroups/ThreddsCatalogGroup";
 import CatalogMemberFactory from "../CatalogMemberFactory";
 import CreateModel from "../../Definition/CreateModel";
 import LoadableStratum from "../../Definition/LoadableStratum";
 import { BaseModel } from "../../Definition/Model";
-import StratumFromTraits from "../../Definition/StratumFromTraits";
 import StratumOrder from "../../Definition/StratumOrder";
-import Terria from "../../Terria";
 import WebMapServiceCatalogGroup from "../Ows/WebMapServiceCatalogGroup";
 
 export class ThreddsDatasetStratum extends LoadableStratum(
@@ -71,15 +68,6 @@ export default class ThreddsItemReference extends UrlMixin(
   _threddsDataset: ThreddsDataset | undefined = undefined;
   _threddsCatalogGroup: ThreddsCatalogGroup | undefined = undefined;
 
-  constructor(
-    id: string | undefined,
-    terria: Terria,
-    sourceReference?: BaseModel,
-    strata?: Map<string, StratumFromTraits<ModelTraits>>
-  ) {
-    super(id, terria, sourceReference, strata);
-  }
-
   setDataset(dataset: ThreddsDataset) {
     this._threddsDataset = dataset;
   }

lib/Models/Catalog/CatalogReferences/UrlReference.ts

@@ -3,9 +3,7 @@ import UrlMixin from "../../../ModelMixins/UrlMixin";
 import CatalogMemberFactory from "../CatalogMemberFactory";
 import CreateModel from "../../Definition/CreateModel";
 import { BaseModel } from "../../Definition/Model";
-import StratumFromTraits from "../../Definition/StratumFromTraits";
 import Terria from "../../Terria";
-import ModelTraits from "../../../Traits/ModelTraits";
 import UrlReferenceTraits from "../../../Traits/TraitsClasses/UrlReferenceTraits";
 import StratumOrder from "../../Definition/StratumOrder";
 import CatalogMemberMixin from "../../../ModelMixins/CatalogMemberMixin";
@@ -23,15 +21,6 @@ export default class UrlReference extends UrlMixin(
     return UrlReference.type;
   }
 
-  constructor(
-    id: string | undefined,
-    terria: Terria,
-    sourceReference?: BaseModel,
-    strata?: Map<string, StratumFromTraits<ModelTraits>>
-  ) {
-    super(id, terria, sourceReference, strata);
-  }
-
   protected forceLoadReference(
     _previousTarget: BaseModel | undefined
   ): Promise<BaseModel | undefined> {

lib/Models/Catalog/Gtfs/GtfsRealtimeProtoBufReaders.ts

@@ -29,10 +29,6 @@ export class FeedMessageReader extends ProtobufMessageReader<FeedMessage> {
     entity: []
   };
 
-  constructor() {
-    super();
-  }
-
   protected readField(tag: number, obj?: FeedMessage, pbf?: Pbf): void {
     if (pbf === null || pbf === undefined) {
       return;

lib/Models/Definition/addModelStrataView.ts

@@ -14,14 +14,11 @@ import ModelPropertiesFromTraits from "./ModelPropertiesFromTraits";
 export default function addModelStrataView<
   T extends TraitsConstructor<ModelTraits>
 >(
-  model: Stratified<InstanceType<T>>,
+  /* TODO: Use a more specific type than "Function". */
+  /* eslint-disable-next-line @typescript-eslint/ban-types */
+  model: Stratified<InstanceType<T>> | Function,
   Traits: T
 ): ModelPropertiesFromTraits<InstanceType<T>>;
-export default function addModelStrataView<
-  T extends TraitsConstructor<ModelTraits>
-  /* TODO: Fix this overload type */
-  /* eslint-disable-next-line @typescript-eslint/ban-types */
->(model: Function, Traits: T): ModelPropertiesFromTraits<InstanceType<T>>;
 export default function addModelStrataView<
   T extends TraitsConstructor<ModelTraits>
 >(model: any, Traits: T): ModelPropertiesFromTraits<InstanceType<T>> {

lib/ReactViews/Disclaimer.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
 
-declare class Disclaimer extends React.Component<{}> {}
+declare class Disclaimer extends React.Component<object> {}
 
 export default Disclaimer;

lib/ReactViews/Disclaimer.jsx

@@ -51,10 +51,6 @@ class Disclaimer extends React.Component {
     t: PropTypes.func.isRequired
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   confirm(confirmCallbackFn) {
     if (confirmCallbackFn) {
       confirmCallbackFn();

lib/ReactViews/DragDropNotification.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
 
-declare class DragDropNotification extends React.Component<{}> {}
+declare class DragDropNotification extends React.Component<object> {}
 
 export default DragDropNotification;

lib/ReactViews/Map/MapNavigation/Items/MapNavigationItem.tsx

@@ -20,10 +20,6 @@ interface PropTypes {
 
 @observer
 class MapNavigationItemBase extends React.Component<PropTypes> {
-  constructor(props: PropTypes) {
-    super(props);
-  }
-
   render() {
     const { closeTool = true, item, expandInPlace, i18n } = this.props;
     if (item.render)

lib/ReactViews/Map/MapNavigation/Items/ZoomControl.tsx

@@ -31,10 +31,6 @@ export const ZOOM_CONTROL_ID = "zoom";
 class ZoomControlBase extends React.Component<PropTypes> {
   static displayName = "ZoomControl";
 
-  constructor(props: PropTypes) {
-    super(props);
-  }
-
   flyToPosition(
     scene: Scene,
     position: Cartesian3,

lib/ReactViews/Map/Panels/HelpPanel/HelpPanel.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 
-declare class HelpPanel extends React.Component<{}> {}
+declare class HelpPanel extends React.Component<object> {}
 export default HelpPanel;

lib/ReactViews/Map/Panels/HelpPanel/HelpPanelItem.jsx

@@ -26,10 +26,6 @@ class HelpPanelItem extends React.Component {
     i18n: PropTypes.object.isRequired
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     const { i18n } = this.props;
 

lib/ReactViews/Map/Panels/HelpPanel/HelpVideoPanel.jsx

@@ -34,10 +34,6 @@ class HelpVideoPanel extends React.Component {
     i18n: PropTypes.object.isRequired
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     const helpItemType = this.props.paneMode || "videoAndContent"; // default is video panel
     const itemSelected =

lib/ReactViews/Map/Panels/HelpPanel/StyledHtml.jsx

@@ -51,10 +51,6 @@ export class StyledHtmlRaw extends React.Component {
     injectTooltips: true
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     const { viewState, injectTooltips, i18n } = this.props;
     const styledTextProps = this.props.styledTextProps || {};

lib/ReactViews/Map/Panels/HelpPanel/TrainerPane.jsx

@@ -33,10 +33,6 @@ class TrainerPane extends React.Component {
     i18n: PropTypes.object.isRequired
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     const { content, i18n, viewState } = this.props;
     const { trainerItems, markdownText } = content;

lib/ReactViews/Map/Panels/HelpPanel/VideoGuide.jsx

@@ -69,10 +69,6 @@ class VideoGuide extends React.Component {
     t: PropTypes.func
   };
 
-  constructor(props) {
-    super(props);
-  }
-
   render() {
     const backgroundOpacity = this.props.backgroundOpacity;
     const backgroundBlackOverlay =

lib/ReactViews/Notification/terriaErrorNotification.tsx

@@ -125,7 +125,7 @@ export const terriaErrorNotification = (error: TerriaError) =>
               bodyBoxProps={{ padded: true }}
               isOpen={error.showDetails}
               onToggle={(show) => {
-                runInAction(() => (error.showDetails = show));
+                return runInAction(() => (error.showDetails = show));
               }}
             >
               <ErrorsBox errors={detailedErrors} viewState={viewState} />

lib/ReactViews/RelatedMaps/RelatedMaps.tsx

@@ -20,13 +20,6 @@ type PropTypes = WithViewState &
 
 @observer
 class RelatedMaps extends React.Component<PropTypes> {
-  /**
-   * @param {Props} props
-   */
-  constructor(props: PropTypes) {
-    super(props);
-  }
-
   render() {
     const t = this.props.t;
     const dropdownTheme = {

lib/ReactViews/SelectableDimensions/Group.tsx

@@ -48,11 +48,13 @@ export const SelectableDimensionGroup: React.FC<{
         onToggle={
           dim.type === "group"
             ? dim.onToggle
-            : (isOpen) =>
+            : (isOpen) => {
                 dim.setDimensionValue(
                   CommonStrata.user,
                   isOpen ? "true" : "false"
-                )
+                );
+                return true;
+              }
         }
         btnStyle={dim.type === "checkbox-group" ? "checkbox" : undefined}
         btnRight={dim.type === "group"}

lib/ReactViews/Tour/TourPortal.d.ts

@@ -3,6 +3,6 @@ import React from "react";
 export declare const TourExplanation: React.FC<unknown>;
 export declare const TourPreface: React.FC<unknown>;
 
-declare const TourPortal: React.FC<{}>;
+declare const TourPortal: React.FC<object>;
 
 export default TourPortal;

lib/ReactViews/WelcomeMessage/WelcomeMessage.d.ts

@@ -8,5 +8,5 @@ interface WelcomeMessagePurePropsType {
 
 export declare const WelcomeMessagePure: React.FC<WelcomeMessagePurePropsType>;
 
-declare class WelcomeMessage extends React.Component<{}> {}
+declare class WelcomeMessage extends React.Component<object> {}
 export default WelcomeMessage;

lib/Table/createLongitudeLatitudeFeaturePerId.ts

@@ -119,8 +119,6 @@ class PreSampledPositionProperty {
 
   private allValuesAreTheSame = true;
 
-  constructor() {}
-
   getProperty() {
     if (this.allValuesAreTheSame) {
       return new ConstantPositionProperty(this.values[0]);

lib/Traits/Decorators/anyTrait.ts

@@ -22,10 +22,6 @@ export default function anyTrait(options: TraitOptions) {
 export class AnyTrait extends Trait {
   readonly decoratorForFlattened = computed.struct;
 
-  constructor(id: string, options: AnyTraitOptions, parent: any) {
-    super(id, options, parent);
-  }
-
   getValue(model: BaseModel): any {
     for (const stratum of model.strataTopToBottom.values()) {
       const stratumAny: any = stratum;

test/ModelMixins/SearchProviders/SearchProviderMixinSpec.ts

@@ -9,10 +9,6 @@ class TestSearchProvider extends SearchProviderMixin(
 ) {
   type = "test";
 
-  constructor(uniqueId: string | undefined, terria: Terria) {
-    super(uniqueId, terria);
-  }
-
   public override logEvent = jasmine.createSpy();
   public override doSearch = jasmine
     .createSpy()