Merge pull request #195 from LabKey/fb_merge_22.11_to_develop

Merge discvr-22.11 to develop

Author: bbimber

SequenceAnalysis/pipeline_code/sequence_tools_install.sh

@@ -282,8 +282,13 @@ then
     rm -Rf DISCVRSeq*
     rm -Rf ${LKTOOLS_DIR}/DISCVRSeq.jar
 
-    wget $WGET_OPTS https://github.com/BimberLab/DISCVRSeq/releases/download/1.29/DISCVRSeq-1.29.jar
-    cp DISCVRSeq-1.29.jar ${LKTOOLS_DIR}/DISCVRSeq.jar
+    curl -s https://api.github.com/repos/BimberLab/DISCVRSeq/releases/latest \
+    | grep 'browser_download_url.*jar' \
+    | cut -d : -f 2,3 \
+    | tr -d \" \
+    | wget -O DISCVRseq.jar -qi -
+
+    cp DISCVRSeq.jar ${LKTOOLS_DIR}/DISCVRSeq.jar
 fi
 
 

SequenceAnalysis/resources/web/SequenceAnalysis/panel/BaseSequencePanel.js

@@ -247,7 +247,7 @@ Ext4.define('SequenceAnalysis.panel.BaseSequencePanel', {
                             bodyStyle: 'padding-top: 10px;padding-left: 5px;',
                             items: [{
                                 xtype: 'labkey-combo',
-                                width: 450,
+                                width: 600,
                                 fieldLabel: 'Select Run',
                                 editable: true,
                                 forceSelection: true,
@@ -268,11 +268,14 @@ Ext4.define('SequenceAnalysis.panel.BaseSequencePanel', {
                                     afterrender: function (field) {
                                         Ext4.defer(field.focus, 200, field);
                                     }
-                                }
+                                },
+                                labelWidth: 200
                             },{
                                 xtype: 'checkbox',
                                 itemId: 'useReadsetContainer',
-                                fieldLabel: 'Submit Jobs to Same Folder/Workbook as Readset'
+                                helpPopup: 'By default, the pipelines jobs and their outputs will be created in the workbook you selected. However, in certain cases, such as bulk submission of many jobs, it might be preferable to submit each job to the source folder/workbook for each input. Checking this box will enable this.',
+                                fieldLabel: 'Submit Jobs to Same Folder/Workbook as Readset',
+                                labelWidth: 200
                             }]
                         }],
                         buttons: [{
@@ -305,6 +308,12 @@ Ext4.define('SequenceAnalysis.panel.BaseSequencePanel', {
                                 }
 
                                 win.sequencePanel.applySavedValues(json);
+
+                                var submitJobToReadsetContainer = win.sequencePanel.down('[name="submitJobToReadsetContainer"]');
+                                if (submitJobToReadsetContainer) {
+                                    submitJobToReadsetContainer.setValue(useReadsetContainer);
+                                }
+
                                 win.close();
                             }
                         },{
@@ -366,7 +375,7 @@ Ext4.define('SequenceAnalysis.panel.BaseSequencePanel', {
         }, this);
 
         // For top-level properties:
-        Ext4.Array.forEach(['submissionType', 'useOutputFileContainer', 'submitJobToReadsetContainer'], function(val) {
+        Ext4.Array.forEach(['submissionType', 'useOutputFileContainer'], function(val) {
             if (values[val]) {
                 var field = this.down('[name="' + val + '"]');
                 if (field) {