Templated queries

api_routes/external.js

@@ -26,6 +26,7 @@ router.route('/name_resolver')
       },
       params: {
         string: req.query.string,
+        biolink_type: req.query.type,
         limit: req.query.limit,
       },
     };

api_routes/routes.js

@@ -1,6 +1,3 @@
-const fs = require('fs');
-const path = require('path');
-
 const router = require('express').Router();
 const axios = require('axios');
 
@@ -11,23 +8,12 @@ const external_apis = require('./external');
 
 const { getDrugDiseasePairs } = require('../explore/query/drug-disease');
 
-const samples = JSON.parse(fs.readFileSync(path.join(__dirname, './sample-query-cache.json')));
-
 router.use('/', external_apis);
 
 router.use('/robokache', robokache.router);
 
 router.route('/quick_answer')
   .post(async (req, res) => {
-    // if this is a sample query, load the response from the cache JSON:
-    for (let i = 0; i < samples.length; i += 1) {
-      const { query, response } = samples[i];
-      if (JSON.stringify(req.body) === JSON.stringify(query)) {
-        res.send(response);
-        return;
-      }
-    }
-
     const { ara } = req.query;
     const ara_url = services[ara];
     const config = {

src/API/nameResolver.js

@@ -6,13 +6,14 @@ const baseRoutes = {
   /**
    * Look up possible entities using a search string
    */
-  async entityLookup(search_string, limit, cancel) {
+  async entityLookup(search_string, limit, cancel, type) {
     const config = {
       headers: {
         'Content-Type': 'text/plain',
       },
       params: {
         string: search_string,
+        type,
         limit,
       },
       cancelToken: cancel,

src/pages/queryBuilder/QueryBuilder.jsx

@@ -17,9 +17,9 @@ import useQueryBuilder from './useQueryBuilder';
 import GraphEditor from './graphEditor/GraphEditor';
 import TextEditor from './textEditor/TextEditor';
 import JsonEditor from './jsonEditor/JsonEditor';
+import TemplatedQueriesModal from './templatedQueries/TemplatedQueriesModal';
 
 import './queryBuilder.css';
-import SampleQueryLoader from './SampleQueryLoader';
 
 const SubmitButton = withStyles((theme) => ({
   root: {
@@ -45,6 +45,7 @@ export default function QueryBuilder() {
   const displayAlert = useContext(AlertContext);
   const history = useHistory();
   const { isAuthenticated, getAccessTokenSilently } = useAuth0();
+  const [exampleQueriesOpen, setExampleQueriesOpen] = useState(false);
 
   /**
    * Submit this query directly to an ARA and then navigate to the answer page
@@ -184,13 +185,25 @@ export default function QueryBuilder() {
         <div id="queryBuilderContainer">
           <div id="queryEditorContainer">
             <QueryBuilderContext.Provider value={queryBuilder}>
-              <TextEditor
-                rows={queryBuilder.textEditorRows}
-              />
+              <div style={{ flex: 1 }}>
+                <TextEditor
+                  rows={queryBuilder.textEditorRows}
+                />
+              </div>
               <div>
                 <GraphEditor />
                 <div id="queryBuilderButtons">
-                  <SampleQueryLoader />
+                  <Button
+                    onClick={() => setExampleQueriesOpen(true)}
+                    variant="outlined"
+                  >
+                    Load Example
+                  </Button>
+                  <TemplatedQueriesModal
+                    open={exampleQueriesOpen}
+                    setOpen={setExampleQueriesOpen}
+                  />
+
                   <Button
                     onClick={() => toggleJson(true)}
                     variant="outlined"