Skip to content

Commit 29d2bd2

Browse files
committed
Drive hashing UI from database
1 parent 7167fef commit 29d2bd2

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SELECT
2+
distinct groupName as groupName
3+
from singlecell.hashing_labels

singlecell/resources/web/singlecell/panel/PoolImportPanel.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,12 @@ Ext4.define('SingleCell.panel.PoolImportPanel', {
202202

203203
return val;
204204
}
205+
else if (val && type === 'BioLegend') {
206+
val = String(val);
207+
if (val.indexOf('SI-NA') === -1) {
208+
val = 'SI-NA-' + val;
209+
}
210+
}
205211
}
206212

207213
return val;
@@ -496,11 +502,15 @@ Ext4.define('SingleCell.panel.PoolImportPanel', {
496502
storeValues: ['SI-NA'],
497503
value: 'SI-NA'
498504
},{
499-
xtype: 'ldk-simplecombo',
505+
xtype: 'ldk-simplelabkeycombo',
500506
fieldLabel: 'Hashing Type',
501507
itemId: 'hashingType',
502508
forceSelection: true,
503-
storeValues: ['CD298', 'MultiSeq'],
509+
containerPath: Laboratory.Utils.getQueryContainerPath(),
510+
schemaName: 'singlecell',
511+
queryName: 'hashing_label_groups',
512+
displayField: 'groupName',
513+
valueField: 'groupName',
504514
value: 'MultiSeq'
505515
},{
506516
xtype: 'textarea',
@@ -811,6 +821,9 @@ Ext4.define('SingleCell.panel.PoolImportPanel', {
811821
else if (hashingType === 'MultiSeq'){
812822
libraryType = 'MultiSeq';
813823
}
824+
else if (hashingType === 'BioLegend'){
825+
libraryType = 'BioLegend';
826+
}
814827

815828
var rs = this.processReadsetForGroup(poolName, rowArr, ret.readsetRows, 'hto', 'HTO', 'Cell Hashing', libraryType);
816829
if (Ext4.isString(rs)) {

singlecell/resources/web/singlecell/panel/cDNAImportPanel.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,15 @@ Ext4.define('SingleCell.panel.cDNAImportPanel', {
142142
storeValues: ['SI-NA'],
143143
value: 'SI-NA'
144144
},{
145-
xtype: 'ldk-simplecombo',
145+
xtype: 'ldk-simplelabkeycombo',
146146
fieldLabel: 'Hashing Type',
147147
itemId: 'hashingType',
148148
forceSelection: true,
149-
storeValues: ['CD298', 'MultiSeq'],
149+
containerPath: Laboratory.Utils.getQueryContainerPath(),
150+
schemaName: 'singlecell',
151+
queryName: 'hashing_label_groups',
152+
displayField: 'groupName',
153+
valueField: 'groupName',
150154
value: 'MultiSeq'
151155
}, {
152156
xtype: 'textarea',

0 commit comments

Comments
 (0)