apostrophe 4.6.1 → 4.7.0

package/modules/@apostrophecms/command-menu/ui/apos/components/AposCommandMenuShortcut.vue

@@ -173,10 +173,12 @@ export default {
 .apos-modal__heading {
   @include type-base;
 
-  display: inline-block;
-  margin: 0;
-  font-size: var(--a-type-large);
-  line-height: $spacing-double;
+  & {
+    display: inline-block;
+    margin: 0;
+    font-size: var(--a-type-large);
+    line-height: $spacing-double;
+  }
 }
 
 .apos-command-menu-key {
@@ -205,18 +207,22 @@ export default {
 .apos-command-menu-shortcut-group {
   @include type-base;
 
-  font-weight: 400;
+  & {
+    font-weight: 400;
+  }
 }
 
 .apos-command-menu-shortcut-group-title {
   @include type-base;
 
-  box-sizing: border-box;
-  height: 24px;
-  margin: 0;
-  padding: $spacing-half 0;
-  color: var(--a-base-3);
-  text-align: left;
+  & {
+    box-sizing: border-box;
+    height: 24px;
+    margin: 0;
+    padding: $spacing-half 0;
+    color: var(--a-base-3);
+    text-align: left;
+  }
 }
 
 .apos-command-menu-shortcut-command {

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

@@ -334,8 +334,12 @@ module.exports = {
       // new document's content wins in the event of a conflict.
       // If `keep` is not set, a `conflict` error is thrown in the
       // event of a conflict.
+      //
+      // If `skipReplace` is set to `true`, the method will not attempt to remove
+      // the old document, but will still update the new document. The new _id
+      // for each pair will be used for retrieving the "existing" document in this case.
 
-      async changeDocIds(pairs, { keep } = {}) {
+      async changeDocIds(pairs, { keep, skipReplace = false } = {}) {
         let renamed = 0;
         let kept = 0;
         // Get page paths up front so we can avoid multiple queries when working on path changes
@@ -347,13 +351,15 @@ module.exports = {
         }).toArray();
         for (const pair of pairs) {
           const [ from, to ] = pair;
-          const existing = await self.apos.doc.db.findOne({ _id: from });
+          const oldAposDocId = from.split(':')[0];
+          const existing = await self.apos.doc.db.findOne({ _id: skipReplace ? to : from });
           if (!existing) {
             throw self.apos.error('notfound');
           }
           const replacement = klona(existing);
-          await self.apos.doc.db.removeOne({ _id: from });
-          const oldAposDocId = existing.aposDocId;
+          if (!skipReplace) {
+            await self.apos.doc.db.removeOne({ _id: from });
+          }
           replacement._id = to;
           const parts = to.split(':');
           replacement.aposDocId = parts[0];
@@ -366,8 +372,10 @@ module.exports = {
             replacement.path = existing.path.replace(existing.aposDocId, replacement.aposDocId);
           }
           try {
-            await self.apos.doc.db.insertOne(replacement);
-            renamed++;
+            if (!skipReplace) {
+              await self.apos.doc.db.insertOne(replacement);
+              renamed++;
+            }
           } catch (e) {
             // First reinsert old doc to prevent content loss on new doc insert failure
             await self.apos.doc.db.insertOne(existing);
@@ -404,7 +412,7 @@ module.exports = {
               throw self.apos.error('conflict');
             }
           }
-          if (isPage) {
+          if (isPage && !skipReplace) {
             for (const page of pages) {
               if (page.path.includes(oldAposDocId)) {
                 await self.apos.doc.db.updateOne({
@@ -1734,14 +1742,13 @@ module.exports = {
         }
 
         function forSchema(schema, doc) {
+          if (!doc) {
+            return;
+          }
           for (const field of schema) {
             if (field.type === 'area' && doc[field.name] && doc[field.name].items) {
               for (const widget of doc[field.name].items) {
-                self.walkByMetaType(widget, {
-                  arrayItem: handlers.arrayItem,
-                  object: handlers.object,
-                  relationship: handlers.relationship
-                });
+                self.walkByMetaType(widget, handlers);
               }
             } else if (field.type === 'array') {
               if (doc[field.name]) {
@@ -1752,14 +1759,10 @@ module.exports = {
               }
             } else if (field.type === 'object') {
               const value = doc[field.name];
-              if (value) {
-                handlers.object(field, value);
-                forSchema(field.schema, value);
-              }
+              handlers.object(field, value);
+              forSchema(field.schema, value);
             } else if (field.type === 'relationship') {
-              if (Array.isArray(doc[field.name])) {
-                handlers.relationship(field, doc);
-              }
+              handlers.relationship(field, doc);
             }
           }
         }

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

@@ -759,6 +759,7 @@ module.exports = {
 
       async convert(req, input, doc, options = {
         presentFieldsOnly: false,
+        fetchRelationships: true,
         type: null,
         copyingId: null,
         createId: null
@@ -783,8 +784,10 @@ module.exports = {
             ...input
           };
         }
-
-        await self.apos.schema.convert(req, schema, input, doc);
+        const convertOptions = {
+          fetchRelationships: options.fetchRelationships !== false
+        };
+        await self.apos.schema.convert(req, schema, input, doc, convertOptions);
 
         if (options.createId) {
           doc.aposDocId = options.createId;
@@ -2439,6 +2442,7 @@ module.exports = {
               // except this one (filtering by topic pares down the list of categories and
               // vice versa)
               const _query = baseQuery.clone();
+              console.log('filter is:', filter);
               _query[filter](null);
               choices[filter] = await _query.toChoices(filter, { counts: query.get('counts') });
             }

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

@@ -610,18 +610,15 @@ export default {
     async onSaveDraft({ navigate = false } = {}) {
       await this.save({
         andPublish: false,
+        draft: true,
         navigate
       });
-      await apos.notify('apostrophe:draftSaved', {
-        type: 'success',
-        dismiss: true,
-        icon: 'file-document-icon'
-      });
     },
     async save({
       andPublish = false,
       navigate = false,
       andSubmit = false,
+      draft = false,
       keepOpen = false
     }) {
       const body = this.getRequestBody({ update: Boolean(this.currentId) });
@@ -668,6 +665,13 @@ export default {
         this.$emit('modal-result', doc);
         this.modal.showModal = false;
       }
+      if (draft) {
+        await apos.notify('apostrophe:draftSaved', {
+          type: 'success',
+          dismiss: true,
+          icon: 'file-document-icon'
+        });
+      }
       if (navigate) {
         if (doc._url) {
           window.location = doc._url;

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

@@ -9,6 +9,7 @@
       identifier="localePickerTrigger"
       :button="button"
       :unpadded="true"
+      :center-on-icon="true"
       menu-placement="bottom-end"
       @open="open"
       @close="isOpen = false"
@@ -163,15 +164,19 @@ async function switchLocale(locale) {
 .apos-doc-locales__label {
   @include type-base;
 
-  margin-right: 0.3rem;
-  font-weight: var(--a-weight-bold);
+  & {
+    margin-right: 0.3rem;
+    font-weight: var(--a-weight-bold);
+  }
 }
 
 .apos-doc-locales__switcher :deep(.apos-button__label) {
   @include type-base;
 
-  color: var(--a-primary);
-  font-weight: var(--a-weight-bold);
-  letter-spacing: 1px;
+  & {
+    color: var(--a-primary);
+    font-weight: var(--a-weight-bold);
+    letter-spacing: 1px;
+  }
 }
 </style>

package/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js

@@ -429,6 +429,18 @@ export default {
 
     },
     async customAction(doc, operation) {
+      if (operation.replaces) {
+        const confirm = await apos.confirm({
+          heading: 'apostrophe:replaceHeadingPrompt',
+          description: this.$t('apostrophe:replaceDescPrompt'),
+          affirmativeLabel: 'apostrophe:replace',
+          icon: false
+        });
+        if (!confirm) {
+          return;
+        }
+        this.$emit('close', doc);
+      }
       const props = {
         moduleName: operation.moduleName || this.moduleName,
         // For backwards compatibility

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

@@ -3,10 +3,15 @@ const qs = require('qs');
 const fetch = require('node-fetch');
 const tough = require('tough-cookie');
 const escapeHost = require('../../../lib/escape-host');
+const util = require('util');
 
 module.exports = {
   options: {
-    alias: 'http'
+    alias: 'http',
+    // 2 hour limit to process a "big upload,"
+    // which could be something like an entire site
+    // with its attachments
+    bigUploadMaxSeconds: 2 * 60 * 60
   },
   init(self) {
     // Map friendly errors created via `apos.error` to status codes.
@@ -27,6 +32,16 @@ module.exports = {
     };
     _.merge(self.errors, self.options.addErrors);
   },
+  handlers(self) {
+    // Wait for the db module to be ready
+    return {
+      'apostrophe:modulesRegistered': {
+        setCollection() {
+          self.bigUploads = self.apos.db.collection('aposBigUploads');
+        }
+      }
+    };
+  },
   methods(self) {
     return {
       // Add another friendly error name to http status code mapping so you
@@ -203,7 +218,7 @@ module.exports = {
         }
         if (options.body && options.body.constructor && (options.body.constructor.name === 'FormData')) {
           // If we don't do this multiparty will not parse it properly
-          const contentLength = await require('util').promisify((callback) => {
+          const contentLength = await util.promisify((callback) => {
             return options.body.getLength(callback);
           })();
           options.headers = options.headers || {};
@@ -294,8 +309,9 @@ module.exports = {
       getBase() {
         const server = self.apos.modules['@apostrophecms/express'].server;
         return `http://${escapeHost(server.address().address)}:${server.address().port}`;
-      }
+      },
 
+      ...require('./lib/big-upload-middleware.js')(self)
     };
   }
 };

package/modules/@apostrophecms/http/lib/big-upload-middleware.js

@@ -0,0 +1,251 @@
+const multiparty = require('connect-multiparty');
+const util = require('util');
+const {
+  readFile, open, unlink
+} = require('node:fs/promises');
+
+module.exports = (self) => ({
+  // Returns middleware that allows any route to receive large
+  // uploads made via big-upload-client. A workaround for
+  // the max POST size, max uploaded file size, etc. of
+  // nginx and other proxy servers.
+  //
+  // If an `authorize` function is supplied, it will be invoked
+  // with `req` at the start of each request. If it throws
+  // an error, a 403 forbidden error is sent. Use this mechanism
+  // to block unauthorized use and potential denial of service.
+
+  bigUploadMiddleware({ authorize } = {}) {
+    return (req, res, next) => {
+      // Chain the multiparty middleware to handle normal uploads
+      // as chunks (more efficient than base64 etc)
+      const multipartyFn = multiparty();
+      return multipartyFn(req, res, () => {
+        return body(req, res, next);
+      });
+    };
+
+    async function body(req, res, next) {
+      const origFiles = req.files;
+      try {
+        if (authorize) {
+          try {
+            await authorize(req);
+          } catch (e) {
+            self.logError('bigUploadUnauthorized', e);
+            return res.status(403).send({
+              name: 'forbidden',
+              message: 'Unauthorized aposBigUpload request'
+            });
+          }
+        }
+        const params = req.query.aposBigUpload;
+        if (!params) {
+          return next();
+        }
+        if (params.type === 'start') {
+          return await self.bigUploadStart(req, req.body.files);
+        } else if (params.type === 'chunk') {
+          return await self.bigUploadChunk(req, params);
+        } else if (params.type === 'end') {
+          return await self.bigUploadEnd(req, params.id, next);
+        } else {
+          return res.status(400).send({
+            name: 'invalid',
+            message: 'Invalid aposBigUpload request'
+          });
+        }
+      } finally {
+        // Clean up multiparty temporary files
+        for (const { path } of Object.values(origFiles || {})) {
+          try {
+            await unlink(path);
+          } catch (e) {
+            // OK if it is already gone
+          }
+        }
+      }
+    };
+  },
+
+  async bigUploadStart(req, files = {}) {
+    await self.bigUploadCleanup();
+    try {
+      const id = self.apos.util.generateId();
+      files = Object.fromEntries(Object.entries(files).map(([ param, info ]) => {
+        if ((typeof param) !== 'string') {
+          throw invalid('param');
+        }
+        if (((typeof info) !== 'object') || (info == null)) {
+          throw invalid('info');
+        }
+        if ((typeof info.name) !== 'string') {
+          throw invalid('name');
+        }
+        if (!info.name.length) {
+          throw invalid('name empty');
+        }
+        if ((typeof info.size) !== 'number') {
+          throw invalid('size');
+        }
+        if ((typeof info.chunks) !== 'number') {
+          throw invalid('chunks');
+        }
+        return [ param, {
+          name: info.name,
+          size: info.size,
+          chunks: info.chunks
+        } ];
+      }));
+      await self.bigUploads.insert({
+        _id: id,
+        files,
+        start: Date.now()
+      });
+      return req.res.send({
+        id
+      });
+    } catch (e) {
+      return req.res.status(500).send({
+        name: 'error',
+        message: 'aposBigUpload error'
+      });
+    }
+    function invalid(s) {
+      self.apos.util.error(`Invalid bigUpload parameter: ${s}`);
+      return self.apos.error('invalid', s);
+    }
+  },
+
+  async bigUploadChunk(req, params) {
+    try {
+      const id = self.apos.launder.id(params.id);
+      const n = self.apos.launder.integer(params.n);
+      const chunk = self.apos.launder.integer(params.chunk);
+      const bigUpload = await self.bigUploads.findOne({ _id: id });
+      if (!bigUpload) {
+        throw self.apos.error('notfound');
+      }
+      if ((n < 0) || (n >= Object.keys(bigUpload.files).length)) {
+        throw self.apos.error('invalid', 'n out of range');
+      }
+      const info = Object.values(bigUpload.files)[n];
+      if ((chunk < 0) || (chunk >= info.chunks)) {
+        throw self.apos.error('invalid', 'chunk out of range');
+      }
+      const file = req.files.chunk;
+      const ufs = self.getBigUploadFs();
+      const ufsPath = `/big-uploads/${id}-${n}-${chunk}`;
+      await ufs.copyIn(file.path, ufsPath);
+      return req.res.send({});
+    } catch (e) {
+      self.logError('bigUploadError', e);
+      return req.res.status(500).send({
+        name: 'error',
+        message: 'aposBigUpload error'
+      });
+    }
+  },
+
+  async bigUploadEnd(req, id, next) {
+    const ufs = self.getBigUploadFs();
+    let bigUpload;
+    try {
+      bigUpload = await self.bigUploads.findOne({
+        _id: id
+      });
+      if (!bigUpload) {
+        return req.res.status(400).send({
+          name: 'invalid'
+        });
+      }
+      let n = 0;
+      req.files = {};
+      for (const [ param, {
+        name, chunks
+      } ] of Object.entries(bigUpload.files)) {
+        let ext = require('path').extname(name);
+        if (ext) {
+          ext = ext.substring(1);
+        } else {
+          ext = 'tmp';
+        }
+        const tmp = `${ufs.getTempPath()}/${id}-${n}.${ext}`;
+        const out = await open(tmp, 'w');
+        for (let i = 0; (i < chunks); i++) {
+          const ufsPath = `/big-uploads/${id}-${n}-${i}`;
+          const chunkTmp = `${tmp}.${i}`;
+          try {
+            await ufs.copyOut(ufsPath, chunkTmp);
+            const data = await readFile(chunkTmp);
+            await out.writeFile(data);
+          } finally {
+            try {
+              await unlink(chunkTmp);
+            } catch (e) {
+              // Probably never got that far
+            }
+          }
+        }
+        await out.close();
+        n++;
+        req.files[param] = {
+          name,
+          path: tmp
+        };
+      }
+      return next();
+    } catch (e) {
+      self.logError('bigUploadError', e);
+      return req.res.status(500).send({
+        name: 'error',
+        message: 'aposBigUpload error'
+      });
+    } finally {
+      // Intentionally in background
+      self.bigUploadCleanupOne(bigUpload);
+    }
+  },
+
+  async bigUploadCleanup() {
+    const old = await self.bigUploads.find({
+      start: {
+        $lte: Date.now() - self.options.bigUploadMaxSeconds * 1000
+      }
+    }).toArray();
+    for (const bigUpload of old) {
+      await self.bigUploadCleanupOne(bigUpload);
+    }
+  },
+
+  async bigUploadCleanupOne(bigUpload) {
+    const ufs = self.getBigUploadFs();
+    const id = bigUpload._id;
+    let n = 0;
+    for (const { chunks } of Object.values(bigUpload.files)) {
+      for (let i = 0; (i < chunks); i++) {
+        const ufsPath = `/big-uploads/${id}-${n}-${i}`;
+        try {
+          await ufs.remove(ufsPath);
+        } catch (e) {
+          // It's OK if someone else already removed it
+          // or it never got there
+        }
+      }
+      n++;
+    }
+    await self.bigUploads.deleteOne({
+      _id: bigUpload._id
+    });
+  },
+
+  getBigUploadFs() {
+    const uploadfs = self.apos.attachment.uploadfs;
+    return {
+      copyIn: util.promisify(uploadfs.copyIn),
+      copyOut: util.promisify(uploadfs.copyOut),
+      remove: util.promisify(uploadfs.remove),
+      getTempPath: uploadfs.getTempPath
+    };
+  }
+});

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

@@ -169,7 +169,7 @@
   "fileTag": "Datei-Tag",
   "fileTags": "Datei-Tags",
   "fileTypeCannotBeCropped": "{{ extension }}-Dateien können nicht zugeschnitten werden.",
-  "fileTypeNotAccepted": "Dieser Dateityp wird nicht akzeptiert. Bitte wähle eine Datei mit einer der folgenden Endungen: {{ extensions }}",
+  "fileTypeNotAccepted": "Dieser Dateityp {{ extension}} wird nicht akzeptiert. Bitte wähle eine Datei mit einer der folgenden Endungen: {{ extensions }}",
   "files": "Dateien",
   "filter": "Filter",
   "filterByTag": "Nach Tag filtern",

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

@@ -58,6 +58,12 @@
   "back": "Back",
   "backToHome": "Back to Home",
   "basics": "Basics",
+  "batchArchiveProgress": "Archiving {{ type }}...",
+  "batchArchiveCompleted": "Archived {{ count }} {{ type }}.",
+  "batchPublishProgress": "Publishing {{ type }}...",
+  "batchPublishCompleted": "Published {{ count }} {{ type }}.",
+  "batchRestoreProgress": "Restoring {{ type }}...",
+  "batchRestoreCompleted": "Restored {{ count }} {{ type }}.",
   "browseDocType": "Browse {{ type }}",
   "cancel": "Cancel",
   "cannotChangeSlugPrefix": "cannot change the slug prefix",
@@ -194,7 +200,7 @@
   "fileTag": "File Tag",
   "fileTags": "File Tags",
   "fileTypeCannotBeCropped": "{{ extension }} files cannot be cropped, do not present the cropping UI for this type",
-  "fileTypeNotAccepted": "File type was not accepted. Allowed extensions: {{ extensions }}",
+  "fileTypeNotAccepted": "File type {{ extension}} was not accepted. Allowed extensions: {{ extensions }}",
   "fileUploaderAttachmentLimitReached": "Attachment limit reached",
   "fileUploaderDropFile": "Drop a file here or",
   "fileUploaderFieldIsDisabled": "Field is disabled",
@@ -399,6 +405,8 @@
   "removeLink": "Remove Link",
   "removeRichTextAnchor": "Remove Rich Text Anchor",
   "replace": "Replace",
+  "replaceHeadingPrompt": "Replace Document?",
+  "replaceDescPrompt": "This operation will replace the contents of this document. Are you sure?",
   "resolveErrorsBeforeSaving": "Resolve errors before saving.",
   "resolveErrorsFirst": "Resolve errors first.",
   "restore": "Restore",

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

@@ -158,7 +158,7 @@
   "fileInvalid": "El archivo no fue aceptado. Puede estar corrupto o su contenido no coincide con su extensión de archivo.",
   "fileTag": "Etiqueta de Archivo",
   "fileTags": "Etiquetas del Archivo",
-  "fileTypeNotAccepted": "El tipo de archivo no fue acceptado. Extensiones de Archivo permitidas: {{ extensions }}",
+  "fileTypeNotAccepted": "El tipo de archivo {{ extension }} no fue acceptado. Extensiones de Archivo permitidas: {{ extensions }}",
   "files": "Archivos",
   "filter": "Filtrar",
   "filterByTag": "Filtrar por Etiqueta",

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

@@ -156,7 +156,7 @@
   "fileTag": "Tag du fichier",
   "fileTags": "Tags du fichier",
   "fileTypeCannotBeCropped": "Les fichiers {{ extension }} ne peuvent être rognés",
-  "fileTypeNotAccepted": "Le type du fichier n'a pas été accepté. Extensions autorisées : {{ extensions }}",
+  "fileTypeNotAccepted": "Le type du fichier {{ extension }} n'a pas été accepté. Extensions autorisées : {{ extensions }}",
   "files": "Fichiers",
   "filter": "Filtrer",
   "filterByTag": "Filtrer par tag",

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

@@ -181,7 +181,7 @@
   "fileTag": "Tag del file",
   "fileTags": "Tag dei file",
   "fileTypeCannotBeCropped": "I file {{ extension }} non possono essere ritagliati, non presentare l'interfaccia di ritaglio per questo tipo",
-  "fileTypeNotAccepted": "Il tipo di file non è stato accettato. Estensioni consentite: {{ extensions }}",
+  "fileTypeNotAccepted": "Il tipo di file {{ extension }} non è stato accettato. Estensioni consentite: {{ extensions }}",
   "files": "File",
   "filter": "Filtro",
   "filterByTag": "Filtra per tag",

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

@@ -157,7 +157,7 @@
   "fileInvalid": "O arquivo não foi aceito. Ele pode estar corrompido ou seu conteúdo pode não corresponder à extensão do arquivo.",
   "fileTag": "Tag de arquivo",
   "fileTags": "Tags de arquivo",
-  "fileTypeNotAccepted": "O tipo de arquivo não foi aceito. Extensões permitidas: {{ extensions }}",
+  "fileTypeNotAccepted": "O tipo de arquivo {{ extension }} não foi aceito. Extensões permitidas: {{ extensions }}",
   "files": "Arquivos",
   "filter": "Filtrar",
   "filterByTag": "Filtrar por Tag",

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

@@ -162,7 +162,7 @@
   "fileInvalid": "Súbor nebol prijatý. Môže byť poškodený alebo sa jeho obsah nemusí zhodovať s príponou súboru.",
   "fileTag": "Značku súboru",
   "fileTags": "Značky súboru",
-  "fileTypeNotAccepted": "Typ súboru nebol prijatý. Povolené rozšírenia: {{ extensions }}",
+  "fileTypeNotAccepted": "Typ súboru {{ extension }} nebol prijatý. Povolené rozšírenia: {{ extensions }}",
   "files": "Súbory",
   "filter": "Filtrovať",
   "filterByTag": "Filtrovať podľa značky",

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

@@ -369,6 +369,9 @@ module.exports = {
   apiRoutes(self) {
     return {
       get: {
+        locales(req) {
+          return self.locales;
+        },
         async localesPermissions(req) {
           const action = self.apos.launder.string(req.query.action);
           const type = self.apos.launder.string(req.query.type);