@localazy/strapi-plugin 0.1.15 → 0.1.16

package/.strapi-updater.json

@@ -0,0 +1,4 @@
+{
+	"latest": "3.6.11",
+	"lastUpdateCheck": 1694088415931
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@localazy/strapi-plugin",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "The official Strapi Plugin by Localazy.",
   "strapi": {
     "name": "localazy",
@@ -54,7 +54,7 @@
     "@strapi-community/eslint-config": "^0.4.3",
     "eslint": "^8.32.0",
     "eslint-plugin-jest": "^27.2.1",
-    "jest": "^29.3.1"
+    "jest": "^29.6.4"
   },
   "maintainers": [
     {

package/server/controllers/localazy-transfer-controller.js

@@ -310,35 +310,39 @@ module.exports = {
     let languagesCodes = projectLanguagesWithoutSourceLanguage.map(
       (language) => language.code
     );
-    // process filtered languages only / keep all of empty!
+    // process filtered languages only / keep all if empty!
     languagesCodes = await getFilteredLanguagesCodesForDownload(languagesCodes);
 
     /**
      * Iterate over languages and create the ones that are not present in Strapi
      */
     const strapiUnsupportedLanguages = []; // do not iterate over these languages later
+    const strapiLocales = await StrapiI18nService.getLocales(ctx);
     for (const isoLocalazy of languagesCodes) {
       try {
+        const isoStrapi = isoLocalazyToStrapi(isoLocalazy);
+        const strapiLocale = strapiLocales.find(
+          (locale) => locale.code === isoStrapi
+        );
+        // skip creating locale if it already exists
+        if (strapiLocale) {
+          strapi.log.info(`The Localazy locale ${isoLocalazy} already exists.`);
+          continue;
+        }
+
         const newLocaleCode = await StrapiI18nService.createStrapiLocale(
           ctx,
           isoLocalazy
         );
         messageReport.push(`Created locale ${newLocaleCode}`);
       } catch (e) {
-        if (
-          e.name === "ApplicationError" &&
-          e.message === "This locale already exists"
-        ) {
-          strapi.log.info(`The Localazy locale ${isoLocalazy} already exists.`);
-        } else {
-          strapi.log.error(e.message);
-        }
+        strapi.log.error(e.message);
         if (e.name === "ValidationError") {
           // store unsupported language code
           strapiUnsupportedLanguages.push(isoLocalazy);
-          messageReport.push(
-            `Language ${isoLocalazy} is not supported by Strapi`
-          );
+          messageReport.push(`Language ${isoLocalazy} is not supported by Strapi`);
+        } else {
+          messageReport.push(e.message);
         }
       }
     }
@@ -391,16 +395,7 @@ module.exports = {
         );
 
         if (typeof modelContentTransferSetup !== "undefined" && shouldSetDownloadedProperty(modelContentTransferSetup, parsedKey.rest)) {
-          const parsedKeyRestWithoutComponents = parsedKey.rest.map((segment) => {
-            const semicolonIndex = segment.indexOf(";");
-
-            if (semicolonIndex === -1) {
-              return segment;
-            }
-
-            return segment.substring(0, semicolonIndex);
-          });
-
+          const parsedKeyRestWithoutComponents = parsedKey.rest;
           const setKey = [
             isoStrapi,
             parsedKey.uid,
@@ -482,6 +477,7 @@ module.exports = {
               } catch (e) {
                 success = false;
                 strapi.log.error(e.message);
+                strapi.log.error(JSON.stringify(e.details?.errors || {}));
                 messageReport.push(
                   `Cannot create an entry in ${isoStrapi} for ${uid}[${baseEntry.id}]: ${e.message}`
                 );
@@ -508,6 +504,7 @@ module.exports = {
               } catch (e) {
                 success = false;
                 strapi.log.error(e.message);
+                strapi.log.error(JSON.stringify(e.details?.errors || {}));
                 messageReport.push(
                   `Cannot update an ${uid}[${baseEntryCurrentLanguageLocalizationInfo.id}] (${isoStrapi}): ${e.message}`
                 );

package/server/services/strapi-i18n-service.js

@@ -2,9 +2,8 @@
 
 const { isoLocalazyToStrapi } = require("../utils/iso-locales-utils.js");
 const intlDisplayName = require("../utils/intl-display-name.js");
-const merge = require("lodash/merge");
-const cloneDeep = require("lodash/cloneDeep");
 const omitDeep = require("../utils/omit-deep.js");
+const { forEach, find } = require("lodash")
 
 module.exports = ({ strapi }) => ({
   async getLocales(ctx = {}) {
@@ -86,14 +85,12 @@ module.exports = ({ strapi }) => ({
       const newEntryLocale = newEntry.locale;
       const filteredNewEntry = omitDeep(newEntry, [
         "locale",
-        "id",
         "createdAt",
-        // "publishedAt",
         "updatedAt",
       ]);
       filteredNewEntry.locale = newEntryLocale;
       // * sets as draft (no timestamp)
-      // ! do not completely omit as it won't process the required fields
+      // do not completely omit as it won't process the required fields
       filteredNewEntry.publishedAt = null;
 
       newLocalizationCtx.request.body = filteredNewEntry;
@@ -105,9 +102,8 @@ module.exports = ({ strapi }) => ({
         baseEntry.id,
         newEntryLocale
       );
-      const mergedEntry = merge(cloneDeep(baseEntry), insertedEntry);
 
-      return mergedEntry;
+      return insertedEntry
     } catch (e) {
       strapi.log.error(e);
       throw e;
@@ -115,9 +111,28 @@ module.exports = ({ strapi }) => ({
   },
   async updateLocalizationForAnExistingEntry(uid, updateEntryId, data) {
     try {
+
       const StrapiService = strapi.plugin("localazy").service("strapiService");
+      const strapiContentTypesModels = await StrapiService.getModels();
       const populate = await StrapiService.getPopulateObject(uid);
 
+      // Bugfix by <emanuele.c@dacoco.io>:
+      // Prevents IDs to be appended when updating a localized entry. When IDs are present
+      // Strapi attempts to update a not yet existent ID into the DB
+      if (strapiContentTypesModels) {
+        const filtered = find(strapiContentTypesModels, (model) => model.uid === uid)
+        if (filtered?.attributes) {
+          for (let attribute in filtered.attributes) {
+            if (filtered.attributes[attribute]?.type === 'dynamiczone') {
+              if (!populate[attribute] || populate[attribute] !== 'deep') {
+                populate[attribute] = 'deep'
+              }
+              forEach(data[attribute], (prop) => { if (prop?.id) delete prop.id })
+            }
+          }
+        }
+      }
+
       const updatedEntry = await strapi.entityService.update(
         uid,
         updateEntryId,

package/server/services/strapi-localazy-i18n-service.js

@@ -2,6 +2,8 @@
 
 const parsedLocalazyEntryToCreateEntry = require("../utils/parsed-localazy-entry-to-create-entry");
 const parsedLocalazyEntryToUpdateEntry = require("../utils/parsed-localazy-entry-to-update-entry");
+const omitDeep = require("../utils/omit-deep");
+const { merge } = require("lodash");
 
 module.exports = ({ strapi }) => ({
   async createEntry(
@@ -13,7 +15,8 @@ module.exports = ({ strapi }) => ({
     isoStrapi,
   ) {
     // * The entry will be created and then updated as the structures differ
-    // * It's one extra database call, but the complexity of recursive code to maintain does worth it
+    // * It's one extra database call, but the amount of recursive code's complexity is reduced
+
 
     // Strapi i18n Service
     const StrapiI18nService = strapi
@@ -28,12 +31,35 @@ module.exports = ({ strapi }) => ({
       isoStrapi,
     );
 
+    const filteredBaseEntry = omitDeep(baseEntry, [
+      "locale",
+      "localizations",
+      "createdAt",
+      "createdBy",
+      "updatedAt",
+      "updatedBy",
+      "publishedAt",
+    ]);
+
+    let mergedCreateEntry = {};
+    merge(mergedCreateEntry, filteredBaseEntry, createEntry);
+    mergedCreateEntry = omitDeep(mergedCreateEntry, [
+      "locale",
+      "localizations",
+      "createdAt",
+      "createdBy",
+      "updatedAt",
+      "updatedBy",
+      "publishedAt",
+    ]);
+
+    mergedCreateEntry.locale = isoStrapi;
     const createdEntry =
       await StrapiI18nService.createLocalizationForAnExistingEntry(
         ctx,
         uid,
         baseEntry,
-        createEntry,
+        mergedCreateEntry,
       );
 
     await this.updateEntry(

package/server/tests/fixtures/parsed-localazy-entry-to-create-entry-lesson-dz.js

@@ -1,10 +1,9 @@
 const parsedLocalazyEntry = {
-  title: "Test: Sčítání",
+  title: "Test: Přidání",
   description: "Otestujte si své dovednosti, které jsme se naučili v předchozí lekci.",
-  lesson_type: [
-    null,
-    {
-      title: "Vyberte správnou odpověď",
+  lesson_type: {
+    "1;lesson.quiz": {
+      title: "Zvolte správnou odpověď",
       questions: [
         null,
         {
@@ -14,7 +13,7 @@ const parsedLocalazyEntry = {
           question: "5 + 15 = ",
         },
         {
-          question: "Kolik pohárů je na fotce?",
+          question: "Kolik šálků je na fotografii?",
         },
       ],
       answers: [
@@ -30,7 +29,7 @@ const parsedLocalazyEntry = {
         },
       ],
     },
-  ],
+  },
 };
 
 const baseEntry = {
@@ -40,7 +39,7 @@ const baseEntry = {
   duration: "02:00:00.000",
   description: "Test your skills we've learnt in the previous lesson.",
   createdAt: "2022-10-19T09:56:10.979Z",
-  updatedAt: "2022-10-19T12:13:58.102Z",
+  updatedAt: "2023-09-07T10:33:16.442Z",
   publishedAt: null,
   locale: "en",
   lesson_type: [
@@ -52,7 +51,7 @@ const baseEntry = {
         {
           id: 1,
           question: "1 + 1 = ",
-          is_active: true,
+          is_active: null,
           question_number: 1,
           assets: null,
         },
@@ -66,7 +65,7 @@ const baseEntry = {
         {
           id: 3,
           question: "How many cups are on the photo?",
-          is_active: false,
+          is_active: true,
           question_number: 3,
           assets: [
             {
@@ -132,6 +131,7 @@ const baseEntry = {
               provider_metadata: null,
               createdAt: "2022-10-19T09:57:52.620Z",
               updatedAt: "2022-10-19T09:57:52.620Z",
+              folderPath: null,
             },
           ],
         },
@@ -141,18 +141,21 @@ const baseEntry = {
           id: 1,
           question_number: 1,
           correct_answer: "2",
+          pick_answer: "C",
           answer_asset: null,
         },
         {
           id: 2,
           question_number: 2,
           correct_answer: "20",
+          pick_answer: null,
           answer_asset: null,
         },
         {
           id: 3,
           question_number: 3,
           correct_answer: "15",
+          pick_answer: "A",
           answer_asset: null,
         },
       ],
@@ -160,39 +163,39 @@ const baseEntry = {
   ],
   localizations: [
     {
-      id: 4,
-      title: "Test: Sčítání",
+      id: 56,
+      title: "Test: Přidání",
       start_time: "2022-10-01T13:00:00.000Z",
       duration: "02:00:00.000",
       description: "Otestujte si své dovednosti, které jsme se naučili v předchozí lekci.",
-      createdAt: "2022-10-19T12:13:58.101Z",
-      updatedAt: "2022-10-20T07:58:33.627Z",
+      createdAt: "2023-09-07T10:33:16.436Z",
+      updatedAt: "2023-09-07T10:53:54.311Z",
       publishedAt: null,
       locale: "cs",
       lesson_type: [
         {
           __component: "lesson.quiz",
-          id: 2,
-          title: "Vyberte správnou odpověď",
+          id: 34,
+          title: "Zvolte správnou odpověď",
           questions: [
             {
-              id: 4,
+              id: 100,
               question: "1 + 1 = ",
-              is_active: true,
+              is_active: null,
               question_number: 1,
               assets: null,
             },
             {
-              id: 5,
+              id: 101,
               question: "5 + 15 = ",
               is_active: false,
               question_number: 2,
               assets: null,
             },
             {
-              id: 6,
-              question: "Kolik pohárů je na fotce?",
-              is_active: false,
+              id: 102,
+              question: "Kolik šálků je na fotografii?",
+              is_active: true,
               question_number: 3,
               assets: [
                 {
@@ -258,27 +261,31 @@ const baseEntry = {
                   provider_metadata: null,
                   createdAt: "2022-10-19T09:57:52.620Z",
                   updatedAt: "2022-10-19T09:57:52.620Z",
+                  folderPath: null,
                 },
               ],
             },
           ],
           answers: [
             {
-              id: 4,
+              id: 100,
               question_number: 1,
               correct_answer: "2",
+              pick_answer: "C",
               answer_asset: null,
             },
             {
-              id: 5,
+              id: 101,
               question_number: 2,
               correct_answer: "20",
+              pick_answer: null,
               answer_asset: null,
             },
             {
-              id: 6,
+              id: 102,
               question_number: 3,
               correct_answer: "15",
+              pick_answer: "A",
               answer_asset: null,
             },
           ],
@@ -292,7 +299,7 @@ const baseEntry = {
           duration: "02:00:00.000",
           description: "Test your skills we've learnt in the previous lesson.",
           createdAt: "2022-10-19T09:56:10.979Z",
-          updatedAt: "2022-10-19T12:13:58.102Z",
+          updatedAt: "2023-09-07T10:33:16.442Z",
           publishedAt: null,
           locale: "en",
           lesson_type: [
@@ -304,7 +311,7 @@ const baseEntry = {
                 {
                   id: 1,
                   question: "1 + 1 = ",
-                  is_active: true,
+                  is_active: null,
                   question_number: 1,
                 },
                 {
@@ -316,7 +323,7 @@ const baseEntry = {
                 {
                   id: 3,
                   question: "How many cups are on the photo?",
-                  is_active: false,
+                  is_active: true,
                   question_number: 3,
                 },
               ],
@@ -325,36 +332,39 @@ const baseEntry = {
                   id: 1,
                   question_number: 1,
                   correct_answer: "2",
+                  pick_answer: "C",
                 },
                 {
                   id: 2,
                   question_number: 2,
                   correct_answer: "20",
+                  pick_answer: null,
                 },
                 {
                   id: 3,
                   question_number: 3,
                   correct_answer: "15",
+                  pick_answer: "A",
                 },
               ],
             },
           ],
           localizations: [
             {
-              id: 4,
-              title: "Test: Sčítání",
+              id: 56,
+              title: "Test: Přidání",
               start_time: "2022-10-01T13:00:00.000Z",
               duration: "02:00:00.000",
               description: "Otestujte si své dovednosti, které jsme se naučili v předchozí lekci.",
-              createdAt: "2022-10-19T12:13:58.101Z",
-              updatedAt: "2022-10-20T07:58:33.627Z",
+              createdAt: "2023-09-07T10:33:16.436Z",
+              updatedAt: "2023-09-07T10:53:54.311Z",
               publishedAt: null,
               locale: "cs",
               lesson_type: [
                 {
                   __component: "lesson.quiz",
-                  id: 2,
-                  title: "Vyberte správnou odpověď",
+                  id: 34,
+                  title: "Zvolte správnou odpověď",
                 },
               ],
               createdBy: null,
@@ -367,7 +377,7 @@ const baseEntry = {
                   duration: "02:00:00.000",
                   description: "Test your skills we've learnt in the previous lesson.",
                   createdAt: "2022-10-19T09:56:10.979Z",
-                  updatedAt: "2022-10-19T12:13:58.102Z",
+                  updatedAt: "2023-09-07T10:33:16.442Z",
                   publishedAt: null,
                   locale: "en",
                 },