From ac87ab7842fafc446e05622295d1f81dc4b86d3d Mon Sep 17 00:00:00 2001
From: RicardoSilvestr <ricardom.silvestr@hes-so.ch>
Date: Wed, 13 Dec 2023 15:45:59 +0100
Subject: [PATCH] fix: entries admin

---
 docker/src/plugins/admin/routes/v1/entriesAdmin.js     |  2 +-
 .../compounds/sync/utils/improveCompoundPool.js        | 10 +---------
 .../substances/sync/utils/improveSubstancePool.js      | 10 +---------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/docker/src/plugins/admin/routes/v1/entriesAdmin.js b/docker/src/plugins/admin/routes/v1/entriesAdmin.js
index 92ebfa84..08149715 100644
--- a/docker/src/plugins/admin/routes/v1/entriesAdmin.js
+++ b/docker/src/plugins/admin/routes/v1/entriesAdmin.js
@@ -23,7 +23,7 @@ const entriesAdmin = {
       fields: {
         type: 'string',
         description: 'Fields to retrieve',
-        default: '',
+        default: '_id,state,seq,dateStart,dateEnd,logs,sources',
       },
     },
   },
diff --git a/docker/src/plugins/compounds/sync/utils/improveCompoundPool.js b/docker/src/plugins/compounds/sync/utils/improveCompoundPool.js
index 82983cb8..543f05b0 100644
--- a/docker/src/plugins/compounds/sync/utils/improveCompoundPool.js
+++ b/docker/src/plugins/compounds/sync/utils/improveCompoundPool.js
@@ -29,7 +29,6 @@ export default async function improveCompoundPool(molecule, options = {}) {
   const timeForTimeout = options.timeout || 60000;
   const abortController = new AbortController();
   const timeout = setTimeout(() => abortController.abort(), timeForTimeout);
-  let counter = 0;
   // if in the queue we have over twice the number of cpu we wait
   while (piscina.queueSize > nbCPU * 5) {
     await delay(1);
@@ -42,15 +41,8 @@ export default async function improveCompoundPool(molecule, options = {}) {
       return info;
     })
     .catch((e) => {
-      // check if it is an abort error
-      if (e.name !== 'AbortError') {
-        debug.info(e);
-        return undefined;
-      } else {
-        counter++;
-      }
+      debug.info(e);
     });
-  debug.info(`AbortError because of timeout happened: ${counter} times`);
   return {
     promise,
   };
diff --git a/docker/src/plugins/substances/sync/utils/improveSubstancePool.js b/docker/src/plugins/substances/sync/utils/improveSubstancePool.js
index 5e4292d9..a655f23b 100644
--- a/docker/src/plugins/substances/sync/utils/improveSubstancePool.js
+++ b/docker/src/plugins/substances/sync/utils/improveSubstancePool.js
@@ -30,7 +30,6 @@ export default async function improveSubstancePool(molecule, options = {}) {
   const timeForTimeout = options.timeout || 60000;
   const abortController = new AbortController();
   const timeout = setTimeout(() => abortController.abort(), timeForTimeout);
-  let counter = 0;
 
   while (piscina.queueSize > nbCPU * 5) {
     await delay(1);
@@ -43,15 +42,8 @@ export default async function improveSubstancePool(molecule, options = {}) {
       return info;
     })
     .catch((e) => {
-      // check if it is an abort error
-      if (e.name !== 'AbortError') {
-        debug.info(e);
-        return undefined;
-      } else {
-        counter++;
-      }
+      debug.info(e);
     });
-  debug.info(`AbortError because of timeout happened: ${counter} times`);
   return {
     promise,
   };