Improved files to distinguish subtypes (allows multiple different files tabs at a entity)

Attachments via the improved files
Block thumbnails at mosaico templates as a separate files tab
Some fixes

All not tested yet

lib/file-helpers.js

@@ -10,9 +10,9 @@ const multer = require('multer')({
     dest: uploadedFilesDir
 });
 
-function installUploadHandler(router, url, getUrl = null, dontReplace = false) {
+function installUploadHandler(router, url, replacementBehavior, type = null, subType = null) {
     router.postAsync(url, passport.loggedIn, multer.array('files[]'), async (req, res) => {
-        return res.json(await files.createFiles(req.context, req.params.type, req.params.entityId, req.files, getUrl, dontReplace));
+        return res.json(await files.createFiles(req.context, type || req.params.type, subType || req.params.subType, req.params.entityId, req.files, replacementBehavior));
     });
 }
 

lib/permissions.js

@@ -20,13 +20,36 @@ const entityTypes = {
         entitiesTable: 'campaigns',
         sharesTable: 'shares_campaign',
         permissionsTable: 'permissions_campaign',
-        filesTable: 'files_campaign'
+        files: {
+            file: {
+                table: 'files_campaign_file',
+                permissions: {
+                    view: 'viewFiles',
+                    manage: 'manageFiles'
+                }
+            },
+            attachment: {
+                table: 'files_campaign_attachment',
+                permissions: {
+                    view: 'viewAttachments',
+                    manage: 'manageAttachments'
+                }
+            }
+        }
     },
     template: {
         entitiesTable: 'templates',
         sharesTable: 'shares_template',
         permissionsTable: 'permissions_template',
-        filesTable: 'files_template'
+        files: {
+            file: {
+                table: 'files_template_file',
+                permissions: {
+                    view: 'viewFiles',
+                    manage: 'manageFiles'
+                }
+            }
+        }
     },
     sendConfiguration: {
         entitiesTable: 'send_configurations',
@@ -47,7 +70,22 @@ const entityTypes = {
         entitiesTable: 'mosaico_templates',
         sharesTable: 'shares_mosaico_template',
         permissionsTable: 'permissions_mosaico_template',
-        filesTable: 'files_mosaico_template'
+        files: {
+            file: {
+                table: 'files_mosaico_template_file',
+                permissions: {
+                    view: 'viewFiles',
+                    manage: 'manageFiles'
+                }
+            },
+            block: {
+                table: 'files_mosaico_template_block',
+                permissions: {
+                    view: 'viewFiles',
+                    manage: 'manageFiles'
+                }
+            }
+        }
     }
 };
 

lib/report-processor.js

@@ -104,7 +104,7 @@ module.exports.start = async (reportId) => {
     if (!workers[reportId]) {
         log.info('ReportProcessor', 'Scheduling report id: %s', reportId);
         await reports.updateFields(reportId, { state: reports.ReportState.SCHEDULED, last_run: null});
-        tryStartWorkers();
+        await tryStartWorkers();
     } else {
         log.info('ReportProcessor', 'Worker for report id: %s is already running.', reportId);
     }
@@ -125,7 +125,7 @@ module.exports.stop = async reportId => {
 module.exports.init = async () => {
     try {
         await reports.bulkChangeState(reports.ReportState.PROCESSING, reports.ReportState.SCHEDULED);
-        tryStartWorkers();
+        await tryStartWorkers();
     } catch (err) {
         log.error('ReportProcessor', err);
     }