Load archive data on archive login

observatorycontrolsystem · Jul 11, 2019 · 1bcf6d0 · 1bcf6d0
1 parent 22d71d2
commit 1bcf6d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/static/js/archive.js b/static/js/archive.js
@@ -12,6 +12,7 @@ function archiveAjaxSetup(){
         jqXHR.setRequestHeader('Authorization', 'Token ' + sessionStorage.getItem('archiveAuthToken'));
       }
     });
+    $(document).trigger('archivelogin');
   });
 }
 

diff --git a/static/js/components/archivetable.vue b/static/js/components/archivetable.vue
@@ -38,9 +38,7 @@
     ],
     watch: {
       requestid: function(){
-        $('#archive-table').bootstrapTable('refresh',
-          {url: archiveRoot + 'frames/?limit=1000&REQNUM=' + this.requestid}
-        );
+        this.refreshTable();
       }
     },
     methods: {
@@ -58,6 +56,13 @@
       },
       downloadAll: function(){
         downloadAll(this.requestid);
+      },
+      refreshTable: function() {
+        if (this.requestid) {
+          $('#archive-table').bootstrapTable('refresh',
+            {url: archiveRoot + 'frames/?limit=1000&REQNUM=' + this.requestid}
+          );
+        }
       }
     },
     computed: {
@@ -132,6 +137,9 @@
           }
         }]
       });
+      $(document).on('archivelogin', function() {
+        that.refreshTable();
+      })
     }
   };
 </script>

diff --git a/static/js/request_row.js b/static/js/request_row.js
@@ -10,7 +10,7 @@ $('.downloadall').click(function(){
   downloadAll($(this).data('requestid'));
 });
 
-$(document).ready(function() {
+function loadThumbnail() {
   $('.thumbnail-small').each(function(idx, elem) {
     getLatestFrame($(elem).data('request'), function(frame) {
       if (!frame) {
@@ -21,6 +21,7 @@ $(document).ready(function() {
         $(elem).attr('alt', frame.filename);
         $(elem).attr('title', frame.filename);
         $(elem).prev().show().html('<center><span class="fa fa-spinner fa-spin"></span></center>');
+        $('button[data-requestid="' + $(elem).data('request') +'"]').prop('disabled', false);
         getThumbnail(frame.id, 75, function(data) {
           if (data.error) {
             $(elem).prev().html(data.error);
@@ -32,7 +33,14 @@ $(document).ready(function() {
       }
     });
   });
+}
+
+$(document).on('archivelogin', function() {
+  loadThumbnail();
+});
 
+$(document).ready(function() {
+  loadThumbnail();
   $('.pending-details').each(function() {
     let that = $(this);
     let requestId = $(this).data('request');