Some more changes

sanger · Jan 20, 2021 · e7551a0 · e7551a0
1 parent 4952c34
commit e7551a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/javascript/plain-javascript/page-reloader.js b/app/javascript/plain-javascript/page-reloader.js
@@ -3,14 +3,14 @@ document.addEventListener('DOMContentLoaded', () => {
   console.log('Loaded')
   const timerElement = document.querySelector('[data-reload-time]')
   if (timerElement) {
-    let timer = parseInt(timerElement.dataset['reloadTime'])
+    let timer = parseInt(timerElement.dataset['reloadTime'], 10)
     let interval = window.setInterval(_ => {
       timer -= 1 // Decrement timer
       timerElement.textContent = timer // Update the onscreen counter
       if (timer <= 0) { // If we've hit zero
         window.clearInterval(interval) // Stop the interval
         location.reload() // And reload the page
       }
-    },1000)
+    }, 1000)
   }
 })
diff --git a/app/models/sequencescape_submission.rb b/app/models/sequencescape_submission.rb
@@ -67,10 +67,14 @@ def assets
     @asset_groups.pluck(:assets)
   end
 
+  def extra_barcodes_list
+    return nil unless extra_barcodes
+    extra_barcodes.split(' ')
+  end
+
   def extra_plates
     return @extra_plates if @extra_plates
-
-    response = Sequencescape::Api::V2.additional_plates_for_presenter(barcode: extra_barcodes)
+    response = Sequencescape::Api::V2.additional_plates_for_presenter(barcode: extra_barcodes_list)
     @extra_plates ||= response
     raise "Barcodes not found #{extra_barcodes}" unless @extra_plates
 
@@ -82,7 +86,7 @@ def extra_assets
 
     @extra_assets ||= extra_plates.map do |labware|
       labware.wells.reject(&:empty?).map(&:uuid)
-    end.flatten
+    end.flatten.uniq
   end
 
   #