Merge branch 'feat/auditlog' of https://github.com/weseek/growi into imprv/96622-use-add-activity-middleware-with-page-event

packages/app/src/server/service/activity.ts

@@ -1,6 +1,6 @@
 import { getModelSafely } from '@growi/core';
 
-import { IActivity, AllSupportedActionToNotifiedType } from '~/interfaces/activity';
+import { IActivity } from '~/interfaces/activity';
 import { IPage } from '~/interfaces/page';
 import Activity from '~/server/models/activity';
 
@@ -40,11 +40,7 @@ class ActivityService {
         return;
       }
 
-      // create inAppNotification
-      const shouldNotification = (AllSupportedActionToNotifiedType as ReadonlyArray<string>).includes(activity.action);
-      if (shouldNotification) {
-        this.activityEvent.emit('createInAppNotification', activity, target);
-      }
+      this.activityEvent.emit('updated', activity, target);
     });
   }
 

packages/app/src/server/service/in-app-notification.ts

@@ -49,7 +49,7 @@ export default class InAppNotificationService {
   }
 
   initActivityEventListeners(): void {
-    this.activityEvent.on('createInAppNotification', async(activity: ActivityDocument, target: IPage) => {
+    this.activityEvent.on('updated', async(activity: ActivityDocument, target: IPage) => {
       try {
         await this.createInAppNotification(activity, target);
       }