apostrophe 4.28.1 → 4.29.0

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

@@ -92,6 +92,16 @@ export default {
     moduleLabels: {
       type: Object,
       default: null
+    },
+    showUnpublish: {
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
+    crossLocale: {
+      type: Boolean,
+      default: false
     }
   },
   emits: [ 'menu-open', 'menu-close', 'close' ],
@@ -105,6 +115,12 @@ export default {
   },
   computed: {
     menu() {
+      // TODO: Register core context actions (edit, preview,
+      // copy, localize, archive, etc.) as custom operations
+      // via `addContextOperation`. This would let us unify
+      // cross-locale gating through the `crossLocale`
+      // flag on each operation, eliminating the manual
+      // `!this.crossLocale` wrapping below.
       const menu = [
         // TODO
         // ...(this.isModifiedFromPublished ? [
@@ -128,64 +144,76 @@ export default {
             }
           ]
           : []),
-        ...((this.showDismissSubmission && this.canDismissSubmission)
+        // In cross-locale mode, only Edit and Preview are safe.
+        // All other built-in ops are hidden.
+        ...(!this.crossLocale
           ? [
-            {
-              label: 'apostrophe:dismissSubmission',
-              action: 'dismissSubmission'
-            }
-          ]
-          : []),
-        ...(this.showCopy && this.canCopy
-          ? [
-            {
-              label: 'apostrophe:duplicate',
-              action: 'copy'
-            }
-          ]
-          : []),
-        ...(this.canLocalize
-          ? [
-            {
-              label: 'apostrophe:localize',
-              action: 'localize'
-            }
+            ...((this.showDismissSubmission && this.canDismissSubmission)
+              ? [
+                {
+                  label: 'apostrophe:dismissSubmission',
+                  action: 'dismissSubmission'
+                }
+              ]
+              : []),
+            ...(this.showCopy && this.canCopy
+              ? [
+                {
+                  label: 'apostrophe:duplicate',
+                  action: 'copy'
+                }
+              ]
+              : []),
+            ...(this.canLocalize
+              ? [
+                {
+                  label: 'apostrophe:localize',
+                  action: 'localize'
+                }
+              ]
+              : [])
           ]
           : []),
         ...this.customMenusByContext,
-        ...((this.showDiscardDraft && this.canDiscardDraft)
+        ...(!this.crossLocale
           ? [
-            {
-              label: this.context.lastPublishedAt ? 'apostrophe:discardDraft' : 'apostrophe:deleteDraft',
-              action: 'discardDraft',
-              modifiers: [ 'danger' ]
-            }
-          ]
-          : []),
-        ...(this.showArchive && this.canArchive
-          ? [
-            {
-              label: 'apostrophe:archive',
-              action: 'archive',
-              modifiers: [ 'danger' ]
-            }
-          ]
-          : []),
-        ...(this.canUnpublish
-          ? [
-            {
-              label: 'apostrophe:unpublish',
-              action: 'unpublish',
-              modifiers: [ 'danger' ]
-            }
-          ]
-          : []),
-        ...(this.showRestore && this.canRestore
-          ? [
-            {
-              label: 'apostrophe:restore',
-              action: 'restore'
-            }
+            ...((this.showDiscardDraft && this.canDiscardDraft)
+              ? [
+                {
+                  label: this.context.lastPublishedAt
+                    ? 'apostrophe:discardDraft'
+                    : 'apostrophe:deleteDraft',
+                  action: 'discardDraft',
+                  modifiers: [ 'danger' ]
+                }
+              ]
+              : []),
+            ...(this.showArchive && this.canArchive
+              ? [
+                {
+                  label: 'apostrophe:archive',
+                  action: 'archive',
+                  modifiers: [ 'danger' ]
+                }
+              ]
+              : []),
+            ...(this.showUnpublish && this.canUnpublish
+              ? [
+                {
+                  label: 'apostrophe:unpublish',
+                  action: 'unpublish',
+                  modifiers: [ 'danger' ]
+                }
+              ]
+              : []),
+            ...(this.showRestore && this.canRestore
+              ? [
+                {
+                  label: 'apostrophe:restore',
+                  action: 'restore'
+                }
+              ]
+              : [])
           ]
           : [])
       ];
@@ -208,8 +236,14 @@ export default {
     },
     customOperationsByContext() {
       return this.customOperations.filter(({
-        manuallyPublished, hasUrl, conditions, context, if: ifProps, moduleIf
+        manuallyPublished, hasUrl, conditions, context,
+        if: ifProps, moduleIf, crossLocale
       }) => {
+        // In cross-locale mode, only show operations explicitly marked as safe
+        if (this.crossLocale && !crossLocale) {
+          return false;
+        }
+
         if (typeof manuallyPublished === 'boolean' && manuallyPublished !== this.manuallyPublished) {
           return false;
         }
@@ -433,13 +467,19 @@ export default {
       this[item.action](this.context);
     },
     async edit(doc) {
+      const props = {
+        moduleName: this.moduleName,
+        docId: doc._id,
+        type: doc.type
+      };
+      // Cross-locale mode suported.
+      if (this.crossLocale && doc.aposLocale) {
+        props.locale = doc.aposLocale.split(':')[0];
+      }
       await apos.modal.execute(
         doc._aposEditorModal || this.moduleOptions.components.editorModal,
-        {
-          moduleName: this.moduleName,
-          docId: doc._id,
-          type: doc.type
-        });
+        props
+      );
     },
     preview(doc) {
       window.open(doc._url, '_blank').focus();
@@ -490,6 +530,11 @@ export default {
         ...docProps(doc),
         ...operation.props
       };
+      // In cross-locale mode, pass the doc's locale so the modal
+      // opens in the correct locale context.
+      if (this.crossLocale && doc.aposLocale) {
+        props.locale = doc.aposLocale.split(':')[0];
+      }
       if (operation.type === 'event') {
         apos.bus.$emit(operation.action, props);
         return;

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

@@ -105,18 +105,112 @@ module.exports = {
           attachmentDocIds: []
         };
       },
-      addUrls(req, files) {
+      // Returns the pretty URL base path (e.g. `/files`) when
+      // pretty URLs are enabled, or `null` otherwise.
+      // The returned path is prefix-qualified. If `options.relative`
+      // is true, the path is relative (no origin).
+      getPrettyUrlBase(req, { relative = false } = {}) {
+        if (!self.options.prettyUrls) {
+          return null;
+        }
+        const base = relative
+          ? self.apos.url.getBaseUrl(req, {
+            relative: true,
+            localePrefix: true
+          })
+          : req.prefix;
+        return `${base}${self.options.prettyUrlDir}`;
+      },
+      // Returns the pretty-URL path component for a file doc.
+      // E.g. `/my-document.pdf` — just the filename portion,
+      // without any base, prefix, or origin.
+      // Returns `null` when pretty URLs are disabled or the
+      // doc has no attachment.  Works with any object that has
+      // `slug` and `attachment.extension` (including the
+      // lightweight projections used by `applyPrettyUrlPaths`).
+      getPrettyPath(doc) {
+        if (!self.options.prettyUrls || !doc.attachment) {
+          return null;
+        }
+        const slug = doc.slug.replace(self.options.slugPrefix || '', '');
+        return `/${slug}.${doc.attachment.extension}`;
+      },
+      // When `options.relative` is true, pretty URLs are built
+      // with only the prefix + prettyUrlDir (no origin).
+      addUrls(req, files, { relative = false } = {}) {
+        const prettyBase = self.getPrettyUrlBase(req, { relative });
         for (const file of files) {
-          // Watch out for projections with no attachment property
-          // (the slug-taken route does that)
-          if (self.options.prettyUrls && file.attachment) {
-            const { extension } = file.attachment;
-            file._url = `${req.prefix}${self.options.prettyUrlDir}/${file.slug.replace(self.options.slugPrefix || '', '')}.${extension}`;
+          const prettyPath = self.getPrettyPath(file);
+          if (prettyBase && prettyPath) {
+            file._url = `${prettyBase}${prettyPath}`;
             file.attachment._prettyUrl = file._url;
-          } else {
+          } else if (file.attachment) {
             file._url = self.apos.attachment.url(file.attachment);
           }
         }
+      },
+      // Mutates `attachmentMeta.results` in-place, replacing
+      // uploadfs paths with pretty URL paths for file pieces
+      // that have pretty URLs enabled.  Adds a `base` property
+      // to each affected entry so the consumer can override the
+      // global `uploadsUrl` for those entries.
+      //
+      // Uses a lightweight direct DB query (no builders) to
+      // find file docs by attachment ID.  Returns nothing —
+      // the mutation is performed on the input object.
+      //
+      // Does nothing when pretty URLs are disabled.
+      // For the shape of the `attachmentMeta` object, see the
+      // `@apostrophecms/url:getAllAttachmentMetadata` method documentation.
+      async applyPrettyUrlPaths(req, attachmentMeta) {
+        if (!self.options.prettyUrls || !attachmentMeta?.results?.length) {
+          return;
+        }
+
+        const base = self.getPrettyUrlBase(req, { relative: true });
+        const batchSize = 100;
+
+        for (let i = 0; i < attachmentMeta.results.length; i += batchSize) {
+          const batch = attachmentMeta.results.slice(i, i + batchSize);
+          const batchIds = batch.map(a => a._id);
+
+          // Lightweight direct query — no builders, no relationship
+          // resolution.  Only needs slug and attachment ID/extension.
+          const fileDocs = await self.apos.doc.db.find({
+            type: self.options.name,
+            'attachment._id': { $in: batchIds },
+            aposLocale: `${req.locale}:${req.mode}`,
+            archived: { $ne: true }
+          }, {
+            projection: {
+              slug: 1,
+              'attachment._id': 1,
+              'attachment.extension': 1
+            }
+          }).toArray();
+
+          if (!fileDocs.length) {
+            continue;
+          }
+
+          const byAttId = new Map();
+          for (const entry of batch) {
+            byAttId.set(entry._id, entry);
+          }
+
+          for (const doc of fileDocs) {
+            const entry = byAttId.get(doc.attachment._id);
+            if (!entry) {
+              continue;
+            }
+            const prettyPath = self.getPrettyPath(doc);
+            if (!prettyPath) {
+              continue;
+            }
+            entry.urls = [ { path: prettyPath } ];
+            entry.base = base;
+          }
+        }
       }
     };
   },
@@ -154,7 +248,14 @@ module.exports = {
             const uglyUrl = self.apos.attachment.url(file.attachment, {
               prettyUrl: false
             });
-            return await streamProxy(req, uglyUrl, { error: self.apos.util.error });
+            // For relative URLs (local uploadfs, not CDN), resolve
+            // against the current server's origin so the proxy can
+            // make the self-request.  During static builds
+            // `attachment.url()` may return only a path.
+            const proxyUrl = uglyUrl.startsWith('/')
+              ? `${req.protocol}://${req.get('host')}${uglyUrl}`
+              : uglyUrl;
+            return await streamProxy(req, proxyUrl, { error: self.apos.util.error });
           } catch (e) {
             self.apos.util.error('Error in pretty URL route:', e);
             return res.status(500).send('error');

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

@@ -71,7 +71,6 @@
   "batchRestoreProgress": "Wiederherstellung {{ type }}...",
   "batchTagProgress": "Taggen von {{ count }} {{ type }}...",
   "batchUntagProgress": "Entfernen der Markierung von {{ count }} {{ type }}...",
-  "batchRestoreProgress": "Wiederherstellung {{ type }}...",
   "boxFieldAriaLabelAll": "Wert - alle Seiten",
   "boxFieldAriaLabelIndividual": "- {{ side }} Wert",
   "boxFieldEditAll": "Alle Werte bearbeiten",
@@ -325,7 +324,6 @@
   "localizeLocalized": "Lokalisierte",
   "localizeNewRelated": "Übersetze alle neuen zugehörige Dokumente",
   "localizeNotYetLocalized": "Noch nicht lokalisiert",
-  "localized": "{{ type }} {{ title }} auf {{ locale }} übersetzt",
   "localizedBatch": "Verarbeitet {{ count }} {{ type }}",
   "localizedBatchFailed": "Lokalisierung von {{ type }} fehlgeschlagen",
   "localizedBatchWithFailures": "Verarbeitet {{ count }} {{ type }} ({{ bad }} von {{ total }} fehlgeschlagen)",

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

@@ -287,6 +287,7 @@
   "insertTable": "Insert Table",
   "invalid": "invalid",
   "lastEdited": "Last Edited",
+  "lastEditor": "Last Editor",
   "lastUpdatedBy": "Last saved on {{ updatedAt }} <br /> by {{ updatedBy }}",
   "layout": "Layout",
   "layoutAlign": "Vertical alignment",
@@ -318,6 +319,7 @@
   "listJoiner": ", ",
   "live": "Live",
   "loadDocFailed": "The requested document was not found.",
+  "loadingMore": "Loading more...",
   "locale": "Locale",
   "localeSwitcherDiscardChangesAffirmative": "Save as draft and switch",
   "localeSwitcherDiscardChangesNegative": "Discard changes and switch",
@@ -326,10 +328,12 @@
   "localize": "Localize...",
   "localizeAllRelated": "Localize all related documents and overwrite existing documents",
   "localizeContent": "Localize Content",
+  "localizeEditDocument": "Edit document",
   "localizeLocalized": "Localized",
+  "localizeManageDocuments": "Manage documents",
   "localizeNewRelated": "Localize new related documents",
   "localizeNotYetLocalized": "Not Yet Localized",
-  "localized": "Localized the {{ type }} {{ title }} to {{ locale }}",
+  "localizeOpenDocument": "View document",
   "localizedBatch": "Processed {{ count }} {{ type }}",
   "localizedBatchFailed": "Localizing {{ type }} failed",
   "localizedBatchWithFailures": "Processed {{ count }} {{ type }} ({{ bad }} of {{ total }} failed)",
@@ -444,6 +448,7 @@
   "pageNumber": "Page {{ number }}",
   "pageTitle": "Page Title",
   "pages": "Pages",
+  "pieces": "Pieces",
   "parentNotLocalized": "Localize the parent page first",
   "password": "Password",
   "passwordChangeHelp": "Modify your existing password",
@@ -476,6 +481,29 @@
   "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.",
+  "recentlyEdited": "Recently edited",
+  "recentlyEditedAction": "Action",
+  "recentlyEditedResetFilters": "Reset filters",
+  "recentlyEditedActionCreated": "Created",
+  "recentlyEditedActionLocalized": "Localized",
+  "recentlyEditedActionPublished": "Published",
+  "recentlyEditedActionSubmitted": "Submitted",
+  "recentlyEditedCurrentUser": "Me ({{ user }})",
+  "recentlyEditedDocuments": "Recently edited documents",
+  "recentlyEditedEditedBy": "Edited by",
+  "recentlyEditedClearAllFilters": "Clear all filters",
+  "recentlyEditedClearSearch": "Clear search",
+  "recentlyEditedEmpty": "No recently edited documents found in the past {{ count }} day",
+  "recentlyEditedEmpty_plural": "No recently edited documents found in the past {{ count }} days",
+  "recentlyEditedEmptyFiltered": "No documents match your current filters",
+  "recentlyEditedEmptyFilteredHint": "Try adjusting or clearing your filters to see more results",
+  "recentlyEditedEmptySearched": "No documents match your search",
+  "recentlyEditedEmptySearchedHint": "Try different search terms or adjust your filters",
+  "recentlyEditedFilters": "Filters",
+  "recentlyEditedSearchDocuments": "Search documents",
+  "recentlyEditedAddFilter": "Add filter value",
+  "recentlyEditedStatus": "Status",
+  "recentlyEditedStatusSubmitted": "Submitted",
   "redo": "Redo",
   "redoFailed": "The operation could not be redone.",
   "redoTooltip": "Redo Change",
@@ -600,14 +628,25 @@
   "splitCell": "Split Cell",
   "style": "Style",
   "styleAlignment": "Alignment",
+  "styleBackground": "Background",
+  "styleBackgroundColor": "Color",
+  "styleBackgroundGradient": "Gradient",
+  "styleBackgroundImage": "Image",
+  "styleBackgroundOverlay": "Overlay",
+  "styleBackgroundType": "Background Type",
   "styleBorder": "Border",
   "styleBorderWidth": "Border Width",
   "styleCenter": "Center",
   "styleColor": "Border Color",
   "styleDashed": "Dashed",
   "styleDotted": "Dotted",
+  "styleGradientAngle": "Angle",
+  "styleGradientEnd": "End Color",
+  "styleGradientStart": "Start Color",
   "styleLeft": "Left",
   "styleMargin": "Margin",
+  "styleOverlayColor": "Overlay Color",
+  "styleOverlayOpacity": "Overlay Opacity",
   "stylePadding": "Padding",
   "styleRadius": "Radius",
   "styleRight": "Right",

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

@@ -324,7 +324,6 @@
   "localizeLocalized": "Localizado",
   "localizeNewRelated": "Traducir nuevos documentos relacionados",
   "localizeNotYetLocalized": "No localizado aún",
-  "localized": "El {{ type }} {{ title }} ha sido traducido a la configuración regional {{ locale }}",
   "localizedBatch": "Procesado {{ count }} {{ type }}",
   "localizedBatchFailed": "Error al localizar {{ type }}",
   "localizedBatchWithFailures": "Procesado {{ count }} {{ type }} ({{ bad }} de {{ total }} fallaron)",

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

@@ -324,7 +324,6 @@
   "localizeLocalized": "Localisé",
   "localizeNewRelated": "Changer la langue des nouveaux documents associés",
   "localizeNotYetLocalized": "Pas encore localisé",
-  "localized": "{{ type }} {{ title }} changé en {{ locale }}",
   "localizedBatch": "Traité {{ count }} {{ type }}",
   "localizedBatchFailed": "La localisation de {{ type }} a échoué.",
   "localizedBatchWithFailures": "Traité {{ count }} {{ type }} ({{ bad }} sur {{ total }} ont échoué).",

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

@@ -324,7 +324,6 @@
   "localizeLocalized": "Localizzato",
   "localizeNewRelated": "Localizza nuovi documenti correlati",
   "localizeNotYetLocalized": "Non ancora localizzato",
-  "localized": "Localizzato il {{ type }} {{ title }} in {{ locale }}",
   "localizedBatch": "Elaborato {{ count }} {{ type }}",
   "localizedBatchFailed": "Localizzazione di {{ type }} fallita",
   "localizedBatchWithFailures": "Elaborato {{ count }} {{ type }} ({{ bad }} di {{ total }} fallito)",

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

@@ -324,7 +324,6 @@
   "localizeLocalized": "Localizado",
   "localizeNewRelated": "Localizar novos documentos relacionados",
   "localizeNotYetLocalized": "Ainda Não Localizado",
-  "localized": "Localizar o(a) {{ type }} {{ title }} para {{ locale }}",
   "localizedBatch": "Processado {{ count }} {{ type }}",
   "localizedBatchFailed": "Falha ao localizar {{ type }}",
   "localizedBatchWithFailures": "Processado {{ count }} {{ type }} ({{ bad }} de {{ total }} falharam)",

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

@@ -324,7 +324,6 @@
   "localizeLocalized": "Lokalizované",
   "localizeNewRelated": "Preložte nové súvisiace dokumenty",
   "localizeNotYetLocalized": "Ešte nie je lokalizované",
-  "localized": "Preložené {{ type }} {{ title }} do {{ locale }}",
   "localizedBatch": "Spracované {{ count }} {{ type }}",
   "localizedBatchFailed": "Lokalizácia {{ type }} zlyhala",
   "localizedBatchWithFailures": "Spracované {{ count }} {{ type }} ({{ bad }} z {{ total }} zlyhalo)",

package/modules/@apostrophecms/i18n/ui/apos/apps/AposI18nBatchReporting.js

@@ -16,11 +16,28 @@ export default () => {
 
     if (!skipCount) {
       if (count) {
+        const targetLocales = [ ...new Set(
+          log.filter(isSuccess).map(entry => entry.locale)
+        ) ];
+        const managerOpen = apos.modal.get()
+          .some(modal => modal.componentName === 'AposRecentlyEditedManager');
         await apos.notify('apostrophe:localizingNotificationSuccess', {
           type: 'success',
           icon: 'translate-icon',
           interpolate: { count },
-          dismiss: true
+          dismiss: managerOpen,
+          ...!managerOpen && {
+            buttons: [
+              {
+                type: 'event',
+                label: 'apostrophe:localizeManageDocuments',
+                name: 'localize-manage-documents',
+                data: {
+                  locales: targetLocales
+                }
+              }
+            ]
+          }
         });
       }
       return;

package/modules/@apostrophecms/i18n/ui/apos/apps/AposI18nLocalizeActions.js

@@ -0,0 +1,50 @@
+export default () => {
+  let once = false;
+
+  apos.util.onReady(() => {
+    if (once) {
+      return;
+    }
+    once = true;
+
+    apos.bus.$on('localize-open-document', openDocument);
+    apos.bus.$on('localize-manage-documents', manageDocuments);
+  });
+
+  function openDocument(data) {
+    if (!data) {
+      return;
+    }
+    if (data._url) {
+      window.open(data._url, '_blank');
+      return;
+    }
+    const docModuleName = data.slug?.startsWith('/')
+      ? '@apostrophecms/page'
+      : data.type;
+    if (!apos.modules[docModuleName]) {
+      return;
+    }
+    const editorComponent = apos.modules[docModuleName]?.components?.editorModal || 'AposDocEditor';
+    apos.modal.execute(editorComponent, {
+      moduleName: docModuleName,
+      docId: data._id,
+      locale: data.locale
+    });
+  }
+
+  function manageDocuments(data) {
+    if (!data) {
+      return;
+    }
+    apos.bus.$emit('admin-menu-click', {
+      itemName: '@apostrophecms/recently-edited:manager',
+      props: {
+        initialFilters: {
+          _action: [ 'localized' ],
+          _locale: data.locales || []
+        }
+      }
+    });
+  }
+};