Merge pull request #731 from tadast/tt/search-header-plugin

Simplify webpack config and allow adding a header above search form

Author: yannickwurm

bin/sequenceserver

@@ -398,8 +398,8 @@ begin
       end
 
       if import?
-        xml_file = fetch_option(:import).value
-        params = {:xml => xml_file}
+        xml_file_path = fetch_option(:import).value
+        params = {:xml => xml_file_path}
         job = SequenceServer::BLAST::Job.new(params)
         puts job.id
         exit

jest.config.js

@@ -44,6 +44,7 @@ module.exports = {
         'report_plugins': '<rootDir>/public/js/null_plugins/report_plugins.js',
         'download_links': '<rootDir>/public/js/null_plugins/download_links.js',
         'hit_buttons': '<rootDir>/public/js/null_plugins/hit_buttons.js',
+        'search_header_plugin': '<rootDir>/public/js/null_plugins/search_header_plugin.js',
     },
     watchPlugins: [
         'jest-watch-typeahead/filename',

package.json

@@ -10,11 +10,11 @@
   },
   "scripts": {
     "watch": "webpack --watch",
-    "watch-cloud": "webpack --watch --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js' --env=targetEnv='cloud'",
+    "watch-cloud": "webpack --watch --env=pluginsPath='../sequence_server_js_extensions' --env=targetEnv='cloud'",
     "test": "jest",
     "minify:css": "cleancss public/css/sequenceserver.css > public/css/sequenceserver.min.css",
     "build": "webpack && npm run minify:css",
-    "build-cloud": "webpack --env=reportPluginsPath='../sequence_server_js_extensions/report_plugins.js' --env=downloadLinks='../sequence_server_js_extensions/conserved_domains/download_links.js' --env=hitButtons='../sequence_server_js_extensions/hit_buttons.js' --env=targetEnv='cloud' && npm run minify:css"
+    "build-cloud": "webpack --env=pluginsPath='../sequence_server_js_extensions' --env=targetEnv='cloud' && npm run minify:css"
   },
   "dependencies": {
     "babel-plugin-transform-export-extensions": "^6.22.0",

public/js/null_plugins/search_header_plugin.js

@@ -0,0 +1,4 @@
+export const SearchHeaderPlugin = () => {
+    return '';
+};
+

public/js/search.js

@@ -3,6 +3,7 @@ import React, { Component } from "react";
 import { createRoot } from "react-dom/client";
 import { DnD } from "./dnd";
 import { Form } from "./form";
+import { SearchHeaderPlugin } from "search_header_plugin";
 
 /**
  * Clear sessionStorage on reload.
@@ -19,6 +20,7 @@ class Page extends Component {
   render() {
     return (
       <div>
+        <SearchHeaderPlugin />
         <DnD ref="dnd" />
         <Form ref="form" />
       </div>

public/sequenceserver-search.min.js

@@ -37,7 +37,7 @@
           <%= erb :blastp_options %>
           </div>
       </div>
-      
+
       <div
         class="modal-footer">
         <button
@@ -49,4 +49,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

views/search.erb

@@ -3,9 +3,7 @@ const path = require('path');
 const webpack = require('webpack');
 
 module.exports = (env, argv)  => {
-    const reportPluginsPath = env.reportPluginsPath || './public/js/null_plugins/report_plugins.js';
-    const downloadLinks = env.downloadLinks || './public/js/null_plugins/download_links.js';
-    const hitButtons = env.hitButtons || './public/js/null_plugins/hit_buttons.js';
+    const pluginsPath = env.pluginsPath || './public/js/null_plugins';
 
     return {
         entry: {
@@ -45,9 +43,10 @@ module.exports = (env, argv)  => {
         resolve: {
             modules: [path.resolve(__dirname, 'public', 'js'), path.resolve(__dirname, 'node_modules')],
             alias: {
-                'report_plugins': path.resolve(__dirname, reportPluginsPath),
-                'download_links': path.resolve(__dirname, downloadLinks),
-                'hit_buttons': path.resolve(__dirname, hitButtons),
+                'report_plugins': path.resolve(__dirname, pluginsPath, 'report_plugins.js'),
+                'download_links': path.resolve(__dirname, pluginsPath, 'download_links.js'),
+                'hit_buttons': path.resolve(__dirname, pluginsPath, 'hit_buttons.js'),
+                'search_header_plugin': path.resolve(__dirname, pluginsPath, 'search_header_plugin.js'),
             }
         }
     };