Fixes download page estimate routing.

Updates patch notes.
oceanobservatories · Mar 26, 2019 · 1388089 · 1388089
1 parent 17a6c1b
commit 1388089
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/ooiui/core/routes/science.py b/ooiui/core/routes/science.py
@@ -629,7 +629,9 @@ def get_csv(stream_name, reference_designator, start, end):
     user = request.args.get('user', '')
     email = request.args.get('email', '')
     parameters = request.args.get('parameters', '')
-    url = app.config['SERVICES_URL'] + '/uframe/get_csv/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s' % (stream_name, reference_designator, start, end, dpa, user, email, parameters)
+    estimate_only = request.args.get('estimate', 'false')
+    url = app.config['SERVICES_URL'] + '/uframe/get_csv/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s&estimate_only=%s' \
+          % (stream_name, reference_designator, start, end, dpa, user, email, parameters, estimate_only)
     req = requests.get(url, auth=(token, ''), stream=True)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
@@ -641,7 +643,9 @@ def get_json(stream_name, reference_designator, start, end, provenance, annotati
     user = request.args.get('user', '')
     email = request.args.get('email', '')
     parameters = request.args.get('parameters', '')
-    url = app.config['SERVICES_URL'] + '/uframe/get_json/%s/%s/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s' % (stream_name, reference_designator, start, end, dpa, provenance, annotations, user, email, parameters)
+    estimate_only = request.args.get('estimate', 'false')
+    url = app.config['SERVICES_URL'] + '/uframe/get_json/%s/%s/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s&estimate_only=%s' \
+          % (stream_name, reference_designator, start, end, dpa, provenance, annotations, user, email, parameters, estimate_only)
     req = requests.get(url, auth=(token, ''), stream=True, params=request.args)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
@@ -653,8 +657,9 @@ def get_netcdf(stream_name, reference_designator, start, end, provenance, annota
     user = request.args.get('user', '')
     email = request.args.get('email', '')
     parameters = request.args.get('parameters', '')
-    req = requests.get(app.config['SERVICES_URL'] + '/uframe/get_netcdf/%s/%s/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s'
-                       % (stream_name, reference_designator, start, end, dpa, provenance, annotations, user, email, parameters), auth=(token, ''), stream=True)
+    estimate_only = request.args.get('estimate', 'false')
+    req = requests.get(app.config['SERVICES_URL'] + '/uframe/get_netcdf/%s/%s/%s/%s/%s/%s/%s?user=%s&email=%s&parameters=%s&estimate_only=%s'
+                       % (stream_name, reference_designator, start, end, dpa, provenance, annotations, user, email, parameters, estimate_only), auth=(token, ''), stream=True)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
 

diff --git a/ooiui/static/js/models/science/StreamModel.js b/ooiui/static/js/models/science/StreamModel.js
@@ -74,15 +74,13 @@ var StreamModel = Backbone.Model.extend({
 
   getURL: function(type) {
     if(type == 'json') {
-      var url = '/api/uframe/get_json/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"/"+this.get('provenance')+"/"+this.get('annotations')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&parameters="+this.get('parameters');
+      var url = '/api/uframe/get_json/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"/"+this.get('provenance')+"/"+this.get('annotations')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&estimate="+this.get('estimate')+"&parameters="+this.get('parameters');
     } else if(type == 'profile_json_download') {
       var url = '/api/uframe/get_profiles/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&parameters="+this.get('parameters');
     } else if(type == 'netcdf') {
-      var url = '/api/uframe/get_netcdf/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"/"+this.get('provenance')+"/"+this.get('annotations')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&parameters="+this.get('parameters');
+      var url = '/api/uframe/get_netcdf/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"/"+this.get('provenance')+"/"+this.get('annotations')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&estimate="+this.get('estimate')+"&parameters="+this.get('parameters');
     } else if(type == 'csv') {
-      var url = '/api/uframe/get_csv/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&parameters="+this.get('parameters');
-    } else if(type == 'estimate') {
-      var url = '/api/uframe/get_json/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"/"+this.get('provenance')+"/"+this.get('annotations')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&parameters="+this.get('parameters')+"&estimate_only=true";
+      var url = '/api/uframe/get_csv/' + this.get('stream_name') + '/' + this.get('reference_designator')+"/"+this.get('start')+"/"+this.get('end')+"?user="+this.get('user_name')+'&email='+this.get('email')+"&estimate="+this.get('estimate')+"&parameters="+this.get('parameters');
     }
     return url;
   },

diff --git a/ooiui/static/js/views/science/StreamDownloadFormView.js b/ooiui/static/js/views/science/StreamDownloadFormView.js
@@ -272,7 +272,7 @@ var StreamDownloadFormView = Backbone.View.extend({
     // $('#metadata').fadeTo(0,0.6);
     // $('#metadata').append('<div id="temp-fade" style="position: absolute;top:0;left:0;width: 100%;height:100%;z-index:2;opacity:0.4;filter: alpha(opacity = 50)"></div>');
     // $("#wspinner").show();
-    // var selection = this.$type_select.val();
+    var selection = this.$type_select.val();
     var localModel = this.model.clone();
     var startDate = moment.utc(this.$start_date.data('date')).toJSON();
     var endDate = moment.utc(this.$end_date.data('date')).toJSON();
@@ -323,9 +323,10 @@ var StreamDownloadFormView = Backbone.View.extend({
       localModel.set('parameters', '')
     }
 
+    localModel.set('estimate', 'true');
 
     // Create the typical download AJAX request
-    var url = localModel.getURL('estimate');
+    var url = localModel.getURL(selection);
     $.ajax({
       url: url,
       type: "GET",
@@ -413,6 +414,8 @@ var StreamDownloadFormView = Backbone.View.extend({
       localModel.set('parameters', '')
     }
 
+    localModel.set('estimate', 'false');
+
 
     // Create the typical download AJAX request
     var url = localModel.getURL(selection);

diff --git a/ooiui/static/json/uiPatchNotes.json b/ooiui/static/json/uiPatchNotes.json
@@ -1,4 +1,11 @@
 [
+  {
+        "VersionNumber": "1.6.1",
+        "VersionDate": "2019-03-26",
+        "VersionDescription": [
+            "Data Download: Fixes time and size estimator launching erroneous download attempts. (14251)"
+        ]
+  },
   {
         "VersionNumber": "1.6.0",
         "VersionDate": "2019-03-08",