LIMS-1854: Prevent submission of multiple reprocessing jobs (#1009)

Co-authored-by: Mark Williams <[email protected]>

Author: ndg63276

api/src/Page/Process.php

@@ -383,7 +383,7 @@ function _enqueue()
         );
         $this->_send_zocalo_message($rabbitmq_zocalo_vhost, $message);
 
-        $this->_output(new \stdClass);
+        $this->_output('Job successfully submitted');
     }
 
     function _enqueue_downstream()
@@ -413,7 +413,7 @@ function _enqueue_downstream()
 
         $this->_submit_zocalo_recipe($this->arg('RECIPE'), $parameters);
 
-        $this->_output(new \stdClass);
+        $this->_output('Job successfully submitted');
     }
 
     /*

client/src/js/modules/dc/views/downstreamreprocess.js

@@ -138,12 +138,19 @@ define(['backbone', 'marionette', 'views/dialog',
 
         submit: function(e) {
             e.preventDefault()
-            
+            this._disableIntegrateButton()
             this._enqueue({ RECIPE: this.model.get('PIPELINE'), DATACOLLECTIONID: this.model.get('ID'), SCALINGID: this.scalingid })
             app.message({ message: 'Downstream processing job successfully submitted'})
 
         },
 
+        _disableIntegrateButton: function() {
+            var btn = $('.ui-dialog-buttonpane button:contains("Submit")')
+            btn.button('disable').button('option', 'label', 'Submitted!')
+            setTimeout(function() {
+                btn.button('enable').button('option', 'label', 'Submit')
+            }, 5000)
+        },
 
         _enqueue: function(options) {
             Backbone.ajax({

client/src/js/modules/dc/views/reprocess.js

@@ -352,6 +352,7 @@ define(['backbone', 'marionette', 'views/dialog',
 
         integrate: function(e) {
             e.preventDefault()
+            this._disableIntegrateButton()
             var s = this.collection.where({ selected: true })
 
             if (!s.length) {
@@ -449,10 +450,10 @@ define(['backbone', 'marionette', 'views/dialog',
                 }, this)
 
                 $.when.apply($, reqs).done(function() {
-                    app.message({ message: jobs+' reprocessing job(s) successfully submitted'})
                     _.each(rps, function(rp) {
                         self._enqueue({ PROCESSINGJOBID: rp.get('PROCESSINGJOBID') })
                     })
+                    app.message({ message: jobs+' reprocessing job(s) successfully submitted'})
                 })
 
 
@@ -541,9 +542,9 @@ define(['backbone', 'marionette', 'views/dialog',
                         reqs.push(reprocessingsweeps.save())
 
                         $.when.apply($, reqs).done(function() {
-                            app.message({ message: '1 reprocessing job successfully submitted'})
                             self._enqueue({ PROCESSINGJOBID: reprocessing.get('PROCESSINGJOBID') })
                         })
+                        app.message({ message: '1 reprocessing job successfully submitted'})
                     },
 
                     error: function() {
@@ -555,6 +556,15 @@ define(['backbone', 'marionette', 'views/dialog',
         },
 
 
+        _disableIntegrateButton: function() {
+            var btn = $('.ui-dialog-buttonpane button:contains("Integrate")')
+            btn.button('disable').button('option', 'label', 'Submitted!')
+            setTimeout(function() {
+                btn.button('enable').button('option', 'label', 'Integrate')
+            }, 5000)
+        },
+
+
         _enqueue: function(options) {
             Backbone.ajax({
                 url: app.apiurl+'/process/enqueue',

client/src/js/modules/mc/views/datacollections.js

@@ -60,7 +60,7 @@ define(['backbone', 'marionette',
 
         events: {
             'click .integrate': 'integrate',
-            'click a.opt': 'toggleOpts',
+            'click button.opt': 'toggleOpts',
             'change @ui.pipeline': 'updatePipeline',
         },
 
@@ -106,11 +106,12 @@ define(['backbone', 'marionette',
 
         integrate: function(e) {
             e.preventDefault()
+            this._disableIntegrateButton()
 
             var s = this.collection.where({ selected: true })
 
             if (!s.length) {
-                utils.confirm({ title: 'No data collections selected', content: 'Please selected some data sets to integrate' })
+                utils.confirm({ title: 'No data collections selected', content: 'Please select some data sets to integrate', buttons: {'Ok': 'closeDialog'}})
                 return
             }
 
@@ -198,8 +199,8 @@ define(['backbone', 'marionette',
                     var reprocessingsweeps = new ReprocessingImageSweeps(sweeps)
                     reprocessingsweeps.save()
 
-                    app.message({ message: '1 reprocessing job successfully submitted'})
                     self._enqueue({ PROCESSINGJOBID: reprocessing.get('PROCESSINGJOBID') })
+                    app.message({ message: 'Reprocessing job successfully submitted'})
                 },
 
                 error: function() {
@@ -210,6 +211,16 @@ define(['backbone', 'marionette',
         },
 
 
+        _disableIntegrateButton: function() {
+            var btn = $('button.integrate')
+            var btnHtml = btn.html()
+            btn.prop('disabled', true).html('<i class="fa fa-check"></i> Submitted!');
+            setTimeout(function() {
+                btn.prop('disabled', false).html(btnHtml);
+            }, 5000)
+        },
+
+
         _enqueue: function(options) {
             Backbone.ajax({
                 url: app.apiurl+'/process/enqueue',

client/src/js/templates/mc/datacollections.html

@@ -32,8 +32,8 @@ <h1>Data Collections for <%-VISIT%></h1>
         <label>High Res <input type="text" name="res" placeholder="eg 1.5" /> &#197;</label>
         <label>Low Res <input type="text" name="lowres" placeholder="eg 40" /> &#197;</label>
 
-        <a href="#" class="button integrate" title="Integrate the selected data collections"><i class="fa fa-cog"></i> Integrate</a>
-        <a href="#" class="button opt">Xia2 Options</a>
+        <button class="button integrate" title="Integrate the selected data collections"><i class="fa fa-cog"></i> Integrate</button>
+        <button class="button opt">Xia2 Options</button>
     </div>
 
     <div class="options data_collection">

client/src/js/utils.js

@@ -81,10 +81,10 @@ define(['backbone',
         },
 
         events: {
-            'click a.dismiss': 'disimss',
+            'click a.dismiss': 'dismiss',
         },
 
-        disimss: function(e) { 
+        dismiss: function(e) {
             e.preventDefault()
             this.destroy()
         },
@@ -118,13 +118,15 @@ define(['backbone',
         var ConfirmDialog = DialogView.extend({
             title: options.title,
             template: _.template(options.content),
-            buttons: {
+            buttons: options.buttons || {
                 'Ok': 'onOK',
                 'Cancel': 'closeDialog',
             },
 
             onOK: function() {
-                options.callback()
+                if (typeof options.callback === 'function') {
+                    options.callback();
+                }
                 this.closeDialog()
             },
         })
@@ -236,4 +238,4 @@ define(['backbone',
 
   return utils
 
-})
+})