apostrophe 3.47.0 → 3.49.0

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

@@ -193,6 +193,12 @@ module.exports = {
     if (!self.options.name) {
       self.options.name = self.__meta.name;
     }
+    if (self.options.singletonAuto) {
+      self.options.singleton = true;
+    }
+    if (self.options.replicate === undefined) {
+      self.options.replicate = self.options.localized && self.options.singletonAuto;
+    }
     self.name = self.options.name;
     // Each doc-type has an array of fields which will be updated
     // if the document is moved to the archive. In most cases 'slug'
@@ -508,6 +514,26 @@ module.exports = {
       //
       // `query.field` will contain the schema field definition for
       // the relationship the user is attempting to match titles from.
+      getRelationshipQueryBuilderChoicesProjection(query) {
+        const projection = self.getAutocompleteProjection(query);
+
+        return {
+          ...projection,
+          title: 1,
+          type: 1,
+          _id: 1,
+          _url: 1,
+          slug: 1
+        };
+      },
+      // Returns a MongoDB projection object to be used when querying
+      // for this type if all that is needed is a title for display
+      // in an autocomplete menu. Default behavior is to
+      // return only the `title`, `_id` and `slug` properties.
+      // Removing any of these three is not recommended.
+      //
+      // `query.field` will contain the schema field definition for
+      // the relationship the user is attempting to match titles from.
       getAutocompleteProjection(query) {
         return {
           title: 1,
@@ -524,6 +550,11 @@ module.exports = {
       // event start dates and similar information that helps the
       // user distinguish between docs.
       getAutocompleteTitle(doc, query) {
+        // TODO Remove in next major version.
+        self.apos.util.warnDevOnce(
+          'deprecate-get-autocomplete-title',
+          'self.getAutocompleteTitle() is deprecated. Use the autocomplete(\'...\') query builder instead. More info at https://v3.docs.apostrophecms.org/reference/query-builders.html#autocomplete'
+        );
         return doc.title;
       },
       // Used by `@apostrophecms/version` to label changes that
@@ -615,6 +646,12 @@ module.exports = {
       //
       // We don't launder the input here, see the 'autocomplete' route.
       async autocomplete(req, query) {
+        // TODO Remove in next major version.
+        self.apos.util.warnDevOnce(
+          'deprecate-autocomplete',
+          'self.autocomplete() is deprecated. Use the autocomplete(\'...\') query builder instead. More info at https://v3.docs.apostrophecms.org/reference/query-builders.html#autocomplete'
+        );
+
         const _query = query.find(req, {}).sort('search');
         if (query.extendAutocompleteQuery) {
           query.extendAutocompleteQuery(_query);
@@ -1442,7 +1479,9 @@ module.exports = {
         browserOptions.schema = self.allowedSchema(req);
         browserOptions.localized = self.isLocalized();
         browserOptions.autopublish = self.options.autopublish;
-        browserOptions.previewDraft = self.isLocalized() && !browserOptions.autopublish && self.options.previewDraft;
+        browserOptions.previewDraft = self.isLocalized() &&
+          !browserOptions.autopublish &&
+          self.options.previewDraft;
 
         return browserOptions;
       }

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

@@ -42,7 +42,9 @@ module.exports = {
     // Intentionally the same
     pluralLabel: 'apostrophe:globalDocLabel',
     searchable: false,
-    singleton: true,
+    singletonAuto: {
+      slug: 'global'
+    },
     showPermissions: true,
     replicate: true
   },
@@ -77,23 +79,10 @@ module.exports = {
   },
   methods(self) {
     return {
-      async insertIfMissing() {
-        // Insert at startup
-        const req = self.apos.task.getReq();
-        const existing = await self.apos.doc.db.findOne({ slug: self.slug });
-        if (!existing) {
-          const _new = self.newInstance();
-          Object.assign(_new, {
-            slug: self.slug,
-            type: self.name
-          });
-          await self.insert(req, _new);
-        }
-      },
       // Fetch and return the `global` doc object. You probably don't need to call this,
       // because middleware has already populated `req.data.global` for you.
       async findGlobal(req) {
-        return self.find(req, { slug: self.slug }).permission(false).toObject();
+        return self.find(req, { type: self.name }).permission(false).toObject();
       },
       // Fetch the global doc and add it to `req.data` as `req.data.global`, if it
       // is not already present. If it is already present, skip the

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -376,13 +376,13 @@
   "richTextH4": "Heading 4 (H4)",
   "richTextHighlight": "Mark",
   "richTextHorizontalRule": "Horizontal Rule",
-  "richTextInsertMenuHeading": "Insert...",
+  "richTextInsertMenuHeading": "Insert element...",
   "richTextItalic": "Italic",
   "richTextLink": "Link",
   "richTextOrderedList": "Ordered List",
   "richTextParagraph": "Paragraph (P)",
   "richTextPlaceholder": "Start Typing Here...",
-  "richTextPlaceholderWithInsertMenu": "Start Typing Here or Press /...",
+  "richTextPlaceholderWithInsertMenu": "Start typing or press '/' for commands...",
   "richTextRedo": "Redo",
   "richTextStrikethrough": "Strike",
   "richTextStyleConfigWarning": "Misconfigured rich text style: label: {{ label }}, {{ tag }}",
@@ -399,6 +399,7 @@
   "saveDraftDescription": "Save as a draft to publish later.",
   "saveType": "Save {{ type }}",
   "savingDocument": "Saving document...",
+  "search": "Search",
   "searchDocType": "Search {{ type }}",
   "searchLabel": "Search Page",
   "searchLocales": "Search Locales",

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

@@ -202,6 +202,47 @@ module.exports = {
         req.session.cookie = new ExpressSessionCookie(aposExpressModule.sessionOptions.cookie);
         return res.redirect(self.apos.url.build(req.url, { aposCrossDomainSessionToken: null }));
       },
+      // If the `redirectToFirstLocale` option is enabled
+      // and the homepage is requested,
+      // redirects to the first locale configured with the
+      // current requested hostname when all of the locales
+      // configured with that hostname do have a prefix.
+      //
+      // However, if the request does not match any explicit
+      // hostnames assigned to locales, redirects to the first
+      // locale that does not have a configured hostname, if
+      // all the locales without a hostname do have a prefix.
+      redirectToFirstLocale(req, res, next) {
+        if (!self.options.redirectToFirstLocale) {
+          return next();
+        }
+        if (req.path !== '' && req.path !== '/') {
+          return next();
+        }
+
+        const locales = Object.values(
+          self.filterPrivateLocales(req, self.locales)
+        );
+        const localesWithoutHostname = locales.filter(
+          locale => !locale.hostname
+        );
+        const localesWithCurrentHostname = locales.filter(
+          locale => locale.hostname && locale.hostname.split(':')[0] === req.hostname
+        );
+
+        const localesToCheck = localesWithCurrentHostname.length
+          ? localesWithCurrentHostname
+          : localesWithoutHostname;
+
+        if (!localesToCheck.length || !localesToCheck.every(locale => locale.prefix)) {
+          return next();
+        }
+
+        // Add / for home page and to avoid being redirected again in the `locale` middleware:
+        const redirectUrl = `${localesToCheck[0].prefix}/`;
+
+        return res.redirect(redirectUrl);
+      },
       locale(req, res, next) {
         // Support for a single aposLocale query param that
         // also contains the mode, which is likely to occur
@@ -666,6 +707,37 @@ module.exports = {
               .entries(locales)
               .filter(([ name, options ]) => options.private !== true)
           );
+      },
+      // Rename a locale. This is time consuming and should be
+      // avoided when possible. If `keep` is present it must be set
+      // to either `oldLocale` or `newLocale` and indicates which version
+      // is kept in the event of a conflict
+      async rename(oldLocale, newLocale, { keep } = {}) {
+        let renamed = 0;
+        let kept = 0;
+        if (!oldLocale) {
+          throw new Error('You must specify --old');
+        }
+        if (!newLocale) {
+          throw new Error('You must specify --new');
+        }
+        if (oldLocale === newLocale) {
+          throw new Error('The old and new locales must be different');
+        }
+        if (keep && (!(keep === oldLocale) && !(keep === newLocale))) {
+          throw new Error('--keep must match --old or --new');
+        }
+        const ids = await self.apos.doc.db.find({ aposLocale: new RegExp(`^${self.apos.util.regExpQuote(oldLocale)}:`) }).project({ _id: 1 }).toArray();
+        ({
+          renamed,
+          kept
+        } = await self.apos.doc.changeDocIds(ids.map(doc => [ doc._id, doc._id.replace(`:${oldLocale}`, `:${newLocale}`) ]), {
+          keep: (keep === oldLocale) ? 'old' : (keep === newLocale) ? 'new' : false
+        }));
+        return {
+          renamed,
+          kept
+        };
       }
     };
   },
@@ -677,67 +749,10 @@ module.exports = {
           const oldLocale = self.apos.launder.string(argv.old);
           const newLocale = self.apos.launder.string(argv.new);
           const keep = self.apos.launder.string(argv.keep);
-          let renamed = 0;
-          let kept = 0;
-          if (!oldLocale) {
-            throw new Error('You must specify --old');
-          }
-          if (!newLocale) {
-            throw new Error('You must specify --new');
-          }
-          if (oldLocale === newLocale) {
-            throw new Error('The old and new locales must be different');
-          }
-          if (keep && (!(keep === oldLocale) && !(keep === newLocale))) {
-            throw new Error('--keep must match --old or --new');
-          }
-          await self.apos.migration.eachDoc({ aposLocale: new RegExp(`^${self.apos.util.regExpQuote(oldLocale)}:`) }, async doc => {
-            const newDoc = {
-              ...doc,
-              aposLocale: doc.aposLocale.replace(oldLocale, newLocale),
-              _id: doc._id.replace(`:${oldLocale}`, `:${newLocale}`)
-            };
-            try {
-              // Remove old first to cut down on duplicate key conflicts due to
-              // custom properties
-              await self.apos.doc.db.removeOne({ _id: doc._id });
-              await self.apos.doc.db.insertOne(newDoc);
-              renamed++;
-            } catch (e) {
-              // First reinsert old doc to prevent content loss on new doc insert failure
-              await self.apos.doc.db.insertOne(doc);
-              if (!self.apos.doc.isUniqueError(e)) {
-                throw e;
-              }
-              const existing = await self.apos.doc.db.findOne({ _id: newDoc._id });
-              if (!existing) {
-                // We don't know the cause of this error
-                throw e;
-              }
-              if (keep === newLocale) {
-                // New content already exists in new locale, delete old locale
-                // and keep new
-                await self.apos.doc.db.removeOne({ _id: doc._id });
-                kept++;
-              } else if (keep === oldLocale) {
-                // We want to keep the old locale's content. Once again we
-                // need to remove the old doc first to cut down on conflicts
-                try {
-                  await self.apos.doc.db.removeOne({ _id: doc._id });
-                  await self.apos.doc.db.deleteOne({ _id: newDoc._id });
-                  await self.apos.doc.db.insertOne(newDoc);
-                } catch (e) {
-                  // Reinsert old doc to prevent content loss on new doc insert failure
-                  await self.apos.doc.db.insertOne(doc);
-                  throw e;
-                }
-                kept++;
-              } else {
-                console.error('A conflict occurred. Use --keep to specify a locale to keep and retry');
-                throw e;
-              }
-            }
-          });
+          const {
+            renamed,
+            kept
+          } = await self.rename(oldLocale, newLocale, { keep });
           console.log(`Renamed ${renamed} documents from ${oldLocale} to ${newLocale}`);
           if (keep) {
             console.log(`Due to conflicts, kept ${kept} documents from ${keep}`);

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

@@ -462,6 +462,14 @@ module.exports = {
   },
   extendMethods(self) {
     return {
+      getRelationshipQueryBuilderChoicesProjection(_super, query) {
+        const projection = _super(query);
+
+        return {
+          ...projection,
+          attachment: 1
+        };
+      },
       getBrowserData(_super, req) {
         const data = _super(req);
         data.components.managerModal = 'AposMediaManager';

package/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerDisplay.vue

@@ -14,6 +14,7 @@
         class="apos-media-manager-display__cell" v-for="item in items"
         :key="idFor(item)"
         :class="{'apos-is-selected': checked.includes(item._id)}"
+        :style="getCellStyles(item)"
       >
         <div class="apos-media-manager-display__checkbox">
           <AposCheckbox
@@ -114,6 +115,10 @@ export default {
       type: String,
       required: false,
       default: null
+    },
+    largePreview: {
+      type: Boolean,
+      default: false
     }
   },
   emits: [
@@ -149,7 +154,7 @@ export default {
       const parentRatio = parentWidth / parentHeight;
       const itemRatio = item.dimensions.width / item.dimensions.height;
 
-      if (parentRatio < itemRatio) {
+      if ((parentRatio < itemRatio) || this.largePreview) {
         return {
           width: `${item.dimensions.width}px`,
           paddingTop: `${(item.dimensions.height / item.dimensions.width) * 100}%`
@@ -162,6 +167,14 @@ export default {
       }
 
     },
+    getCellStyles(item) {
+      if (this.largePreview && item.dimensions) {
+        return {
+          width: `${item.dimensions.width}px`,
+          height: `${item.dimensions.height}px`
+        };
+      }
+    },
     addDragClass(event) {
       event.target.classList.add('apos-is-hovering');
     },

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

@@ -43,69 +43,12 @@
 </template>
 
 <script>
-import AposLoginFormMixin from 'Modules/@apostrophecms/login/mixins/AposLoginFormMixin';
+import AposForgotPasswordFormLogic from 'Modules/@apostrophecms/login/logic/AposForgotPasswordForm';
 
 export default {
   name: 'AposForgotPasswordForm',
-  mixins: [ AposLoginFormMixin ],
-  emits: [ 'set-stage' ],
-  data() {
-    return {
-      busy: false,
-      done: false,
-      schema: [
-        {
-          name: 'email',
-          label: 'apostrophe:email',
-          placeholder: 'apostrophe:loginEnterEmail',
-          type: 'string',
-          required: true
-        }
-      ]
-    };
-  },
-  computed: {
-    disabled() {
-      return this.doc.hasErrors;
-    },
-    help() {
-      if (this.done) {
-        return this.$t('apostrophe:loginResetRequestDone', {
-          email: this.doc.data.email
-        });
-      }
-      return this.$t('apostrophe:loginResetPasswordRequest');
-    }
-  },
-  created() {
-    if (!this.passwordResetEnabled) {
-      this.$emit('set-stage', 'login');
-    }
-  },
-  methods: {
-    async submit() {
-      if (this.busy) {
-        return;
-      }
-      this.busy = true;
-      this.error = '';
-
-      await this.requestReset();
-    },
-    async requestReset() {
-      try {
-        await apos.http.post(`${apos.login.action}/reset-request`, {
-          busy: true,
-          body: { ...this.doc.data }
-        });
-        this.done = true;
-      } catch (e) {
-        this.error = e.message || 'apostrophe:loginErrorGeneric';
-      } finally {
-        this.busy = false;
-      }
-    }
-  }
+  mixins: [ AposForgotPasswordFormLogic ],
+  emits: [ 'set-stage' ]
 };
 </script>
 

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

@@ -70,241 +70,13 @@
 </template>
 
 <script>
-import AposLoginFormMixin from 'Modules/@apostrophecms/login/mixins/AposLoginFormMixin';
+import AposLoginFormLogic from 'Modules/@apostrophecms/login/logic/AposLoginForm';
 
 export default {
   name: 'AposLoginForm',
-  mixins: [ AposLoginFormMixin ],
-  emits: [ 'redirect', 'set-stage' ],
-  data() {
-    return {
-      phase: 'beforeSubmit',
-      busy: false,
-      schema: [
-        {
-          name: 'username',
-          label: 'Username',
-          placeholder: 'Enter username',
-          type: 'string',
-          required: true
-        },
-        {
-          name: 'password',
-          label: 'Password',
-          placeholder: 'Enter password',
-          type: 'password',
-          required: true
-        }
-      ],
-      requirements: getRequirements(),
-      requirementProps: {},
-      fetchingRequirementProps: false
-    };
-  },
-  computed: {
-    disabled() {
-      return this.doc.hasErrors ||
-        !!this.beforeSubmitRequirements.find(requirement => !requirement.done);
-    },
-    beforeSubmitRequirements() {
-      return this.requirements.filter(requirement => requirement.phase === 'beforeSubmit');
-    },
-    // The currently active requirement expecting a solo presentation.
-    // Currently it only concerns `afterPasswordVerified` requirements.
-    // beforeSubmit requirements are not presented solo.
-    activeSoloRequirement() {
-      return (this.phase === 'afterPasswordVerified') &&
-        this.requirements.find(requirement =>
-          (requirement.phase === 'afterPasswordVerified') && !requirement.done
-        );
-    }
-  },
-  watch: {
-    context(newVal) {
-      this.requirementProps = newVal.requirementProps;
-    },
-    async activeSoloRequirement(newVal) {
-      if (
-        (this.phase === 'afterPasswordVerified') &&
-        (newVal?.phase === 'afterPasswordVerified') &&
-        newVal.propsRequired &&
-        !(newVal.success || newVal.error)
-      ) {
-        try {
-          this.fetchingRequirementProps = true;
-          const data = await apos.http.post(`${apos.login.action}/requirement-props`, {
-            busy: true,
-            body: {
-              name: newVal.name,
-              incompleteToken: this.incompleteToken
-            }
-          });
-          this.requirementProps = {
-            ...this.requirementProps,
-            [newVal.name]: data
-          };
-        } catch (e) {
-          this.error = e.message || 'apostrophe:loginErrorGeneric';
-        } finally {
-          this.fetchingRequirementProps = false;
-        }
-      } else {
-        return null;
-      }
-    }
-  },
-  created() {
-    this.requirementProps = this.context.requirementProps;
-  },
-  methods: {
-    async submit() {
-      if (this.busy) {
-        return;
-      }
-      this.busy = true;
-      this.error = '';
-
-      await this.invokeInitialLoginApi();
-    },
-    async invokeInitialLoginApi() {
-      try {
-        const response = await apos.http.post(`${apos.login.action}/login`, {
-          busy: true,
-          body: {
-            ...this.doc.data,
-            requirements: this.getInitialSubmitRequirementsData(),
-            session: true
-          }
-        });
-        if (response && response.incompleteToken) {
-          this.incompleteToken = response.incompleteToken;
-          this.phase = 'afterPasswordVerified';
-        } else {
-          this.redirectAfterLogin();
-        }
-      } catch (e) {
-        this.error = e.message || 'An error occurred. Please try again.';
-        this.phase = 'beforeSubmit';
-      } finally {
-        this.busy = false;
-      }
-    },
-    getInitialSubmitRequirementsData() {
-      return Object.fromEntries(this.requirements
-        .filter(r => r.phase !== 'afterPasswordVerified' || !r.done)
-        .map(r => ([
-          r.name,
-          r.value
-        ])));
-    },
-    async invokeFinalLoginApi() {
-      try {
-        await apos.http.post(`${apos.login.action}/login`, {
-          busy: true,
-          body: {
-            ...this.doc.data,
-            incompleteToken: this.incompleteToken,
-            requirements: this.getFinalSubmitRequirementsData(),
-            session: true
-          }
-        });
-        this.redirectAfterLogin();
-      } catch (e) {
-        this.error = e.message || 'An error occurred. Please try again.';
-        this.phase = 'beforeSubmit';
-      } finally {
-        this.busy = false;
-      }
-    },
-    getFinalSubmitRequirementsData() {
-      return Object.fromEntries(this.requirements.filter(r => r.phase === 'afterPasswordVerified').map(r => ([
-        r.name,
-        r.value
-      ])));
-    },
-    redirectAfterLogin() {
-      // TODO handle situation where user should be sent somewhere other than homepage.
-      // Redisplay homepage with editing interface
-      this.$emit('redirect', `${apos.prefix}/`);
-    },
-    async requirementBlock(requirementBlock) {
-      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);
-
-      if (requirement.phase === 'beforeSubmit') {
-        requirement.done = true;
-        requirement.value = value;
-        return;
-      }
-
-      requirement.error = null;
-
-      try {
-        await apos.http.post(`${apos.login.action}/requirement-verify`, {
-          busy: true,
-          body: {
-            name: requirement.name,
-            value,
-            incompleteToken: this.incompleteToken
-          }
-        });
-
-        requirement.success = true;
-      } catch (err) {
-        requirement.error = err;
-      }
-
-      // Avoids the need for a deep watch
-      this.requirements = [ ...this.requirements ];
-
-      if (requirement.success && !requirement.askForConfirmation) {
-        requirement.done = true;
-
-        if (!this.activeSoloRequirement) {
-          await this.invokeFinalLoginApi();
-        }
-      }
-    },
-
-    async requirementConfirmed (requirementConfirmed) {
-      const requirement = this.requirements
-        .find(requirement => requirement.name === requirementConfirmed.name);
-
-      requirement.done = true;
-
-      if (!this.activeSoloRequirement) {
-        await this.invokeFinalLoginApi();
-      }
-    },
-    getRequirementProps(name) {
-      return this.requirementProps[name] || {};
-    }
-  }
+  mixins: [ AposLoginFormLogic ],
+  emits: [ 'set-stage' ]
 };
-
-function getRequirements() {
-  const requirements = Object.entries(apos.login.requirements).map(([ name, requirement ]) => {
-    return {
-      name,
-      component: requirement.component || name,
-      ...requirement,
-      done: false,
-      value: null,
-      success: null,
-      error: null
-    };
-  });
-  return [
-    ...requirements.filter(r => r.phase === 'beforeSubmit'),
-    ...requirements.filter(r => r.phase === 'afterPasswordVerified')
-  ];
-}
 </script>
 
 <style lang="scss" scoped>