Merge branch 'develop' into release/4.17.2

# Conflicts: # package-lock.json # package.json
podaac · Jul 24, 2024 · 51de42d · 51de42d
2 parents 045217a + 3758779
commit 51de42d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 - issue-44: Fixed footprints and previews stay on map when not intended
+- issue-65: Fixed footprints and previews disappearing from map when not intended
 
 ## [4.17.0]
 ### Added

diff --git a/src/hitideConfig.js b/src/hitideConfig.js
@@ -1,4 +1,5 @@
 var hitideProfileOrigin = "https://hitide.profile.podaac.uat.earthdatacloud.nasa.gov/hitide/api";
+// var hitideProfileOrigin = "http://localhost:8080/hitide/api";
 
 window.hitideConfig = {
     paletteService: "https://hitide.podaac.earthdatacloud.nasa.gov/palettes",
@@ -10,7 +11,7 @@ window.hitideConfig = {
     cmrVariableService: hitideProfileOrigin + "/cmr/graphql",
     crossOriginCmrCookies: true,
 
-    authCodeUrl: "https://uat.urs.earthdata.nasa.gov/oauth/authorize",
+    authCodeUrl: "https://urs.earthdata.nasa.gov/oauth/authorize",
 
     loginUrl: hitideProfileOrigin + "/session/login",
     logoutUrl: hitideProfileOrigin + "/session/logout",
@@ -24,5 +25,5 @@ window.hitideConfig = {
     datasetSearchServiceItemsPerPage: 200,
     maxGranulesPerDownload: 999999999,
     googleTagManagerId: "GTM-M5D83V6",
-    earthDataAppClientId: "dxpH2WeN_f8IpNLgHwplsg"
+    earthDataAppClientId: "mn6VmRfej3U2Tm0UhbC1jw"
 };
diff --git a/src/jpl/dijit/GranulesController.js b/src/jpl/dijit/GranulesController.js
@@ -78,6 +78,7 @@ define([
         _granuleSearchInProgress: false,
         loadingGranulesMessage: '<div class="granulesControllerLoadingGranulesMessage">Loading Granules...</div>',
         noGranulesMessage: '<div class="granulesControllerNoDataMessage">No Granules Found</div>',
+        scrollLoadInProgress: false,
 
         constructor: function() {
             this.datasetVariables = {};
@@ -757,14 +758,17 @@ define([
                     stateStoreItemsToRemove.push((currentStateStore[j]))
                 }
             }
-            for(var k=0; k<stateStoreItemsToRemove.length; k++) {
-                _context.stateStore.remove(stateStoreItemsToRemove[k]["Granule-Id"])
-                topic.publish(GranuleSelectionEvent.prototype.REMOVE_GRANULE_FOOTPRINT, {
-                    granuleObj: stateStoreItemsToRemove[k]
-                });
-                topic.publish(GranuleSelectionEvent.prototype.REMOVE_GRANULE_PREVIEW, {
-                    granuleObj: stateStoreItemsToRemove[k]
-                });
+            // if scroll, don't remove
+            if(!this.scrollLoadInProgress) {
+                for(var k=0; k<stateStoreItemsToRemove.length; k++) {
+                    _context.stateStore.remove(stateStoreItemsToRemove[k]["Granule-Id"])
+                    topic.publish(GranuleSelectionEvent.prototype.REMOVE_GRANULE_FOOTPRINT, {
+                        granuleObj: stateStoreItemsToRemove[k]
+                    });
+                    topic.publish(GranuleSelectionEvent.prototype.REMOVE_GRANULE_PREVIEW, {
+                        granuleObj: stateStoreItemsToRemove[k]
+                    });
+                }
             }
             // clear anything from state store that is not a concept id in the response items
             response.items.map(function(x) {
@@ -838,6 +842,9 @@ define([
             // Show spinner 
             this.displayLoadingSpinner(false);
 
+            // set scroll back to false
+            this.scrollLoadInProgress = false;
+
         },
 
         filterGranules: function() {
@@ -892,6 +899,7 @@ define([
             // First approach, fetch more if scroll pos is 90% of way down
             if ((scrollPosTop + offsetHeight) / scrollHeight > 0.90) {
                 this.currentSolrIdx += this.itemsPerPage;
+                this.scrollLoadInProgress = true;
                 this.fetchGranules();
             }
         },

diff --git a/src/jpl/dijit/templates/HelpDialog.html b/src/jpl/dijit/templates/HelpDialog.html
@@ -127,7 +127,7 @@ <h5 class="help-brandVersion" data-dojo-attach-point="hitideVersion">version #.#
                         <div class="help-container help-container-hidden" id="helpReleaseNotesContent">
                             <div>
                                 <div class="helpReleaseNotesVersionTitle">
-                                    <b>Version 4.17.2</b> (4/3/2024)
+                                    <b>Version 4.17.2</b> (7/24/2024)
                                 </div>
                                 <ul>
                                     <li><span class="releaseNotesTag releaseNotesTagFixed">Fixed</span> Security and bug fixes.</li>