apostrophe 3.63.3 → 4.1.0

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

@@ -24,12 +24,7 @@ export default {
     return {
       previousKey: '',
       modal: 'default',
-      keyboardShortcutListener() {},
-      delay(resolve, ms) {
-        return new Promise(() => {
-          setTimeout(resolve, ms);
-        });
-      }
+      keyboardShortcutListener() {}
     };
   },
   computed: {
@@ -90,13 +85,21 @@ export default {
     apos.bus.$on('modal-launched', this.updateModal);
     apos.bus.$on('modal-resolved', this.updateModal);
   },
-  beforeDestroy() {
+  beforeUnmount() {
     document.removeEventListener('keydown', this.keyboardShortcutListener);
 
     apos.bus.$off('modal-launched', this.updateModal);
     apos.bus.$off('modal-resolved', this.updateModal);
   },
   methods: {
+    delay(resolve, ms) {
+      return new Promise(() => {
+        setTimeout(resolve, ms);
+      });
+    },
+    getModal() {
+      return this.modal;
+    },
     getFirstNonShortcutModal(index = -1) {
       const modal = apos.modal.getAt(index);
       const properties = apos.modal.getProperties(modal.id);

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

@@ -1047,6 +1047,7 @@ module.exports = {
           locale: toLocale,
           mode: 'draft'
         });
+
         const toId = draft._id.replace(`:${draft.aposLocale}`, `:${toLocale}:draft`);
         const actionModule = self.apos.page.isPage(draft) ? self.apos.page : self;
         // Use findForEditing so that we are successful even for edge cases
@@ -1059,17 +1060,26 @@ module.exports = {
         const existing = await actionModule.findForEditing(toReq, {
           _id: toId
         }).permission('view').toObject();
+
+        const eventOptions = {
+          source: draft.aposLocale.split(':')[0],
+          target: toLocale,
+          existing: Boolean(existing)
+        };
+
         // We only want to copy schema properties, leave non-schema
         // properties of the source document alone
-        const data = Object.fromEntries(Object.entries(draft).filter(([ key, value ]) => self.schema.find(field => field.name === key)));
+        const data = Object.fromEntries(Object.entries(draft)
+          .filter(
+            ([ key, value ]) => key === 'type' || self.schema.find(field => field.name === key)
+          ));
         // We need a slug even if removed from the schema for editing purposes
         data.slug = draft.slug;
         let result;
         if (!existing) {
           if (self.apos.page.isPage(draft)) {
             if (!draft.level) {
-              // Replicating the home page for the first time
-              result = await self.apos.doc.insert(toReq, {
+              const insert = {
                 ...data,
                 aposDocId: draft.aposDocId,
                 aposLocale: `${toLocale}:draft`,
@@ -1079,7 +1089,10 @@ module.exports = {
                 rank: draft.rank,
                 parked: draft.parked,
                 parkedId: draft.parkedId
-              });
+              };
+              await self.emit('beforeLocalize', req, insert, eventOptions);
+              // Replicating the home page for the first time
+              result = await self.apos.doc.insert(toReq, insert);
             } else {
               // A page that is not the home page, being replicated for the first time
               let { lastTargetId, lastPosition } = await self.apos.page.inferLastTargetIdAndPosition(draft);
@@ -1137,25 +1150,29 @@ module.exports = {
                   lastPosition = 'lastChild';
                 }
               }
+              const insert = {
+                ...data,
+                aposLocale: `${toLocale}:draft`,
+                _id: toId,
+                parked: draft.parked,
+                parkedId: draft.parkedId
+              };
+              await self.emit('beforeLocalize', req, insert, eventOptions);
               result = await actionModule.insert(toReq,
                 localizedTargetId,
                 lastPosition,
-                {
-                  ...data,
-                  aposLocale: `${toLocale}:draft`,
-                  _id: toId,
-                  parked: draft.parked,
-                  parkedId: draft.parkedId
-                }
+                insert
               );
             }
           } else {
-            result = await actionModule.insert(toReq, {
+            const insert = {
               ...data,
               aposDocId: draft.aposDocId,
               aposLocale: `${toLocale}:draft`,
               _id: toId
-            });
+            };
+            await self.emit('beforeLocalize', req, insert, eventOptions);
+            result = await actionModule.insert(toReq, insert);
           }
         } else {
           if (!options.update) {
@@ -1169,8 +1186,12 @@ module.exports = {
             aposLocale: `${toLocale}:draft`,
             metaType: 'doc'
           };
+          await self.emit('beforeLocalize', req, update, eventOptions);
           result = await actionModule.update(toReq, update);
         }
+
+        await self.emit('afterLocalize', req, draft, result, eventOptions);
+
         return result;
       },
       // Reverts the given draft to the most recent publication.

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

@@ -4,9 +4,6 @@
     :menu="menu"
     :disabled="disabled || (menu.length === 0)"
     menu-placement="bottom-end"
-    @item-clicked="menuHandler"
-    @open="$emit('menu-open')"
-    @close="$emit('menu-close')"
     :button="{
       tooltip: { content: 'apostrophe:moreOptions', placement: 'bottom' },
       label: 'apostrophe:moreOptions',
@@ -15,6 +12,9 @@
       type: 'subtle',
       modifiers: ['small', 'no-motion']
     }"
+    @item-clicked="menuHandler"
+    @open="$emit('menu-open')"
+    @close="$emit('menu-close')"
   />
 </template>
 

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

@@ -1,13 +1,17 @@
 <template>
   <AposModal
-    class="apos-doc-editor" :modal="modal"
+    class="apos-doc-editor"
+    :modal="modal"
     :modal-title="modalTitle"
-    @inactive="modal.active = false" @show-modal="modal.showModal = true"
-    @esc="confirmAndCancel" @no-modal="$emit('safe-close')"
+    @inactive="modal.active = false"
+    @show-modal="modal.showModal = true"
+    @esc="confirmAndCancel"
+    @no-modal="$emit('safe-close')"
   >
     <template #secondaryControls>
       <AposButton
-        type="default" label="apostrophe:cancel"
+        type="default"
+        label="apostrophe:cancel"
         @click="confirmAndCancel"
       />
     </template>
@@ -24,10 +28,11 @@
       />
       <AposButton
         v-if="restoreOnly"
-        type="primary" :label="saveLabel"
+        type="primary"
+        :label="saveLabel"
         :disabled="saveDisabled"
-        @click="onRestore"
         :tooltip="errorTooltip"
+        @click="onRestore"
       />
       <AposButtonSplit
         v-else-if="saveMenu"
@@ -42,8 +47,8 @@
     <template #leftRail>
       <AposModalRail>
         <AposModalTabs
-          :key="tabKey"
           v-if="tabs.length"
+          :key="tabKey"
           :current="currentTab"
           :tabs="tabs"
           :errors="fieldErrors"
@@ -59,6 +64,7 @@
               v-for="tab in tabs"
               v-show="tab.name === currentTab"
               :key="tab.name"
+              :ref="tab.name"
               :changed="changed"
               :schema="groups[tab.name].schema"
               :current-fields="groups[tab.name].fields"
@@ -67,12 +73,11 @@
               :following-values="followingValues('other')"
               :conditional-fields="conditionalFields"
               :doc-id="docId"
-              :value="docFields"
+              :model-value="docFields"
               :meta="docMeta"
               :server-errors="serverErrors"
-              :ref="tab.name"
               :generation="generation"
-              @input="updateDocFields"
+              @update:model-value="updateDocFields"
               @validate="triggerValidate"
               @update-doc-data="onUpdateDocFields"
             />
@@ -85,6 +90,7 @@
         <div class="apos-doc-editor__utility">
           <AposSchema
             v-if="docReady"
+            ref="utilitySchema"
             :schema="groups['utility'].schema"
             :changed="changed"
             :current-fields="groups['utility'].fields"
@@ -93,14 +99,13 @@
             :following-values="followingUtils"
             :conditional-fields="conditionalFields"
             :doc-id="docId"
-            :value="docFields"
+            :model-value="docFields"
             :meta="docMeta"
-            @input="updateDocFields"
-            @validate="triggerValidate"
             :modifiers="['small', 'inverted']"
-            ref="utilitySchema"
             :server-errors="serverErrors"
             :generation="generation"
+            @update:model-value="updateDocFields"
+            @validate="triggerValidate"
           />
         </div>
       </AposModalRail>
@@ -423,7 +428,7 @@ export default {
     }
     apos.bus.$on('content-changed', this.onContentChanged);
   },
-  destroyed() {
+  unmounted() {
     apos.bus.$off('content-changed', this.onContentChanged);
   },
   methods: {

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

@@ -356,7 +356,7 @@ export default {
     apos.bus.$on('content-changed', this.onContentChanged);
     apos.bus.$on('command-menu-admin-bar-discard-draft', this.customDiscardDraft);
   },
-  destroyed() {
+  unmounted() {
     apos.bus.$off('content-changed', this.onContentChanged);
     apos.bus.$off('command-menu-admin-bar-discard-draft', this.customDiscardDraft);
   },

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

@@ -45,6 +45,15 @@
   "assetWebpackCacheCleared": "Build cache cleared.",
   "assetWebpackConfigWarning": "⚠️ In the module {{ module }}, your webpack config is incorrect. It must be an object and should contain only the properties: {{ properties }}.",
   "at": "at",
+  "automaticTranslationCheckbox": "Translate text content",
+  "automaticTranslationErrMsg": "An error happened while getting available languages for translation. Translation will be skipped.",
+  "automaticTranslationErrorNoProvider": "Translation provider not found. Page \"{{ title }}\" was not translated.",
+  "automaticTranslationErrorTargets": "Badly formatted translation targets.",
+  "automaticTranslationLngCheckNoProvider": "Translation provider not found.",
+  "automaticTranslationSettings": "Automatic translation settings",
+  "automaticTranslationSourceErrMsg": "The current locale <strong>{{ source }}</strong> is not suitable for translation. Translation will be skipped.",
+  "automaticTranslationTargetErrMsg": "Could not find a suitable language for the locale <strong>{{ targets }}</strong>. Translation will be skipped for this locale.",
+  "automaticTranslationTargetErrMsg_plural": "Could not find a suitable language for the locales <strong>{{ targets }}</strong>. Translation will be skipped for these locales.",
   "back": "Back",
   "backToHome": "Back to Home",
   "basics": "Basics",
@@ -149,6 +158,8 @@
   "email": "Email",
   "emptyRichTextWidget": "Empty Rich Text Widget",
   "enabled": "Enabled",
+  "enterPassword": "Enter password",
+  "enterUsername": "Enter username",
   "error": "An error occurred",
   "errorBatchOperationNoti": "Batch operation {{ operation }} failed.",
   "errorCount": "{{ count }} error remaining",
@@ -281,6 +292,7 @@
   "noNewRelatedDocuments": "Although this document has related documents, none of them are new to the locales you have selected.",
   "noTypeFound": "No {{ type }} Found",
   "none": "None",
+  "notAvailable": "n/a",
   "notFound": "Not found.",
   "notFoundPageMessage": "We can't seem to find the page you're looking for.",
   "notFoundPageStatusCode": "404",
@@ -366,6 +378,7 @@
   "restoredPrevious": "Restored previously published version.",
   "resumeEditing": "Resume Editing",
   "retryingSaveDocument": "Retrying save document...",
+  "retry": "Retry",
   "returnToPage": "Return to {{ label }}",
   "richText": "Rich Text",
   "richTextAlignCenter": "Align Center",