return to original code

packages/app/src/server/routes/apiv3/export.js

@@ -55,14 +55,14 @@ module.exports = (crowi) => {
   const adminEvent = crowi.event('admin');
 
   // setup event
-  adminEvent.on('admin:onProgressForExport', (data) => {
-    socketIoService.getAdminSocket().emit('admin:admin:onProgressForExport', data);
+  adminEvent.on('onProgressForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onProgressForExport', data);
   });
-  adminEvent.on('admin:onStartZippingForExport', (data) => {
-    socketIoService.getAdminSocket().emit('admin:admin:onStartZippingForExport', data);
+  adminEvent.on('onStartZippingForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onStartZippingForExport', data);
   });
-  adminEvent.on('admin:onTerminateForExport', (data) => {
-    socketIoService.getAdminSocket().emit('admin:admin:onTerminateForExport', data);
+  adminEvent.on('onTerminateForExport', (data) => {
+    socketIoService.getAdminSocket().emit('admin:onTerminateForExport', data);
   });
 
   const validator = {

packages/app/src/server/service/export.js

@@ -1,5 +1,5 @@
-import loggerFactory from '~/utils/logger';
 import { toArrayIfNot } from '~/utils/array-utils';
+import loggerFactory from '~/utils/logger';
 
 import ConfigLoader from './config-loader';
 
@@ -7,10 +7,11 @@ const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-
 
 const fs = require('fs');
 const path = require('path');
-const mongoose = require('mongoose');
 const { Transform } = require('stream');
-const streamToPromise = require('stream-to-promise');
+
 const archiver = require('archiver');
+const mongoose = require('mongoose');
+const streamToPromise = require('stream-to-promise');
 
 const CollectionProgressingStatus = require('../models/vo/collection-progressing-status');
 
@@ -288,14 +289,14 @@ class ExportService {
     };
 
     // send event (in progress in global)
-    this.adminEvent.emit('admin:onProgressForExport', data);
+    this.adminEvent.emit('onProgressForExport', data);
   }
 
   /**
    * emit start zipping event
    */
   emitStartZippingEvent() {
-    this.adminEvent.emit('admin:onStartZippingForExport', {});
+    this.adminEvent.emit('onStartZippingForExport', {});
   }
 
   /**
@@ -303,7 +304,7 @@ class ExportService {
    * @param {object} zipFileStat added zip file status data
    */
   emitTerminateEvent(zipFileStat) {
-    this.adminEvent.emit('admin:onTerminateForExport', { addedZipFileStat: zipFileStat });
+    this.adminEvent.emit('onTerminateForExport', { addedZipFileStat: zipFileStat });
   }
 
   /**