From e3752b7eccc41e227324bda5d2c9dc17f0b5554c Mon Sep 17 00:00:00 2001
From: Spencer Rose <spencerrose@uvic.ca>
Date: Fri, 3 Nov 2023 14:00:21 -0700
Subject: [PATCH] Fix missing db client in downloads service.

---
 client/src/_components/menus/viewer.menu.js   | 24 +++++++++----------
 .../src/_components/tools/download.tools.js   |  2 +-
 src/controllers/files.controller.js           |  6 +++--
 src/services/files.services.js                |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/client/src/_components/menus/viewer.menu.js b/client/src/_components/menus/viewer.menu.js
index f67be4b..38a9e85 100644
--- a/client/src/_components/menus/viewer.menu.js
+++ b/client/src/_components/menus/viewer.menu.js
@@ -58,6 +58,18 @@ const ViewerPanelMenu = () => {
     return <div className={'viewer-menu'}>
         <div className={'h-menu'}>
             <ul>
+                {
+                    (nav.downloads || []).length > 0 &&
+                    <li key={`${menuID}_menuitem_attached_downloads`}>
+                        <Button
+                            icon={'download'}
+                            label={!nav.compact && 'Download Package'}
+                            className={styles.active}
+                            title={`Bulk download selected files.`}
+                            onClick={() => {dialog.setCurrent({dialogID: 'bulk_download_selections'})}}
+                        />
+                    </li>
+                }
                 {
                     isAdmin && <li className={user ? 'push' : ''}>
                         <Dropdown
@@ -76,18 +88,6 @@ const ViewerPanelMenu = () => {
                             }]} />
                     </li>
                 }
-                {
-                    (nav.downloads || []).length > 0 &&
-                    <li key={`${menuID}_menuitem_attached_downloads`}>
-                        <Button
-                            icon={'download'}
-                            label={!nav.compact && 'Download Package'}
-                            className={styles.active}
-                            title={`Bulk download selected files.`}
-                            onClick={() => {dialog.setCurrent({dialogID: 'bulk_download_selections'})}}
-                        />
-                    </li>
-                }
                 <li className={'push'}>
                     <Button
                         icon={'sync'}
diff --git a/client/src/_components/tools/download.tools.js b/client/src/_components/tools/download.tools.js
index 6378823..6bf3ba5 100644
--- a/client/src/_components/tools/download.tools.js
+++ b/client/src/_components/tools/download.tools.js
@@ -259,7 +259,7 @@ const Downloader = ({id}) => {
      */
     const _handleCallback = (err) => {
         if (!id) nav.clearDownloads();
-        err ? setMessage(err) : dialog.cancel();
+        // err ? setMessage(err) : dialog.cancel();
     }
 
     /**
diff --git a/src/controllers/files.controller.js b/src/controllers/files.controller.js
index 0ef89b6..e22533f 100644
--- a/src/controllers/files.controller.js
+++ b/src/controllers/files.controller.js
@@ -45,12 +45,14 @@ export default function FilesController(modelType) {
 
     this.init = async () => {
         try {
+            // ignore if no model type provided
+            if (!modelType) return;
             // generate model constructor
             Model = await db.model.create(modelType);
             model = new Model();
             mserve = new ModelServices(new Model());
         } catch (err) {
-            console.error(err)
+            console.error(err);
         }
     };
 
@@ -522,7 +524,7 @@ export default function FilesController(modelType) {
         const client = await pool.connect();
 
         try {
-            await fserve.bulkDownload(req, res, next, 'raw');
+            await fserve.bulkDownload(req, res, next, 'raw', client);
         } catch (err) {
             return next(err);
         } finally {
diff --git a/src/services/files.services.js b/src/services/files.services.js
index cf53c8f..09bbb6c 100644
--- a/src/services/files.services.js
+++ b/src/services/files.services.js
@@ -1046,6 +1046,7 @@ export const streamDownload = (res, buffer) => {
  * @param res
  * @param next
  * @param version
+ * @param client
  */
 
 export const bulkDownload = async (req, res, next, version, client) => {