Merge pull request Third-Culture-Software#7874 from jniles/bump-deps

Remove q.js from package.json All tests pass.
jmcameron · Nov 14, 2024 · d8abff0 · d8abff0
2 parents 2eb5aff + c75dbe7
commit d8abff0
Show file tree

Hide file tree

Showing 150 changed files with 3,528 additions and 2,179 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -150,7 +150,6 @@
     "nodemailer": "^6.9.16",
     "p-retry": "^4.6.2",
     "puppeteer": "^23.8.0",
-    "q": "^1.5.1",
     "socket.io": "4.8.1",
     "stream-to-promise": "^3.0.0",
     "tempy": "^1.0.1",
@@ -205,7 +204,7 @@
     "mocha-xunit-reporter": "^2.3.0",
     "postcss": "^8.4.49",
     "qs": "^6.13.0",
-    "release-it": "^17.10.0",
+    "release-it": "^17.1.1",
     "sinon": "^18.0.1",
     "standard-version": "^9.5.0",
     "typescript": "^5.6.3"

diff --git a/server/controllers/admin/choicesListManagement.js b/server/controllers/admin/choicesListManagement.js
@@ -39,8 +39,8 @@ function list(req, res, next) {
     .then((rows) => {
       res.status(200).json(rows);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**
@@ -55,10 +55,9 @@ function detail(req, res, next) {
     .then((record) => {
       res.status(200).json(record);
     })
-    .catch(next)
-    .done();
-}
+    .catch(next);
 
+}
 
 // POST /choices_list_management
 function create(req, res, next) {
@@ -71,10 +70,9 @@ function create(req, res, next) {
     .then((row) => {
       res.status(201).json({ id : row.insertId });
     })
-    .catch(next)
-    .done();
-}
+    .catch(next);
 
+}
 
 // PUT /choices_list_management /:id
 function update(req, res, next) {
@@ -88,8 +86,8 @@ function update(req, res, next) {
     // all updates completed successfull, return full object to client
       res.status(200).json(record);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 // DELETE /choices_list_management/:id
@@ -105,8 +103,8 @@ function remove(req, res, next) {
 
       res.status(204).json();
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 // get list of choicesListManagement

diff --git a/server/controllers/admin/cron/index.js b/server/controllers/admin/cron/index.js
@@ -16,8 +16,8 @@ function list(req, res, next) {
   `;
   db.exec(query)
     .then(rows => res.status(200).json(rows))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function details(req, res, next) {
@@ -27,8 +27,8 @@ function details(req, res, next) {
   `;
   db.one(query, [req.params.id])
     .then(rows => res.status(200).json(rows))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function update(req, res, next) {
@@ -41,8 +41,8 @@ function update(req, res, next) {
   }
   db.exec(query, [params, req.params.id])
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function remove(req, res, next) {
@@ -51,8 +51,8 @@ function remove(req, res, next) {
   `;
   db.exec(query, [req.params.id])
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function create(req, res, next) {
@@ -64,6 +64,6 @@ function create(req, res, next) {
     .then((result) => {
       res.status(201).json({ id : result.insertId });
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
diff --git a/server/controllers/admin/cronEmailReport/index.js b/server/controllers/admin/cronEmailReport/index.js
@@ -68,15 +68,15 @@ function lookup(id) {
 function list(req, res, next) {
   find(req.query)
     .then(rows => res.status(200).json(rows))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function details(req, res, next) {
   lookup(req.params.id)
     .then((data) => res.status(200).json(data))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**
@@ -106,8 +106,8 @@ function remove(req, res, next) {
   db.exec(query, [ident])
     .then(() => removeJob(ident))
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 async function create(req, res, next) {

diff --git a/server/controllers/admin/dataCollectorManagement.js b/server/controllers/admin/dataCollectorManagement.js
@@ -19,7 +19,6 @@ function lookupDataCollectorManagement(id) {
   return db.one(sql, [id]);
 }
 
-
 // List
 function list(req, res, next) {
   const filters = new FilterParser(req.query);
@@ -65,8 +64,8 @@ function list(req, res, next) {
 
       res.status(200).json(dataCollector);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**
@@ -81,10 +80,9 @@ function detail(req, res, next) {
     .then((record) => {
       res.status(200).json(record);
     })
-    .catch(next)
-    .done();
-}
+    .catch(next);
 
+}
 
 // POST /data_collector_management
 function create(req, res, next) {
@@ -95,10 +93,9 @@ function create(req, res, next) {
     .then((row) => {
       res.status(201).json({ id : row.insertId });
     })
-    .catch(next)
-    .done();
-}
+    .catch(next);
 
+}
 
 // PUT /data_collector_management /:id
 function update(req, res, next) {
@@ -112,8 +109,8 @@ function update(req, res, next) {
     // all updates completed successfull, return full object to client
       res.status(200).json(record);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 // DELETE /data_collector_management/:id
@@ -129,8 +126,8 @@ function remove(req, res, next) {
 
       res.status(204).json();
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 // get list of dataCollectorManagement

diff --git a/server/controllers/admin/displayMetadata.js b/server/controllers/admin/displayMetadata.js
@@ -267,8 +267,7 @@ function list(req, res, next) {
     .then((dataSurvey) => {
       res.status(200).json(dataSurvey);
     })
-    .catch(next)
-    .done();
+    .catch(next);
 
 }
 
@@ -280,8 +279,8 @@ function remove(req, res, next) {
     .then(() => {
       res.status(204).json();
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 // get list of Display Metadata

diff --git a/server/controllers/admin/enterprises.js b/server/controllers/admin/enterprises.js
@@ -72,8 +72,8 @@ exports.list = function list(req, res, next) {
 
       res.status(200).json(data);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 };
 
 // GET /enterprises/:id
@@ -82,8 +82,8 @@ exports.detail = function detail(req, res, next) {
     .then(enterprise => {
       res.status(200).json(enterprise);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 };
 
 function lookupEnterprise(id) {
@@ -156,8 +156,8 @@ exports.create = function create(req, res, next) {
     .then(row => {
       res.status(201).json({ id : row.insertId });
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 };
 
 // PUT /enterprises/:id
@@ -183,8 +183,8 @@ exports.update = function update(req, res, next) {
     .then((enterprise) => {
       res.status(200).json(enterprise);
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 };
 
 // POST /enterprises/:id/logo
@@ -201,6 +201,6 @@ exports.uploadLogo = (req, res, next) => {
     .then(() => {
       res.status(200).json({ logo });
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 };
diff --git a/server/controllers/admin/entities/groups/index.js b/server/controllers/admin/entities/groups/index.js
@@ -24,8 +24,8 @@ function list(req, res, next) {
   `;
   db.exec(query)
     .then(rows => res.status(200).json(rows))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 async function lookupEntity(uuid) {
@@ -88,8 +88,8 @@ function update(req, res, next) {
 
   transaction.execute()
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function remove(req, res, next) {
@@ -105,8 +105,8 @@ function remove(req, res, next) {
     .addQuery(queryEntityGroup, [db.bid(req.params.uuid)])
     .execute()
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function create(req, res, next) {
@@ -134,6 +134,6 @@ function create(req, res, next) {
     .then(() => {
       res.status(201).json({ uuid : params.uuid });
     })
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
diff --git a/server/controllers/admin/entities/index.js b/server/controllers/admin/entities/index.js
@@ -25,16 +25,16 @@ function list(req, res, next) {
   `;
   db.exec(query)
     .then(rows => res.status(200).json(rows))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function details(req, res, next) {
   const buid = db.bid(req.params.uuid);
   fetchEntity(buid)
     .then(entity => res.status(200).json(entity))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**
@@ -55,8 +55,8 @@ function update(req, res, next) {
   db.exec(query, [params, buid])
     .then(() => fetchEntity(buid))
     .then(entity => res.status(200).json(entity))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**
@@ -69,8 +69,8 @@ function remove(req, res, next) {
   const buid = db.bid(req.params.uuid);
   db.exec(query, [buid])
     .then(() => res.sendStatus(204))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 function create(req, res, next) {
@@ -82,8 +82,8 @@ function create(req, res, next) {
   params.uuid = db.bid(identifier);
   db.exec(query, [params])
     .then(() => res.status(201).json({ uuid : identifier }))
-    .catch(next)
-    .done();
+    .catch(next);
+
 }
 
 /**