apostrophe 3.60.0 → 3.61.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 3.61.0 (2023-12-21)
+
+### Adds
+
+* Add a `validate` method to the `url` field type to allow the use of the `pattern` property.
+* Add `autocomplete` attribute to schema fields that implement it (cf. [HTML attribute: autocomplete](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete)).
+* Add the `delete` method to the `@apostrophecms/cache` module so we don't have to rely on direct MongoDB manipulation to remove a cache item.
+* Adds tag property to fields in order to show a tag next to the field title (used in advanced permission for the admin field). Adds new sensitive label color.
+* Pass on the module name and the full, namespaced template name to external front ends, e.g. Astro.
+Also make this information available to other related methods for future and project-level use.
+* Fixes the AposCheckbox component to be used more easily standalone, accepts a single model value instead of an array.
+
+### Fixes
+
+* Fix `date` schema field query builder to work with arrays.
+* Fix `if` on pages. When you open the `AposDocEditor` modal on pages, you now see an up to date view of the visible fields.
+* Pass on complete annotation information for nested areas when adding or editing a nested widget using an external front, like Astro.
+* We can now close the image modal in rich-text widgets when we click outside of the modal.
+The click on the cancel button now works too.
+* Fixes the `clearLoginAttempts` method to work with the new `@apostrophecms/cache` module `delete` method.
+
+## 3.60.1 (2023-12-06)
+
+### Fixes
+
+* corrected an issue where the use of the doc template library can result in errors at startup when
+replicating certain content to new locales. This was not a bug in the doc template library.
+Apostrophe was not invoking `findForEditing` where it should have.
+
 ## 3.60.0 (2023-11-29)
 
 ### Adds
@@ -510,6 +539,7 @@ those writing mocha tests of Apostrophe modules.
 * Hide the suggestion help from the relationship input list when the user starts typing a search term.
 * Hide the suggestion hint from the relationship input list when the user starts typing a search term except when there are no matches to display.
 * Disable context menu for related items when their `relationship` field has no sub-[`fields`](https://v3.docs.apostrophecms.org/guide/relationships.html#providing-context-with-fields) configured.
+* Logic for checking whether we are running a unit test of an external module under mocha now uses `includes` for a simpler, safer test that should be more cross-platform.
 
 ## 3.42.0 (2023-03-16)
 

package/index.js

@@ -525,12 +525,12 @@ async function apostrophe(options, telemetry, rootSpan) {
     // and throws an exception if we don't
     function findTestModule() {
       let m = module;
-      const nodeModuleRegex = new RegExp(`node_modules${path.sep}mocha`);
-      if (!require.main.filename.match(nodeModuleRegex)) {
+      const testFor = `node_modules${path.sep}mocha`;
+      if (!require.main.filename.includes(testFor)) {
         throw new Error('mocha does not seem to be running, is this really a test?');
       }
       while (m) {
-        if (m.parent && m.parent.filename.match(nodeModuleRegex)) {
+        if (m.parent && m.parent.filename.includes(testFor)) {
           return m;
         } else if (!m.parent) {
           // Mocha v10 doesn't inject mocha paths inside `module`, therefore, we only detect the parent until the last parent. But we can get Mocha running using `require.main` - Amin

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

@@ -69,6 +69,28 @@ module.exports = {
           }
           async function render() {
             if (req.aposExternalFront) {
+              // Simulate an area and annotate it so that the
+              // widget's sub-areas wind up with the right metadata
+              const area = {
+                metaType: 'area',
+                items: [ widget ],
+                _docId
+              };
+              self.apos.template.annotateAreaForExternalFront(field, area);
+              // Annotate sub-areas. It's like annotating a doc, but not quite,
+              // so this logic is reproduced partially
+              self.apos.doc.walk(area, (o, k, v) => {
+                if (v && v.metaType === 'area') {
+                  const manager = self.apos.util.getManagerOf(o);
+                  if (!manager) {
+                    self.apos.util.warnDevOnce('noManagerForDocInExternalFront', `No manager for: ${o.metaType} ${o.type || ''}`);
+                    return;
+                  }
+                  const field = manager.schema.find(f => f.name === k);
+                  v._docId = _docId;
+                  self.apos.template.annotateAreaForExternalFront(field, v);
+                }
+              });
               const result = {
                 ...req.data,
                 options,

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

@@ -79,6 +79,15 @@ module.exports = {
         return self.cacheCollection.removeMany({ namespace });
       },
 
+      // Delete a single key and value from the cache.
+
+      async delete(namespace, username) {
+        await self.cacheCollection.deleteOne({
+          namespace,
+          key: username
+        });
+      },
+
       // Establish the collection that will store all of the caches and
       // set up its indexes.
 

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

@@ -225,8 +225,8 @@ module.exports = {
   handlers(self) {
     return {
       beforeSave: {
-        prepareForStorage(req, doc) {
-          self.apos.schema.prepareForStorage(req, doc);
+        prepareForStorage(req, doc, options) {
+          self.apos.schema.prepareForStorage(req, doc, options);
         },
         async updateCacheField(req, doc) {
           await self.updateCacheField(req, doc);
@@ -1028,9 +1028,16 @@ module.exports = {
         });
         const toId = draft._id.replace(`:${draft.aposLocale}`, `:${toLocale}:draft`);
         const actionModule = self.apos.page.isPage(draft) ? self.apos.page : self;
+        // Use findForEditing so that we are successful even for edge cases
+        // like doc templates that don't appear in public renderings, but
+        // also use permission('view') so that we are not actually restricted
+        // to what we can edit, avoiding any confusion about whether there
+        // is really an existing localized doc or not and preventing the
+        // possibility of inserting an unwanted duplicate. The update() call will
+        // still stop us if edit permissions are an issue
         const existing = await actionModule.findForEditing(toReq, {
           _id: toId
-        }).toObject();
+        }).permission('view').toObject();
         // We only want to copy schema properties, leave non-schema
         // properties of the source document alone
         const data = Object.fromEntries(Object.entries(draft).filter(([ key, value ]) => self.schema.find(field => field.name === key)));
@@ -1056,8 +1063,15 @@ module.exports = {
               // A page that is not the home page, being replicated for the first time
               let { lastTargetId, lastPosition } = await self.apos.page.inferLastTargetIdAndPosition(draft);
               let localizedTargetId = lastTargetId.replace(`:${draft.aposLocale}`, `:${toLocale}:draft`);
+              // When fetching the target (parent or peer), always use findForEditing
+              // so we don't miss doc templates and other edge cases, but also use
+              // .permission('view') because we are not actually editing the target
+              // and should not be blocked over edit permissions. Later change this check
+              // to 'create' ("can create a child of this doc"), but not until we're ready
+              // to do it for all creation attempts
               const localizedTarget = await actionModule
-                .find(toReq, self.apos.page.getIdCriteria(localizedTargetId))
+                .findForEditing(toReq, self.apos.page.getIdCriteria(localizedTargetId))
+                .permission('view')
                 .archived(null)
                 .areas(false)
                 .relationships(false)
@@ -1070,7 +1084,13 @@ module.exports = {
                     parentNotLocalized: true
                   });
                 } else {
-                  const originalTarget = await actionModule.find(req, self.apos.page.getIdCriteria(lastTargetId)).archived(null).areas(false).relationships(false).toObject();
+                  const originalTarget = await actionModule
+                    .findForEditing(req, self.apos.page.getIdCriteria(lastTargetId))
+                    .permission('view')
+                    .archived(null)
+                    .areas(false)
+                    .relationships(false)
+                    .toObject();
                   if (!originalTarget) {
                     // Almost impossible (race conditions like someone removing it while we're in the modal)
                     throw self.apos.error('notfound');
@@ -1078,7 +1098,13 @@ module.exports = {
                   const criteria = {
                     path: self.apos.page.getParentPath(originalTarget)
                   };
-                  const localizedTarget = await actionModule.find(toReq, criteria).archived(null).areas(false).relationships(false).toObject();
+                  const localizedTarget = await actionModule
+                    .findForEditing(toReq, criteria)
+                    .permission('view')
+                    .archived(null)
+                    .areas(false)
+                    .relationships(false)
+                    .toObject();
                   if (!localizedTarget) {
                     throw self.apos.error('notfound', req.t('apostrophe:parentNotLocalized'), {
                       // Also provide as data for code that prefers to localize client side

package/modules/@apostrophecms/doc-type/ui/apos/components/AposDocEditor.vue

@@ -350,8 +350,8 @@ export default {
       type: this.$t(this.moduleOptions.label)
     };
     if (this.docId) {
-      this.evaluateConditions();
       await this.loadDoc();
+      this.evaluateConditions();
       try {
         if (this.manuallyPublished) {
           this.published = await apos.http.get(this.getOnePath, {

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

@@ -890,10 +890,7 @@ module.exports = {
       },
 
       async clearLoginAttempts (username, namespace = loginAttemptsNamespace) {
-        await self.apos.cache.cacheCollection.deleteOne({
-          namespace,
-          key: username
-        });
+        await self.apos.cache.delete(namespace, username);
       },
 
       addToAdminBar() {

package/modules/@apostrophecms/modal/ui/apos/mixins/AposEditorMixin.js

@@ -55,6 +55,7 @@ export default {
       async handler() {
         if (this.moduleName === '@apostrophecms/page') {
           await this.evaluateExternalConditions();
+          this.evaluateConditions();
         }
       }
     }

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

@@ -432,8 +432,8 @@ module.exports = {
         await self.apos.area.loadDeferredWidgets(req);
         if (req.aposExternalFront) {
           data = self.apos.template.getRenderDataArgs(req, data, self);
-          await self.apos.template.annotateDataForExternalFront(req, template, data);
-          self.apos.template.pruneDataForExternalFront(req, template, data);
+          await self.apos.template.annotateDataForExternalFront(req, template, data, self.__meta.name);
+          self.apos.template.pruneDataForExternalFront(req, template, data, self.__meta.name);
           // Reply with JSON
           return data;
         }

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

@@ -1,6 +1,6 @@
 // This module provides a framework for triggering notifications
 // within the Apostrophe admin UI. Notifications may be triggered
-// either on the browser or the server side, via `apos.notice`.
+// either on the browser or the server side, via `apos.notify`.
 //
 // ## Options
 //
@@ -209,17 +209,17 @@ module.exports = {
           action: self.action
         };
       },
-      // Call with `req`, then a message key as found in the localization files,
-      // followed by an `options` object if desired.
-      //
-      // If you do not have a `req` it is acceptable to pass a user `_id` string
+      // When used server-side, call with `req` as the first argument,
+      // or if you do not have a `req` it is acceptable to pass a user `_id` string
       // in place of `req`. Someone must be the recipient.
       //
-      // `message` should be a key that exists in a localization file. If it does not
-      // it will be displayed directly as a fallback.
+      // When called client-side, there is no req argument because the recipient is always the current user.
+      //
+      // The `message` argument should be a key that exists in a localization file.
+      // If it does not, it will be displayed directly as a fallback.
       //
-      // `options.type` styles the notification and may be set to `error`,
-      // `warning` or `success`. If not set, a "plain" default style is used.
+      // The `options.type` styles the notification and may be set to `error`, `danger`,
+      // `warning`, `info` or `success`. If not set, a "plain" default style is used.
       //
       // If `options.dismiss` is set to `true`, the message will auto-dismiss after 5 seconds.
       // If it is set to a number of seconds, it will dismiss after that number of seconds.

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposImageControlDialog.vue

@@ -1,12 +1,12 @@
 <template>
   <div
     v-if="active"
-    v-click-outside-element="cancel"
+    v-click-outside-element="close"
     class="apos-popover apos-image-control__dialog"
     x-placement="bottom"
     :class="{
       'apos-is-triggered': active,
-      'apos-has-selection': true
+      'apos-has-selection': hasSelection
     }"
   >
     <AposContextMenuDialog
@@ -26,7 +26,7 @@
       <footer class="apos-image-control__footer">
         <AposButton
           type="default" label="apostrophe:cancel"
-          @click="cancel"
+          @click="close"
           :modifiers="formModifiers"
         />
         <AposButton
@@ -55,9 +55,14 @@ export default {
     active: {
       type: Boolean,
       required: true
+    },
+    hasSelection: {
+      type: Boolean,
+      required: true,
+      default: false
     }
   },
-  emits: [ 'before-commands', 'done', 'cancel' ],
+  emits: [ 'before-commands', 'close' ],
   data() {
     return {
       generation: 1,
@@ -92,27 +97,52 @@ export default {
         {
           name: 'caption',
           label: this.$t('apostrophe:caption'),
-          type: 'string'
+          type: 'string',
+          def: ''
         }
       ]
     };
   },
   computed: {
+    attributes() {
+      return this.editor.getAttributes('image');
+    },
     lastSelectionTime() {
-      return this.editor.view.lastSelectionTime;
+      return this.editor.view.input.lastSelectionTime;
     },
     schema() {
       return this.originalSchema;
     }
   },
   watch: {
-    active(newVal) {
+    'attributes.imageId': {
+      handler(newVal, oldVal) {
+        if (newVal === oldVal) {
+          return;
+        }
+
+        this.close();
+      }
+    },
+    active(newVal, oldVal) {
       if (newVal) {
         window.addEventListener('keydown', this.keyboardHandler);
-        this.populateFields();
       } else {
         window.removeEventListener('keydown', this.keyboardHandler);
       }
+
+      if (newVal !== oldVal && this.hasSelection) {
+        this.populateFields();
+        this.evaluateConditions();
+      }
+    },
+    lastSelectionTime(newVal, oldVal) {
+      if (newVal === oldVal) {
+        return;
+      }
+
+      this.populateFields();
+      this.evaluateConditions();
     }
   },
   async mounted() {
@@ -120,11 +150,8 @@ export default {
     this.evaluateConditions();
   },
   methods: {
-    cancel() {
-      this.$emit('cancel');
-    },
-    done() {
-      this.$emit('done');
+    close() {
+      this.$emit('close');
     },
     save() {
       this.triggerValidation = true;
@@ -142,24 +169,24 @@ export default {
           style: this.docFields.data.style,
           alt: this.docFields.data.alt
         });
-        this.done();
+        this.close();
       });
     },
     keyboardHandler(e) {
       if (e.keyCode === 27) {
-        this.cancel();
+        this.close();
       }
       if (e.keyCode === 13) {
         if (this.docFields.data.href || e.metaKey) {
           this.save();
-          this.done();
+          this.close();
         }
         e.preventDefault();
       }
     },
     async populateFields() {
       try {
-        const attrs = this.editor.getAttributes('image');
+        const attrs = this.attributes;
         this.docFields.data = {};
         this.schema.forEach((item) => {
           this.docFields.data[item.name] = attrs[item.name] || '';

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposTiptapAnchor.vue

@@ -107,7 +107,7 @@ export default {
       return this.editor.isActive('anchor') || this.active;
     },
     lastSelectionTime() {
-      return this.editor.view.lastSelectionTime;
+      return this.editor.view.input.lastSelectionTime;
     },
     hasSelection() {
       const { state } = this.editor;
@@ -129,7 +129,7 @@ export default {
         window.removeEventListener('keydown', this.keyboardHandler);
       }
     },
-    'editor.view.lastSelectionTime': {
+    'editor.view.input.lastSelectionTime': {
       handler(newVal, oldVal) {
         this.populateFields();
       }

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposTiptapImage.vue

@@ -7,19 +7,19 @@
       :label="tool.label"
       :icon-only="!!tool.icon"
       :icon="tool.icon || false"
+      :icon-size="tool.iconSize || 16"
       :modifiers="['no-border', 'no-motion']"
       :tooltip="{
         content: tool.label,
         placement: 'top',
         delay: 650
       }"
-      @close="close"
     />
     <AposImageControlDialog
       :active="active"
       :editor="editor"
+      :has-selection="hasSelection"
       @close="close"
-      @click.stop="$event => null"
     />
   </div>
 </template>
@@ -42,18 +42,45 @@ export default {
       active: false
     };
   },
+  watch: {
+    hasSelection(newVal, oldVal) {
+      if (!newVal) {
+        this.close();
+      }
+    }
+  },
   computed: {
+    attributes() {
+      return this.editor.getAttributes('image');
+    },
     buttonActive() {
-      return this.editor.isActive('image');
+      return this.attributes.imageId || this.active;
+    },
+    hasSelection() {
+      const { state } = this.editor;
+      const { selection } = this.editor.state;
+
+      // Text is selected
+      const { from, to } = selection;
+      const text = state.doc.textBetween(from, to, '');
+
+      // Image node is selected
+      const { content = [] } = selection.content().content;
+      const [ { type } = {} ] = content;
+
+      return text !== '' || type?.name === 'image';
     }
   },
   methods: {
     click() {
-      this.active = !this.active;
+      if (this.hasSelection) {
+        this.active = !this.active;
+      }
     },
     close() {
-      this.active = false;
-      this.editor.chain().focus();
+      if (this.active) {
+        this.active = false;
+      }
     }
   }
 };

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposTiptapLink.vue

@@ -168,11 +168,14 @@ export default {
     };
   },
   computed: {
+    attributes() {
+      return this.editor.getAttributes('link');
+    },
     buttonActive() {
-      return this.editor.getAttributes('link').href || this.active;
+      return this.attributes.href || this.active;
     },
     lastSelectionTime() {
-      return this.editor.view.lastSelectionTime;
+      return this.editor.view.input.lastSelectionTime;
     },
     hasSelection() {
       const { state } = this.editor;
@@ -186,6 +189,15 @@ export default {
     }
   },
   watch: {
+    'attributes.href': {
+      handler(newVal, oldVal) {
+        if (newVal === oldVal) {
+          return;
+        }
+
+        this.close();
+      }
+    },
     active(newVal) {
       if (newVal) {
         this.hasLinkOnOpen = !!(this.docFields.data.href);
@@ -194,11 +206,6 @@ export default {
         window.removeEventListener('keydown', this.keyboardHandler);
       }
     },
-    'editor.view.lastSelectionTime': {
-      handler(newVal, oldVal) {
-        this.populateFields();
-      }
-    },
     hasSelection(newVal, oldVal) {
       if (!newVal) {
         this.close();
@@ -265,7 +272,7 @@ export default {
     },
     async populateFields() {
       try {
-        const attrs = this.editor.getAttributes('link');
+        const attrs = this.attributes;
         if (attrs.target) {
           // checkboxes field expects an array
           attrs.target = [ attrs.target ];

package/modules/@apostrophecms/rich-text-widget/ui/apos/tiptap-extensions/Image.js

@@ -24,7 +24,7 @@ export default options => {
 
     draggable: true,
 
-    isolating: false,
+    isolating: true,
 
     addAttributes() {
       return {
@@ -109,6 +109,7 @@ export default options => {
       return {
         setImage: (attrs) => ({ chain }) => {
           return chain()
+            .focus()
             .insertContent({
               type: this.name,
               attrs,

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

@@ -999,9 +999,10 @@ module.exports = {
       //
       // Currently `req` does not impact this, but that may change.
 
-      prepareForStorage(req, doc) {
+      prepareForStorage(req, doc, options = {}) {
         const can = (field) => {
-          return (!field.withType && !field.editPermission && !field.viewPermission) ||
+          return options.permissions === false ||
+            (!field.withType && !field.editPermission && !field.viewPermission) ||
             (field.withType && self.apos.permission.can(req, 'view', field.withType)) ||
             (field.editPermission && self.apos.permission.can(req, field.editPermission.action, field.editPermission.type)) ||
             (field.viewPermission && self.apos.permission.can(req, field.viewPermission.action, field.viewPermission.type)) ||

package/modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -544,6 +544,18 @@ module.exports = (self) => {
     vueComponent: 'AposInputString',
     async convert(req, field, data, destination) {
       destination[field.name] = self.apos.launder.url(data[field.name], field.def, true);
+
+      if (field.required && (data[field.name] == null || !data[field.name].toString().length)) {
+        throw self.apos.error('required');
+      }
+
+      if (field.pattern) {
+        const regex = new RegExp(field.pattern);
+
+        if (!regex.test(destination[field.name])) {
+          throw self.apos.error('invalid');
+        }
+      }
     },
     diffable: function (value) {
       // URLs are fine to diff and display
@@ -553,6 +565,18 @@ module.exports = (self) => {
       // always return a valid string
       return '';
     },
+    validate(field, options, warn, fail) {
+      if (!field.pattern) {
+        return;
+      }
+
+      const isRegexInstance = field.pattern instanceof RegExp;
+      if (!isRegexInstance && typeof field.pattern !== 'string') {
+        fail('The pattern property must be a RegExp or a String');
+      }
+
+      field.pattern = isRegexInstance ? field.pattern.source : field.pattern;
+    },
     addQueryBuilder(field, query) {
       query.addBuilder(field.name, {
         finalize: function () {
@@ -613,18 +637,16 @@ module.exports = (self) => {
         finalize: function () {
           if (self.queryBuilderInterested(query, field.name)) {
             const value = query.get(field.name);
-            let criteria;
+            const criteria = {};
             if (Array.isArray(value)) {
-              criteria = {};
               criteria[field.name] = {
                 $gte: value[0],
                 $lte: value[1]
               };
             } else {
-              criteria = {};
               criteria[field.name] = self.apos.launder.date(value);
-              query.and(criteria);
             }
+            query.and(criteria);
           }
         },
         launder: function (value) {

package/modules/@apostrophecms/schema/ui/apos/components/AposArrayEditor.vue

@@ -1,9 +1,12 @@
 <template>
   <AposModal
-    class="apos-array-editor" :modal="modal"
+    class="apos-array-editor"
+    :modal="modal"
     :modal-title="modalTitle"
-    @inactive="modal.active = false" @show-modal="modal.showModal = true"
-    @esc="confirmAndCancel" @no-modal="$emit('safe-close')"
+    @inactive="modal.active = false"
+    @show-modal="modal.showModal = true"
+    @esc="confirmAndCancel"
+    @no-modal="emitSafeClose"
   >
     <template #secondaryControls>
       <AposButton
@@ -88,7 +91,8 @@ import AposArrayEditorLogic from '../logic/AposArrayEditor';
 
 export default {
   name: 'AposArrayEditor',
-  mixins: [ AposArrayEditorLogic ]
+  mixins: [ AposArrayEditorLogic ],
+  emits: [ 'safe-close' ]
 };
 </script>
 

package/modules/@apostrophecms/schema/ui/apos/components/AposInputArray.vue

@@ -42,6 +42,7 @@
             <th
               v-for="subfield in visibleSchema()"
               :key="subfield._id"
+              :style="subfield.columnStyle || {}"
             >
               {{ $t(subfield.label) }}
             </th>
@@ -76,6 +77,7 @@
                 <component
                   :is="field.style === 'table' ? 'td' : 'div'"
                   class="apos-input-array-inline-item-controls"
+                  :style="(field.style === 'table' && field.columnStyle) || {}"
                 >
                   <AposIndicator
                     v-if="field.draggable"

package/modules/@apostrophecms/schema/ui/apos/components/AposInputPassword.vue

@@ -15,7 +15,8 @@
           :required="field.required"
           :id="uid"
           :tabindex="tabindex"
-          @keydown.enter="$emit('return')"
+          :autocomplete="field.autocomplete"
+          @keydown.enter="emitReturn"
         >
       </div>
     </template>
@@ -26,6 +27,7 @@
 import AposInputPasswordLogic from '../logic/AposInputPassword';
 export default {
   name: 'AposInputPassword',
-  mixins: [ AposInputPasswordLogic ]
+  mixins: [ AposInputPasswordLogic ],
+  emits: [ 'return' ]
 };
 </script>

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue

@@ -13,6 +13,7 @@
         :classes="classes"
         :disabled="field.readOnly"
         :selected="value.data"
+        :autocomplete="field.autocomplete"
         @change="change"
       />
     </template>

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSlug.vue

@@ -18,10 +18,11 @@
           :class="classes"
           v-model="next" :type="type"
           :placeholder="$t(field.placeholder)"
-          @keydown.enter="$emit('return')"
+          @keydown.enter="emitReturn"
           :disabled="field.readOnly" :required="field.required"
           :id="uid" :tabindex="tabindex"
           ref="input"
+          :autocomplete="field.autocomplete"
         >
         <component
           v-if="icon"
@@ -38,7 +39,8 @@
 import AposInputSlugLogic from '../logic/AposInputSlug';
 export default {
   name: 'AposInputSlug',
-  mixins: [ AposInputSlugLogic ]
+  mixins: [ AposInputSlugLogic ],
+  emits: [ 'return' ]
 };
 </script>
 

package/modules/@apostrophecms/schema/ui/apos/components/AposInputString.vue

@@ -14,6 +14,7 @@
           :disabled="field.readOnly"
           :required="field.required"
           :id="uid" :tabindex="tabindex"
+          :autocomplete="field.autocomplete"
         />
         <input
           v-else :class="classes"
@@ -24,6 +25,7 @@
           :required="field.required"
           :id="uid" :tabindex="tabindex"
           :step="step"
+          :autocomplete="field.autocomplete"
         >
         <component
           v-if="icon"

package/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue

@@ -17,6 +17,12 @@
           <span v-if="field.required" class="apos-field__required">
             *
           </span>
+          <AposLabel
+            class="apos-field__tag"
+            v-if="field.tag"
+            :label="field.tag.value || field.tag"
+            :modifiers="[ `apos-is-${field.tag.type || 'success'}`, 'apos-is-filled' ]"
+          />
           <span
             v-if="(field.help || field.htmlHelp) && displayOptions.helpTooltip"
             class="apos-field__help-tooltip"
@@ -119,6 +125,10 @@ export default {
   color: var(--a-danger);
 }
 
+.apos-field__tag {
+  margin-left: 5px;
+}
+
 .apos-field__help-tooltip {
   position: relative;
   top: 2px;

package/modules/@apostrophecms/schema/ui/apos/components/AposSchema.vue

@@ -32,6 +32,7 @@
       v-for="field in schema" :key="field.name.concat(field._id ?? '')"
       :data-apos-field="field.name"
       :is="fieldStyle === 'table' ? 'td' : 'div'"
+      :style="(fieldStyle === 'table' && field.columnStyle) || {}"
       v-show="displayComponent(field)"
     >
       <component

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

@@ -364,6 +364,9 @@ export default {
         }
       }
       return choices;
+    },
+    emitSafeClose() {
+      this.$emit('safe-close');
     }
   }
 };

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

@@ -36,6 +36,9 @@ export default {
         }
       }
       return false;
+    },
+    emitReturn() {
+      this.$emit('return');
     }
   }
 };

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

@@ -273,6 +273,9 @@ export default {
     },
     passFocus() {
       this.$refs.input.focus();
+    },
+    emitReturn() {
+      this.$emit('return');
     }
   }
 };

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

@@ -890,20 +890,24 @@ module.exports = {
         self.insertions[key].push(componentName);
       },
 
-      async annotateDataForExternalFront(req, template, data) {
-        const docs = self.getDocsForExternalFront(req, template, data);
+      async annotateDataForExternalFront(req, template, data, moduleName) {
+        const docs = self.getDocsForExternalFront(req, template, data, moduleName);
         for (const doc of docs) {
           self.annotateDocForExternalFront(doc);
         }
         data.aposBodyData = await self.getBodyData(req);
+        // Already contains module name too
+        data.template = template;
+        // For simple cases (not piece pages and the like)
+        data.module = moduleName;
         return data;
       },
 
-      pruneDataForExternalFront(req, data, template) {
+      pruneDataForExternalFront(req, template, data, moduleName) {
         return data;
       },
 
-      getDocsForExternalFront(req, template, data) {
+      getDocsForExternalFront(req, template, data, moduleName) {
         return [ data.home, ...(data.page?._ancestors || []), ...(data.page?._children || []), data.page, data.piece, ...(data.pieces || []) ].filter(doc => !!doc);
       },
 

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

@@ -5,19 +5,21 @@
     :tabindex="{'-1' : field.hideLabel}"
   >
     <input
+      v-model="checkProxy"
       type="checkbox" class="apos-sr-only apos-input--choice apos-input--checkbox"
-      :value="choice.value" :name="field.name"
+      :value="choice.value"
+      :name="field.name"
       :id="id" :aria-label="choice.label || field.label"
       :tabindex="tabindex" :disabled="field.readOnly || choice.readOnly"
-      v-model="checkProxy"
-      @change="updateThis"
+      @change="update"
     >
     <span class="apos-input-indicator" aria-hidden="true">
       <component
+        v-if="isChecked(checked)"
         :is="`${
           choice.indeterminate ? 'minus-icon' : 'check-bold-icon'
         }`"
-        :size="10" v-if="checked && checked.includes(choice.value)"
+        :size="10"
       />
     </span>
     <span
@@ -39,7 +41,7 @@ export default {
   },
   props: {
     checked: {
-      type: [ Array, Boolean, String ],
+      type: [ Array, Boolean ],
       default: false
     },
     choice: {
@@ -74,8 +76,7 @@ export default {
         return this.checked;
       },
       set(val) {
-        // TODO: Move indeterminate to `status`
-        if (!this.choice.indeterminate) {
+        if (!this.choice.indeterminate || this.choice.triggerIndeterminateEvent) {
           // Only update the model if the box was *not* indeterminate.
           this.$emit('change', val);
         }
@@ -83,10 +84,15 @@ export default {
     }
   },
   methods: {
+    isChecked(checked) {
+      return Array.isArray(checked)
+        ? checked.includes(this.choice.value)
+        : checked;
+    },
     // This event is only necessary if the parent needs to do *more* than simply
     // keep track of an array of checkbox values. For example, AposTagApply
     // does extra work with indeterminate values.
-    updateThis($event) {
+    update($event) {
       this.$emit('updated', $event);
     }
   }

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

@@ -1,6 +1,7 @@
 <template>
   <span
-    class="apos-label" :class="modifiers"
+    class="apos-label"
+    :class="modifiers"
     v-apos-tooltip="tooltip"
   >
     {{ $t(label) }}
@@ -49,6 +50,11 @@ export default {
     border-color: var(--a-danger);
   }
 
+  .apos-is-sensitive {
+    border-color: var(--a-sensitive-medium);
+    color: var(--a-sensitive);
+  }
+
   .apos-is-success {
     border-color: var(--a-success);
   }
@@ -58,6 +64,11 @@ export default {
     color: var(--a-base-1);
   }
 
+  .apos-is-sensitive {
+    border-color: var(--a-sensitive-medium);
+    color: var(--a-sensitive);
+  }
+
   .apos-is-warning.apos-is-filled {
     background-color: var(--a-warning-fade);
   }
@@ -66,6 +77,10 @@ export default {
     background-color: var(--a-danger-fade);
   }
 
+  .apos-is-sensitive.apos-is-filled {
+    background-color: var(--a-sensitive-light);
+  }
+
   .apos-is-success.apos-is-filled {
     background-color: var(--a-success-fade);
   }

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

@@ -5,6 +5,7 @@
       :class="classes"
       :uid="uid"
       :disabled="disabled"
+      :autocomplete="autocomplete"
       @change="change($event.target.value)"
     >
       <option
@@ -61,6 +62,10 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    autocomplete: {
+      type: String,
+      default: null
     }
   },
   emits: [ 'change' ],

package/modules/@apostrophecms/ui/ui/apos/mixins/AposAdvisoryLockMixin.js

@@ -69,7 +69,7 @@ export default {
               return true;
             } catch (e) {
               await apos.notify(e.message, {
-                type: 'error',
+                type: 'danger',
                 localize: false
               });
               return false;

package/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss

@@ -13,6 +13,10 @@
   --a-danger-button-active: #a10000;
   --a-danger-button-disabled: #ff9d98;
 
+  --a-sensitive: #643810;
+  --a-sensitive-medium: #E2C7B9;
+  --a-sensitive-light: #FFF3E7;
+
   --a-base-1: #5d5d5d;
   --a-base-2: #6f6f6f;
   --a-base-3: #818181;

package/package.json

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