Merge branch 'develop' into release/4.17.3

# Conflicts: # package-lock.json # package.json
podaac · Sep 23, 2024 · 1770fb4 · 1770fb4
2 parents a8248d0 + 55b1934
commit 1770fb4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
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
 - Fixed adding matching granules feature
+- Fixed missing extraction variables selection
 
 
 ## [4.17.2]

diff --git a/src/jpl/dijit/DownloadsListing.js b/src/jpl/dijit/DownloadsListing.js
@@ -69,6 +69,16 @@ define([
             var variables = [];
             var all_variables = []
 
+            for (var j = 0; j < message.variables.variables.length; ++j) {
+                var variable = message.variables.variables[j];
+                // verify variable isn't a special case
+                if (message.variables.latVar != variable &&
+                    message.variables.lonVar != variable &&
+                    message.variables.timeVar != variable) {
+                    all_variables.push(message.variables.variables[j]);
+                }
+            }
+
             all_variables.sort(function (a, b) {
                 return a.toLowerCase().localeCompare(b.toLowerCase());
             });
@@ -86,7 +96,8 @@ define([
                 startDate: startDate,
                 endDate: endDate,
                 variables: variables,
-                defaultVars: [message.latVar, message.lonVar, message.timeVar],
+                // defaultVars: [message.latVar, message.lonVar, message.timeVar],
+                defaultVars: [message.variables.latVar, message.variables.lonVar, message.variables.timeVar],
                 granuleNames: granuleNames,
                 granuleIds: granuleIds,
                 granuleNamesFilter: granuleNamesFilter,