fix ImportService and ExportService

src/server/routes/apiv3/export.js

@@ -43,21 +43,20 @@ module.exports = (crowi) => {
   const adminRequired = require('../../middlewares/admin-required')(crowi);
   const csrf = require('../../middlewares/csrf')(crowi);
 
-  const { exportService } = crowi;
+  const { exportService, socketIoService } = crowi;
 
   this.adminEvent = crowi.event('admin');
 
   // setup event
-  // FIXME: with GW-3262
-  // this.adminEvent.on('onProgressForExport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onProgressForExport', data);
-  // });
-  // this.adminEvent.on('onStartZippingForExport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onStartZippingForExport', data);
-  // });
-  // this.adminEvent.on('onTerminateForExport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onTerminateForExport', data);
-  // });
+  this.adminEvent.on('onProgressForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onProgressForExport', data);
+  });
+  this.adminEvent.on('onStartZippingForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onStartZippingForExport', data);
+  });
+  this.adminEvent.on('onTerminateForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onTerminateForExport', data);
+  });
 
 
   /**

src/server/routes/apiv3/import.js

@@ -60,7 +60,7 @@ const generateOverwriteParams = (collectionName, req, options) => {
 };
 
 module.exports = (crowi) => {
-  const { growiBridgeService, importService } = crowi;
+  const { growiBridgeService, importService, socketIoService } = crowi;
   const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
   const loginRequired = require('../../middlewares/login-required')(crowi);
   const adminRequired = require('../../middlewares/admin-required')(crowi);
@@ -69,16 +69,15 @@ module.exports = (crowi) => {
   this.adminEvent = crowi.event('admin');
 
   // setup event
-  // FIXME: with GW-3262
-  // this.adminEvent.on('onProgressForImport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onProgressForImport', data);
-  // });
-  // this.adminEvent.on('onTerminateForImport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onTerminateForImport', data);
-  // });
-  // this.adminEvent.on('onErrorForImport', (data) => {
-  //   crowi.getIo().sockets.emit('admin:onErrorForImport', data);
-  // });
+  this.adminEvent.on('onProgressForImport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onProgressForImport', data);
+  });
+  this.adminEvent.on('onTerminateForImport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onTerminateForImport', data);
+  });
+  this.adminEvent.on('onErrorForImport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onErrorForImport', data);
+  });
 
   const uploads = multer({
     storage: multer.diskStorage({