Merge pull request #215 from CBIIT/develop_3.0.1

Develop 3.0.1

Author: fmanuelos

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "evs-sip",
-  "version": "v3.0.0",
+  "version": "v3.0.1",
   "private": true,
   "homepage": "/evssip/",
   "dependencies": {

package.json

@@ -374,18 +374,18 @@ const getGraphicalPCDCDictionary = (project = null, node, prop) => {
   };
   let result;
 
-  // TODO - fix result being empty after making same request for 2nd time
-  // if (project) {
-  //   result = cache.getValue(`pcdc_dict_${project}`);
-  // } else {
-  //   result = cache.getValue("pcdc_dict");
-  // }
+  // Read from cache
+  if (project) {
+    result = cache.getValue(`public_pcdc_dict_${project}`);
+  } else {
+    result = cache.getValue("public_pcdc_dict");
+  }
 
   if (true || result === undefined) {
     let jsonData = shared.readPCDCMapping();
     result = generatePCDCData(jsonData, {});
     //result = generatePCDCData(jsonData, {Relationships: {}});
-    cache.setValue("pcdc_dict", result, config.item_ttl);
+    cache.setValue("public_pcdc_dict", result, config.item_ttl);
   }
 
   // Obtain nodes from specified project
@@ -417,7 +417,13 @@ const getGraphicalPCDCDictionary = (project = null, node, prop) => {
       project_result[n].links.push(linkItem);
     }
   });
-  cache.setValue("pcdc_dict_" + project, project_result, config.item_ttl);
+
+  // Cache the results
+  if (project) {
+    cache.setValue(`public_pcdc_dict_${project}`, project_result, config.item_ttl);
+  } else {
+    cache.setValue("public_pcdc_dict", project_result, config.item_ttl);
+  }
 
   // Handle empty results
   if (project_result.results.length === 0 ) {
@@ -442,7 +448,7 @@ const getPcdcNodes = (nodes, desiredNode, desiredProp) => {
   const desiredNodes = [];
 
   // Gather desired nodes into an array
-  for(const nodeName in nodes) {
+  for (const nodeName in nodes) {
     const node = nodes[nodeName];
     const isCorrectNode = node.node_name?.toLowerCase() === desiredNode?.toLowerCase();
 

server/service/esapi/esapicontroller.js

@@ -468,7 +468,7 @@ const getGraphicalCTDCDictionary = (req, res) => {
 };
 
 const getGraphicalPCDCDictionary = (req, res) => {
-  let project = req.query.project == "" ? "AML" : req.query.project;
+  let project = (req.query.project !== undefined && req.query.project !== '') ? req.query.project : 'AML';
   let jsonData = shared.getGraphicalPCDCDictionary(project);
   res.json(jsonData);
 };

server/service/search/controller.js

@@ -1284,35 +1284,42 @@ const getCompareResult_conflict = async function(searchText, from , limit) {
 
 const getGraphicalPCDCDictionary = (project) => {
   let project_result = cache.getValue("pcdc_dict_" + project);
-  if (project_result == undefined) {
-    let result = cache.getValue("pcdc_dict");
-    if (result == undefined) {
-      let jsonData = readPCDCMapping();
-      result = generatePCDCData(jsonData, {});
-      //result = generatePCDCData(jsonData, {Relationships: {}});
-      cache.setValue("pcdc_dict", result, config.item_ttl);
+
+  // Early return for successful cache retrieval
+  if (project_result !== undefined) {
+    return project_result;
+  }
+
+  let result = cache.getValue("pcdc_dict");
+
+  if (result === undefined) {
+    let jsonData = readPCDCMapping();
+    result = generatePCDCData(jsonData, {});
+    //result = generatePCDCData(jsonData, {Relationships: {}});
+    cache.setValue("pcdc_dict", result, config.item_ttl);
+  }
+
+  project_result = result[project];
+  let nodes = Object.keys(project_result);
+  //create fake relationship for graphical display purpose
+  nodes.forEach((n, i) => {
+    if (i - 4 >= 0) {
+      let linkItem = {};
+      linkItem["name"] = nodes[i - 4];
+      linkItem["backref"] = n;
+      linkItem["label"] = "of_pcdc";
+      linkItem["target_type"] = nodes[i - 4];
+      linkItem["required"] = false;
+
+      project_result[n].links.push(linkItem);
     }
+  });
 
-    project_result = result[project];
-    let nodes = Object.keys(project_result);
-    //create fake relationship for graphical display purpose
-
-    nodes.forEach((n, i) => {
-      if (i - 4 >= 0) {
-        let linkItem = {};
-        linkItem["name"] = nodes[i - 4];
-        linkItem["backref"] = n;
-        linkItem["label"] = "of_pcdc";
-        linkItem["target_type"] = nodes[i - 4];
-        linkItem["required"] = false;
-
-        // TODO - find out why linkItem is sometimes undefined
-        if (linkItem) {
-          project_result[n].links.push(linkItem);
-        }
-      }
-    });
-    cache.setValue("pcdc_dict_" + project, project_result, config.item_ttl);
+  // Cache the results
+  if (project) {
+    cache.setValue(`pcdc_dict_${project}`, project_result, config.item_ttl);
+  } else {
+    cache.setValue("pcdc_dict", project_result, config.item_ttl);
   }
 
   return project_result;

server/service/search/shared.js

@@ -1,5 +1,6 @@
 import React, { useState, useRef } from 'react';
 import styled from 'styled-components';
+import debounce from 'lodash.debounce';
 import { apiSuggest } from '../../api';
 import { InputGroup, FormControl, Button } from 'react-bootstrap';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -321,9 +322,20 @@ const SearchBox = (props) => {
     setSelectIndexState(-1);
   };
 
+  const suggestHandlerDebounce = useRef(
+    debounce((value) => {
+      apiSuggest(value)
+        .then(result => setSuggestState(result))
+        .catch(error => {
+          console.log(error);
+        });
+    }, 300)
+  ).current;
+
   const suggestHandler = event => {
-    setSearchState(event.target.value);
-    apiSuggest(event.target.value).then(result => setSuggestState(result));
+    let value =  event.target.value;
+    setSearchState(value);
+    suggestHandlerDebounce(value);
   };
 
   const matchOptionsHandler = event => {