Added guard where vocabulary terms was an empty lists, causing the fo…

…rm to crash
SAEON · Jul 29, 2021 · f71096c · f71096c
1 parent a0dfddd
commit f71096c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/api/src/graphql/resolvers/queries/controlled-vocabulary.js b/src/api/src/graphql/resolvers/queries/controlled-vocabulary.js
@@ -3,7 +3,7 @@ import logSql from '../../../lib/log-sql.js'
 export default async (_, { root, roots, tree }, ctx) => {
   const { query } = ctx.mssql
 
-  if (!root && !roots?.length) {
+  if (!root && !roots) {
     throw new Error('Either a vocabulary "root" or "roots" argument must be provided')
   }
 

diff --git a/...ent/src/components/project-form/form/components/controlled-vocabulary-select-multiple.jsx b/...ent/src/components/project-form/form/components/controlled-vocabulary-select-multiple.jsx
@@ -59,7 +59,9 @@ export default ({
   }
 
   if (gqlError) {
-    throw gqlError
+    throw new Error(
+      `GQL Error in Vocabulary select (multiple roots) form component. ${gqlError.message}`
+    )
   }
 
   let options
@@ -85,6 +87,10 @@ export default ({
     }
   }
 
+  if (!options.length) {
+    return null
+  }
+
   return (
     <Multiselect
       id={id}

diff --git a/src/client/src/components/project-form/form/components/controlled-vocabulary-select.jsx b/src/client/src/components/project-form/form/components/controlled-vocabulary-select.jsx
@@ -64,7 +64,7 @@ export default ({
   }
 
   if (gqlError) {
-    throw gqlError
+    throw new Error(`GQL Error in Vocabulary select form component. ${gqlError.message}`)
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ export default ({ @@
       }
       if (gqlError) {
-        throw gqlError
+        throw new Error(`GQL Error in Vocabulary select form component. ${gqlError.message}`)
       }
       /**
@@ Expand Down @@