Merge branch 'imprv/revert-deleted-pages' into imprv/normalize-legacy-pages

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

@@ -1775,14 +1775,14 @@ class PageService {
 
     // GRANT_RESTRICTED and GRANT_SPECIFIED will never have parent
     const grantFilter: any = {
-      $or: [
+      $and: [
         { grant: { $ne: Page.GRANT_RESTRICTED } },
         { grant: { $ne: Page.GRANT_SPECIFIED } },
       ],
     };
 
     if (grant != null) { // add grant condition if not null
-      grantFilter.$or = [...grantFilter.$or, { grant }];
+      grantFilter.$and = [...grantFilter.$and, { grant }];
     }
 
     // generate filter