Merge pull request #50 from qresp-code-development/develop

New Release, v2.0.5
qresp-code-development · Feb 21, 2021 · 769e3c9 · 769e3c9
2 parents d62728d + 397fc5f
commit 769e3c9
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## v2.0.5 (2021/02/21)
+
+Patch Update
+
+- Fixed typos, missing commas in list of collections
+- Fixed missing middle names
+- Fixed critical bug causing crashes on clicking external nodes in the workflow graph.
 ## v2.0.4 (2021/01/09)
 
 Patch Update

diff --git a/backend/project/models.py b/backend/project/models.py
@@ -129,6 +129,7 @@ class Heads(DynamicEmbeddedDocument):
     readme = StringField()
     files = ListField()
     URLs = ListField()
+    id = StringField()
     saveas = StringField()
     meta = {'strict': False}
 

diff --git a/backend/project/paperdao.py b/backend/project/paperdao.py
@@ -157,8 +157,13 @@ def __filtersearchedPaper(self, filteredPaper):
             search.title = paper.reference.title
             search.tags = paper.tags
             search.collections = paper.collections
-            search.authors = [authors.firstName + " " +
-                              authors.lastName for authors in paper.reference.authors]
+            search.authors = []
+
+            for author in paper.reference.authors:
+                if author.middleName is None:
+                    author.middleName = ""
+                search.authors.append("{} {} {}".format(author.firstName, author.middleName, author.lastName).replace("  "," "))
+
             search.authors = ", ".join(search.authors)
             search.publication = paper.reference.journal.fullName + \
                 " " + paper.reference.volume + ", " + paper.reference.page
@@ -187,10 +192,15 @@ def getPaperDetails(self, paperid):
         paperDetails.tags = paper.tags
         paperDetails.collections = paper.collections
         paperDetails.license = paper.license
+        paperDetails.authors = []     
+
         if paper.reference.authors and paper.reference.authors[0].firstName:
-            paperDetails.authors = [
-                authors.firstName + " " + authors.lastName for authors in paper.reference.authors]
+            for author in paper.reference.authors:
+                if author.middleName is None:
+                    author.middleName = ""
+                paperDetails.authors.append("{} {} {}".format(author.firstName, author.middleName, author.lastName).replace("  "," "))
             paperDetails.authors = ", ".join(paperDetails.authors)
+
         if paper.PIs and paper.PIs[0].firstName:
             paperDetails.PIs = [pi.firstName + " " +
                                 pi.lastName for pi in paper.PIs]
@@ -214,6 +224,7 @@ def getPaperDetails(self, paperid):
         paperDetails.tools = paper.tools
         paperDetails.workflows = paper.workflow
         paperDetails.heads = paper.heads
+        print(paperDetails.heads)
         paperDetails.cite = getattr(paper.info, 'doi', '')
         paperDetails.timeStamp = paper.info.timeStamp
         paperDetails.firstName = paper.info.insertedBy.firstName

diff --git a/backend/setup.py b/backend/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='qresp',
-    version='2.0.4',
+    version='2.0.5',
     url='https://qresp.org/',
     entry_points = {
         'console_scripts': ['qresp=project.__main__:main'],

diff --git a/frontend/components/CuratorForms/ToolsInfoForm.js b/frontend/components/CuratorForms/ToolsInfoForm.js
@@ -78,7 +78,7 @@ const Software = ({ errors, register, unregister, def, openFileSelector }) => {
           id="patches"
           placeholder="Select patch files using the picker"
           name="patches"
-          helperText="Enter the file name(s) containing the patches of puublicly available or versioned software, customized by the authors to generate some of the resources for the paper. Use the file picker to select files"
+          helperText="Enter the file name(s) containing the patches of publicly available or versioned software, customized by the authors to generate some of the resources for the paper. Use the file picker to select files"
           label="Patches"
           error={errors.patches}
           inputRef={register}
@@ -254,7 +254,7 @@ const ToolsInfoForm = () => {
       <Dialog
         open={open}
         onClose={() => {
-          setDefault("chart", null);
+          setDefault("tool", null);
           closeForm("tool");
         }}
         maxWidth="md"
@@ -270,7 +270,7 @@ const ToolsInfoForm = () => {
             <Grid item xs={1}>
               <RegularStyledButton
                 onClick={() => {
-                  setDefault("chart", null);
+                  setDefault("tool", null);
                   closeForm("tool");
                 }}
                 fullWidth

diff --git a/frontend/components/labelvalue.js b/frontend/components/labelvalue.js
@@ -57,8 +57,8 @@ SimpleLabelValue.propTypes = {
 };
 
 const LabelValue = ({ label, value, link, image, textVariant, direction }) => {
-  if (typeof value === "array") {
-    value = value.join(",");
+  if (Array.isArray(value) && value.length > 0 && typeof value[0] === "string") {
+    value = value.join(", ");
   }
 
   return (

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qresp",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "private": true,
   "scripts": {
     "dev": "next dev",