apostrophe 3.13.0 → 3.14.2-alpha.20220401

package/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue

@@ -6,8 +6,9 @@
       :class="themeClass"
     >
       <div class="apos-login__wrapper">
-        <transition name="fade-body">
+        <transition name="fade-body" mode="out-in">
           <div
+            key="1"
             class="apos-login__upper"
             v-if="loaded && phase === 'beforeSubmit'"
           >
@@ -18,25 +19,19 @@
             />
 
             <div class="apos-login__body">
-              <form
-                @submit.prevent="submit"
-              >
+              <form @submit.prevent="submit">
                 <AposSchema
                   :schema="schema"
                   v-model="doc"
                 />
-                <!-- Do not ask these components to render without their props,
-                  v-show is not enough -->
-                <template v-if="loaded">
-                  <Component
-                    v-for="requirement in beforeSubmitRequirements"
-                    :key="requirement.name"
-                    :is="requirement.component"
-                    v-bind="getRequirementProps(requirement.name)"
-                    @done="requirementDone(requirement, $event)"
-                    @block="requirementBlock(requirement)"
-                  />
-                </template>
+                <Component
+                  v-for="requirement in beforeSubmitRequirements"
+                  :key="requirement.name"
+                  :is="requirement.component"
+                  v-bind="getRequirementProps(requirement.name)"
+                  @done="requirementDone(requirement, $event)"
+                  @block="requirementBlock(requirement)"
+                />
                 <!-- TODO -->
                 <!-- <a href="#" class="apos-login__link">Forgot Password</a> -->
                 <AposButton
@@ -53,8 +48,9 @@
             </div>
           </div>
           <div
+            key="2"
             class="apos-login__upper"
-            v-else-if="activeSoloRequirement && !fetchingRequirementProps"
+            v-else-if="activeSoloRequirement"
           >
             <TheAposLoginHeader
               :env="context.env"
@@ -64,6 +60,7 @@
             />
             <div class="apos-login__body">
               <Component
+                v-if="!fetchingRequirementProps"
                 v-bind="getRequirementProps(activeSoloRequirement.name)"
                 :is="activeSoloRequirement.component"
                 :success="activeSoloRequirement.success"
@@ -131,7 +128,8 @@ export default {
       return this.mounted && this.beforeCreateFinished;
     },
     disabled() {
-      return this.doc.hasErrors || !!this.beforeSubmitRequirements.find(requirement => !requirement.done);
+      return this.doc.hasErrors ||
+        !!this.beforeSubmitRequirements.find(requirement => !requirement.done);
     },
     beforeSubmitRequirements() {
       return this.requirements.filter(requirement => requirement.phase === 'beforeSubmit');
@@ -277,12 +275,14 @@ export default {
       location.assign(`${apos.prefix}/`);
     },
     async requirementBlock(requirementBlock) {
-      const requirement = this.requirements.find(requirement => requirement.name === requirementBlock.name);
+      const requirement = this.requirements
+        .find(requirement => requirement.name === requirementBlock.name);
       requirement.done = false;
       requirement.value = undefined;
     },
     async requirementDone(requirementDone, value) {
-      const requirement = this.requirements.find(requirement => requirement.name === requirementDone.name);
+      const requirement = this.requirements
+        .find(requirement => requirement.name === requirementDone.name);
 
       if (requirement.phase === 'beforeSubmit') {
         requirement.done = true;
@@ -392,12 +392,11 @@ function getRequirements() {
     transition-delay: 0.6s;
   }
 
-  .fade-leave-active {
+  .fade-body-leave-active {
     transition: all 0.25s linear;
-    transition-delay: 0;
   }
 
-  .fade-body-enter-to,.fade-body-leave {
+  .fade-body-enter-to, .fade-body-leave {
     transform: translateY(0);
   }
 
@@ -459,7 +458,7 @@ function getRequirements() {
       max-width: $login-container;
       margin: auto;
       align-items: center;
-      justify-content: start;
+      justify-content: flex-start;
     }
 
     &__project-version {

package/modules/@apostrophecms/login/ui/apos/components/TheAposLoginHeader.vue

@@ -50,7 +50,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: start;
+    align-items: flex-start;
     width: max-content;
   }
 

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

@@ -231,41 +231,36 @@ module.exports = {
       // Perform the actual migrations. Implementation of
       // the @apostrophecms/migration:migrate task
       async migrate(options) {
-        await self.apos.lock.lock(self.__meta.name);
         await self.emit('before');
-        try {
-          if (self.apos.isNew) {
-            // Since the site is brand new (zero documents), we may assume
-            // it requires no migrations. Mark them all as "done" but note
-            // that they were skipped, just in case we decide that's an issue later
-            const at = new Date();
-            // Just in case the db has no documents but did
-            // start to run migrations on a previous attempt,
-            // which causes an occasional unique key error if not
-            // corrected for here
-            await self.db.removeMany({});
-            await self.db.insertMany(self.migrations.map(migration => ({
-              _id: migration.name,
-              at,
-              skipped: true
-            })));
-          } else {
-            for (const migration of self.migrations) {
-              await self.runOne(migration);
-            }
+        if (self.apos.isNew) {
+          // Since the site is brand new (zero documents), we may assume
+          // it requires no migrations. Mark them all as "done" but note
+          // that they were skipped, just in case we decide that's an issue later
+          const at = new Date();
+          // Just in case the db has no documents but did
+          // start to run migrations on a previous attempt,
+          // which causes an occasional unique key error if not
+          // corrected for here
+          await self.db.removeMany({});
+          await self.db.insertMany(self.migrations.map(migration => ({
+            _id: migration.name,
+            at,
+            skipped: true
+          })));
+        } else {
+          for (const migration of self.migrations) {
+            await self.runOne(migration);
           }
-          // In production, this event is emitted only at the end of the migrate command line task.
-          // In dev it is emitted at every startup after the automatic migration.
-          //
-          // Intentionally emitted regardless of whether the site is new or not.
-          //
-          // This is the right time to park pages, for instance, because the
-          // database is guaranteed to be in a stable state, whether because the
-          // site is new or because migrations ran successfully.
-          await self.emit('after');
-        } finally {
-          await self.apos.lock.unlock(self.__meta.name);
         }
+        // In production, this event is emitted only at the end of the migrate command line task.
+        // In dev it is emitted at every startup after the automatic migration.
+        //
+        // Intentionally emitted regardless of whether the site is new or not.
+        //
+        // This is the right time to park pages, for instance, because the
+        // database is guaranteed to be in a stable state, whether because the
+        // site is new or because migrations ran successfully.
+        await self.emit('after');
       },
       async runOne(migration) {
         const info = await self.db.findOne({ _id: migration.name });

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

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const path = require('path');
 const { klona } = require('klona');
+const expressCacheOnDemand = require('express-cache-on-demand')();
 
 module.exports = {
   cascades: [ 'batchOperations' ],
@@ -47,6 +48,9 @@ module.exports = {
     }
   },
   async init(self) {
+    const { enableCacheOnDemand = true } = self.apos
+      .modules['@apostrophecms/express'].options;
+    self.enableCacheOnDemand = enableCacheOnDemand;
     self.typeChoices = self.options.types || [];
     // If "park" redeclares something with a parkedId present in "minimumPark",
     // the later one should win
@@ -55,9 +59,11 @@ module.exports = {
     self.addEditorModal();
     self.enableBrowserData();
     self.addLegacyMigrations();
+    self.addMisreplicatedParkedPagesMigration();
     await self.createIndexes();
   },
   restApiRoutes(self) {
+
     return {
       // Trees are arranged in a tree, not a list. So this API returns the home page,
       // with _children populated if ?_children=1 is in the query string. An editor can
@@ -77,95 +83,102 @@ module.exports = {
       // If querying for draft pages, you may add ?published=1 to attach a
       // `_publishedDoc` property to each draft that also exists in a published form.
 
-      async getAll(req) {
-        self.publicApiCheck(req);
-        const all = self.apos.launder.boolean(req.query.all);
-        const archived = self.apos.launder.booleanOrNull(req.query.archived);
-        const flat = self.apos.launder.boolean(req.query.flat);
-        const autocomplete = self.apos.launder.string(req.query.autocomplete);
+      getAll: [
+        ...self.enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        async (req) => {
+          self.publicApiCheck(req);
+          const all = self.apos.launder.boolean(req.query.all);
+          const archived = self.apos.launder.booleanOrNull(req.query.archived);
+          const flat = self.apos.launder.boolean(req.query.flat);
+          const autocomplete = self.apos.launder.string(req.query.autocomplete);
 
-        if (autocomplete.length) {
-          if (!self.apos.permission.can(req, 'edit', '@apostrophecms/any-page-type')) {
-            throw self.apos.error('forbidden');
+          if (autocomplete.length) {
+            if (!self.apos.permission.can(req, 'edit', '@apostrophecms/any-page-type')) {
+              throw self.apos.error('forbidden');
+            }
+            return {
+              // For consistency with the pieces REST API we
+              // use a results property when returning a flat list
+              results: await self.getRestQuery(req).limit(10).relationships(false)
+                .areas(false).toArray()
+            };
           }
-          return {
-            // For consistency with the pieces REST API we
-            // use a results property when returning a flat list
-            results: await self.getRestQuery(req).limit(10).relationships(false)
-              .areas(false).toArray()
-          };
-        }
 
-        if (all) {
-          if (!self.apos.permission.can(req, 'edit', '@apostrophecms/any-page-type')) {
-            throw self.apos.error('forbidden');
-          }
-          const page = await self.getRestQuery(req).and({ level: 0 }).children({
-            depth: 1000,
-            archived,
-            orphan: null,
-            relationships: false,
-            areas: false,
-            permission: false,
-            withPublished: self.apos.launder.boolean(req.query.withPublished),
-            project: self.getAllProjection()
-          }).toObject();
+          if (all) {
+            if (!self.apos.permission.can(req, 'edit', '@apostrophecms/any-page-type')) {
+              throw self.apos.error('forbidden');
+            }
+            const page = await self.getRestQuery(req).and({ level: 0 }).children({
+              depth: 1000,
+              archived,
+              orphan: null,
+              relationships: false,
+              areas: false,
+              permission: false,
+              withPublished: self.apos.launder.boolean(req.query.withPublished),
+              project: self.getAllProjection()
+            }).toObject();
 
-          if (!page) {
-            throw self.apos.error('notfound');
-          }
+            if (!page) {
+              throw self.apos.error('notfound');
+            }
 
-          if (flat) {
-            const result = [];
-            flatten(result, page);
+            if (flat) {
+              const result = [];
+              flatten(result, page);
 
-            return {
-              // For consistency with the pieces REST API we
-              // use a results property when returning a flat list
-              results: result
-            };
+              return {
+                // For consistency with the pieces REST API we
+                // use a results property when returning a flat list
+                results: result
+              };
+            } else {
+              return page;
+            }
           } else {
-            return page;
-          }
-        } else {
-          const result = await self.getRestQuery(req).and({ level: 0 }).toObject();
-          if (!result) {
-            throw self.apos.error('notfound');
-          }
+            const result = await self.getRestQuery(req).and({ level: 0 }).toObject();
+            if (!result) {
+              throw self.apos.error('notfound');
+            }
 
-          // Attach `_url` and `_urls` properties to the home page
-          self.apos.attachment.all(result, { annotate: true });
-          return result;
-        }
+            // Attach `_url` and `_urls` properties to the home page
+            self.apos.attachment.all(result, { annotate: true });
+            return result;
+          }
 
-        function flatten(result, node) {
-          const children = node._children;
-          node._children = _.map(node._children, '_id');
-          result.push(node);
-          _.each(children || [], function(child) {
-            flatten(result, child);
-          });
+          function flatten(result, node) {
+            const children = node._children;
+            node._children = _.map(node._children, '_id');
+            result.push(node);
+            _.each(children || [], function(child) {
+              flatten(result, child);
+            });
 
+          }
         }
-      },
+      ],
       // _id may be a page _id, or the convenient shorthands
       // `_home` or `_archive`
-      async getOne(req, _id) {
-        _id = self.inferIdLocaleAndMode(req, _id);
-        // Edit access to draft is sufficient to fetch either
-        self.publicApiCheck(req);
-        const criteria = self.getIdCriteria(_id);
-        const result = await self.getRestQuery(req).and(criteria).toObject();
-        if (!result) {
-          throw self.apos.error('notfound');
-        }
-        if (self.apos.launder.boolean(req.query['render-areas']) === true) {
-          await self.apos.area.renderDocsAreas(req, [ result ]);
+
+      getOne: [
+        ...self.enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        async (req, _id) => {
+          _id = self.inferIdLocaleAndMode(req, _id);
+          // Edit access to draft is sufficient to fetch either
+          self.publicApiCheck(req);
+          const criteria = self.getIdCriteria(_id);
+          const result = await self.getRestQuery(req).and(criteria).toObject();
+          if (!result) {
+            throw self.apos.error('notfound');
+          }
+          if (self.apos.launder.boolean(req.query['render-areas']) === true) {
+            await self.apos.area.renderDocsAreas(req, [ result ]);
+          }
+          // Attach `_url` and `_urls` properties
+          self.apos.attachment.all(result, { annotate: true });
+          return result;
         }
-        // Attach `_url` and `_urls` properties
-        self.apos.attachment.all(result, { annotate: true });
-        return result;
-      },
+      ],
       // POST a new page to the site. The schema fields should be part of the JSON request body.
       //
       // You may pass `_targetId` and `_position` to specify the location in the page tree.
@@ -576,7 +589,14 @@ database.`);
       },
       'apostrophe:ready': {
         addServeRoute() {
-          self.apos.app.get('*', self.serve);
+          self.apos.app.get('*',
+            (req, res, next) => {
+              return self.enableCacheOnDemand
+                ? expressCacheOnDemand(req, res, next)
+                : next();
+            },
+            self.serve
+          );
         }
       }
     };
@@ -1298,9 +1318,6 @@ database.`);
         if (!options) {
           options = {};
         }
-        const manager = self.apos.doc.getManager(page.type);
-        await manager.emit('beforeUpdate', req, page, options);
-        await manager.emit('beforeSave', req, page, options);
         await self.apos.doc.update(req, page, options);
         return page;
       },
@@ -2171,7 +2188,44 @@ database.`);
           }
         }
       },
-      ...require('./lib/legacy-migrations')(self)
+      ...require('./lib/legacy-migrations')(self),
+      addMisreplicatedParkedPagesMigration() {
+        self.apos.migration.add('misreplicated-parked-pages', async () => {
+          const parkedPages = await self.apos.doc.db.find({
+            parkedId: {
+              $ne: null
+            }
+          }).toArray();
+          const locales = [ self.apos.i18n.defaultLocale, ...Object.keys(self.apos.i18n.locales) ];
+          const parkedIds = [ ...new Set(parkedPages.map(page => page.parkedId)) ];
+          for (const parkedId of parkedIds) {
+            let aposDocId;
+            for (const locale of locales) {
+              for (const mode of [ 'draft', 'published' ]) {
+                const page = parkedPages.find(page => (page.parkedId === parkedId) && (page.aposLocale === `${locale}:${mode}`));
+                if (!page) {
+                  continue;
+                }
+                if (!aposDocId) {
+                  aposDocId = page.aposDocId;
+                } else {
+                  if (page.aposDocId !== aposDocId) {
+                    await self.apos.doc.db.removeOne({
+                      _id: page._id
+                    });
+                    await self.apos.doc.db.insertOne({
+                      ...page,
+                      _id: `${aposDocId}:${locale}:${mode}`,
+                      aposDocId,
+                      path: page.path.replace(page.aposDocId, aposDocId)
+                    });
+                  }
+                }
+              }
+            }
+          }
+        });
+      }
     };
   },
   helpers(self) {

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

@@ -220,7 +220,7 @@ module.exports = {
         if (!page) {
           return false;
         }
-        return page._url + '/' + piece.slug;
+        return self.apos.util.addSlashIfNeeded(page._url) + piece.slug;
       },
 
       // Adds the `._url` property to all of the provided pieces,

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

@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const expressCacheOnDemand = require('express-cache-on-demand')();
 
 module.exports = {
   extend: '@apostrophecms/doc-type',
@@ -164,79 +165,91 @@ module.exports = {
     self.addManagerModal();
     self.addEditorModal();
   },
-  restApiRoutes: (self) => ({
-    async getAll(req) {
-      self.publicApiCheck(req);
-      const query = self.getRestQuery(req);
-      if (!query.get('perPage')) {
-        query.perPage(
-          self.options.perPage
-        );
-      }
-      const result = {};
-      // Also populates totalPages when perPage is present
-      const count = await query.toCount();
-      if (self.apos.launder.boolean(req.query.count)) {
-        return {
-          count
-        };
-      }
-      result.pages = query.get('totalPages');
-      result.currentPage = query.get('page') || 1;
-      result.results = await query.toArray();
-      if (self.apos.launder.boolean(req.query['render-areas']) === true) {
-        await self.apos.area.renderDocsAreas(req, result.results);
-      }
-      if (query.get('choicesResults')) {
-        result.choices = query.get('choicesResults');
-      }
-      if (query.get('countsResults')) {
-        result.counts = query.get('countsResults');
-      }
-      return result;
-    },
-    async getOne(req, _id) {
-      _id = self.inferIdLocaleAndMode(req, _id);
-      self.publicApiCheck(req);
-      const doc = await self.getRestQuery(req).and({ _id }).toObject();
-      if (!doc) {
-        throw self.apos.error('notfound');
-      }
-      if (self.apos.launder.boolean(req.query['render-areas']) === true) {
-        await self.apos.area.renderDocsAreas(req, [ doc ]);
-      }
-      self.apos.attachment.all(doc, { annotate: true });
-      return doc;
-    },
-    async post(req) {
-      self.publicApiCheck(req);
-      if (req.body._newInstance) {
-        const newInstance = self.newInstance();
-        newInstance._previewable = self.addUrlsViaModule && (await self.addUrlsViaModule.readyToAddUrlsToPieces(req, self.name));
-        delete newInstance._url;
-        return newInstance;
+  restApiRoutes(self) {
+    const { enableCacheOnDemand = true } = self.apos
+      .modules['@apostrophecms/express'].options;
+
+    return {
+      getAll: [
+        ...enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        async (req) => {
+          self.publicApiCheck(req);
+          const query = self.getRestQuery(req);
+          if (!query.get('perPage')) {
+            query.perPage(
+              self.options.perPage
+            );
+          }
+          const result = {};
+          // Also populates totalPages when perPage is present
+          const count = await query.toCount();
+          if (self.apos.launder.boolean(req.query.count)) {
+            return {
+              count
+            };
+          }
+          result.pages = query.get('totalPages');
+          result.currentPage = query.get('page') || 1;
+          result.results = await query.toArray();
+          if (self.apos.launder.boolean(req.query['render-areas']) === true) {
+            await self.apos.area.renderDocsAreas(req, result.results);
+          }
+          if (query.get('choicesResults')) {
+            result.choices = query.get('choicesResults');
+          }
+          if (query.get('countsResults')) {
+            result.counts = query.get('countsResults');
+          }
+          return result;
+        }
+      ],
+      getOne: [
+        ...enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        async (req, _id) => {
+          _id = self.inferIdLocaleAndMode(req, _id);
+          self.publicApiCheck(req);
+          const doc = await self.getRestQuery(req).and({ _id }).toObject();
+          if (!doc) {
+            throw self.apos.error('notfound');
+          }
+          if (self.apos.launder.boolean(req.query['render-areas']) === true) {
+            await self.apos.area.renderDocsAreas(req, [ doc ]);
+          }
+          self.apos.attachment.all(doc, { annotate: true });
+          return doc;
+        }
+      ],
+      async post(req) {
+        self.publicApiCheck(req);
+        if (req.body._newInstance) {
+          const newInstance = self.newInstance();
+          newInstance._previewable = self.addUrlsViaModule && (await self.addUrlsViaModule.readyToAddUrlsToPieces(req, self.name));
+          delete newInstance._url;
+          return newInstance;
+        }
+        return await self.convertInsertAndRefresh(req, req.body);
+      },
+      async put(req, _id) {
+        _id = self.inferIdLocaleAndMode(req, _id);
+        self.publicApiCheck(req);
+        return self.convertUpdateAndRefresh(req, req.body, _id);
+      },
+      async delete(req, _id) {
+        _id = self.inferIdLocaleAndMode(req, _id);
+        self.publicApiCheck(req);
+        const piece = await self.findOneForEditing(req, {
+          _id
+        });
+        return self.delete(req, piece);
+      },
+      async patch(req, _id) {
+        _id = self.inferIdLocaleAndMode(req, _id);
+        self.publicApiCheck(req);
+        return self.convertPatchAndRefresh(req, req.body, _id);
       }
-      return await self.convertInsertAndRefresh(req, req.body);
-    },
-    async put(req, _id) {
-      _id = self.inferIdLocaleAndMode(req, _id);
-      self.publicApiCheck(req);
-      return self.convertUpdateAndRefresh(req, req.body, _id);
-    },
-    async delete(req, _id) {
-      _id = self.inferIdLocaleAndMode(req, _id);
-      self.publicApiCheck(req);
-      const piece = await self.findOneForEditing(req, {
-        _id
-      });
-      return self.delete(req, piece);
-    },
-    async patch(req, _id) {
-      _id = self.inferIdLocaleAndMode(req, _id);
-      self.publicApiCheck(req);
-      return self.convertPatchAndRefresh(req, req.body, _id);
-    }
-  }),
+    };
+
+  },
   apiRoutes(self) {
     return {
       get: {