apostrophe 4.28.0 → 4.29.0

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 || []
+        }
+      }
+    });
+  }
+};

package/modules/@apostrophecms/i18n/ui/apos/components/AposI18nLocalize.vue

@@ -317,7 +317,7 @@ export default {
       type: Object,
       default: null
     },
-    locale: {
+    targetLocale: {
       required: false,
       type: Object,
       default: null
@@ -385,7 +385,7 @@ export default {
             title: this.$t('apostrophe:selectLocales'),
             filter: '',
             if() {
-              return !this.locale;
+              return !this.targetLocale;
             },
             complete() {
               return this.selectedLocales.length > 0;
@@ -409,7 +409,7 @@ export default {
         },
         values: {
           toLocalize: { data: 'thisDocAndRelated' },
-          toLocales: { data: this.locale ? [ this.locale ] : [] },
+          toLocales: { data: this.targetLocale ? [ this.targetLocale ] : [] },
           relatedDocSettings: { data: 'localizeNewRelated' },
           relatedDocTypesToLocalize: { data: [] },
           translateContent: { data: false },
@@ -836,7 +836,7 @@ export default {
         this.modal.busy = true;
         for (const locale of this.selectedLocales) {
           try {
-            await apos.http.post(`${apos.modules[doc.type].action}/${doc._id}/localize`, {
+            const result = await apos.http.post(`${apos.modules[doc.type].action}/${doc._id}/localize`, {
               body: {
                 toLocale: locale.name,
                 update: (doc._id === this.fullDoc._id) || !(this.wizard.values.relatedDocSettings.data === 'localizeNewRelated')
@@ -853,10 +853,11 @@ export default {
               locale,
               docTypeLabel: this.singular(doc.type),
               doc,
+              result,
               relationship: doc._id === this.fullDoc._id
             });
 
-            if (this.locale && this.shouldRedirect) {
+            if (this.targetLocale && this.shouldRedirect) {
               // Ask for the redirect URL, this way it still works if we
               // need to carry a session across hostnames
               const result = await apos.http.post(`${this.moduleOptions.action}/locale`, {
@@ -938,15 +939,57 @@ export default {
           }
         );
       } else {
-        for (const item of notifications) {
-          await apos.notify('apostrophe:localized', {
+        const successes = notifications.filter(({ type }) => type === 'success');
+        const count = successes.length;
+        const targetLocales = [ ...new Set(successes.map(item => item.locale.name)) ];
+        const managerOpen = apos.modal.get()
+          .some(modal => modal.componentName === 'AposRecentlyEditedManager');
+
+        if (count === 1) {
+          const item = successes[0];
+          const hasUrl = !!item.result?._url;
+          await apos.notify('apostrophe:localizingNotificationSuccess', {
             type: 'success',
-            interpolate: {
-              type: this.$t(this.singular(item.doc.type)),
-              title: item.doc.title,
-              locale: item.locale.name
-            },
-            dismiss: true
+            icon: 'translate-icon',
+            interpolate: { count },
+            dismiss: managerOpen,
+            ...!managerOpen && {
+              buttons: [
+                {
+                  type: 'event',
+                  label: hasUrl
+                    ? 'apostrophe:localizeOpenDocument'
+                    : 'apostrophe:localizeEditDocument',
+                  name: 'localize-open-document',
+                  data: {
+                    _url: item.result?._url || null,
+                    type: item.doc.type,
+                    _id: item.result?._id || null,
+                    locale: item.locale.name,
+                    slug: item.result?.slug || item.doc.slug
+                  }
+                }
+              ]
+            }
+          });
+        } else if (count > 1) {
+          await apos.notify('apostrophe:localizingNotificationSuccess', {
+            type: 'success',
+            icon: 'translate-icon',
+            interpolate: { count },
+            dismiss: managerOpen,
+            ...!managerOpen && {
+              buttons: [
+                {
+                  type: 'event',
+                  label: 'apostrophe:localizeManageDocuments',
+                  name: 'localize-manage-documents',
+                  data: {
+                    locales: targetLocales
+                  }
+                }
+              ]
+            }
           });
         }
       }

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

@@ -290,21 +290,27 @@ export default {
       };
     },
     async submit() {
+      let attachment;
       if (this.image.attachment) {
-        await apos.http.post(`${apos.attachment.action}/crop`, {
+        attachment = await apos.http.post(`${apos.attachment.action}/crop`, {
           body: {
             _id: this.image.attachment._id,
-            crop: this.docFields.data
+            crop: this.docFields.data,
+            annotate: true
           },
           busy: true
         });
       }
 
       if (!this.widget) {
+        if (attachment) {
+          this.image.attachment = attachment;
+        }
         this.$emit('modal-result', this.docFields.data);
       } else {
         const image = {
           ...this.image,
+          ...(attachment && { attachment }),
           _fields: this.docFields.data
         };
         const widget = {