@raketa-cloud/admin 1.9.3 → 1.9.5

package/src/tests/handlers/resources/TranslationsHandler.test/create.test.js

@@ -68,6 +68,72 @@ describe("Resource Translations Handler", () => {
     });
   });
 
+  test("create fails with locale errors segmented by locale", async () => {
+    const resource = Factory.build("resource", {
+      translations: {},
+      categories: [{ id: "cat1" }],
+    });
+    const params = {
+      languages: ["fr", "es"],
+    };
+
+    const ctx = buildCtx(params, resource);
+
+    jest.spyOn(ctx.client.resources, "find").mockImplementation(() => resource);
+
+    const localeErrors = [
+      {
+        locale: "fr",
+        errors: [{ key: "title", message: "cannot be blank" }],
+      },
+      {
+        locale: "es",
+        errors: [{ key: "slug", message: "already taken" }],
+      },
+    ];
+
+    jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: null,
+        errors: null,
+        localeErrors,
+      }));
+
+    const result = await TranslationsHandler.create(ctx);
+
+    expect(result).toEqual({
+      assigns: {
+        resource: {
+          title: resource.title,
+          tags: [],
+          visibility: "private",
+          slug: resource.slug,
+          settings: resource.settings,
+          widgets: resource.widgets,
+          categories: ["cat1"],
+          translations: {},
+          languages: ["fr", "es"],
+        },
+        blueprint: resource,
+        targetLocale: "en",
+        errors: {
+          resource: {},
+          localeErrors: [
+            {
+              locale: "fr",
+              errors: { title: "cannot be blank" },
+            },
+            {
+              locale: "es",
+              errors: { slug: "already taken" },
+            },
+          ],
+        },
+      },
+    });
+  });
+
   test("create fails with translation errors", async () => {
     const resource = Factory.build("resource", {
       translations: {},
@@ -84,14 +150,12 @@ describe("Resource Translations Handler", () => {
       .mockImplementation(() => resource);
 
     const translationErrors = [{ key: "title", message: "cannot be blank" }];
-    const mockTranslateBatch = jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation((parentId, locales) =>
-        locales.map(() => ({
-          resource: null,
-          errors: translationErrors,
-        })),
-      );
+    const mockMultiTranslate = jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: null,
+        errors: translationErrors,
+      }));
 
     const mockFormatErrors = jest
       .spyOn(ctx.client.resources, "formatErrors")
@@ -100,7 +164,7 @@ describe("Resource Translations Handler", () => {
     const result = await TranslationsHandler.create(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
-    expect(mockTranslateBatch).toHaveBeenCalled();
+    expect(mockMultiTranslate).toHaveBeenCalled();
     expect(mockFormatErrors).toHaveBeenCalledWith(translationErrors);
 
     expect(result).toEqual({
@@ -117,7 +181,7 @@ describe("Resource Translations Handler", () => {
           languages: ["fr"],
         },
         blueprint: resource,
-        targetLocale: "fr",
+        targetLocale: "en",
         errors: { resource: { title: "cannot be blank" } },
       },
     });
@@ -139,14 +203,14 @@ describe("Resource Translations Handler", () => {
       .spyOn(ctx.client.resources, "find")
       .mockImplementation(() => resource);
 
-    const mockTranslateBatch = jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation((parentId, locales) =>
-        locales.map((locale) => ({
-          resource: { id: `translated-resource-${locale}` },
-          errors: null,
+    const mockMultiTranslate = jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation((parentId, locales) => ({
+        resources: locales.map((locale) => ({
+          id: `translated-resource-${locale}`,
         })),
-      );
+        errors: null,
+      }));
 
     const mockCreateRevisionBatch = jest
       .spyOn(ctx.client.resourceRevisions, "createBatch")
@@ -161,8 +225,8 @@ describe("Resource Translations Handler", () => {
 
     expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
 
-    expect(mockTranslateBatch).toHaveBeenCalledTimes(1);
-    expect(mockTranslateBatch).toHaveBeenCalledWith(
+    expect(mockMultiTranslate).toHaveBeenCalledTimes(1);
+    expect(mockMultiTranslate).toHaveBeenCalledWith(
       resource.id,
       ["fr", "es"],
       expect.objectContaining({
@@ -173,6 +237,7 @@ describe("Resource Translations Handler", () => {
       }),
       "article",
       undefined,
+      "en",
     );
 
     expect(mockCreateRevisionBatch).toHaveBeenCalledTimes(1);
@@ -210,22 +275,12 @@ describe("Resource Translations Handler", () => {
       .spyOn(ctx.client.resources, "find")
       .mockImplementation(() => resource);
 
-    const mockTranslateBatch = jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation(() => [
-        {
-          resource: {
-            id: "translated-resource-fr",
-            slug: "resource-slug",
-            visibility: "public",
-          },
-          errors: null,
-        },
-        {
-          resource: null,
-          errors: [{ key: "title", message: "invalid for spanish" }],
-        },
-      ]);
+    const mockMultiTranslate = jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: null,
+        errors: [{ key: "title", message: "invalid for spanish" }],
+      }));
 
     jest
       .spyOn(ctx.client.resources, "formatErrors")
@@ -235,7 +290,7 @@ describe("Resource Translations Handler", () => {
 
     expect(mockFind).toHaveBeenCalledWith(resource.id, "en", "article");
 
-    expect(mockTranslateBatch).toHaveBeenCalledWith(
+    expect(mockMultiTranslate).toHaveBeenCalledWith(
       resource.id,
       ["fr", "es"],
       expect.objectContaining({
@@ -246,6 +301,7 @@ describe("Resource Translations Handler", () => {
       }),
       "article",
       undefined,
+      "en",
     );
 
     expect(result).toEqual({
@@ -258,17 +314,11 @@ describe("Resource Translations Handler", () => {
           settings: resource.settings,
           widgets: resource.widgets,
           categories: ["some-category-uno"],
-          translations: {
-            fr: {
-              id: "translated-resource-fr",
-              slug: resource.slug,
-              visibility: resource.visibility,
-            },
-          },
+          translations: {},
           languages: ["fr", "es"],
         },
         blueprint: resource,
-        targetLocale: "es",
+        targetLocale: "en",
         errors: { resource: { title: "invalid for spanish" } },
       },
     });
@@ -288,17 +338,17 @@ describe("Resource Translations Handler", () => {
     jest.spyOn(ctx.client.resources, "find").mockImplementation(() => resource);
 
     jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation(() => [
-        {
-          resource: {
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: [
+          {
             id: "translated-resource-fr",
             slug: "resource-slug",
             visibility: "public",
           },
-          errors: null,
-        },
-      ]);
+        ],
+        errors: null,
+      }));
 
     const revisionErrors = [{ key: "base", message: "something went wrong" }];
     const mockCreateRevisionBatch = jest
@@ -365,12 +415,14 @@ describe("Resource Translations Handler", () => {
     const mockQuery = jest
       .spyOn(ctx.client.resources, "query")
       .mockImplementation(() => ({
-        translate0: {
-          resource: {
-            id: "translated-resource-fr",
-            slug: "resource-slug",
-            visibility: "public",
-          },
+        multiTranslateResource: {
+          resources: [
+            {
+              id: "translated-resource-fr",
+              slug: "resource-slug",
+              visibility: "public",
+            },
+          ],
           errors: null,
         },
       }));
@@ -378,23 +430,27 @@ describe("Resource Translations Handler", () => {
     const result = await TranslationsHandler.create(ctx);
 
     expect(mockQuery).toHaveBeenCalledWith(expect.any(String), {
-      input0: {
-        locale: "fr",
-        resource: {
-          categories: ["cat1"],
-          resourceType: "article",
-          settings:
-            '{"layout":"default","meta":{"title":"Open graph","description":"Open graph???","image":{}}}',
-          slug: "resource-slug",
-          tags: [],
-          title: "Resource Title",
-          visibility: "private",
-          widgets: "[]",
-        },
+      input: {
         sourceResourceId: "2",
+        translations: [
+          {
+            locale: "fr",
+            resource: {
+              categories: ["cat1"],
+              resourceType: "article",
+              settings:
+                '{"layout":"default","meta":{"title":"Open graph","description":"Open graph???","image":{}}}',
+              slug: "resource-slug",
+              tags: [],
+              title: "Resource Title",
+              visibility: "private",
+              widgets: "[]",
+            },
+          },
+        ],
         workflow: {
           previewUrl: expect.stringMatching(
-            /^https:\/\/example\.com\/fr\/magic-preview\/articles\/[A-Za-z0-9_-]+$/,
+            /^https:\/\/example\.com\/en\/magic-preview\/articles\/[A-Za-z0-9_-]+$/,
           ),
           type: "LOKALISE_TT_AI",
         },

package/src/tests/handlers/resources/TranslationsHandler.test/edge_cases.test.js

@@ -114,21 +114,25 @@ describe("Resource Translations Handler create", () => {
     });
 
     jest.spyOn(ctx.client.resources, "find").mockImplementation(() => resource);
-    const mockBatch = jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation(() => [{ resource: { id: "fr-1" }, errors: null }]);
+    const mockMultiTranslate = jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: [{ id: "fr-1" }],
+        errors: null,
+      }));
     jest
       .spyOn(ctx.client.resourceRevisions, "createBatch")
       .mockImplementation(() => [{ errors: null }]);
 
     const result = await TranslationsHandler.create(ctx);
 
-    expect(mockBatch).toHaveBeenCalledWith(
+    expect(mockMultiTranslate).toHaveBeenCalledWith(
       resource.id,
       ["fr"],
       expect.anything(),
       "article",
       undefined,
+      "en",
     );
     expect(result).toEqual({
       redirect: `/en/articles/${resource.id}/translations?translations=fr:fr-1`,
@@ -150,8 +154,11 @@ describe("Resource Translations Handler create", () => {
       .spyOn(ctx.client.resources, "find")
       .mockImplementation(() => blueprint);
     jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation(() => [{ resource: { id: "fr-1" }, errors: null }]);
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: [{ id: "fr-1" }],
+        errors: null,
+      }));
     const mockRevisions = jest.spyOn(
       ctx.client.resourceRevisions,
       "createBatch",
@@ -195,8 +202,8 @@ describe("Resource Translations Handler create", () => {
 
     jest.spyOn(ctx.client.resources, "find").mockImplementation(() => resource);
     jest
-      .spyOn(ctx.client.resources, "translateBatch")
-      .mockImplementation(() => null);
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({ resources: null, errors: null }));
     const mockFormatErrors = jest
       .spyOn(ctx.client.resources, "formatErrors")
       .mockImplementation(() => ({ languages: "translation failed" }));
@@ -210,4 +217,40 @@ describe("Resource Translations Handler create", () => {
       languages: "translation failed",
     });
   });
+
+  test("deduplicates languages when duplicate locales are provided in params", async () => {
+    const resource = Factory.build("resource", {
+      translations: {},
+      categories: [{ id: "cat1" }],
+    });
+    const ctx = buildCtx({
+      resource,
+      resourceParams: { resource: { languages: ["fr", "fr", "de"] } },
+    });
+
+    jest.spyOn(ctx.client.resources, "find").mockImplementation(() => resource);
+    const mockMultiTranslate = jest
+      .spyOn(ctx.client.resources, "multiTranslate")
+      .mockImplementation(() => ({
+        resources: [{ id: "fr-1" }, { id: "de-1" }],
+        errors: null,
+      }));
+    jest
+      .spyOn(ctx.client.resourceRevisions, "createBatch")
+      .mockImplementation(() => [{ errors: null }, { errors: null }]);
+
+    const result = await TranslationsHandler.create(ctx);
+
+    expect(mockMultiTranslate).toHaveBeenCalledWith(
+      resource.id,
+      ["fr", "de"],
+      expect.anything(),
+      "article",
+      undefined,
+      "en",
+    );
+    expect(result).toEqual({
+      redirect: `/en/articles/${resource.id}/translations?translations=fr:fr-1;de:de-1`,
+    });
+  });
 });

package/src/tests/routeCategoriesModule.test.js

@@ -21,7 +21,7 @@ describe("routeCategoriesModule", () => {
       {
         categoryType: "tag",
         categoryTypePlural: "tags",
-        views: "categories",
+        viewsFallback: "categories",
       },
     );
   });

package/src/tests/support/factory.js

@@ -87,16 +87,18 @@ const CONTENT_TASK = {
   failedAt: null,
   insertedAt: "2024-08-30T19:05:00Z",
   updatedAt: "2024-08-30T19:05:00Z",
-  resource: {
-    id: "123",
-    title: "Test Resource",
-    slug: "test-resource",
-    locale: "en",
-    visibility: "public",
-    resourceType: "page",
-    insertedAt: "2024-08-30T19:00:00Z",
-    updatedAt: "2024-08-30T19:05:00Z",
-  },
+  resources: [
+    {
+      id: "123",
+      title: "Test Resource",
+      slug: "test-resource",
+      locale: "en",
+      visibility: "public",
+      resourceType: "page",
+      insertedAt: "2024-08-30T19:00:00Z",
+      updatedAt: "2024-08-30T19:05:00Z",
+    },
+  ],
   lokaliseWorkflow: null,
 };