Y24 335 updating flowcel types and library types

app/controllers/print_jobs_controller.rb

@@ -28,7 +28,7 @@ def print_job_params
         # While we COULD carefully define the current label structure, we gain nothing by doing so and make
         # future changes more painful.
         permitted[:labels] = params.require(:print_job)[:labels].map(&:permit!)
-        permitted[:labels_sprint] = params.require(:print_job)[:labels_sprint].permit!
+        permitted[:labels_sprint] = params.require(:print_job)[:labels_sprint][:sprint].map(&:permit!)
       end
   end
 

app/models/print_job.rb

@@ -90,8 +90,6 @@ def print_to_sprint
 
     label_template = get_label_template_by_service('SPrint')
 
-    label_array = labels_sprint.values
-
     # label_array:
     # [{
     #   "right_text"=>"DN9000003B",
@@ -101,7 +99,7 @@ def print_to_sprint
     #   "extra_left_text"=>"10-NOV-2020"
     # }]
 
-    merge_fields_list = label_array * number_of_copies
+    merge_fields_list = labels_sprint * number_of_copies
 
     # assumes all labels use the same label template
     SPrintClient.send_print_request(printer_name, label_template, merge_fields_list)

app/views/labware/_barcode_printing_form.html.erb

@@ -27,7 +27,7 @@
   <% labels.each do |label| %>
     <!-- this includes main label and extra label in one -->
     <% label.sprint_attributes.each_with_index do |(k, v), index|%>
-      <%= hidden_field_tag "#{f.object_name}[labels_sprint][sprint][#{k}]", v %>
+      <%= hidden_field_tag "#{f.object_name}[labels_sprint][sprint][][#{k}]", v %>
     <%end%>
     <!-- additional labels (e.g. for additional labels on the same plate or for extra intermediate plates) -->
     <% label.additional_label_definitions.each_with_index do |additional_labels, index|%>

config/pipelines/hic.wip.yml

@@ -0,0 +1,42 @@
+---
+Bespoke PCR HiC:
+  pipeline_group: Bespoke PCR HiC
+  filters:
+    request_type_key:
+      - limber_hic # Have to move this into a the new pipeline config when HiC pipeline is implemented (Y24-335).
+    library_type:
+      - ChIP-Seq Auto
+      - Chromium single cell HTO
+      - Chromium single cell surface protein
+      - Chromium single cell surface protein HT
+      - Chromium Visium
+      - Chromium Visium FFPE
+      - Manual Chromium single cell 3 prime v3
+      - Manual Chromium single cell 3 prime HT v3
+      - Manual Chromium single cell 5 prime v2
+      - Manual Chromium single cell 5 prime HT v2
+      - emSEQ
+      - Haplotagging
+      - Hi-C
+      - Hi-C - Arima v1
+      - Hi-C - Arima v2
+      - Hi-C - Dovetail
+      - Hi-C - OmniC
+      - Hi-C - Qiagen
+      - Manual Standard WGS (Plate)
+      - Ribozero RNA depletion
+      - Ribozero RNA-seq (Bacterial)
+      - Ribozero RNA-seq (HMR)
+      - RNA-seq dUTP eukaryotic
+      - RNA-seq dUTP prokaryotic
+      - Small RNA (miRNA)
+      - Standard
+      - TraDIS
+      - TruSeq mRNA (RNA Seq)
+      - SGE Library v0.2
+  library_pass: LBB Lib PCR-XP
+  relationships:
+    Stock Plate: LBB Ligation
+    LBB Cherrypick: LBB Ligation
+    LBC Cherrypick: LBB Ligation
+    LBB Ligation: LBB Lib PCR-XP

spec/controllers/print_jobs_controller_spec.rb

@@ -16,10 +16,7 @@
           label_templates_by_service: 'tube_label_template_1d',
           labels: [{ 'label' => { 'barcode' => '12345', 'test_attr' => 'test' } }],
           labels_sprint: {
-            sprint: {
-              'extra_right_text' => 'some x right text',
-              'extra_left_text' => 'some x left text'
-            }
+            sprint: [{ 'extra_right_text' => 'some x right text', 'extra_left_text' => 'some x left text' }]
           },
           number_of_copies: 1
         }

spec/models/print_job_spec.rb

@@ -188,15 +188,15 @@
 
   describe 'print_to_sprint' do
     let(:labels_sprint) do
-      {
-        'sprint' => {
+      [
+        {
           'right_text' => 'DN9000003B',
           'left_text' => 'DN9000003B',
           'barcode' => 'DN9000003B',
           'extra_right_text' => 'DN9000003B  LTHR-384 RT',
           'extra_left_text' => '10-NOV-2020'
         }
-      }
+      ]
     end
 
     it 'will send a print request to SPrintClient' do
@@ -215,7 +215,7 @@
       expect(SPrintClient).to receive(:send_print_request).with(
         printer_sprint.name,
         label_template_name_sprint,
-        labels_sprint.values
+        labels_sprint
       )
       expect(pj.print_to_sprint).to eq(true)
     end