fix: show warning

TerriaJS · Nov 20, 2023 · e985376 · e985376
1 parent d3fe2f4
commit e985376
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/lib/ModelMixins/SearchProviders/LocationSearchProviderMixin.ts b/lib/ModelMixins/SearchProviders/LocationSearchProviderMixin.ts
@@ -28,6 +28,9 @@ function LocationSearchProviderMixin<
     toggleOpen(stratumId: CommonStrata = CommonStrata.user) {
       this.setTrait(stratumId, "isOpen", !this.isOpen);
     }
+
+    @action
+    showWarning() {}
   }
 
   return LocationSearchProviderMixin;

diff --git a/lib/Models/SearchProviders/BingMapsSearchProvider.ts b/lib/Models/SearchProviders/BingMapsSearchProvider.ts
@@ -1,5 +1,5 @@
 import i18next from "i18next";
-import { action, makeObservable, runInAction } from "mobx";
+import { makeObservable, override, runInAction } from "mobx";
 import Rectangle from "terriajs-cesium/Source/Core/Rectangle";
 import Resource from "terriajs-cesium/Source/Core/Resource";
 import defined from "terriajs-cesium/Source/Core/defined";
@@ -34,18 +34,18 @@ export default class BingMapsSearchProvider extends LocationSearchProviderMixin(
     makeObservable(this);
 
     runInAction(() => {
-      if (!this.key && this.terria.configParameters.bingMapsKey) {
+      if (!!this.terria.configParameters.bingMapsKey) {
         this.setTrait(
           CommonStrata.defaults,
           "key",
           this.terria.configParameters.bingMapsKey
         );
       }
-      this.showWarning();
     });
   }
 
-  showWarning() {
+  @override
+  override showWarning() {
     if (!this.key || this.key === "") {
       console.warn(
         `The ${applyTranslationIfExists(this.name, i18next)}(${

diff --git a/lib/Models/SearchProviders/CesiumIonSearchProvider.ts b/lib/Models/SearchProviders/CesiumIonSearchProvider.ts
@@ -1,5 +1,5 @@
 import i18next from "i18next";
-import { makeObservable, runInAction } from "mobx";
+import { makeObservable, override, runInAction } from "mobx";
 import Rectangle from "terriajs-cesium/Source/Core/Rectangle";
 
 import {
@@ -16,13 +16,6 @@ import SearchProviderResults from "./SearchProviderResults";
 import SearchResult from "./SearchResult";
 import CommonStrata from "../Definition/CommonStrata";
 
-interface CesiumIonSearchProviderOptions {
-  terria: Terria;
-  url?: string;
-  key: string;
-  flightDurationSeconds?: number;
-}
-
 interface CesiumIonGeocodeResultFeature {
   bbox: [number, number, number, number];
   properties: { label: string };
@@ -47,18 +40,18 @@ export default class CesiumIonSearchProvider extends LocationSearchProviderMixin
     makeObservable(this);
 
     runInAction(() => {
-      if (!this.key && this.terria.configParameters.cesiumIonAccessToken) {
+      if (!!this.terria.configParameters.cesiumIonAccessToken) {
         this.setTrait(
           CommonStrata.defaults,
           "key",
           this.terria.configParameters.cesiumIonAccessToken
         );
       }
-      this.showWarning();
     });
   }
 
-  showWarning() {
+  @override
+  override showWarning() {
     if (!this.key || this.key === "") {
       console.warn(
         `The ${applyTranslationIfExists(this.name, i18next)}(${

diff --git a/lib/Models/SearchProviders/SearchBarModel.ts b/lib/Models/SearchProviders/SearchBarModel.ts
@@ -61,12 +61,16 @@ export class SearchBarModel extends CreateModel(SearchBarTraits) {
       );
     }
     searchProviders?.forEach((searchProvider) => {
-      upsertSearchProviderFromJson(
+      const loadedModel = upsertSearchProviderFromJson(
         SearchProviderFactory,
         this.terria,
         CommonStrata.definition,
         searchProvider
       ).pushErrorTo(errors);
+
+      if (LocationSearchProviderMixin.isMixedInto(loadedModel)) {
+        loadedModel.showWarning();
+      }
     });
 
     return new Result(