/deploy sit

podaac · Mar 28, 2024 · c5b80cf · c5b80cf
2 parents a6f954b + d52545d
commit c5b80cf
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+### Changed
+### Removed
+### Fixed
+
+
+## [4.17.1]
+### Added
+### Changed
+### Removed
+### Fixed
+- issue-44: Fixed footprints and previews stay on map when not intended
+
+## [4.17.0]
+### Added
 - Added global_grid configuration check to make a global extent for images.
 ### Changed
 ### Removed
@@ -16,15 +30,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - issue-52: Fixed missing thumbnail placeholder
 - issue-44: Fixed footprints and previews stay on map when not intended
 
-
 ## [4.16.2]
 ### Added
 ### Changed
 ### Removed
 ### Fixed
 - issue-38: Removed shortName retrieval operation from variable graphql query
 
-
 ## [4.16.1]
 ### Added
 ### Changed
@@ -33,7 +45,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - issue-33: Fixed collection resolution displaying multiple resolutions and scaling
 
-
 ## [4.16.0]
 ### Added
 ### Changed
@@ -46,7 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - issue-15: Fixed color palette error in the legend when selecting datasets
 
-
 ## [4.15.0]
 ### Added
 - issue-17: Add way to read config files to allow for multiple lat lon for variables images.

diff --git a/cmr/ops_associations.txt b/cmr/ops_associations.txt
@@ -1,18 +1,8 @@
 C1940473819-POCLOUD
 C1940475563-POCLOUD
-C1968979997-POCLOUD
-C1968979762-POCLOUD
 C1996881456-POCLOUD
 C1996881636-POCLOUD
 C1996881807-POCLOUD
-C1968980549-POCLOUD
-C1968979566-POCLOUD
-C1968979550-POCLOUD
-C1968980583-POCLOUD
-C1968980576-POCLOUD
-C1968979597-POCLOUD
-C1968979561-POCLOUD
-C1968980609-POCLOUD
 C2036880739-POCLOUD
 C2205618215-POCLOUD
 C2205618339-POCLOUD
@@ -28,8 +18,6 @@ C2254232941-POCLOUD
 C2251465126-POCLOUD
 C2075141524-POCLOUD
 C2596983413-POCLOUD
-C2205121449-POCLOUD
-C2251464384-POCLOUD
 C1940471193-POCLOUD
 C1940472420-POCLOUD
 C1940470304-POCLOUD
@@ -70,4 +58,7 @@ C2746966657-POCLOUD
 C2799465428-POCLOUD
 C2799465507-POCLOUD
 C2799465497-POCLOUD
-C2832221740-POCLOUD
+C2068529568-POCLOUD
+C2832196001-POCLOUD
+C2147478146-POCLOUD
+C2147480877-POCLOUD
diff --git a/cmr/uat_associations.txt b/cmr/uat_associations.txt
@@ -7,17 +7,7 @@ C1234071416-POCLOUD
 C1940473819-POCLOUD
 C1940475563-POCLOUD
 C1940466008-POCLOUD
-C1238543220-POCLOUD
-C1238543223-POCLOUD
-C1238538240-POCLOUD
 C1238621102-POCLOUD
-C1238538225-POCLOUD
-C1238538224-POCLOUD
-C1238538231-POCLOUD
-C1238538230-POCLOUD
-C1238538233-POCLOUD
-C1238538232-POCLOUD
-C1238538241-POCLOUD
 C1238658052-POCLOUD
 C1240739577-POCLOUD
 C1240739709-POCLOUD
@@ -29,8 +19,6 @@ C1238658389-POCLOUD
 C1243175554-POCLOUD
 C1242387586-POCLOUD
 C1242387621-POCLOUD
-C1240739713-POCLOUD
-C1238621088-POCLOUD
 C1244810554-POCLOUD
 C1256420925-POCLOUD
 C1256507988-POCLOUD
@@ -45,33 +33,24 @@ C1238687284-POCLOUD
 C1238621115-POCLOUD
 C1240739688-POCLOUD
 C1238621172-POCLOUD
-C1238621178-POCLOUD
 C1245295751-POCLOUD
 C1238658080-POCLOUD
-C1238621182-POCLOUD
 C1240739654-POCLOUD
 C1238657960-POCLOUD
 C1238621118-POCLOUD
-C1245295750-POCLOUD
 C1242735870-POCLOUD
-C1240739704-POCLOUD
 C1238621219-POCLOUD
 C1240739764-POCLOUD
 C1238657961-POCLOUD
-C1238621111-POCLOUD
 C1238687534-POCLOUD
 C1238658050-POCLOUD
 C1238658086-POCLOUD
 C1240739611-POCLOUD
 C1240739768-POCLOUD
 C1238658088-POCLOUD
-C1238687282-POCLOUD
-C1238621176-POCLOUD
 C1238658049-POCLOUD
 C1238687546-POCLOUD
-C1256445396-POCLOUD
 C1240817851-POCLOUD
-C1238621186-POCLOUD
 C1240739606-POCLOUD
 C1238621112-POCLOUD
 C1259115176-POCLOUD
@@ -96,3 +75,19 @@ C1240739573-POCLOUD
 C1259966654-POCLOUD
 C1240739508-POCLOUD
 C1240739686-POCLOUD
+C1261072659-POCLOUD
+C1261072656-POCLOUD
+C1261072652-POCLOUD
+C1261072654-POCLOUD
+C1261072655-POCLOUD
+C1261072661-POCLOUD
+C1261072658-POCLOUD
+C1261072662-POCLOUD
+C1262095061-POCLOUD
+C1261072651-POCLOUD
+C1261591569-POCLOUD
+C1244459498-POCLOUD
+C1261591414-POCLOUD
+C1257081728-POCLOUD
+C1256981321-POCLOUD
+C1262623432-POCLOUD
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@gov.nasa.jpl.podaac/hitide-ui",
   "title": "HiTIDE",
   "description": "High Level Tool for Interactive Data Extraction",
-  "version": "4.17.1-5",
+  "version": "4.18.0-4",
   "scripts": {
     "build": "grunt --force; npm run copy",
     "copy": "node scripts/copy-files.js",

diff --git a/src/jpl/dijit/GranulesController.js b/src/jpl/dijit/GranulesController.js
@@ -746,13 +746,32 @@ define([
         postGranulesFetch: function(response) {
             this.availableGranules = response.hits;
             var _context = this;
-
+            var currentStateStore = _context.stateStore.query()
+            var acceptableStateStoreIds = []
+            var stateStoreItemsToRemove = []
+            for(var i=0; i<response.items.length; i++) {
+                acceptableStateStoreIds.push(response.items[i]["meta"]["concept-id"])
+            }
+            for(var j=0; j<currentStateStore.length; j++) {
+                if(!(acceptableStateStoreIds.includes(currentStateStore[j]["meta"]["concept-id"]))) {
+                    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]
+                });
+            }
+            // clear anything from state store that is not a concept id in the response items
             response.items.map(function(x) {
                 GranuleMetadata.convertFootprintAndImageFromCMR(x);
                 var currentGridStore = _context.gridStore.query()
                 var currentStateStore = _context.stateStore.query()
                 var relevantStateStoreObject = {}
-                var replacementGridGranuleAdded = false
                 var granule_id = x["meta"]["concept-id"];
                 for(var i=0; i<_context.stateStore.query().length; i++) {
                     var currentGridStoreContainsCurrentStateGranule = false
@@ -766,7 +785,6 @@ define([
                     }
                     if(!currentGridStoreContainsCurrentStateGranule && (currentStateStore[i].footprint || currentStateStore[i].preview)) {
                         _context.gridStore.put(currentStateStore[i])
-                        replacementGridGranuleAdded = true
                     }
                 }
                 var fpState = relevantStateStoreObject.footprint
@@ -782,8 +800,14 @@ define([
                 x["Granule-StopTime"] = moment.utc(x["umm"]["TemporalExtent"]["RangeDateTime"]["EndingDateTime"]);
 
                 x["source"] = "cmr";
-
-                if(!replacementGridGranuleAdded) {
+                var newGridStore = _context.gridStore.query()
+                var xAlreadyInGridStore = false
+                for(var k=0; k<newGridStore.length; k++){
+                    if(x["meta"]["concept-id"] === newGridStore[k]["meta"]["concept-id"]) {
+                        xAlreadyInGridStore = true
+                    }
+                }
+                if(!xAlreadyInGridStore) {
                     _context.gridStore.add(x)
                 }
             });

diff --git a/src/jpl/dijit/templates/HelpDialog.html b/src/jpl/dijit/templates/HelpDialog.html
@@ -127,7 +127,15 @@ <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.0</b> (1/31/2024)
+                                    <b>Version 4.17.1</b> (3/13/2024)
+                                </div>
+                                <ul>
+                                    <li><span class="releaseNotesTag releaseNotesTagFixed">Fixed</span> Security and bug fixes.</li>
+                               </ul>
+                            </div>
+                            <div>
+                                <div class="helpReleaseNotesVersionTitle">
+                                    <b>Version 4.17.0</b> (2/29/2024)
                                 </div>
                                 <ul>
                                     <li><span class="releaseNotesTag releaseNotesTagFixed">Fixed</span> Fixed collection thumbnails not loading properly for certain collections.</li>