apostrophe 3.6.0 → 3.9.0

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

@@ -1,4 +1,4 @@
-// This module establishes `apos.db`, the mongodb driver connection object.
+// This module establishes `apos.db`, the MongoDB database object.
 //
 // ## Options
 //
@@ -20,8 +20,7 @@
 //
 // ### `client`
 //
-// An existing MongoDB connection (MongoClient) object. If present, a new
-// connection instance is created that reuses the same sockets,
+// An existing MongoDB connection (MongoClient) object. If present, it is used
 // and `uri`, `host`, `connect`, etc. are ignored.
 //
 // ### `versionCheck`
@@ -40,7 +39,7 @@
 // allow other modules to drop related non-MongoDB resources at the
 // same time, if desired.
 //
-// Note that `apos.db` is the mongodb database object, not this module.
+// Note that `apos.db` is the MongoDB database object, not this module.
 // You shouldn't need to talk to this module after startup, but you can
 // access it as `apos.modules['@apostrophecms/db']` if you wish. You can
 // also access `apos.dbClient` if you need the MongoClient object.
@@ -81,8 +80,8 @@ module.exports = {
   },
   methods(self) {
     return {
-      // Open the database connection. Always use MongoClient with its
-      // sensible defaults. Build a URI if we need to, so we can call it
+      // Open the database connection. Always uses MongoClient with its
+      // sensible defaults. Builds a URI if necessary, so we can call it
       // in a consistent way.
       //
       // One default we override: if the connection is lost, we keep

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

@@ -439,6 +439,7 @@ module.exports = {
         await self.insertBody(req, doc, options);
         await m.emit('afterInsert', req, doc, options);
         await m.emit('afterSave', req, doc, options);
+        // TODO: Remove `afterLoad` in next major version. Deprecated.
         await m.emit('afterLoad', req, [ doc ]);
         return doc;
       },
@@ -474,6 +475,7 @@ module.exports = {
         await self.updateBody(req, doc, options);
         await m.emit('afterUpdate', req, doc, options);
         await m.emit('afterSave', req, doc, options);
+        // TODO: Remove `afterLoad` in next major version. Deprecated.
         await m.emit('afterLoad', req, [ doc ]);
         return doc;
       },

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

@@ -389,7 +389,7 @@ module.exports = {
         self.schema = self.apos.schema.compose({
           addFields: self.apos.schema.fieldsToArray(`Module ${self.__meta.name}`, self.fields),
           arrangeFields: self.apos.schema.groupsToArray(self.fieldsGroups)
-        });
+        }, self);
         if (self.options.slugPrefix) {
           if (self.options.slugPrefix === 'deduplicate-') {
             const req = self.apos.task.getReq();
@@ -545,8 +545,11 @@ module.exports = {
 
         await self.apos.schema.convert(req, schema, input, doc);
 
-        doc.copyOfId = copyOf && copyOf._id;
         if (copyOf) {
+          if (copyOf._id) {
+            doc.copyOfId = copyOf._id;
+          }
+
           self.apos.schema.regenerateIds(req, fullSchema, doc);
         }
       },
@@ -554,17 +557,9 @@ module.exports = {
       // taking into account issues like relationship fields keeping their data in
       // a separate ids property, etc.
       fieldsPresent(input) {
-        const schema = self.schema;
-        const output = [];
-        for (const field of schema) {
-          if (field.type.name.substring(0, 5) === '_relationship') {
-            if (_.has(input, field.idsStorage)) {
-              output.push(field.name);
-            }
-          } else {
-            output.push(field.name);
-          }
-        }
+        return self.schema
+          .filter((field) => _.has(input, field.name))
+          .map((field) => field.name);
       },
       // Returns a query that finds docs the current user can edit. Unlike
       // find(), this query defaults to including docs in the archive. Subclasses
@@ -738,7 +733,7 @@ module.exports = {
       },
       // Localize (export) the given draft to another locale, creating the document in the
       // other locale if necessary. By default, if the document already exists in the
-      // other locale, it is not ovewritten. Use the `update: true` option to change that.
+      // other locale, it is not overwritten. Use the `update: true` option to change that.
       // You can localize starting from either draft or published content. Either way what
       // gets created or updated in the other locale is a draft.
       async localize(req, draft, toLocale, options = { update: false }) {
@@ -1217,6 +1212,21 @@ module.exports = {
         // cursors.
 
         project: {
+          launder (p) {
+            // check that project is an object
+            if (!p || typeof p !== 'object' || Array.isArray(p)) {
+              return {};
+            }
+
+            const projection = Object.entries(p).reduce((acc, [ key, val ]) => {
+              return {
+                ...acc,
+                [key]: self.apos.launder.boolean(val)
+              };
+            }, {});
+
+            return projection;
+          },
           finalize() {
             let projection = query.get('project') || {};
             // Keys beginning with `_` are computed values
@@ -1259,6 +1269,14 @@ module.exports = {
             if (query.get('search')) {
               // MongoDB mandates this if we want to sort on search result quality
               projection.textScore = { $meta: 'textScore' };
+            } else if (projection.textScore) {
+              // Gracefully elide the textScore projection when it is not useful and
+              // would cause an error anyway.
+              //
+              // This allows the reuse of the `project()` value passed to one query
+              // in a second query without worrying about whether the second query
+              // contains a search or not
+              delete projection.textScore;
             }
             query.set('project', projection);
           }
@@ -1442,9 +1460,14 @@ module.exports = {
         attachments: {
           def: false,
           after(results) {
-            for (const doc of results) {
-              self.apos.attachment.all(doc, { annotate: true });
+            const attachments = query.get('attachments');
+
+            if (attachments) {
+              self.apos.attachment.all(results, { annotate: true });
             }
+          },
+          launder(b) {
+            return self.apos.launder.boolean(b);
           }
         },
 

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

@@ -286,9 +286,21 @@ export default {
     apos.bus.$off('content-changed', this.onContentChanged);
   },
   methods: {
-    onContentChanged(e) {
+    async onContentChanged(e) {
       if (e.doc && (e.doc._id === this.context._id)) {
         this.context = e.doc;
+      } else if (e.docIds && e.docIds.includes(this.context._id)) {
+        try {
+          this.context = await apos.http.get(`${this.moduleOptions.action}/${this.context._id}`, {
+            busy: true
+          });
+        } catch (error) {
+          // If not found it is likely that there was an archiving or restoring
+          // batch operation.
+          if (error.name !== 'notfound') {
+            console.error(error);
+          }
+        }
       }
     },
     menuHandler(action) {

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

@@ -162,7 +162,6 @@ export default {
       return `${this.moduleAction}/${this.docId}`;
     },
     tooltip() {
-      // TODO I18N
       let msg;
       if (this.errorCount) {
         msg = {

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

@@ -3,6 +3,7 @@
   "addItem": "Add Item",
   "addWidgetType": "Add {{ label }}",
   "admin": "Admin",
+  "affirmativeLabel": "Yes, continue.",
   "altText": "Alt Text",
   "altTextHelp": "Image description used for accessibility",
   "any": "Any",
@@ -17,6 +18,8 @@
   "archiveTypeAffirmativeLabel": "Yes, archive {{ type }}",
   "archiveTypeNote": "You are currently viewing the {{ type }} you want to archive. When it is archived you will be returned to the home page.",
   "archived": "Archived",
+  "archivingBatchConfirmation": "Are you sure you want to archive {{ count }} {{ type }}?",
+  "archivingBatchConfirmationButton": "Yes, archive content.",
   "archivingDraftChildCount": "{{ count }} of those descendants have never been published.",
   "archivingPageHasChild": "That page has one descendant.",
   "archivingPageHasChild_plural": "That page has {{ count }} descendants.",
@@ -121,6 +124,7 @@
   "errorPageMessage": "An error has occurred",
   "errorPageStatusCode": "500",
   "errorPageTitle": "An error has occurred",
+  "errorBatchOperationNoti": "Batch operation {{ operation }} failed.",
   "everythingElse": "Everything Else",
   "exit": "Exit",
   "fetchPublishedVersionFailed": "An error occurred fetching the published version of the document.",
@@ -173,6 +177,8 @@
   "manageDocType": "Manage {{ type }}",
   "manageDraftSubmissions": "Manage Draft Submissions",
   "managePages": "Manage Pages",
+  "maxLabel": "Max:",
+  "maxUi": "Max: {{ number }}",
   "mediaCreatedDate": "Uploaded: {{ createdDate }}",
   "mediaDimensions": "Dimensions: {{ width }} 𝗑 {{ height }}",
   "mediaFileSize": "File Size: {{ fileSize }}",
@@ -180,6 +186,8 @@
   "mediaMB": "{{ size }}MB",
   "mediaUploadViaDrop": "Drop ’em when you’re ready",
   "mediaUploadViaExplorer": "Or click to open the file explorer",
+  "minLabel": "Min:",
+  "minUi": "Min: {{ number }}",
   "modify": "Modify",
   "modifyOrDelete": "Modify / Delete",
   "moreOptions": "More Options",
@@ -204,11 +212,13 @@
   "notFoundPageStatusCode": "404",
   "notFoundPageTitle": "404 - Page not found",
   "notInLocale": "The current page doesn’t exist in {{ label }}. Localize the version from {{ currentLocale }}?",
+  "notificationClearEventError": "There was an error clearing a registered notification event.",
   "noTypeFound": "No {{ type }} Found",
   "parentNotLocalized": "Localize the parent page first",
   "notYetPublished": "This document hasn't been published yet.",
   "nudgeDown": "Nudge Down",
   "nudgeUp": "Nudge Up",
+  "numberAdded": "{{ count }} Added",
   "office": "Office",
   "openGlobal": "Open Global Site Settings",
   "page": "Page",
@@ -244,6 +254,8 @@
   "richTextUndo": "Undo",
   "richTextStyleConfigWarning": "Misconfigured rich text style: label: {{ label }}, {{ tag }}",
   "password": "Password",
+  "passwordErrorMin": "Minimum of {{ min }} characters",
+  "passwordErrorMax": "Maximum of {{ max }} characters",
   "passwordResetRequest": "Your request to reset your password on {{ site }}",
   "pasteWidget": "Paste {{ widget }}",
   "pending": "Pending",
@@ -255,12 +267,12 @@
   "provideButtonLabel": "Provide a Button Label",
   "previousPage": "Previous Page",
   "public": "Public",
-  "modernBuild": "public-facing modern JavaScript and Sass",
-  "ie11Build": "public-facing modern JavaScript and Sass (IE11 build)",
+  "modernBuild": "Public-facing modern JavaScript and Sass",
+  "ie11Build": "Public-facing modern JavaScript and Sass (IE11 build)",
   "publish": "Publish",
   "publishBeforeUsingTooltip": "Publish this content before using it in a relationship",
   "published": "Published",
-  "rawCssAndJs": "raw CSS and JS",
+  "rawCssAndJs": "Raw CSS and JS",
   "rawHtml": "Raw HTML",
   "rawHtmlCode": "Raw HTML (Code)",
   "rawHtmlCodeHelp": "Be careful when embedding third-party code, as it can break the website editing functionality. If a page becomes unusable, add \"?safe_mode=1\" to the URL to make it work temporarily without the problem code being rendered.",
@@ -279,6 +291,8 @@
   "relatedDocsOnly": "Related documents only",
   "relatedDocsDefinition": "Related documents are documents referenced by this document. This typically includes images, content defined by relationships, etc.",
   "restore": "Restore",
+  "restoreBatchConfirmation": "Are you sure you want to restore {{ count }} {{ type }}?",
+  "restoreBatchConfirmationButton": "Yes, restore content.",
   "resolveErrorsBeforeSaving": "Resolve errors before saving.",
   "resolveErrorsFirst": "Resolve errors first.",
   "restoreOnlyThisPage": "Restore only this page",
@@ -307,6 +321,12 @@
   "select": "Select",
   "selectedMenuItem": "✓ {{ label }}",
   "selectAll": "Select All",
+  "selectBoxMessage": "{{ num }} {{ label }} selected.",
+  "selectBoxMessagePage": "{{ num }} {{ label }} on this page selected.",
+  "selectBoxMessageAllButton": "Select all {{ num }} {{ label }}.",
+  "selectBoxMessageButton": "Select {{ num }} {{ label }}.",
+  "selectBoxMessageSelected": "{{ num }} {{ label }} selected.",
+  "selectBoxMessageAllSelected": "All {{ num }} {{ label }} selected.",
   "deselectAll": "Deselect All",
   "selectContent": "Select Content",
   "selectContentToLocalize": "What content do you want to localize?",
@@ -375,7 +395,6 @@
   "videoUrlHelp": "Enter the URL for a media source you wish to embed (e.g., YouTube, Vimeo, or other hosted video URL).",
   "view": "View",
   "visibility": "Visibility",
-  "visibilityLabel": "Who can view this?",
   "willMoveImageToArchive": "This will move the image to the archive.",
   "yes": "Yes",
   "yesLocalizeAndSwitchLocales": "Yes, localize this page and switch locales",

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

@@ -204,7 +204,7 @@
   "notFoundPageStatusCode": "404",
   "notFoundPageTitle": "404 - Página no encontrada",
   "notInLocale": "La página actual no existe en {{ label }}. ¿Traducir la versión desde la configuración regional {{ currentLocale }}?",
-  "noTypeFound": "Ningún {{ type }} Ecnontrado",
+  "noTypeFound": "Ningún {{ type }} Encontrado",
   "parentNotLocalized": "Primero traduzca la configuración regional de la página principal",
   "notYetPublished": "Este documento aún no ha sido publicado.",
   "nudgeDown": "Mover Hacia Arriba",
@@ -375,7 +375,6 @@
   "videoUrlHelp": "Ingresa la dirección URL del video que quiere insertar (e.j., YouTube, Vimeo, o otra dirección URL de video).",
   "view": "Mirar",
   "visibility": "Visibilidad",
-  "visibilityLabel": "¿Quién puede mirar esto?",
   "willMoveImageToArchive": "Esto moverá la imagen al archivo de documentos.",
   "yes": "Sí",
   "yesLocalizeAndSwitchLocales": "Sí, traducir esta página y cambiar de configuración regional",

package/modules/@apostrophecms/i18n/i18n/pt-BR.json

@@ -372,7 +372,6 @@
   "videoUrlHelp": "Insira o URL de uma fonte de mídia que deseja incorporar (por exemplo, YouTube, Vimeo ou outro URL de vídeo).",
   "view": "Visualizar",
   "visibility": "Visibilidade",
-  "visibilityLabel": "Quem pode ver isto?",
   "willMoveImageToArchive": "Isso moverá a imagem para o arquivo.",
   "yes": "Sim",
   "yesLocalizeAndSwitchLocales": "Sim, localize esta página e mude de local",

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

@@ -253,12 +253,12 @@
   "provideButtonLabel": "Poskytnite štítok s tlačidlom",
   "previousPage": "Predchádzajúca strana",
   "public": "Verejné",
-  "modernBuild": "verejnosti orientovaný moderný JavaScript a Sass",
-  "ie11Build": "verejný moderný JavaScript a Sass (zostava IE11)",
+  "modernBuild": "Verejnosti orientovaný moderný JavaScript a Sass",
+  "ie11Build": "Verejný moderný JavaScript a Sass (zostava IE11)",
   "publish": "Publikovať",
   "publishBeforeUsingTooltip": "Pred použitím v kontexte zverejnite tento obsah",
   "published": "Publikovaný",
-  "rawCssAndJs": "zdrojový CSS a JS",
+  "rawCssAndJs": "Zdrojový CSS a JS",
   "rawHtml": "Zdrojový HTML",
   "rawHtmlCode": "Zdrojový HTML (kód)",
   "rawHtmlCodeHelp": "Pri vkladaní kódu tretej strany buďte opatrní, pretože môže narušiť funkciu úprav webových stránok. Ak sa stránka stane nepoužiteľnou, pridajte \"?safe_mode=1\" na adresu URL, aby dočasne fungovala bez toho, aby sa zobrazil problémový kód.",
@@ -373,7 +373,6 @@
   "videoUrlHelp": "Zadajte webovú adresu zdroja média, ktorý chcete vložiť (napr. YouTube, Vimeo alebo inej adresy URL hosteného videa).",
   "view": "Pozrieť",
   "visibility": "Viditeľnosť",
-  "visibilityLabel": "Kto to môže vidieť?",
   "willMoveImageToArchive": "Tým sa obrázok presunie do archívu.",
   "yes": "Áno",
   "yesLocalizeAndSwitchLocales": "Áno, preložte túto stránku a prepnite jazykovú mutáciu",

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

@@ -13,11 +13,27 @@ const ExpressSessionCookie = require('express-session/session/cookie');
 
 const apostropheI18nDebugPlugin = {
   type: 'postProcessor',
-  name: 'apostrophei18nDebugPlugin',
+  name: 'apostropheI18nDebugPlugin',
   process(value, key, options, translator) {
-    // For ease of tracking down which phrases were
-    // actually passed through i18next
-    return `🌍 ${value}`;
+    // The key is passed as an array (theoretically to include multiple keys).
+    // We confirm that and grab the primary one for comparison.
+    const l10nKey = Array.isArray(key) ? key[0] : key;
+
+    if (value === l10nKey) {
+      if (l10nKey.match(/^\S+:/)) {
+        // The l10n key does not have a value assigned (or the key is
+        // actually the same as the phrase). The key seems to have a
+        // namespace, so might be from the Apostrophe UI.
+        return `❌ ${value}`;
+      } else {
+        // The l10n key does not have a value assigned (or the key is
+        // actually the same as the phrase). It is in the default namespace.
+        return `🕳 ${value}`;
+      }
+    } else {
+      // The phrase is fully localized.
+      return `🌍 ${value}`;
+    }
   }
 };
 
@@ -51,9 +67,14 @@ module.exports = {
         throw self.apos.error('invalid', `Locale prefixes must not contain more than one forward slash ("/").\nUse hyphens as separators. Check locale "${key}".`);
       }
     }
+    const fallbackLng = [ self.defaultLocale ];
+    // In case the default locale also has inadequate admin UI phrases
+    if (fallbackLng[0] !== 'en') {
+      fallbackLng.push('en');
+    }
     // Make sure we have our own instance to avoid conflicts with other apos objects
     self.i18next = i18next.createInstance({
-      fallbackLng: self.defaultLocale,
+      fallbackLng,
       // Required to prevent the debugger from complaining
       languages: Object.keys(self.locales),
       // Added later, but required here
@@ -68,7 +89,12 @@ module.exports = {
     if (self.show) {
       self.i18next.use(apostropheI18nDebugPlugin);
     }
-    await self.i18next.init();
+
+    const i18nextOptions = self.show ? {
+      postProcess: 'apostropheI18nDebugPlugin'
+    } : {};
+
+    await self.i18next.init(i18nextOptions);
     self.addInitialResources();
     self.enableBrowserData();
   },
@@ -459,6 +485,10 @@ module.exports = {
         if (req.locale !== self.defaultLocale) {
           i18n[self.defaultLocale] = self.getBrowserBundles(self.defaultLocale);
         }
+        // In case the default locale also has inadequate admin UI phrases
+        if (!i18n.en) {
+          i18n.en = self.getBrowserBundles('en');
+        }
         const result = {
           i18n,
           locale: req.locale,

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

@@ -45,10 +45,13 @@
         <template #bodyHeader>
           <AposDocsManagerToolbar
             :selected-state="selectAllState"
-            :total-pages="totalPages" :current-page="currentPage"
-            :filters="toolbarFilters" :labels="moduleLabels"
+            :total-pages="totalPages"
+            :current-page="currentPage"
+            :filters="toolbarFilters"
+            :labels="moduleLabels"
             :disable="relationshipErrors === 'min'"
-            :options="{ hideSelectAll: !relationshipField }"
+            :displayed-items="items.length"
+            :checked-count="checked.length"
             @page-change="updatePage"
             @select-click="selectClick"
             @search="search"

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

@@ -3,7 +3,8 @@ module.exports = {
   options: {
     label: 'apostrophe:image',
     className: false,
-    icon: 'image-icon'
+    icon: 'image-icon',
+    dimensionAttrs: false
   },
   fields: {
     add: {

package/modules/@apostrophecms/image-widget/views/widget.html

@@ -4,15 +4,25 @@
   {% set className = data.manager.options.className %}
 {% endif %}
 
+{% if data.options.dimensionAttrs %}
+  {% set dimensionAttrs = data.options.dimensionAttrs %}
+{% elif data.manager.options.dimensionAttrs  %}
+  {% set dimensionAttrs = data.manager.options.dimensionAttrs  %}
+{% endif %}
+
 {% set attachment = apos.image.first(data.widget._image) %}
 
 {% if attachment %}
-  <img{% if className %} class="{{ className }}"{% endif %}
+  <img {% if className %} class="{{ className }}"{% endif %}
     srcset="{{ apos.image.srcset(attachment) }}"
     src="{{ apos.attachment.url(attachment, { size: data.options.size or 'full' }) }}"
     alt="{{ attachment._alt or '' }}"
+    {% if dimensionAttrs %}
+      {% if attachment.width %} width="{{ attachment.width }}" {% endif %}
+      {% if attachment.height %} height="{{ attachment.height }}" {% endif %}
+    {% endif %}
     {% if data.contextOptions and data.contextOptions.sizes %}
       sizes="{{ data.contextOptions.sizes }}"
     {% endif %}
   />
-{% endif %}
+{% endif %}