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

Merge discvr-22.11 to develop

Author: bbimber

SequenceAnalysis/pipeline_code/sequence_tools_install.sh

@@ -856,7 +856,7 @@ then
     PIP_VERSION=`pip -V | cut -d '(' -f 2 | sed 's/python //' | cut -c 1 2>1`
 
     if [[ $PIP_VERSION == '2' ]];then
-      CUTADAPT_BRANCH='v1.18'
+      CUTADAPT_BRANCH='v1.3'
     fi
 
     pip install --target ${LKTOOLS_DIR}/cutadapt_pip git+https://github.com/marcelm/cutadapt.git@${CUTADAPT_BRANCH}

SequenceAnalysis/resources/web/SequenceAnalysis/panel/SequenceImportPanel.js

@@ -1438,7 +1438,7 @@ Ext4.define('SequenceAnalysis.panel.SequenceImportPanel', {
                                 xtype: 'textfield',
                                 fieldLabel: 'Group RegEx',
                                 itemId: 'groupEx',
-                                value: '(.*)_'
+                                value: 's_([^_]+)_'
                             },{
                                 xtype: 'ldk-integerfield',
                                 fieldLabel: 'Group Index',
@@ -1449,12 +1449,12 @@ Ext4.define('SequenceAnalysis.panel.SequenceImportPanel', {
                                 xtype: 'textfield',
                                 fieldLabel: 'Platform Unit RegEx',
                                 itemId: 'platformEx',
-                                value: '(.*)_'
+                                value: '(.*)_R[1-2]+'
                             },{
                                 xtype: 'ldk-integerfield',
                                 fieldLabel: 'Platform Index',
                                 itemId: 'platformNum',
-                                value: 2,
+                                value: 1,
                                 minValue: 0
                             }],
                             buttons: [{