apostrophe 3.8.1 → 3.9.0

package/.github/workflows/main.yml

@@ -0,0 +1,45 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Tests
+
+# Controls when the action will run. 
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12, 14, 16]
+        mongodb-version: [4.2, 4.4, 5.0]
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      with:
+        mongodb-version: ${{ matrix.mongodb-version }}
+
+    - run: npm install
+
+    - run: npm test
+      env:
+        CI: true

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 3.9.0 - 2021-12-08
+
+### Adds
+
+* Developers can now override any Vue component of the ApostropheCMS admin UI by providing a component of the same name in the `ui/apos/components` folder of their own module. This is not always the best approach, see the documentation for details.
+* When running a job, we now trigger the notification before to run the job, this way the progress notification ID is available from the job and the notification can be dismissed if needed.
+* Adds `maxUi`, `maxLabel`, `minUi`, and `minLabel` localization strings for array input and other UI.
+
+### Fixes
+
+* Fully removes references to the A2 `self.partial` module method. It appeared only once outside of comments, but was not actually used by the UI. The `self.render` method should be used for simple template rendering.
+* Fixes string interpolation for the confirmation modal when publishing a page that has an unpublished parent page.
+* No more "cannot set headers after they are sent to the client" and "req.res.redirect not defined" messages when handling URLs with extra trailing slashes.
+* The `apos.util.runPlayers` method is not called until all of the widgets in a particular tree of areas and sub-areas have been added to the DOM. This means a parent area widget player will see the expected markup for any sub-widgets when the "Edit" button is clicked.
+* Properly activates the `apostropheI18nDebugPlugin` i18next debugging plugin when using the `APOS_SHOW_I18N` environment variable. The full set of l10n emoji indicators previously available for the UI is now available for template and server-side strings.
+* Actually registers piece types for site search unless the `searchable` option is `false`.
+* Fixes the methods required for the search `index` task.
+
+### Changes
+
+* Adds localization keys for the password field component's min and max error messages.
+
 ## 3.8.1 - 2021-11-23
 
 ### Fixes

package/README.md

@@ -1,5 +1,4 @@
-
-[![CircleCI](https://circleci.com/gh/apostrophecms/apostrophe/tree/main.svg?style=svg)](https://circleci.com/gh/apostrophecms/apostrophe/tree/main)
+![Unit Tests](https://github.com/apostrophecms/apostrophe/actions/workflows/main.yml/badge.svg)
 [![Chat on Discord](https://img.shields.io/discord/517772094482677790.svg)](https://chat.apostrophecms.org)
 
 <p align="center">

package/modules/@apostrophecms/area/ui/apos/apps/AposAreas.js

@@ -3,27 +3,32 @@ import { klona } from 'klona';
 
 export default function() {
 
+  let widgetsRendering = 0;
+
   createWidgetClipboardApp();
 
-  prepareAreas();
+  createAreaApps();
 
   document.documentElement.style.setProperty('--a-widget-margin', apos.ui.widgetMargin);
 
+  apos.bus.$on('widget-rendering', function() {
+    widgetsRendering++;
+  });
+
   apos.bus.$on('widget-rendered', function() {
-    prepareAreas();
+    widgetsRendering--;
+    createAreaAppsAndRunPlayersIfDone();
   });
+
   apos.bus.$on('refreshed', function() {
-    prepareAreas();
+    createAreaAppsAndRunPlayersIfDone();
   });
 
-  function prepareAreas() {
-    // Doing this first allows markup to be captured for the editor
-    // before players alter it
+  function createAreaAppsAndRunPlayersIfDone() {
     createAreaApps();
-    // Even though we invoke the player directly from
-    // the widget mixin used for editable widgets, we still have to
-    // call runPlayers eventually to account for any foreign area widgets
-    apos.util.runPlayers();
+    if (widgetsRendering === 0) {
+      apos.util.runPlayers();
+    }
   }
 
   function createAreaApps() {

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

@@ -192,7 +192,10 @@ module.exports = {
             let iconImports, componentImports, tiptapExtensionImports, appImports, indexJsImports, indexSassImports;
             if (options.apos) {
               iconImports = getIcons();
-              componentImports = getImports(`${source}/components`, '*.vue', { registerComponents: true });
+              componentImports = getImports(`${source}/components`, '*.vue', {
+                registerComponents: true,
+                importLastVersion: true
+              });
               tiptapExtensionImports = getImports(`${source}/tiptap-extensions`, '*.js', { registerTiptapExtensions: true });
               appImports = getImports(`${source}/apps`, '*.js', {
                 invokeApps: true,
@@ -441,6 +444,25 @@ module.exports = {
               paths: []
             };
 
+            if (options.importLastVersion) {
+              // Reverse the list so we can easily find the last configured import
+              // of a given component, allowing "improve" modules to win over
+              // the originals when shipping an override of a Vue component
+              // with the same name, and filter out earlier versions
+              components.reverse();
+              const seen = new Set();
+              components = components.filter(component => {
+                const name = getComponentName(component, options);
+                if (seen.has(name)) {
+                  return false;
+                }
+                seen.add(name);
+                return true;
+              });
+              // Put the components back in their original order
+              components.reverse();
+            }
+
             components.forEach((component, i) => {
               if (options.requireDefaultExport) {
                 if (!fs.readFileSync(component, 'utf8').match(/export[\s\n]+default/)) {
@@ -453,7 +475,7 @@ module.exports = {
                 }
               }
               const jsFilename = JSON.stringify(component);
-              const name = require('path').basename(component).replace(/\.\w+/, '') + (options.enumerateImports ? `_${i}` : '');
+              const name = getComponentName(component, options, i);
               const jsName = JSON.stringify(name);
               output.paths.push(component);
               const importCode = `
@@ -492,6 +514,10 @@ module.exports = {
 
             return pkgTimestamp > parseInt(timestamp);
           }
+
+          function getComponentName(component, options, i) {
+            return require('path').basename(component).replace(/\.\w+/, '') + (options.enumerateImports ? `_${i}` : '');
+          }
         }
       }
     };

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

@@ -230,7 +230,6 @@ module.exports = {
       addFieldType() {
         self.apos.schema.addFieldType({
           name: self.name,
-          partial: self.fieldTypePartial,
           convert: self.convert,
           index: self.index,
           register: self.register
@@ -274,9 +273,6 @@ module.exports = {
         await self.db.replaceOne({ _id: info._id }, info);
         object[field.name] = info;
       },
-      fieldTypePartial(data) {
-        return self.partial('attachment', data);
-      },
       index(value, field, texts) {
         const silent = field.silent === undefined ? true : field.silent;
         texts.push({

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

@@ -124,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.",
@@ -176,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 }}",
@@ -183,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",
@@ -213,6 +218,7 @@
   "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",
@@ -248,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",

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",

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}`;
+    }
   }
 };
 
@@ -73,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();
   },

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

@@ -189,38 +189,31 @@ module.exports = {
       async run(req, doTheWork, options = {}) {
         const res = req.res;
         let job;
-        let notification;
         let total;
 
         try {
           job = await self.start(options);
-          run();
 
-          // Trigger the "in progress" notification.
-          notification = await self.triggerNotification(req, 'progress', {
-            // It's only relevant to pass a job ID to the notification if
-            // the notification will show progress. Without a total number we
-            // can't show progress.
-            jobId: total && job._id,
-            count: total
+          const notification = await self.triggerNotification(req, 'progress', {
+            jobId: job._id
           });
 
+          run({ notificationId: notification.noteId });
+
           return {
             jobId: job._id
           };
         } catch (err) {
           self.apos.util.error(err);
-          if (job) {
-            // Not a lot we can do about this since we already
-            // stopped talking to the user
-            self.apos.util.error(err);
-          } else {
+
+          if (!job) {
             // If we never made a job, then we never responded
+            // otherwise we already stopped talking to the user
             return res.status(500).send('error');
           }
         }
 
-        async function run() {
+        async function run(info) {
           let results;
           let good = false;
           try {
@@ -240,7 +233,7 @@ module.exports = {
               setResults (_results) {
                 results = _results;
               }
-            });
+            }, info);
             good = true;
           } finally {
             await self.end(job, good, results);
@@ -253,7 +246,7 @@ module.exports = {
             // Dismiss the progress notification. It will delay 4 seconds
             // because "completed" notification will dismiss in 5 and we want
             // to maintain the feeling of process order for users.
-            await self.apos.notification.dismiss(req, notification.noteId, 4000);
+            await self.apos.notification.dismiss(req, info.notificationId, 4000);
           }
         }
       },

package/modules/@apostrophecms/modal/ui/apos/components/AposDocsManagerToolbar.vue

@@ -5,7 +5,7 @@
         v-if="displayedItems"
         label="apostrophe:select"
         type="outline"
-        text-color="var(--a-primary)"
+        text-color="var(--a-base-1)"
         :icon-only="true"
         :icon="checkboxIcon"
         @click="$emit('select-click')"

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

@@ -292,10 +292,7 @@ module.exports = {
       // your version wins if it exists.
       //
       // You MUST pass req as the first argument. This allows
-      // internationalization/localization to work. If you
-      // are writing a Nunjucks helper function, use
-      // self.partial instead. This method is primarily used
-      // to implement routes that respond with HTML fragments.
+      // internationalization/localization to work.
       //
       // All properties of `data` appear in Nunjucks templates as
       // properties of the `data` object. Nunjucks helper functions

package/modules/@apostrophecms/notification/ui/apos/components/AposNotification.vue

@@ -173,7 +173,7 @@ export default {
       this.job.processed = job.processed;
       this.job.percentage = job.percentage;
 
-      if (this.job.processed < this.job.total) {
+      if (this.job.processed < this.job.total && !job.ended) {
         await new Promise(resolve => {
           setTimeout(resolve, 500);
         });

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

@@ -1385,6 +1385,24 @@ database.`);
       // home page.
       async serveGetPage(req) {
         req.slug = req.params[0];
+        self.normalizeSlug(req);
+        // Had to change the URL, so redirect to it. TODO: this
+        // contains an assumption that we are mounted at /
+        if (req.slug !== req.params[0]) {
+          req.redirect = req.slug;
+        }
+        const builders = self.getServePageBuilders();
+        const query = self.find(req);
+        query.applyBuilders(builders);
+        self.matchPageAndPrefixes(query, req.slug);
+        await self.emit('serveQuery', query);
+        req.data.bestPage = await query.toObject();
+        self.evaluatePageMatch(req);
+      },
+      // Normalize req.slug to account for unneeded trailing whitespace,
+      // trailing slashes other than the root, and double slash based open
+      // redirect attempts
+      normalizeSlug(req) {
         // Fix common screwups in URLs: leading/trailing whitespace,
         // presence of trailing slashes (but always restore the
         // leading slash). Express leaves escape codes uninterpreted
@@ -1399,18 +1417,6 @@ database.`);
         if (!req.slug.length || req.slug.charAt(0) !== '/') {
           req.slug = '/' + req.slug;
         }
-        // Had to change the URL, so redirect to it. TODO: this
-        // contains an assumption that we are mounted at /
-        if (req.slug !== req.params[0]) {
-          return req.res.redirect(req.slug);
-        }
-        const builders = self.getServePageBuilders();
-        const query = self.find(req);
-        query.applyBuilders(builders);
-        self.matchPageAndPrefixes(query, req.slug);
-        await self.emit('serveQuery', query);
-        req.data.bestPage = await query.toObject();
-        self.evaluatePageMatch(req);
       },
       // Remove trailing slashes from a slug. This is factored out
       // so that it can be overridden, for instance by the
@@ -1446,8 +1452,27 @@ database.`);
               mode: 'draft',
               locale: req.locale
             });
-            await self.serveGetPage(testReq);
-            await self.emit('serve', testReq);
+            let again;
+            do {
+              again = false;
+              await self.serveGetPage(testReq);
+              await self.emit('serve', testReq);
+              if (testReq.res.redirectedTo) {
+                again = true;
+                testReq.url = testReq.res.redirectedTo;
+                const qat = testReq.url.indexOf('?');
+                if (qat >= 0) {
+                  testReq.slug = testReq.url.substring(0, qat);
+                } else {
+                  testReq.slug = testReq.url;
+                }
+                testReq.path = testReq.slug;
+                testReq.params = {
+                  0: testReq.path
+                };
+                testReq.res.redirectedTo = null;
+              }
+            } while (again);
             if (self.isFound(testReq)) {
               req.redirect = self.apos.url.build(req.url, {
                 aposMode: 'draft'
@@ -1473,14 +1498,6 @@ database.`);
       },
       async serveDeliver(req, err) {
         let providePage = true;
-        // A2 treats req as a notepad of things we'd
-        // like to happen in res; that allows various
-        // pageServe methods to override each other.
-        // Now we're finally ready to enact those
-        // things on res
-        if (req.contentType) {
-          req.res.setHeader('Content-Type', req.contentType);
-        }
         if (req.statusCode) {
           req.res.statusCode = req.statusCode;
         }
@@ -1500,6 +1517,14 @@ database.`);
           }
           return req.res.redirect(status, req.redirect);
         }
+        // Apostrophe treats req as a notepad of things we'd
+        // like to happen in res; that allows various
+        // pageServe methods to override each other.
+        // Now we're finally ready to enact those
+        // things on res
+        if (req.contentType) {
+          req.res.setHeader('Content-Type', req.contentType);
+        }
         // Handle 500 errors
         if (err) {
           self.apos.util.error(err);

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

@@ -152,7 +152,11 @@ module.exports = {
               type: 1
             }).toArray();
             throw self.apos.error('invalid', {
-              unpublishedAncestors: draftAncestors.filter(draftAncestor => !publishedAncestors.find(publishedAncestor => draftAncestor.aposDocId === publishedAncestor.aposDocId))
+              unpublishedAncestors: draftAncestors.filter(draftAncestor => {
+                return !publishedAncestors.find(publishedAncestor => {
+                  return draftAncestor.aposDocId === publishedAncestor.aposDocId;
+                });
+              })
             });
           }
         }

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

@@ -514,6 +514,11 @@ module.exports = {
               ...properties
             }));
         }
+      },
+      '@apostrophecms/search:determineTypes': {
+        checkSearchable(types) {
+          self.searchDetermineTypes(types);
+        }
       }
     };
   },

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManager.vue

@@ -481,10 +481,11 @@ export default {
             }
           });
         } catch (error) {
-          apos.notify('Batch operation {{ operation }} failed.', {
+          apos.notify('apostrophe:errorBatchOperationNoti', {
             interpolate: { operation: label },
             type: 'danger'
           });
+          console.error(error);
         }
       }
     },

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerSelectBox.vue

@@ -4,26 +4,26 @@
     :duration="300"
   >
     <div
-      v-if="selectedState === 'checked' || allPiecesSelection.isSelected"
+      v-show="showSelectAll"
       class="apos-select-box"
     >
       <div class="apos-select-box__content">
         <p class="apos-select-box__text">
           {{ selectBoxMessage }}
-          <button
+          <AposButton
             v-if="!allPiecesSelection.isSelected"
-            class="apos-select-box__select-all"
+            type="subtle" :modifiers="['inline', 'small', 'no-motion']"
+            :label="selectBoxMessageButton" class="apos-select-box__select-all"
             @click="$emit('select-all')"
-          >
-            {{ selectBoxMessageButton }}
-          </button>
-          <button
+            text-color="var(--a-primary)"
+          />
+          <AposButton
             v-else
-            class="apos-select-box__select-all"
+            type="subtle" :modifiers="['inline', 'small', 'no-motion']"
+            label="apostrophe:clearSelection" class="apos-select-box__select-all"
+            text-color="var(--a-primary)"
             @click="clearSelection"
-          >
-            {{ $t('apostrophe:clearSelection') }}.
-          </button>
+          />
         </p>
       </div>
     </div>
@@ -56,6 +56,15 @@ export default {
   },
   emits: [ 'select-all', 'clear-select', 'set-all-pieces-selection' ],
   computed: {
+    showSelectAll() {
+      if (
+        this.allPiecesSelection.isSelected ||
+        (this.selectedState === 'checked' && this.allPiecesSelection.total > this.displayedItems)
+      ) {
+        return true;
+      }
+      return false;
+    },
     selectBoxMessage () {
       const checkedCount = this.checkedIds.length;
       const showAllWord = (checkedCount === this.allPiecesSelection.total) &&
@@ -104,35 +113,29 @@ export default {
   .apos-select-box {
     box-sizing: border-box;
     overflow: hidden;
-    height: 5rem;
-    transition: all 0.3s linear;
+    max-height: 65px;
+    transition: max-height 200ms ease-in;
 
     &.collapse-enter, &.collapse-leave-to {
-      height: 0;
+      max-height: 0;
     }
 
     &__content {
       display: flex;
       align-items: center;
       justify-content: center;
-      background-color: var(--a-base-9);
+      background-color: var(--a-base-10);
       margin-top: 1rem;
       color: var(--a-text-primary);
+      border-radius: var(--a-border-radius);
     }
 
     &__text {
-      @include type-large;
+      @include type-base;
     }
 
     &__select-all {
-      color: var(--a-primary);
-      cursor: pointer;
-      margin-left: 0.4rem;
-      border: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
+      margin-left: $spacing-half;
     }
   }
 </style>

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

@@ -1292,24 +1292,6 @@ module.exports = {
           return field.group && field.group.name === defaultGroup.name;
         }));
 
-        _.each(schema, function (field) {
-
-          // A field can have a custom template, which can be a
-          // template name (relative to the @apostrophecms/schema module)
-          // or a function (called to render it)
-
-          if (field.template) {
-            if (typeof field.template === 'string') {
-              field.partial = self.partialer(field.template);
-              delete field.template;
-            } else {
-              field.partial = field.template;
-              delete field.template;
-            }
-          }
-
-        });
-
         // Shallowly clone the fields. This allows modules
         // like workflow to patch schema fields of various modules
         // without inadvertently impacting other apos instances

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

@@ -150,7 +150,9 @@ export default {
       return (this.field.schema || []).filter(field => apos.schema.components.fields[field.type]);
     },
     countLabel() {
-      return `${this.next.length} Added`;
+      return this.$t('apostrophe:numberAdded', {
+        count: this.next.length
+      });
     },
     // Here in the array editor we use effectiveMin to factor in the
     // required property because there is no other good place to do that,
@@ -158,14 +160,18 @@ export default {
     // representation of "required".
     minLabel() {
       if (this.effectiveMin) {
-        return `Min: ${this.effectiveMin}`;
+        return this.$t('apostrophe:minUi', {
+          number: this.effectiveMin
+        });
       } else {
         return false;
       }
     },
     maxLabel() {
       if ((typeof this.field.max) === 'number') {
-        return `Max: ${this.field.max}`;
+        return this.$t('apostrophe:maxUi', {
+          number: this.field.max
+        });
       } else {
         return false;
       }

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

@@ -28,7 +28,7 @@ import AposInputMixin from 'Modules/@apostrophecms/schema/mixins/AposInputMixin'
 export default {
   name: 'AposInputPassword',
   mixins: [ AposInputMixin ],
-  emits: ['return'],
+  emits: [ 'return' ],
   computed: {
     tabindex () {
       return this.field.disableFocus ? '-1' : '0';
@@ -43,12 +43,20 @@ export default {
       }
       if (this.field.min) {
         if (value.length && (value.length < this.field.min)) {
-          return { message: `Minimum of ${this.field.min} characters` };
+          return {
+            message: this.$t('apostrophe:passwordErrorMin', {
+              min: this.field.min
+            })
+          };
         }
       }
       if (this.field.max) {
         if (value.length && (value.length > this.field.max)) {
-          return { message: `Maximum of ${this.field.max} characters` };
+          return {
+            message: this.$t('apostrophe:passwordErrorMax', {
+              max: this.field.max
+            })
+          };
         }
       }
       return false;
@@ -56,4 +64,3 @@ export default {
   }
 };
 </script>
-

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

@@ -20,13 +20,13 @@
           <div class="apos-range__scale">
             <span>
               <span class="apos-sr-only">
-                Min:
+                {{ $t('apostrophe:minLabel') }}
               </span>
               {{ minLabel }}
             </span>
             <span>
               <span class="apos-sr-only">
-                Max:
+                {{ $t('apostrophe:maxLabel') }}
               </span>
               {{ maxLabel }}
             </span>

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

@@ -2,7 +2,6 @@
   <div class="apos-field__wrapper">
     <component :is="wrapEl" :class="classList">
       <div class="apos-field__info">
-        <!-- TODO i18n -->
         <component
           v-if="field.label" :class="{'apos-sr-only': field.hideLabel }"
           class="apos-field__label"
@@ -32,7 +31,6 @@
             />
           </span>
         </component>
-        <!-- TODO i18n -->
         <p
           v-if="(field.help || field.htmlHelp) && !displayOptions.helpTooltip"
           class="apos-field__help"

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

@@ -60,4 +60,4 @@
       fill="url(#triangle)"
     />
   </svg>
-</template>
+</template>

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

@@ -57,4 +57,4 @@
       fill="url(#triangle)"
     />
   </svg>
-</template>
+</template>

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

@@ -54,4 +54,4 @@
       fill="url(#triangle)"
     />
   </svg>
-</template>
+</template>

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

@@ -148,6 +148,5 @@ export default {
   &.apos-search__item--disabled {
     @include disabled;
   }
-
 }
 </style>

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

@@ -44,6 +44,7 @@
 // are edge cases not relevant enough to explicitly offer a filter for, but
 // which should nevertheless be included in results.
 
+const { stripIndent } = require('common-tags');
 const _ = require('lodash');
 
 module.exports = {
@@ -98,37 +99,7 @@ module.exports = {
       },
       '@apostrophecms/doc-type:beforeSave': {
         indexDoc(req, doc) {
-
-          const texts = self.getSearchTexts(doc);
-
-          _.each(texts, function (text) {
-            if (text.text === undefined) {
-              text.text = '';
-            }
-          });
-
-          const highTexts = _.filter(texts, function (text) {
-            return text.weight > 10;
-          });
-
-          const searchSummary = _.map(_.filter(texts, function (text) {
-            return !text.silent;
-          }), function (text) {
-            return text.text;
-          }).join(' ');
-          const highText = self.boilTexts(highTexts);
-          const lowText = self.boilTexts(texts);
-          const titleSortified = self.apos.util.sortify(doc.title);
-          const highWords = _.uniq(highText.split(/ /));
-
-          // merge our doc with its various search texts
-          _.assign(doc, {
-            titleSortified: titleSortified,
-            highSearchText: highText,
-            highSearchWords: highWords,
-            lowSearchText: lowText,
-            searchSummary: searchSummary
-          });
+          self.indexDoc(req, doc);
         }
       }
     };
@@ -261,13 +232,58 @@ module.exports = {
         self.dispatch('/', self.indexPage);
       },
 
+      indexDoc(req, doc) {
+
+        const texts = self.getSearchTexts(doc);
+
+        _.each(texts, function (text) {
+          if (text.text === undefined) {
+            text.text = '';
+          }
+        });
+
+        const highTexts = _.filter(texts, function (text) {
+          return text.weight > 10;
+        });
+
+        const searchSummary = _.map(_.filter(texts, function (text) {
+          return !text.silent;
+        }), function (text) {
+          return text.text;
+        }).join(' ');
+        const highText = self.boilTexts(highTexts);
+        const lowText = self.boilTexts(texts);
+        const titleSortified = self.apos.util.sortify(doc.title);
+        const highWords = _.uniq(highText.split(/ /));
+
+        // merge our doc with its various search texts
+        _.assign(doc, {
+          titleSortified: titleSortified,
+          highSearchText: highText,
+          highSearchWords: highWords,
+          lowSearchText: lowText,
+          searchSummary: searchSummary
+        });
+      },
+
       // Indexes just one document as part of the implementation of the
       // `@apostrophecms/search:index` task. This isn't the method you want to
       // override. See `indexDoc` and `getSearchTexts`
 
       async indexTaskOne(req, doc) {
         self.indexDoc(req, doc);
-        return self.apos.doc.db.updateOne({ _id: doc._id }, doc);
+
+        return self.apos.doc.db.updateOne({
+          _id: doc._id
+        }, {
+          $set: {
+            titleSortified: doc.titleSortified,
+            highSearchText: doc.highSearchText,
+            highSearchWords: doc.highSearchWords,
+            lowSearchText: doc.lowSearchText,
+            searchSummary: doc.searchSummary
+          }
+        });
       },
 
       // Returns texts which are a reasonable basis for
@@ -348,7 +364,11 @@ module.exports = {
   tasks(self) {
     return {
       index: {
-        usage: 'Rebuild the search index. Normally this happens automatically.\nThis should only be needed if you have changed the\n"searchable" property for various fields or types.',
+        usage: stripIndent`
+          Rebuild the search index. Normally this happens automatically.
+          This should only be needed if you have changed the"searchable" property
+          for various fields or types.
+        `,
         task(argv) {
           const req = self.apos.task.getReq();
           return self.apos.migration.eachDoc({}, _.partial(self.indexTaskOne, req));

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

@@ -190,7 +190,11 @@ module.exports = {
               role: options.role
             }
           }),
-          res: {},
+          res: {
+            redirect(url) {
+              req.res.redirectedTo = url;
+            }
+          },
           t(key, options = {}) {
             return self.apos.i18n.i18next.t(key, {
               ...options,

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

@@ -1,5 +1,5 @@
 // Implements template rendering via Nunjucks. **You should use the
-// `self.render` and `self.partial` methods of *your own* module**,
+// `self.render` method of *your own* module**,
 // which exist courtesy of [@apostrophecms/module](../@apostrophecms/module/index.html)
 // and invoke methods of this module more conveniently for you.
 //
@@ -21,7 +21,7 @@
 // you have a custom version of Nunjucks that is compatible.
 //
 // ### `viewsFolderFallback`: specifies a folder to be checked for templates
-// if they are not found in the module that called `self.render` or `self.partial`
+// if they are not found in the module that called `self.render`
 // or those it extends. This is a handy place for project-wide macro files.
 // Often set to `__dirname + '/views'` in `app.js`.
 
@@ -203,7 +203,7 @@ module.exports = {
 
       async renderForModule(req, name, data, module) {
         if (typeof req !== 'object') {
-          throw new Error('The first argument to module.render must be req. If you are trying to implement a Nunjucks helper function, use module.partial.');
+          throw new Error('The first argument to module.render must be req.');
         }
         return self.renderBody(req, 'file', name, data, module);
       },
@@ -214,7 +214,7 @@ module.exports = {
 
       async renderStringForModule(req, s, data, module) {
         if (typeof req !== 'object') {
-          throw new Error('The first argument to module.render must be req. If you are trying to implement a Nunjucks helper function, use module.partial.');
+          throw new Error('The first argument to module.render must be req.');
         }
         return self.renderBody(req, 'string', s, data, module);
       },
@@ -289,12 +289,6 @@ module.exports = {
 
         args.data = merged;
 
-        // // Allows templates to render other templates in an independent
-        // // nunjucks environment, rather than including them
-        // args.partial = function(name, data) {
-        //   return self.partialForModule(name, data, module);
-        // };
-
         if (req.data) {
           _.defaults(merged, req.data);
         }
@@ -334,7 +328,7 @@ module.exports = {
 
       // Fetch a nunjucks environment in which `include`, `extends`, etc. search
       // the views directories of the specified module and its ancestors.
-      // Typically you will call `self.render` or `self.partial` on your module
+      // Typically you will call `self.render` on your module
       // object rather than calling this directly.
       //
       // `req` is effectively here for bc purposes only. This method

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

@@ -61,7 +61,9 @@ export default {
       return maxError;
     },
     countLabel() {
-      return `${this.value.length} Added`;
+      return this.$t('apostrophe:numberAdded', {
+        count: this.value.length
+      });
     },
     // Here in the array editor we use effectiveMin to factor in the
     // required property because there is no other good place to do that,
@@ -69,14 +71,18 @@ export default {
     // representation of "required".
     minLabel() {
       if (this.effectiveMin) {
-        return `Min: ${this.effectiveMin}`;
+        return this.$t('apostrophe:minUi', {
+          number: this.effectiveMin
+        });
       } else {
         return false;
       }
     },
     maxLabel() {
       if ((typeof this.field.max) === 'number') {
-        return `Max: ${this.field.max}`;
+        return this.$t('apostrophe:maxUi', {
+          number: this.field.max
+        });
       } else {
         return false;
       }

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

@@ -49,9 +49,10 @@ export default {
         if ((e.name === 'invalid') && e.body && e.body.data && e.body.data.unpublishedAncestors) {
           if (await apos.confirm({
             heading: 'apostrophe:unpublishedParent',
-            description: 'apostrophe:unpublishedParentDescription',
+            description: 'apostrophe:unpublishedParentDescription'
+          }, {
             interpolate: {
-              unpublishedParents: this.$t(e.body.data.unpublishedAncestors.map(page => page.title).join(this.$t('apostrophe:listJoiner')))
+              unpublishedParents: e.body.data.unpublishedAncestors.map(page => page.title).join(this.$t('apostrophe:listJoiner'))
             }
           })) {
             try {

package/modules/@apostrophecms/widget-type/ui/apos/mixins/AposWidgetMixin.js

@@ -22,17 +22,11 @@ export default {
   },
   data() {
     return {
-      rendered: '...',
-      playerOpts: null,
-      playerEl: null
+      rendered: '...'
     };
   },
   mounted() {
     this.renderContent();
-    this.playerOpts = apos.util.widgetPlayers[this.type] || null;
-  },
-  updated () {
-    this.runPlayer();
   },
   computed: {
     moduleOptions() {
@@ -41,7 +35,7 @@ export default {
   },
   methods: {
     async renderContent() {
-      const self = this;
+      apos.bus.$emit('widget-rendering');
       const parameters = {
         _docId: this.docId,
         widget: this.value,
@@ -51,7 +45,6 @@ export default {
       try {
         if (this.rendering && (isEqual(this.rendering.parameters, parameters))) {
           this.rendered = this.rendering.html;
-          this.runPlayer();
         } else {
           this.rendered = '...';
           this.rendered = await apos.http.post(`${apos.area.action}/render-widget?aposEdit=1&aposMode=draft`, {
@@ -59,11 +52,10 @@ export default {
             body: parameters
           });
         }
-        // Wait for reactivity to populate v-html so the
-        // AposAreas manager can spot any new area divs.
-        // This will also run the player
+        // Wait for reactivity to render v-html so that markup is
+        // in the DOM before hinting that it might be time to prepare
+        // sub-area editors and run players
         setTimeout(function() {
-          self.setPlayerEl();
           apos.bus.$emit('widget-rendered');
         }, 0);
       } catch (e) {
@@ -71,20 +63,6 @@ export default {
         console.error('Unable to render widget. Possibly the schema has been changed and the existing widget does not pass validation.', e);
       }
     },
-    setPlayerEl() {
-      if (this.playerOpts) {
-        const el = this.$el.querySelector(this.playerOpts.selector);
-        if (el && this.playerOpts.player) {
-          this.playerEl = el;
-        }
-      }
-    },
-    runPlayer() {
-      if (this.playerEl && !this.playerEl.aposWidgetPlayed) {
-        this.playerOpts.player(this.playerEl);
-        this.playerEl.aposWidgetPlayed = true;
-      }
-    },
     clicked(e) {
       // If you do not want a particular click to swap to the edit view
       // for your widget, you should make sure it does not bubble

package/package.json

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

package/.circleci/config.yml

@@ -1,94 +0,0 @@
-version: 2
-jobs:
-  build-node14-mongo5:
-    docker:
-      - image: circleci/node:14-browsers
-      - image: mongo:5.0
-    steps:
-      - checkout
-      - run:
-          name: update-npm
-          command: 'sudo npm install -g npm@7'
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run:
-          name: install-npm-wee
-          command: npm install
-      - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
-      - run:
-          name: test
-          command: npm test
-  build-node14-mongo44:
-    docker:
-      - image: circleci/node:14-browsers
-      - image: mongo:4.4
-    steps:
-      - checkout
-      - run:
-          name: update-npm
-          command: 'sudo npm install -g npm@7'
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run:
-          name: install-npm-wee
-          command: npm install
-      - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
-      - run:
-          name: test
-          command: npm test
-  build-node14-mongo42:
-    docker:
-      - image: circleci/node:14-browsers
-      - image: mongo:4.2
-    steps:
-      - checkout
-      - run:
-          name: update-npm
-          command: 'sudo npm install -g npm@7'
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-      - run:
-          name: install-npm-wee
-          command: npm install
-      - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
-      - run:
-          name: test
-          command: npm test
-  build-node12:
-    docker:
-      - image: circleci/node:12-browsers
-      - image: mongo:3.6.11
-    steps:
-      - checkout
-      - run:
-          name: update-npm
-          command: "sudo npm install -g npm"
-      - restore_cache:
-          key: dependency-cache-{{ .Branch }}-{{ checksum "package-lock.json" }}
-      - run:
-          name: install-npm-wee
-          command: npm install
-      - save_cache:
-          key: dependency-cache-{{ .Branch }}-{{ checksum "package-lock.json" }}
-          paths:
-            - ./node_modules
-      - run:
-          name: test
-          command: npm test
-workflows:
-  version: 2
-  build:
-    jobs:
-      - build-node14-mongo5
-      - build-node14-mongo44
-      - build-node14-mongo42
-      - build-node12

package/.scratch.md

@@ -1,2 +0,0 @@
-- `/deep/ .apos-button` to `:deep(.apos-button)`
-- Remove v-popover, v-tooltip, VueClickOutsideElement