apostrophe 4.5.2 → 4.5.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## UNRELEASED
+
+### Fixes
+
+* Overriding standard Vue.js components with `editorModal` and `managerModal` are now applied all the time.
+
+## 4.5.4 (2024-07-22)
+
+### Fixes
+
+* Add a default projection to ancestors of search results in order to load a reasonable amount of data and avoid request timeouts.
+
+## 4.5.3 (2024-07-17)
+
+### Fixes
+
+* Enhanced media selection with touchpad on Windows by extending focus timeout.
+
 ## 4.5.2 (2024-07-11)
 
 ### Fixes

package/modules/@apostrophecms/any-page-type/index.js

@@ -120,6 +120,11 @@ module.exports = {
                 continue;
               }
               const subquery = self.apos.page.find(req);
+
+              if (req.aposAncestors === true && req.aposAncestorsApiProjection) {
+                subquery.project(req.aposAncestorsApiProjection);
+              }
+
               subquery.ancestorPerformanceRestrictions();
               const parameters = applySubqueryOptions(subquery, options, [ 'depth' ]);
               const components = page.path.split('/');
@@ -145,7 +150,7 @@ module.exports = {
               }
               if (!paths.length) {
                 page._ancestors = [];
-                return;
+                continue;
               }
               subquery.and({
                 path: { $in: paths }

package/modules/@apostrophecms/page/index.js

@@ -873,8 +873,8 @@ database.`);
           components: {}
         });
         _.defaults(browserOptions.components, {
-          editorModal: 'AposDocEditor',
-          managerModal: 'AposPagesManager'
+          editorModal: self.getComponentName('editorModal', 'AposDocEditor'),
+          managerModal: self.getComponentName('managerModal', 'AposPagesManager')
         });
 
         if (req.data.bestPage) {

package/modules/@apostrophecms/piece-type/index.js

@@ -1146,8 +1146,8 @@ module.exports = {
           components: {}
         });
         _.defaults(browserOptions.components, {
-          editorModal: 'AposDocEditor',
-          managerModal: 'AposDocsManager'
+          editorModal: self.getComponentName('editorModal', 'AposDocEditor'),
+          managerModal: self.getComponentName('managerModal', 'AposDocsManager')
         });
         browserOptions.managerApiProjection = self.getManagerApiProjection(req);
 

package/modules/@apostrophecms/schema/ui/apos/logic/AposInputRelationship.js

@@ -209,7 +209,7 @@ export default {
       // timeout to execute "@select" method before
       setTimeout(() => {
         this.searchList = [];
-      }, 200);
+      }, 300);
     },
     watchValue () {
       this.error = this.modelValue.error;

package/modules/@apostrophecms/search/index.js

@@ -52,7 +52,41 @@ module.exports = {
   options: {
     alias: 'search',
     perPage: 10,
-    label: 'apostrophe:searchLabel'
+    label: 'apostrophe:searchLabel',
+
+    // Default projection for ancestors, used in search results.
+    // See `req.aposAncestors` and `req.ancestorsApiProjection`
+    // in modules/@apostrophecms/search/index.js and
+    // in modules/@apostrophecms/any-page-type/index.js
+    ancestorsApiProjection: {
+      _id: 1,
+      title: 1,
+      slug: 1,
+      type: 1,
+      visibility: 1,
+      orphan: 1,
+      parkedId: 1,
+      parked: 1,
+      rank: 1,
+      level: 1,
+      aposDocId: 1,
+      path: 1,
+      lastPublishedAt: 1,
+      aposLocale: 1,
+      aposMode: 1,
+      metaType: 1,
+      createdAt: 1,
+      archived: 1,
+      titleSortified: 1,
+      updatedAt: 1,
+      cacheInvalidatedAt: 1,
+      updatedBy: 1,
+      highSearchText: 1,
+      highSearchWords: 1,
+      lowSearchText: 1,
+      searchSummary: 1,
+      _url: 1
+    }
   },
   init(self) {
 
@@ -107,7 +141,6 @@ module.exports = {
   },
   methods(self) {
     return {
-
       enableFilters() {
         if (self.options.filters) {
           self.filters = self.options.filters;
@@ -208,6 +241,7 @@ module.exports = {
 
         async function findDocs() {
           req.aposAncestors = true;
+          req.aposAncestorsApiProjection = self.options.ancestorsApiProjection;
 
           // Polymorphic find: fetch just the ids at first, then go back
           // and fetch them via their own type managers so that we get the

package/modules/@apostrophecms/ui/ui/apos/components/AposContextMenu.vue

@@ -300,7 +300,7 @@ async function setDropdownPosition() {
   list-style-type: none;
   width: max-content;
   margin: none;
-  margin-block: 0 0;
+  margin-block: 0;
   padding: 10px 0;
 }
 </style>

package/modules/@apostrophecms/ui/ui/apos/components/AposContextMenuDialog.vue

@@ -140,7 +140,7 @@ function emitSetArrow(arrowEl) {
   list-style-type: none;
   width: max-content;
   margin: none;
-  margin-block: 0 0;
+  margin-block: 0;
   padding: 10px 0;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {

package/test/search.js

@@ -22,6 +22,34 @@ describe('Search', function() {
         'event-page': {
           extend: '@apostrophecms/piece-page-type'
         },
+        '@apostrophecms/search': {
+          options: {
+            ancestorsApiProjection: {
+              _id: 1,
+              title: 1,
+              slug: 1,
+              type: 1,
+              visibility: 1,
+              orphan: 1,
+              parkedId: 1,
+              parked: 1,
+              rank: 1,
+              level: 1,
+              aposDocId: 1,
+              path: 1,
+              lastPublishedAt: 1,
+              aposLocale: 1,
+              aposMode: 1,
+              metaType: 1,
+              createdAt: 1,
+              archived: 1,
+              titleSortified: 1,
+              updatedAt: 1,
+              updatedBy: 1,
+              _url: 1
+            }
+          }
+        },
         '@apostrophecms/page': {
           options: {
             park: [
@@ -75,6 +103,7 @@ describe('Search', function() {
   it('should carry the _ancestors property', async function() {
     const response1 = await apos.http.get('/search?q=event');
     const [ piece ] = JSON.parse(response1);
+
     assert(piece._parent.title === 'Events');
     assert(piece._parent.type === 'event-page');
     assert(piece._parent.slug === '/events');
@@ -83,6 +112,41 @@ describe('Search', function() {
 
     const response2 = await apos.http.get('/search?q=home');
     const [ homepage ] = JSON.parse(response2);
+
     assert(homepage._ancestors.length === 0);
   });
+
+  it('should apply a custom projection on the _ancestors', async function() {
+    const response1 = await apos.http.get('/search?q=event');
+    const [ piece ] = JSON.parse(response1);
+
+    assert.deepEqual(
+      Object.keys(piece._parent._ancestors[0]),
+      [
+        '_id',
+        'title',
+        'slug',
+        'type',
+        'visibility',
+        'orphan',
+        'parkedId',
+        'parked',
+        'rank',
+        'level',
+        'aposDocId',
+        'path',
+        'lastPublishedAt',
+        'aposLocale',
+        'aposMode',
+        'metaType',
+        'createdAt',
+        'archived',
+        'titleSortified',
+        'updatedAt',
+        'updatedBy',
+        '_url',
+        '_ancestors'
+      ]
+    );
+  });
 });