return to orizinal code

packages/app/src/components/Admin/ExportArchiveDataPage.jsx

@@ -70,7 +70,7 @@ class ExportArchiveDataPage extends React.Component {
 
     if (socket != null) {
       // websocket event
-      socket.on('onProgressForExport', ({ currentCount, totalCount, progressList }) => {
+      socket.on('admin:onProgressForExport', ({ currentCount, totalCount, progressList }) => {
         this.setState({
           isExporting: true,
           progressList,
@@ -78,14 +78,14 @@ class ExportArchiveDataPage extends React.Component {
       });
 
       // websocket event
-      socket.on('onStartZippingForExport', () => {
+      socket.on('admin:onStartZippingForExport', () => {
         this.setState({
           isZipping: true,
         });
       });
 
       // websocket event
-      socket.on('onTerminateForExport', ({ addedZipFileStat }) => {
+      socket.on('admin:onTerminateForExport', ({ addedZipFileStat }) => {
         const zipFileStats = this.state.zipFileStats.concat([addedZipFileStat]);
 
         this.setState({

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

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

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

@@ -288,14 +288,14 @@ class ExportService {
     };
 
     // send event (in progress in global)
-    this.adminEvent.emit('onProgressForExport', data);
+    this.adminEvent.emit('admin:onProgressForExport', data);
   }
 
   /**
    * emit start zipping event
    */
   emitStartZippingEvent() {
-    this.adminEvent.emit('onStartZippingForExport', {});
+    this.adminEvent.emit('admin:onStartZippingForExport', {});
   }
 
   /**
@@ -303,7 +303,7 @@ class ExportService {
    * @param {object} zipFileStat added zip file status data
    */
   emitTerminateEvent(zipFileStat) {
-    this.adminEvent.emit('onTerminateForExport', { addedZipFileStat: zipFileStat });
+    this.adminEvent.emit('admin:onTerminateForExport', { addedZipFileStat: zipFileStat });
   }
 
   /**