ryoji-s пре 2 година
родитељ
комит
b793c33863
2 измењених фајлова са 4 додато и 4 уклоњено
  1. 2 2
      apps/app/src/server/events/user.ts
  2. 2 2
      apps/app/src/server/service/page.ts

+ 2 - 2
apps/app/src/server/events/user.ts

@@ -1,6 +1,6 @@
 import EventEmitter from 'events';
 
-import type { IUserHasId } from '@growi/core';
+import type { IPage, IUserHasId } from '@growi/core';
 import { pagePathUtils } from '@growi/core/dist/utils';
 import mongoose from 'mongoose';
 
@@ -25,7 +25,7 @@ class UserEvent extends EventEmitter {
       return;
     }
 
-    const Page = mongoose.model('Page') as unknown as PageModel;
+    const Page = mongoose.model<IPage, PageModel>('Page');
     const userHomepagePath = pagePathUtils.userHomepagePath(user);
 
     let page = await Page.findByPath(userHomepagePath, true);

+ 2 - 2
apps/app/src/server/service/page.ts

@@ -5,7 +5,7 @@ import type {
   Ref, HasObjectId, IUserHasId,
   IPage, IPageInfo, IPageInfoAll, IPageInfoForEntity, IPageWithMeta,
 } from '@growi/core';
-import { PageGrant, PageStatus, isPopulated } from '@growi/core';
+import { PageGrant, PageStatus, getIdForRef } from '@growi/core';
 import {
   pagePathUtils, pathUtils,
 } from '@growi/core/dist/utils';
@@ -1997,7 +1997,7 @@ class PageService {
 
     const ids = [userHomepage._id];
     const paths = [userHomepage.path];
-    const parentId = isPopulated(userHomepage.parent) ? userHomepage.parent._id : userHomepage.parent;
+    const parentId = getIdForRef(userHomepage.parent);
 
     try {
       if (!shouldUseV4Process) {