Allow setting permission of collections during import (#6799)

* Allow setting permission of collections during import

closes #6767

* Remove unused column

server/queues/tasks/ExportHTMLZipTask.ts

@@ -11,7 +11,7 @@ export default class ExportHTMLZipTask extends ExportDocumentTreeTask {
       zip,
       collections,
       FileOperationFormat.HTMLZip,
-      fileOperation.includeAttachments
+      fileOperation.options?.includeAttachments ?? true
     );
   }
 }

server/queues/tasks/ExportJSONTask.ts

@@ -28,7 +28,7 @@ export default class ExportJSONTask extends ExportTask {
       await this.addCollectionToArchive(
         zip,
         collection,
-        fileOperation.includeAttachments
+        fileOperation.options?.includeAttachments ?? true
       );
     }
 

server/queues/tasks/ExportMarkdownZipTask.ts

@@ -11,7 +11,7 @@ export default class ExportMarkdownZipTask extends ExportDocumentTreeTask {
       zip,
       collections,
       FileOperationFormat.MarkdownZip,
-      fileOperation.includeAttachments
+      fileOperation.options?.includeAttachments
     );
   }
 }

server/queues/tasks/ExportTask.ts

@@ -59,7 +59,7 @@ export default abstract class ExportTask extends BaseTask<Props> {
         );
 
         if (
-          fileOperation.includeAttachments &&
+          fileOperation.options?.includeAttachments &&
           env.MAXIMUM_EXPORT_SIZE &&
           totalAttachmentsSize > env.MAXIMUM_EXPORT_SIZE
         ) {
@@ -74,7 +74,7 @@ export default abstract class ExportTask extends BaseTask<Props> {
       }
 
       Logger.info("task", `ExportTask processing data for ${fileOperationId}`, {
-        includeAttachments: fileOperation.includeAttachments,
+        options: fileOperation.options,
       });
 
       await this.updateFileOperation(fileOperation, {

server/queues/tasks/ImportTask.ts

@@ -391,7 +391,11 @@ export default abstract class ImportTask extends BaseTask<Props> {
                 teamId: fileOperation.teamId,
                 createdById: fileOperation.userId,
                 name,
-                permission: item.permission ?? CollectionPermission.ReadWrite,
+                permission:
+                  item.permission ??
+                  fileOperation.options?.permission !== undefined
+                    ? fileOperation.options?.permission
+                    : CollectionPermission.ReadWrite,
                 importId: fileOperation.id,
               },
               { transaction }