Restore ability to set click action on layer

- Re-add feature added in #2488.
- Add map method to prevent (and re-enable) all click actions on features. Use these methods in the DownloadPanelView when draw mode is enabled.
- Remove some dev code

Issue #1889

Author: robyngit

src/js/models/connectors/GeoPoints-Cesium.js

@@ -108,6 +108,7 @@ define([
       connect: function () {
         try {
           this.disconnect();
+
           // Listen for changes to the points collection and update the layer
           const geoPoints = this.get("geoPoints");
           const events = ["update", "reset"];

src/js/models/connectors/GeoPoints-CesiumPoints.js

@@ -49,7 +49,6 @@ define(["cesium", "models/connectors/GeoPoints-Cesium"], function (
        */
       handleCollectionChange(eventName, collection, options) {
         try {
-          // alert("Point change");
           // For merges and resets, just remove all points and re-add them
           if (!options?.add && !options?.remove) {
             this.resetLayerPoints();

src/js/models/maps/MapInteraction.js

@@ -176,7 +176,20 @@ define([
         // Clone the models in hovered features and set them as clicked features
         const hoveredFeatures = this.get("hoveredFeatures").models;
         this.setClickedFeatures(hoveredFeatures);
-        const clickAction = this.get("mapModel")?.get("clickFeatureAction");
+
+        // First check if there is specific action set for the layer.
+        let clickAction = this.get("hoveredFeatures")
+          ?.at(0)
+          ?.get("mapAsset")
+          ?.get("clickFeatureAction");
+        // Default to the mapModel action otherwise.
+        if (clickAction == null) {
+          clickAction = this.get("mapModel")?.get("clickFeatureAction");
+        }
+
+        if (this.get("preventClickAction")) {
+          clickAction = false;
+        }
 
         if (clickAction === "showDetails") {
           this.selectFeatures(hoveredFeatures);
@@ -191,6 +204,16 @@ define([
         this.setClickedPositionFromMousePosition();
       },
 
+      /** Prevent any action from happening when the user clicks a feature */
+      preventClickAction() {
+        this.set("preventClickAction", true);
+      },
+
+      /** Enable click actions on features if previous prevented */
+      enableClickAction() {
+        this.set("preventClickAction", false);
+      },
+
       /**
        * Sets the clicked position to the current mouse position.
        */
@@ -339,8 +362,6 @@ define([
             return;
           }
 
-          // alert("This is where the error is happening....");
-
           // Ignore if new features are identical to the current features
           const currentFeatures = model.get(type);
           if (

src/js/templates/maps/layers-panel.html

@@ -1,3 +1,3 @@
 <div class="toolbar__content-header">Layers</div>
 <div class="<%= classNames.search %>"></div>
-<div class="<%= classNames.layers %>"></div>
+<div class="<%= classNames.layers %>"></div>

src/js/templates/maps/toolbar.html

@@ -1,3 +1,2 @@
 <div class="toolbar__all-content"></div>
-<div class="toolbar__links"></div>
-
+<div class="toolbar__links"></div>

src/js/views/maps/CesiumWidgetView.js

@@ -174,6 +174,7 @@ define([
           if (!MetacatUI.appModel.get("enableCesium")) {
             return;
           }
+
           // Save a reference to this view
           const view = this;
 
@@ -607,7 +608,6 @@ define([
         if (now - lastCall < delay) return;
         this.setHoveredFeaturesLastCall = now;
         const pickedFeature = view.scene.pick(position);
-
         view.interactions.setHoveredFeatures([pickedFeature]);
       },
 

src/js/views/maps/DownloadPanelView.js

@@ -315,19 +315,14 @@ define([
       initialize(options) {
         this.mapModel = options.model || new Map();
         this.objectServiceUrl = MetacatUI.appModel.get("objectServiceUrl");
-        // Add models & collections and add interactions, layer, connector,
-        // points, and originalAction properties to this view
+        // Add models & collections, interactions, layer, connector, points
         this.setUpMapModel();
         this.setUpLayer();
         this.setUpConnectors();
       },
 
-      /**
-       * Sets up the map model and adds the interactions and originalAction
-       * properties to this view.
-       */
+      /** Adds reference to interaction model to view */
       setUpMapModel() {
-        this.originalAction = this.mapModel.get("clickFeatureAction");
         this.interactions =
           this.mapModel.get("interactions") ||
           this.mapModel.setUpInteractions();
@@ -569,13 +564,12 @@ define([
        */
       removeClickListeners() {
         const handler = this.clickHandler;
-        const { originalAction } = this;
         if (handler) {
           handler.stopListening();
           handler.clear();
           this.clickHandler = null;
         }
-        this.mapModel.set("clickFeatureAction", originalAction);
+        this.interactions.enableClickAction();
         this.listeningForClicks = false;
       },
 
@@ -592,7 +586,7 @@ define([
         this.clickHandler = handler;
         const { interactions } = this;
         const clickedPosition = interactions.get("clickedPosition");
-        this.mapModel.set("clickFeatureAction", null);
+        this.interactions.preventClickAction();
         handler.listenTo(
           clickedPosition,
           "change:latitude change:longitude",