fix: broken execution of upgrade scripts

data-fair · Jun 24, 2024 · 3a9a4e0 · 3a9a4e0
1 parent e85b643
commit 3a9a4e0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/ui/pages/processings/[id].vue b/ui/pages/processings/[id].vue
@@ -213,6 +213,9 @@ async function patch() {
     return
   }
 
+  // TODO: some problem in vjsf makes it necessary to wait when adding a permission for validity to be correct
+  await new Promise(resolve => setTimeout(resolve, 1))
+
   if (!valid.value || !canAdminProcessing.value) return
   edited.value = true
   if (editProcessing.value?.scheduling && editProcessing.value.scheduling.type === 'weekly') {

diff --git a/worker/config/default.cjs b/worker/config/default.cjs
@@ -45,5 +45,6 @@ module.exports = {
     killInterval: 20000,
     concurrency: 4,
     gracePeriod: 20000
-  }
+  },
+  upgradeRoot: '/app/'
 }
diff --git a/worker/config/development.cjs b/worker/config/development.cjs
@@ -10,5 +10,6 @@ module.exports = {
   observer: {
     port: 9091
   },
-  privateDataFairUrl: 'http://localhost:8081'
+  privateDataFairUrl: 'http://localhost:8081',
+  upgradeRoot: '../'
 }
diff --git a/worker/config/test.cjs b/worker/config/test.cjs
@@ -12,5 +12,6 @@ module.exports = {
     killInterval: 2000,
     concurrency: 1,
     gracePeriod: 3000
-  }
+  },
+  upgradeRoot: './'
 }
diff --git a/worker/config/type/schema.json b/worker/config/type/schema.json
@@ -21,7 +21,8 @@
     "locks",
     "observer",
     "worker",
-    "secretKeys"
+    "secretKeys",
+    "upgradeRoot"
   ],
   "properties": {
     "dataDir": {
@@ -129,6 +130,9 @@
         }
       }
     },
+    "upgradeRoot": {
+      "type": "string"
+    },
     "util": {},
     "get": {},
     "has": {}

diff --git a/worker/src/worker.js b/worker/src/worker.js
@@ -43,7 +43,7 @@ export const start = async () => {
   await mongo.connect(config.mongoUrl, { readPreference: 'primary', maxPoolSize: 1 })
   const db = mongo.db
   await locks.init(db)
-  await upgradeScripts(db, '../')
+  await upgradeScripts(db, config.upgradeRoot)
   wsPublish = await initPublisher(db)
   if (config.observer.active) {
     await initMetrics(db)