delete generateTrashPageChildrenPathRegExp

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

@@ -40,7 +40,7 @@ const debug = require('debug')('growi:services:page');
 const logger = loggerFactory('growi:services:page');
 const {
   isTrashPage, isTopPage, omitDuplicateAreaPageFromPages,
-  collectAncestorPaths, isMovablePage, canMoveByPath, isUsersProtectedPages, hasSlash, generateChildrenRegExp, generateTrashPageChildrenPathRegExp,
+  collectAncestorPaths, isMovablePage, canMoveByPath, isUsersProtectedPages, hasSlash, generateChildrenRegExp,
 } = pagePathUtils;
 
 const { addTrailingSlash } = pathUtils;
@@ -4040,8 +4040,10 @@ class PageService {
    */
   async findAllPagesInTrashPage(user: IUserHasId, userGroups = null): Promise<PageDocument[]> {
     const Page = mongoose.model('Page') as unknown as PageModel;
-    const path = '/trash';
-    const regexp = generateTrashPageChildrenPathRegExp(path);
+
+    // https://regex101.com/r/KYZWls/1
+    // ex. /trash/.*
+    const regexp = new RegExp('^/trash\\/.*$');
     const queryBuilder = new PageQueryBuilder(Page.find({ path: { $regex: regexp } }), true);
 
     await queryBuilder.addViewerCondition(user, userGroups);

packages/core/src/utils/page-path-utils.ts

@@ -305,12 +305,3 @@ export const generateChildrenRegExp = (path: string): RegExp => {
   // ex. /parent/any_child OR /any_level1
   return new RegExp(`^${path}(\\/[^/]+)\\/?$`);
 };
-
-/**
- * Generate RegExp instance for trash page any lower level paths
- */
-export const generateTrashPageChildrenPathRegExp = (path: string): RegExp => {
-  // https://regex101.com/r/KYZWls/1
-  // ex. /trash/.*
-  return new RegExp(`^${path}\\/.*$`);
-};