Skip to content

Commit c4fd53e

Browse files
committed
Improved validation on alignment import
1 parent 1a41612 commit c4fd53e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

SequenceAnalysis/resources/web/SequenceAnalysis/panel/AlignmentImportPanel.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ Ext4.define('SequenceAnalysis.panel.AlignmentImportPanel', {
610610
},
611611
scope: this,
612612
success: this.onFileLoad,
613-
failure: LDK.Utils.getErrorCallback
613+
failure: LDK.Utils.getErrorCallback()
614614
});
615615

616616
this.fileNameStore = Ext4.create('Ext.data.Store', {
@@ -860,7 +860,7 @@ Ext4.define('SequenceAnalysis.panel.AlignmentImportPanel', {
860860

861861
var found = false;
862862
Ext4.each(cols, function(col, idx){
863-
if (col.name == field || col.text == field || col.dataIndex.toLowerCase() == field.toLowerCase()){
863+
if (col.name === field || col.text === field || col.dataIndex.toLowerCase() === field.toLowerCase()){
864864
columns.push(col);
865865
found = true;
866866
return false;
@@ -918,11 +918,11 @@ Ext4.define('SequenceAnalysis.panel.AlignmentImportPanel', {
918918
var recIdx = col.editor.store.find(col.editor.valueField, value, null, false, false);
919919

920920
//attempt to resolve by displayField
921-
if (recIdx == -1) {
921+
if (recIdx === -1) {
922922
recIdx = col.editor.store.find(col.editor.displayField, value, null, false, false);
923923
}
924924

925-
if (recIdx == -1) {
925+
if (recIdx === -1) {
926926
errors.push('Invalid value for field ' + col.text + ': ' + value);
927927
}
928928
else {
@@ -932,6 +932,10 @@ Ext4.define('SequenceAnalysis.panel.AlignmentImportPanel', {
932932
}
933933
}
934934

935+
if (value && col.dataIndex === 'readset' && !Ext4.isNumeric(value)) {
936+
errors.push('Readset Id should be an integer: ' + value);
937+
}
938+
935939
if (!Ext4.isEmpty(value)){
936940
obj[col.dataIndex] = value;
937941
}

0 commit comments

Comments
 (0)