Bugfix to 10x lane assignment

Author: bbimber

cluster/src/org/labkey/cluster/pipeline/SlurmExecutionEngine.java

@@ -183,7 +183,7 @@ protected Set<String> updateStatusForAllJobs() throws PipelineJobException
                                 String reason = reasonIdx != -1 && tokens.length > reasonIdx ? StringUtils.trimToNull(tokens[reasonIdx]) : null;
                                 if (reason != null)
                                 {
-                                    if (!"Priority".equals(reason))
+                                    if (!"Priority".equals(reason) && !"None".equals(reason))
                                     {
                                         if (status == null)
                                         {

singlecell/resources/web/singlecell/panel/LibraryExportPanel.js

@@ -839,6 +839,20 @@ Ext4.define('SingleCell.panel.LibraryExportPanel', {
                                 return;
                             }
 
+                            // The goal is to assign samples per lane, incrementing as we reach lane capacity
+                            if (totalData && autoAssignLane && !r.laneAssignment) {
+                                const dataAfterLane = dataInActiveLane + totalData;
+                                if (dataAfterLane > laneDataMax) {
+                                    currentLane++;
+                                    dataInActiveLane = totalData;
+                                }
+                                else {
+                                    dataInActiveLane = dataAfterLane;
+                                }
+
+                                r.laneAssignment = currentLane;
+                            }
+
                             barcodeCombosUsed.push([r[fieldName + '/barcode5'], r[fieldName + '/barcode3'], r.laneAssignment || ''].join('/'));
 
                             //The new format requires one/line
@@ -854,20 +868,6 @@ Ext4.define('SingleCell.panel.LibraryExportPanel', {
                                 //barcode5s = [barcode5s.join(',')];
                             }
 
-                            // The goal is to assign samples per lane, incrementing as we reach lane capacity
-                            if (totalData && autoAssignLane && !r.laneAssignment) {
-                                const dataAfterLane = dataInActiveLane + totalData;
-                                if (dataAfterLane > laneDataMax) {
-                                    currentLane++;
-                                    dataInActiveLane = totalData;
-                                }
-                                else {
-                                    dataInActiveLane = dataAfterLane;
-                                }
-
-                                r.laneAssignment = currentLane;
-                            }
-
                             Ext4.Array.forEach(barcode5s, function (bc, idx) {
                                 bc = doRC ? doReverseComplement(bc) : bc;
                                 const bc3 = barcode3s.length ? barcode3s[idx] : '';