Merge pull request #746 from tadast/tt/fix-remember-and-test

Fix remembering last used advanced params, add tests

Author: yannickwurm

lib/sequenceserver/routes.rb

@@ -300,7 +300,7 @@ def update_searchdata_from_job(searchdata)
       if job.advanced && job.advanced !=
                          searchdata.dig(:options, method, :default, :attributes).to_a.join(' ')
         searchdata[:options] = searchdata[:options].deep_copy
-        searchdata[:options][method]['last search'] = [job.advanced]
+        searchdata[:options][method]['last search'] = { attributes: [job.advanced] }
       end
     end
 

public/js/options.js

@@ -28,8 +28,8 @@ export class Options extends Component {
     componentDidUpdate(prevProps) {
         if (prevProps.predefinedOptions !== this.props.predefinedOptions) {
             let defaultOptions = this.props.predefinedOptions.default || {attributes: []};
-            let initialTextValue = (this.props.predefinedOptions['last search'] ||
-                    defaultOptions.attributes || []).join(' ').trim();
+            let advancedOptions = this.props.predefinedOptions['last search'] || defaultOptions || {attributes: []};
+            let initialTextValue = advancedOptions.attributes.join(' ').trim();
             let parsedOptions = this.parsedOptions(initialTextValue);
             this.setState({ textValue: initialTextValue, objectValue: parsedOptions});
         }

public/js/tests/mock_data/databases.json

@@ -82,10 +82,10 @@
     }
   ],
   "options": {
-    "blastn": { "default": ["-task blastn", "-evalue 1e-5"] },
-    "blastp": { "default": ["-evalue 1e-5"] },
-    "blastx": { "default": ["-evalue 1e-5"] },
-    "tblastx": { "default": ["-evalue 1e-5"] },
-    "tblastn": { "default": ["-evalue 1e-5"] }
+    "blastn": { "default": { "attributes": ["-task blastn", "-evalue 1e-5"] }},
+    "blastp": { "default": { "attributes": ["-evalue 1e-5"] }},
+    "blastx": { "default": { "attributes": ["-evalue 1e-5"] }},
+    "tblastx": { "default": { "attributes": ["-evalue 1e-5"] }},
+    "tblastn": { "default": { "attributes": ["-evalue 1e-5"] }}
   }
 }

public/sequenceserver-search.min.js

@@ -105,6 +105,27 @@ def nucleotide_query
     expect(page).to have_content('TBLASTN')
   end
 
+  it 'remembers advanced params for the same algorithm' do
+    visit '/'
+
+    fill_in('sequence', with: protein_query)
+    nucleotide_databases.each { |db| check db }
+    fill_in('advanced', with: '-evalue 0.01 -num_alignments 1')
+    click_button('method')
+    expect(page).to have_content('Query')
+
+    visit '/'
+    fill_in('sequence', with: protein_query)
+    check(protein_databases.first)
+    expect(page).to have_field('advanced', with: '-evalue 1e-5') # different algorithm, no memories
+    uncheck(protein_databases.first)
+
+    check(nucleotide_databases.first)
+    expect(page).to have_field('advanced', with: '-evalue 0.01 -num_alignments 1')
+    expect(page).to have_checked_field('predefinedOption', with: '-evalue 0.01 -num_alignments 1')
+
+  end
+
   ### Test aspects of the generated report.
 
   it 'can download FASTA of each hit' do