Explorar el Código

elm redundant code

yohei0125 hace 4 años
padre
commit
17cd353853

+ 1 - 5
packages/app/src/server/routes/apiv3/page.js

@@ -10,9 +10,7 @@ const express = require('express');
 const { body, query } = require('express-validator');
 const { body, query } = require('express-validator');
 
 
 const router = express.Router();
 const router = express.Router();
-const {
-  convertToNewAffiliationPath, isTopPage, isUserPage, isUserNamePage,
-} = pagePathUtils;
+const { convertToNewAffiliationPath } = pagePathUtils;
 const ErrorV3 = require('../../models/vo/error-apiv3');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 
 
 
@@ -393,14 +391,12 @@ module.exports = (crowi) => {
 
 
       const isBookmarked = await Bookmark.findByPageIdAndUserId(pageId, user._id);
       const isBookmarked = await Bookmark.findByPageIdAndUserId(pageId, user._id);
       const isLiked = page.isLiked(user);
       const isLiked = page.isLiked(user);
-      const isMovable = !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
       const isAbleToDeleteCompletely = pageService.canDeleteCompletely(page.creator?._id, user);
       const isAbleToDeleteCompletely = pageService.canDeleteCompletely(page.creator?._id, user);
 
 
       const subscription = await Subscription.findByUserIdAndTargetId(user._id, pageId);
       const subscription = await Subscription.findByUserIdAndTargetId(user._id, pageId);
 
 
       const responseBody = {
       const responseBody = {
         ...responseBodyForGuest,
         ...responseBodyForGuest,
-        isMovable,
         isAbleToDeleteCompletely,
         isAbleToDeleteCompletely,
         isBookmarked,
         isBookmarked,
         isLiked,
         isLiked,

+ 3 - 3
packages/app/src/server/service/page.ts

@@ -1689,17 +1689,17 @@ class PageService {
   }
   }
 
 
   constructBasicPageInfo(page: IPage, isGuestUser?: boolean): IPageInfo | IPageInfoForEntity {
   constructBasicPageInfo(page: IPage, isGuestUser?: boolean): IPageInfo | IPageInfoForEntity {
+    const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
+
     if (page.isEmpty) {
     if (page.isEmpty) {
       return {
       return {
         isEmpty: true,
         isEmpty: true,
-        isMovable: true,
+        isMovable,
         isDeletable: false,
         isDeletable: false,
         isAbleToDeleteCompletely: false,
         isAbleToDeleteCompletely: false,
       };
       };
     }
     }
 
 
-    const isMovable = isGuestUser ? false : !isTopPage(page.path) && !isUserPage(page.path) && !isUserNamePage(page.path);
-
     const likers = page.liker.slice(0, 15) as Ref<IUserHasId>[];
     const likers = page.liker.slice(0, 15) as Ref<IUserHasId>[];
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];
     const seenUsers = page.seenUsers.slice(0, 15) as Ref<IUserHasId>[];