Merge branch 'develop' into develop-Y24-190

sanger · Oct 24, 2024 · a868e2e · a868e2e
2 parents 9a6765e + 859dd00
commit a868e2e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/app/frontend/javascript/legacy_scripts_a.js b/app/frontend/javascript/legacy_scripts_a.js
@@ -59,9 +59,12 @@ let limberPlateView = function (defaultTab) {
   control.find('a[href="' + defaultTab + '"]').tab('show')
 
   plateElement.on('click', '.aliquot', function (event) {
+    control.find('a[data-plate-view="pools-view"]').tab('show')
+
     let pool = $(event.currentTarget).data('pool')
 
-    control.find('a[data-plate-view="pools-view"]').tab('show')
+    // Handle cases where pool is not defined to prevent errors
+    if (pool === undefined || pool === '') return
 
     plateElement
       .find('.aliquot[data-pool!=' + pool + ']')

diff --git a/app/helpers/page_helper.rb b/app/helpers/page_helper.rb
@@ -52,8 +52,8 @@ def jumbotron(jumbotron_id = nil, options = {}, &)
 
   # eg. state_badge('pending')
   # <span class="state-badge-pending">Pending</span>
-  def state_badge(state)
-    tag.span(state.titleize, class: "state-badge #{state}", title: 'Labware State', data: { toggle: 'tooltip' })
+  def state_badge(state, title: 'Labware State')
+    tag.span(state.titleize, class: "state-badge #{state}", title: title, data: { toggle: 'tooltip' })
   end
 
   # eg. count_badge(0)

diff --git a/app/views/application/_submission_item.html.erb b/app/views/application/_submission_item.html.erb
@@ -1,3 +1,3 @@
 <li>
- <%= state_badge(submission_item.state) %> <%= submission_item.name %>
+ <%= state_badge(submission_item.state, title: 'Submission State') %> <%= submission_item.name %>
 </li>
diff --git a/config/pipelines/bespoke_pcr.yml b/config/pipelines/bespoke_pcr.yml
@@ -88,6 +88,5 @@ Bespoke PCR MX:
     request_type_key:
       - limber_multiplexing
   relationships:
-    LBB Lib PCR-XP: LBB Lib PCR-XP Norm
-    LBB Lib PCR-XP Norm: LBB Lib Pool Stock
+    LBB Lib PCR-XP: LBB Lib Pool Stock
     LBB Lib Pool Stock: LB Lib Pool Norm
diff --git a/config/purposes/bespoke.yml b/config/purposes/bespoke.yml
@@ -13,8 +13,6 @@ LBB Lib PCR-XP:
   :asset_type: plate
   :presenter_class: Presenters::PcrPresenter
   :creator_class: LabwareCreators::CustomTaggedPlate
-LBB Lib PCR-XP Norm:
-  :asset_type: plate
 LBB Ligation Tagged:
   :asset_type: plate
   :presenter_class: Presenters::PcrPresenter

diff --git a/spec/helpers/page_helper_spec.rb b/spec/helpers/page_helper_spec.rb
@@ -22,4 +22,18 @@
       expect(count_badge(0, 'test')).to eq('<span class="badge badge-pill badge-secondary" id="test">0</span>')
     end
   end
+
+  describe '::state_badge' do
+    it 'returns a badge with the given state and default title' do
+      expect(state_badge('pending')).to eq(
+        '<span class="state-badge pending" title="Labware State" data-toggle="tooltip">Pending</span>'
+      )
+    end
+
+    it 'returns a badge with the given state and title' do
+      expect(state_badge('passed', title: 'Submission State')).to eq(
+        '<span class="state-badge passed" title="Submission State" data-toggle="tooltip">Passed</span>'
+      )
+    end
+  end
 end