yohei0125 4 лет назад
Родитель
Сommit
0154a46e23
2 измененных файлов с 8 добавлено и 13 удалено
  1. 1 1
      .vscode/settings.json
  2. 7 12
      packages/app/src/server/models/page.ts

+ 1 - 1
.vscode/settings.json

@@ -19,7 +19,7 @@
     "editor.formatOnSave": false
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
+    "source.fixAll.eslint": false,
     "source.fixAll.markdownlint": true
   }
 }

+ 7 - 12
packages/app/src/server/models/page.ts

@@ -1,24 +1,19 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import nodePath from 'path';
-
-import { getOrCreateModel, pagePathUtils, pathUtils } from '@growi/core';
-import escapeStringRegexp from 'escape-string-regexp';
 import mongoose, {
   Schema, Model, Document, AnyObject,
 } from 'mongoose';
 import mongoosePaginate from 'mongoose-paginate-v2';
 import uniqueValidator from 'mongoose-unique-validator';
+import escapeStringRegexp from 'escape-string-regexp';
+import nodePath from 'path';
+import { getOrCreateModel, pagePathUtils, pathUtils } from '@growi/core';
 
-
-import { IUserHasId } from '~/interfaces/user';
-import { ObjectIdLike } from '~/server/interfaces/mongoose-utils';
-
-import { IPage, IPageHasId } from '../../interfaces/page';
 import loggerFactory from '../../utils/logger';
 import Crowi from '../crowi';
-
+import { IPage } from '../../interfaces/page';
 import { getPageSchema, extractToAncestorsPaths, populateDataToShowRevision } from './obsolete-page';
+import { ObjectIdLike } from '~/server/interfaces/mongoose-utils';
 import { PageRedirectModel } from './page-redirect';
 
 const { addTrailingSlash } = pathUtils;
@@ -1096,7 +1091,7 @@ export default (crowi: Crowi): any => {
     return !isRestricted && (!isV5Compatible || !isOnTree);
   };
 
-  schema.statics.emitPageEventUpdate = (page: IPageHasId, user: IUserHasId) => {
+  schema.statics.emitPageEventUpdate = async(page, user) => {
     pageEvent.emit('update', page, user);
   };
 
@@ -1169,7 +1164,7 @@ export default (crowi: Crowi): any => {
       savedPage = await this.syncRevisionToHackmd(savedPage);
     }
 
-    this.emitPageEventUpdate(savedPage, user);
+    this.emitPageEventUpdate(savedPage, user); // call asynchronously
 
     // Update ex children's parent
     if (!wasOnTree && shouldBeOnTree) {