Merge pull request #6087 from weseek/feat/98331

feat: Create activity when "Archive data" is uploaded

packages/app/src/interfaces/activity.ts

@@ -39,6 +39,7 @@ const ACTION_ADMIN_APP_SETTINGS_UPDATE = 'ADMIN_APP_SETTING_UPDATE';
 const ACTION_ADMIN_SECURITY_SETTINGS_UPDATE = 'ADMIN_SECURITY_SETTINGS_UPDATE';
 const ACTION_ADMIN_LINE_BREAK_UPDATE = 'ADMIN_LINE_BREAK_UPDATE';
 const ACTION_ADMIN_LAYOUT_UPDATE = 'ADMIN_LAYOUT_UPDATE';
+const ACTION_ADMIN_ARCHIVE_DATA_UPLOAD = 'ADMIN_ARCHIVE_DATA_UPLOAD';
 
 export const SupportedTargetModel = {
   MODEL_PAGE,
@@ -81,6 +82,7 @@ export const SupportedAction = {
   ACTION_ADMIN_SECURITY_SETTINGS_UPDATE,
   ACTION_ADMIN_LINE_BREAK_UPDATE,
   ACTION_ADMIN_LAYOUT_UPDATE,
+  ACTION_ADMIN_ARCHIVE_DATA_UPLOAD,
 } as const;
 
 export const SupportedActionToNotified = {

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

@@ -1,15 +1,21 @@
 import mongoose from 'mongoose';
 
+import { SupportedAction } from '~/interfaces/activity';
 import loggerFactory from '~/utils/logger';
 
+import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
+
+
 const logger = loggerFactory('growi:routes:apiv3:import'); // eslint-disable-line no-unused-vars
 
 const path = require('path');
-const multer = require('multer');
 
 const express = require('express');
+const multer = require('multer');
+
 
 const GrowiArchiveImportOption = require('~/models/admin/growi-archive-import-option');
+
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
@@ -68,8 +74,10 @@ module.exports = (crowi) => {
   const loginRequired = require('../../middlewares/login-required')(crowi);
   const adminRequired = require('../../middlewares/admin-required')(crowi);
   const csrf = require('../../middlewares/csrf')(crowi);
+  const addActivity = generateAddActivityMiddleware(crowi);
 
   this.adminEvent = crowi.event('admin');
+  const activityEvent = crowi.event('activity');
 
   // setup event
   this.adminEvent.on('onProgressForImport', (data) => {
@@ -321,7 +329,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: the property of each extracted file
    */
-  router.post('/upload', uploads.single('file'), accessTokenParser, loginRequired, adminRequired, csrf, async(req, res) => {
+  router.post('/upload', uploads.single('file'), accessTokenParser, loginRequired, adminRequired, csrf, addActivity, async(req, res) => {
     const { file } = req;
     const zipFile = importService.getFile(file.filename);
     let data = null;
@@ -337,6 +345,10 @@ module.exports = (crowi) => {
     try {
       // validate with meta.json
       importService.validate(data.meta);
+
+      const parameters = { action: SupportedAction.ACTION_ADMIN_ARCHIVE_DATA_UPLOAD };
+      activityEvent.emit('update', res.locals.activity._id, parameters);
+
       return res.apiv3(data);
     }
     catch {