apostrophe 4.7.0 → 4.7.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 4.7.2 (2024-10-09)
+
+### Fixes
+
+* Correct a race condition that can cause a crash at startup when custom `uploadfs` options are present in some specific cloud environments e.g. when using Azure Blob Storage.
+
+## 4.7.1 (2024-09-20)
+
+### Fixes
+
+* Ensure parked fields are not modified for parked pages when not configured in `_defaults`.
+
 ## 4.7.0 (2024-09-05)
 
 ### Adds

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

@@ -54,7 +54,7 @@ module.exports = {
       ...globalIcons
     };
     self.configureBuilds();
-    self.initUploadfs();
+    await self.initUploadfs();
     self.enableBrowserData();
 
     const {

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

@@ -2442,7 +2442,6 @@ module.exports = {
               // except this one (filtering by topic pares down the list of categories and
               // vice versa)
               const _query = baseQuery.clone();
-              console.log('filter is:', filter);
               _query[filter](null);
               choices[filter] = await _query.toChoices(filter, { counts: query.get('counts') });
             }

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

@@ -846,6 +846,21 @@ module.exports = {
   },
   handlers(self) {
     return {
+      '@apostrophecms/page-type:beforeSave': {
+        handleParkedFieldsOverride(req, doc) {
+          if (!doc.parkedId) {
+            return;
+          }
+          const parked = self.parked.find(p => p.parkedId === doc.parkedId);
+          if (!parked) {
+            return;
+          }
+          const parkedFields = Object.keys(parked).filter(field => field !== '_defaults');
+          for (const parkedField of parkedFields) {
+            doc[parkedField] = parked[parkedField];
+          }
+        }
+      },
       beforeSend: {
         async addLevelAttributeToBody(req) {
           // Add level as a data attribute on the body tag

package/package.json

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

package/test/content-i18n.js

@@ -96,7 +96,7 @@ describe('content-i18n', function() {
     peoplePageFrCA = await apos.page.find(frCAReq, {
       parkedId: 'people'
     }).toObject();
-    assert(peoplePageFrCA.title === 'Altered');
+    assert(peoplePageFrCA.title === 'People');
   });
 
   let home;

package/test/events2.js

@@ -45,10 +45,12 @@ describe('Promisified Events: @apostrophecms/doc-type:beforeInsert', function()
               {
                 type: 'default-page',
                 findMeAgain: true,
-                title: 'Test',
                 slug: '/test',
                 visibility: 'public',
-                parkedId: 'test'
+                parkedId: 'test',
+                _defaults: {
+                  title: 'Test'
+                }
               }
             ]
           }

package/test/parked-pages.js

@@ -271,6 +271,81 @@ describe('Parked Pages', function() {
     });
     await validate(apos6, [ '/', '/archive', '/default1', '/default2', '/default3', '/default3/child1' ]);
   });
+
+  it('field override on save is possible only when it is configured as default', async function () {
+    this.timeout(20000);
+    await t.destroy(apos6);
+    apos6 = await t.create({
+      root: module,
+      modules: {
+        '@apostrophecms/page': {
+          options: {
+            park: [
+              ...park2,
+              {
+                parkedId: 'default3',
+                type: 'default-page',
+                title: 'Default 3',
+                slug: '/default3'
+              },
+              {
+                parkedId: 'default4',
+                type: 'default-page',
+                title: 'Default 4',
+                _defaults: {
+                  slug: '/default4'
+                }
+              }
+            ]
+          }
+        },
+        'default-page': {}
+      }
+    });
+    const manager = apos6.doc.getManager('default-page');
+    const req = apos.task.getReq({ mode: 'draft' });
+
+    // slug override not possible, slug is NOT configured in defaults
+    {
+      const page = await manager.find(req, {
+        parkedId: 'default3',
+        aposMode: 'draft'
+      }).toObject();
+      assert.strictEqual(page.slug, '/default3');
+      assert.deepStrictEqual(page.parked, [ 'parkedId', 'type', 'title', 'slug' ]);
+
+      page.slug = '/default3-overridden';
+      await manager.update(req, page);
+      const updated = await manager.find(req, {
+        parkedId: 'default3',
+        aposMode: 'draft'
+      }).toObject();
+
+      assert.strictEqual(updated.slug, '/default3');
+    }
+
+    // slug override is possible because slug is configured in defaults
+    {
+      const page = await manager.find(req, {
+        parkedId: 'default4',
+        aposMode: 'draft'
+      }).toObject();
+      assert.strictEqual(page.slug, '/default4');
+      assert.deepStrictEqual(page.parked, [ 'parkedId', 'type', 'title' ]);
+
+      page.slug = '/default4-overridden';
+      await manager.update(req, page);
+      const updated = await manager.find(req, {
+        parkedId: 'default4',
+        aposMode: 'draft'
+      }).toObject();
+
+      assert.strictEqual(updated.slug, '/default4-overridden');
+    }
+
+    await t.destroy(apos6);
+    apos6 = null;
+  });
 });
 
 async function validate(apos, expected) {