Fix issue HumanBrainProject#12

ehennestad · Mar 22, 2024 · 7cca552 · 7cca552
1 parent 5218aa3
commit 7cca552
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 39 deletions.
diff --git a/server/internal/createFormSchemas.js b/server/internal/createFormSchemas.js
@@ -97,11 +97,6 @@ async function assembleRJSFSchemas () {
     console.log('\n')
     console.log('Deleting temporary folder.')
     console.log('- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -')
-    fse.remove(SCHEMA_TEMPORARY_DIRECTORY, err => {
-        if (err) return console.error(err);
-        console.log('Deleted temporary folder');
-    });
-
     try {
         await fse.remove(SCHEMA_TEMPORARY_DIRECTORY)
         console.log('Deleted temporary folder');

diff --git a/server/internal/fetchDataFromKg.js b/server/internal/fetchDataFromKg.js
@@ -31,8 +31,6 @@ configObject = [
 module.exports = fetchDataFromKg;
 
 async function fetchDataFromKg() {
-    console.log('Fetching openMINDS instances...')
-    await fetchCoreSchemaInstances(configObject)
-    console.log('Fetching controlled term instances...')
-    await fetchControlledTerms()
+    console.log('Fetching data from KG')
+    await Promise.all( [fetchCoreSchemaInstances(configObject), fetchControlledTerms()] )
 }
diff --git a/server/kg-util/fetchCoreSchemaInstances.js b/server/kg-util/fetchCoreSchemaInstances.js
@@ -29,37 +29,30 @@ fs.mkdir(INSTANCE_OUTPUT_DIRECTORY, { recursive: true }, (err) => {
 let fetchCoreSchemaInstances = async (typeSpecifications) => {
     // Create request header with authorization and options
     const requestOptions = await getRequestOptions();
+    const API_BASE_URL = "https://core.kg.ebrains.eu/";
+    const API_ENDPOINT = "v3/instances";
+
+    const fetchPromises = typeSpecifications.map(async (typeSpecification) => {
+        let spaceName = typeSpecification.space !== undefined ? typeSpecification.space : "common";
+        const QUERY_PARAMS = ["stage=RELEASED", `space=${spaceName}`, "type=https://openminds.ebrains.eu/core/"];
+        const TYPE_NAME = typeSpecification.openMindsType;
+
+        // Assemble Query URL
+        let queryUrl = `${API_BASE_URL}${API_ENDPOINT}?${QUERY_PARAMS.join("&")}${TYPE_NAME}`;
+
+        try {
+            // Fetch instances
+            await fetchInstances(queryUrl, requestOptions, TYPE_NAME, typeSpecification.typeProperties);
+        } catch (error) {
+            // Handle error for this specific fetch
+            console.error(`Error fetching instances for ${TYPE_NAME}:`, error);
+        }
+    });
 
-    return new Promise((resolve, reject) => {
-
-        // Define some api constants
-        const API_BASE_URL = "https://core.kg.ebrains.eu/";
-        const API_ENDPOINT = "v3/instances";
-
-        typeSpecifications.forEach(async (typeSpecification) => {
-            let spaceName = "common";
-            if (typeSpecification.space !== undefined) {
-                spaceName = typeSpecification.space;
-            }
-
-            const QUERY_PARAMS = ["stage=RELEASED", `space=${spaceName}`, "type=https://openminds.ebrains.eu/core/"];
-            const TYPE_NAME = typeSpecification.openMindsType;
-
-            var completedRequests = 0;
-
-            // Assemble Query URL
-            let queryUrl = `${API_BASE_URL}${API_ENDPOINT}?${QUERY_PARAMS.join("&")}${TYPE_NAME}`;
+    // Wait for all fetch operations to complete
+    await Promise.all(fetchPromises);
+};
 
-            try {
-                // Fetch instances
-                const data = await fetchInstances(queryUrl, requestOptions, TYPE_NAME, typeSpecification.typeProperties);
-                resolve(data);
-            } catch (error) {
-                reject(error);
-            }
-        });
-    });
-}
 
 // function to get schema instances from kg api
 function fetchInstances(apiQueryUrl, requestOptions, typeName, propertyNames) {

diff --git a/setup.js b/setup.js
@@ -17,7 +17,6 @@ async function setup() {
 
     var startTime = performance.now()
 
-    console.log('Fetching openMINDS instances...')
     fetchDataFromKg()
         .then( () => {
             var endTime = performance.now()
@@ -29,6 +28,7 @@ async function setup() {
             assembleRJSFSchemas()
             .then( () => {
                 console.log('Assembled form schemas from templates and controlled terms.')
+                console.log('')
 
                 // Redo the build in order for the updated terms to be used by the frontend
                 console.log('Creating a production build for the React App...')