Merge branch 'main' into pro-8358-add-missing-schema-fields-skip-migration

* main:
  Pro 8541 switch locale empty doc (#5135)

Author: haroun

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 * Add `@apostrophecms/migration:add-missing-schema-fields` task. This task does not run database migrations.
 * Translation strings added for the layout- and layout-column-widgets.
+* When switching locale from the doc editor, ask if the user wants to localize the current document in the target locale or want to start a blank document.
 
 ### Changes
 

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

@@ -526,14 +526,15 @@ export default {
           draft: true
         });
 
+        this.currentId = docData._id;
         if (docData.archived) {
           this.restoreOnly = true;
         } else {
           this.restoreOnly = false;
         }
         const canEdit = docData._edit || this.moduleOptions.canEdit;
         this.readOnly = canEdit === false;
-        if (canEdit && !await this.lock(this.getOnePath, this.currentId)) {
+        if (canEdit && !await this.lock(this.getOnePath)) {
           this.lockNotAvailable();
         }
       } catch {
@@ -860,10 +861,11 @@ export default {
       this.modal.showModal = false;
     },
     async switchLocale({
-      locale, localized, save
+      locale, save, localized, toLocalize
     }) {
+      let saved;
       if (save) {
-        const saved = await this.saveHandler('onSave', {
+        saved = await this.saveHandler('onSave', {
           keepOpen: true,
           andPublish: false
         });
@@ -874,18 +876,37 @@ export default {
           this.referenceDocId = saved._id;
         }
       }
-      this.updateModalData(this.modalData.id, { locale });
-      this.localeSwitched = locale !== apos.i18n.locale;
-      this.published = null;
       if (localized) {
         this.currentId = localized._id;
+        this.switchModalLocale(locale.name);
         await this.instantiateExistingDoc();
-      } else {
+        return;
+      }
+      if (!toLocalize) {
+        this.switchModalLocale(locale.name);
         this.currentId = '';
         this.docType = this.moduleName;
         await this.instantiateNewDoc();
+        return;
+      }
+
+      const isLocalized = await apos.modal.execute('AposI18nLocalize', {
+        doc: saved || this.original,
+        locale,
+        moduleName: this.moduleName,
+        shouldRedirect: false
+      });
+
+      if (isLocalized) {
+        this.switchModalLocale(locale.name);
+        await this.instantiateExistingDoc();
       }
     },
+    switchModalLocale(locale) {
+      this.updateModalData(this.modalData.id, { locale });
+      this.localeSwitched = locale !== apos.i18n.locale;
+      this.published = null;
+    },
     getRequestBody({ newInstance = false, update = false }) {
       const body = newInstance
         ? { _newInstance: true }

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

@@ -16,11 +16,11 @@
     >
       <AposLocalePicker
         :current-locale="locale"
-        :localized="localized"
+        :localized="docLocalized"
         :forbidden="forbidden"
         :forbidden-tooltip="forbiddenTooltip"
         :is-open="isOpen"
-        :show-localized="showLocalized"
+        :show-localized="!isManager"
         @switch-locale="switchLocale"
       />
     </AposContextMenu>
@@ -53,19 +53,18 @@ const props = defineProps({
     type: Boolean,
     required: true
   },
-  showLocalized: {
+  isManager: {
     type: Boolean,
-    default: true
+    default: false
   }
 });
 
 const $t = inject('i18n');
 const i18nAction = apos.modules['@apostrophecms/i18n'].action;
-const forbiddenTooltip = $t('apostrophe:localeSwitcherPermissionToCreate', {
-  docType: props.moduleOptions.label.toLowerCase()
-});
+const docType = $t(props.moduleOptions.label)?.toLowerCase();
+const forbiddenTooltip = $t('apostrophe:localeSwitcherPermissionToCreate', { docType });
 const menu = ref(null);
-const localized = ref({});
+const docLocalized = ref({});
 const forbidden = ref([]);
 const isOpen = ref(false);
 const button = computed(() => {
@@ -91,7 +90,7 @@ async function open() {
     const docs = await apos.http.get(
     `${props.moduleOptions.action}/${props.docId}/locales`, { busy: true }
     );
-    localized.value = Object.fromEntries(
+    docLocalized.value = Object.fromEntries(
       docs.results
         .filter(doc => doc.aposLocale.endsWith(':draft'))
         .map(doc => [ doc.aposLocale.split(':')[0], doc ])
@@ -106,7 +105,7 @@ async function open() {
 
 async function checkCreatePermission() {
   const localesWithNoDocs = Object.keys(apos.i18n.locales)
-    .filter((locale) => !localized.value[locale]);
+    .filter((locale) => !docLocalized.value[locale]);
 
   const allowed = await apos.http.get(`${i18nAction}/locales-permissions`, {
     qs: {
@@ -131,29 +130,58 @@ async function switchLocale(locale) {
     return;
   }
 
+  if (props.isManager) {
+    emit('switch-locale', { locale });
+    return;
+  }
+
   const save = props.isModified
     ? await apos.confirm({
       heading: 'apostrophe:unsavedChanges',
-      description: $t(
-        'apostrophe:localeSwitcherDiscardChangesPrompt',
-        { docType: props.moduleOptions.label.toLowerCase() }
-      ),
+      description: 'apostrophe:localeSwitcherDiscardChangesPrompt',
       negativeLabel: 'apostrophe:localeSwitcherDiscardChangesNegative',
       affirmativeLabel: 'apostrophe:localeSwitcherDiscardChangesAffirmative',
       icon: false
     }, {
       hasCloseButton: true,
-      tiny: true
+      tiny: true,
+      interpolate: {
+        docType
+      }
     })
     : false;
 
   if (save === null) {
     return;
   }
 
+  const docExist = docLocalized.value[props.locale];
+  const isDocLocalized = docLocalized.value[locale.name];
+  const toLocalize = (docExist && !isDocLocalized)
+    ? await apos.confirm({
+      heading: 'apostrophe:switchLocalesAndLocalizeDoc',
+      description: 'apostrophe:notInLocaleDoc',
+      negativeLabel: 'apostrophe:noCreateBlankDoc',
+      affirmativeLabel: 'apostrophe:yesLocalizeAndSwitchLocalesDoc'
+    }, {
+      hasCloseButton: true,
+      tiny: true,
+      interpolate: {
+        docType,
+        label: locale.label,
+        currentLocale: props.locale
+      }
+    })
+    : false;
+
+  if (toLocalize === null) {
+    return;
+  }
+
   emit('switch-locale', {
-    locale: locale.name,
-    localized: localized.value[locale.name],
+    locale,
+    localized: docLocalized.value[locale.name],
+    toLocalize,
     save
   });
 }

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

@@ -62,9 +62,9 @@
   "batchPublishCompleted": "{{ count }} {{ type }} veröffentlicht.",
   "batchPublishProgress": "Veröffentlichung {{ type }}...",
   "batchRestoreCompleted": "{{ count }} {{ type }} wiederhergestellt.",
+  "batchRestoreProgress": "Wiederherstellung {{ type }}...",
   "batchTagProgress": "Taggen von {{ count }} {{ type }}...",
   "batchUntagProgress": "Entfernen der Markierung von {{ count }} {{ type }}...",
-  "batchRestoreProgress": "Wiederherstellung {{ type }}...",
   "breakpointPreviewClear": "Klarer Haltepunkt",
   "breakpointPreviewDesktop": "Desktop",
   "breakpointPreviewExit": "Beenden",
@@ -85,9 +85,9 @@
   "clearSelection": "Auswahl löschen",
   "close": "Schliessen",
   "closeGlobal": "Globale Einstellungen schliessen",
+  "collapseAll": "Alles einklappen",
   "colorFieldClickToSelect": "Klicken, um eine Farbe auszuwählen",
   "colorFieldColorValue": "Farbe {{ color }}.",
-  "collapseAll": "Alles einklappen",
   "commandMenuArchiveSelected": "Archiv ausgewählt",
   "commandMenuContent": "Inhalt",
   "commandMenuCreateNew": "Neuen {{ type }} erstellenCreate new {{ type }}",
@@ -114,6 +114,7 @@
   "commandMenuWidgetDuplicate": "Duplizieren Widget",
   "commandMenuWidgetPaste": "Einfügen Widget",
   "commandMenuWidgetRemove": "Entfernen Widget",
+  "confirm": "Bestätigen",
   "confirmArchive": "{{ type }} {{ title }} archivieren?",
   "confirmSettings": "Einstellungen bestätigen",
   "contentArchived": "Inhalt archiviert",
@@ -354,8 +355,8 @@
   "mergeCells": "Zellen zusammenführen",
   "minLabel": "Min:",
   "minSize": "Minimale Grösse {{ width }}x{{ height }}",
-  "minimumSize": "Mindestgröße von {{ width }} x {{ height }} px",
   "minUi": "Min: {{ number }}",
+  "minimumSize": "Mindestgröße von {{ width }} x {{ height }} px",
   "modalBreadcrumbsDefaultLabel": "Eine Bezeichnung festlegen",
   "modalTabsError": "Fehler",
   "modalTabsErrors": "Fehler",
@@ -375,6 +376,7 @@
   "next": "Weiter",
   "nextPage": "Nächste Seite",
   "no": "Nein",
+  "noCreateBlankDoc": "Nein, leeres {{ docType }} erstellen",
   "noDraftSubmissions": "Keine Entwürfe",
   "noItemsAdded": "Keine Elemente hinzugefügt",
   "noItemsSelected": "Keine Elemente ausgewählt",
@@ -390,6 +392,7 @@
   "notFoundPageStatusCode": "404",
   "notFoundPageTitle": "404 - Seite nicht gefunden",
   "notInLocale": "Die Seite existiert nicht in {{ label }}. Aus {{ currentLocale }} übersetzen?",
+  "notInLocaleDoc": "Das aktuelle {{ docType }} existiert nicht in {{ label }}. Version aus {{ currentLocale }} lokalisieren?",
   "notYetPublished": "Dieses Dokument wurde noch nicht veröffentlicht.",
   "notificationClearEventError": "Fehler beim Löschen der Benachrichtigung",
   "nudgeDown": "Nach unten verschieben",
@@ -399,6 +402,7 @@
   "oembedTypeNotSupported": "Einbettungstyp nicht unterstützt",
   "oembedVideoUrlInvalid": "Video-URL ungültig",
   "office": "Büro",
+  "ok": "OK",
   "openGlobal": "Globale Einstellungen öffnen",
   "openLinkInNewTab": "Link in neuem Tab öffnen",
   "page": "Seite",
@@ -572,6 +576,7 @@
   "subscript": "Tiefgestellt",
   "suggestionsHeader": "Probiere einen der folgenden Vorschläge:",
   "superscript": "Hochgestellt",
+  "switchLocalesAndLocalizeDoc": "Sprache wechseln und {{ docType }} für {{ label }} lokalisieren?",
   "switchLocalesAndLocalizePage": "Sprache ändern zu {{ label }}?",
   "table": "Tabelle",
   "tableDescription": "Fügen Sie tabellarische Inhalte zu Ihrer Seite hinzu",
@@ -651,6 +656,7 @@
   "willMoveImageToArchive": "Bild ins Archiv verschieben.",
   "yes": "Ja",
   "yesLocalizeAndSwitchLocales": "Ja, diese Seite übersetzen und zu der Sprache wechseln.",
+  "yesLocalizeAndSwitchLocalesDoc": "Ja, dieses {{ docType }} lokalisieren und Sprache wechseln",
   "youTookControl": "Du hast die Kontrolle über dieses Dokument in einer anderen Registerkarte oder einem anderen Fenster übernommen. Ein Dokument kann immer nur an einer Stelle bearbeitet werden.",
   "yourDevice": "Ihr Gerät"
 }

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

@@ -87,9 +87,9 @@
   "clearSelection": "Clear Selection",
   "close": "Close",
   "closeGlobal": "Close Global Site Settings",
+  "collapseAll": "Collapse all",
   "colorFieldClickToSelect": "Click to select a color",
   "colorFieldColorValue": "Color {{ color }}.",
-  "collapseAll": "Collapse all",
   "commandMenuArchiveSelected": "Archive selected",
   "commandMenuContent": "Content",
   "commandMenuCreateNew": "Create new {{ type }}",
@@ -116,6 +116,7 @@
   "commandMenuWidgetDuplicate": "Duplicate Widget",
   "commandMenuWidgetPaste": "Paste Widget",
   "commandMenuWidgetRemove": "Remove Widget",
+  "confirm": "Confirm",
   "confirmArchive": "You are going to archive the {{ type }} {{ title }}.",
   "confirmSettings": "Confirm Settings",
   "contentArchived": "Content Archived",
@@ -380,6 +381,7 @@
   "next": "Next",
   "nextPage": "Next Page",
   "no": "No",
+  "noCreateBlankDoc": "No, create a blank {{ docType }}",
   "noDraftSubmissions": "No Draft Submissions to Manage",
   "noItemsAdded": "No Items Added",
   "noItemsSelected": "No Items Selected",
@@ -395,6 +397,7 @@
   "notFoundPageStatusCode": "404",
   "notFoundPageTitle": "404 - Page not found",
   "notInLocale": "The current page doesn’t exist in {{ label }}. Localize the version from {{ currentLocale }}?",
+  "notInLocaleDoc": "The current {{ docType }} doesn’t exist in {{ label }}. Localize the version from {{ currentLocale }}?",
   "notYetPublished": "This document hasn't been published yet.",
   "notificationClearEventError": "There was an error clearing a registered notification event.",
   "nudgeDown": "Nudge Down",
@@ -404,6 +407,7 @@
   "oembedTypeNotSupported": "Embed type not supported",
   "oembedVideoUrlInvalid": "Video URL invalid",
   "office": "Office",
+  "ok": "OK",
   "openGlobal": "Open Global Site Settings",
   "openLinkInNewTab": "Open link in new tab",
   "page": "Page",
@@ -578,6 +582,7 @@
   "suggestionsHeader": "Try one of these suggestions:",
   "superscript": "Superscript",
   "switchLocalesAndLocalizePage": "Switch locales and localize page to {{ label }}?",
+  "switchLocalesAndLocalizeDoc": "Switch locales and localize {{ docType }} to {{ label }}?",
   "table": "Table",
   "tableDescription": "Add tabular content to your page",
   "tableImport": "Import Table",
@@ -658,6 +663,7 @@
   "willMoveImageToArchive": "This will move the image to the archive.",
   "yes": "Yes",
   "yesLocalizeAndSwitchLocales": "Yes, localize this page and switch locales",
+  "yesLocalizeAndSwitchLocalesDoc": "Yes, localize this {{ docType }} and switch locales",
   "youTookControl": "You took control of this document in another tab or window. A document can only be edited in one place at a time.",
   "yourDevice": "your device"
 }