@raketa-cloud/admin 0.0.88 → 0.0.90

package/src/handlers/articles/TranslationsHandler.js

@@ -76,7 +76,28 @@ const create_form = async (ctx) => {
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
   const originalLocale = ctx.locale;
-  const blueprint = await ctx.client.articles.find(parent_id, ctx.locale);
+  const blueprint = await ctx.client.articles.find(parent_id, originalLocale);
+
+  if (!ctx.resourceParams?.resource?.languages) {
+    return {
+      assigns: {
+        resource: {
+          translations: blueprint.translations || {},
+          languages: [],
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.articles.formatErrors([
+            {
+              key: "languages",
+              message: "select at least one language for translation",
+            },
+          ]),
+        },
+      },
+    };
+  }
 
   const formLanguages = Array.isArray(ctx.resourceParams.resource.languages)
     ? ctx.resourceParams.resource.languages
@@ -98,18 +119,61 @@ const create = async (ctx) => {
     tags: [],
   };
 
+  const resource = ctx.client.articles.deepMerge(params, {
+    visibility: "private",
+  });
+
   const translationIds = [];
 
-  for (const locale of selectedLocales) {
-    const resource = ctx.client.articles.deepMerge(params, {
-      visibility: "private",
-    });
+  const translations = await ctx.client.articles.translateBatch(
+    parent_id,
+    selectedLocales,
+    resource
+  );
 
-    const { errors, article } = await ctx.client.articles.translate(
-      parent_id,
-      locale,
-      resource
-    );
+  if (!translations) {
+    return {
+      assigns: {
+        resource: {
+          ...resource,
+          translations: blueprint.translations || {},
+          languages: formLanguages,
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.articles.formatErrors([
+            {
+              key: "generalError",
+              message: "Failed to process translations",
+            },
+          ]),
+        },
+      },
+    };
+  }
+
+  for (let i = 0; i < translations.length; i++) {
+    const { article } = translations[i];
+    const locale = selectedLocales[i];
+
+    if (article) {
+      blueprint.translations = {
+        ...blueprint.translations,
+        [locale]: {
+          id: article.id,
+          slug: article.slug,
+          visibility: article.visibility,
+        },
+      };
+    }
+  }
+
+  const revisionInputs = [];
+
+  for (let i = 0; i < translations.length; i++) {
+    const { errors, article } = translations[i];
+    const locale = selectedLocales[i];
 
     if (errors) {
       return {
@@ -128,13 +192,15 @@ const create = async (ctx) => {
 
     if (article) {
       translationIds.push(`${locale}:${article.id}`);
+      revisionInputs.push({ articleId: article.id, locale });
     }
+  }
 
-    const { errors: revisionErrors } = await ctx.client.articleRevisions.create(
-      article.id,
-      locale
-    );
+  const revisionResults =
+    await ctx.client.articleRevisions.createBatch(revisionInputs);
 
+  for (let i = 0; i < revisionResults.length; i++) {
+    const { errors: revisionErrors } = revisionResults[i];
     if (revisionErrors) {
       return {
         assigns: {
@@ -144,7 +210,7 @@ const create = async (ctx) => {
             languages: formLanguages,
           },
           blueprint,
-          targetLocale: locale,
+          targetLocale: selectedLocales[i],
           errors: {
             resource: ctx.client.articles.formatErrors(revisionErrors),
           },

package/src/handlers/events/TranslationsHandler.js

@@ -78,6 +78,27 @@ const create = async (ctx) => {
   const originalLocale = ctx.locale;
   const blueprint = await ctx.client.events.find(parent_id, ctx.locale);
 
+  if (!ctx.resourceParams?.resource?.languages) {
+    return {
+      assigns: {
+        resource: {
+          translations: blueprint.translations || {},
+          languages: [],
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.events.formatErrors([
+            {
+              key: "languages",
+              message: "select at least one language for translation",
+            },
+          ]),
+        },
+      },
+    };
+  }
+
   const formLanguages = Array.isArray(ctx.resourceParams.resource.languages)
     ? ctx.resourceParams.resource.languages
     : [ctx.resourceParams.resource.languages].filter(Boolean);
@@ -100,18 +121,61 @@ const create = async (ctx) => {
     tags: [],
   };
 
+  const resource = ctx.client.events.deepMerge(params, {
+    visibility: "private",
+  });
+
   const translationIds = [];
 
-  for (const locale of selectedLocales) {
-    const resource = ctx.client.events.deepMerge(params, {
-      visibility: "private",
-    });
+  const translations = await ctx.client.events.translateBatch(
+    parent_id,
+    selectedLocales,
+    resource
+  );
 
-    const { errors, event } = await ctx.client.events.translate(
-      parent_id,
-      locale,
-      resource
-    );
+  if (!translations) {
+    return {
+      assigns: {
+        resource: {
+          ...resource,
+          translations: blueprint.translations || {},
+          languages: formLanguages,
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.events.formatErrors([
+            {
+              key: "generalError",
+              message: "Failed to process translations",
+            },
+          ]),
+        },
+      },
+    };
+  }
+
+  for (let i = 0; i < translations.length; i++) {
+    const { event } = translations[i];
+    const locale = selectedLocales[i];
+
+    if (event) {
+      blueprint.translations = {
+        ...blueprint.translations,
+        [locale]: {
+          id: event.id,
+          slug: event.slug,
+          visibility: event.visibility,
+        },
+      };
+    }
+  }
+
+  const revisionInputs = [];
+
+  for (let i = 0; i < translations.length; i++) {
+    const { errors, event } = translations[i];
+    const locale = selectedLocales[i];
 
     if (errors) {
       return {
@@ -130,13 +194,15 @@ const create = async (ctx) => {
 
     if (event) {
       translationIds.push(`${locale}:${event.id}`);
+      revisionInputs.push({ eventId: event.id, locale });
     }
+  }
 
-    const { errors: revisionErrors } = await ctx.client.eventRevisions.create(
-      event.id,
-      locale
-    );
+  const revisionResults =
+    await ctx.client.eventRevisions.createBatch(revisionInputs);
 
+  for (let i = 0; i < revisionResults.length; i++) {
+    const { errors: revisionErrors } = revisionResults[i];
     if (revisionErrors) {
       return {
         assigns: {
@@ -146,7 +212,7 @@ const create = async (ctx) => {
             languages: formLanguages,
           },
           blueprint,
-          targetLocale: locale,
+          targetLocale: selectedLocales[i],
           errors: {
             resource: ctx.client.events.formatErrors(revisionErrors),
           },

package/src/handlers/pages/TranslationsHandler.js

@@ -78,6 +78,27 @@ const create = async (ctx) => {
   const originalLocale = ctx.locale;
   const blueprint = await ctx.client.pages.find(parent_id, originalLocale);
 
+  if (!ctx.resourceParams?.resource?.languages) {
+    return {
+      assigns: {
+        resource: {
+          translations: blueprint.translations || {},
+          languages: [],
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.pages.formatErrors([
+            {
+              key: "languages",
+              message: "select at least one language for translation",
+            },
+          ]),
+        },
+      },
+    };
+  }
+
   const formLanguages = Array.isArray(ctx.resourceParams.resource.languages)
     ? ctx.resourceParams.resource.languages
     : [ctx.resourceParams.resource.languages].filter(Boolean);
@@ -95,23 +116,66 @@ const create = async (ctx) => {
     slug: blueprint.slug,
   };
 
+  const resource = ctx.client.pages.deepMerge(
+    {
+      settings: blueprint.settings,
+      widgets: blueprint.widgets,
+      categories: blueprint.categories.map((category) => category.id),
+    },
+    params
+  );
+
   const translationIds = [];
 
-  for (const locale of selectedLocales) {
-    const resource = ctx.client.pages.deepMerge(
-      {
-        settings: blueprint.settings,
-        widgets: blueprint.widgets,
-        categories: blueprint.categories.map((category) => category.id),
+  const translations = await ctx.client.pages.translateBatch(
+    parent_id,
+    selectedLocales,
+    resource
+  );
+
+  if (!translations) {
+    return {
+      assigns: {
+        resource: {
+          ...resource,
+          translations: blueprint.translations || {},
+          languages: formLanguages,
+        },
+        blueprint,
+        targetLocale: originalLocale,
+        errors: {
+          resource: ctx.client.pages.formatErrors([
+            {
+              key: "generalError",
+              message: "Failed to process translations",
+            },
+          ]),
+        },
       },
-      params
-    );
+    };
+  }
 
-    const { errors, page } = await ctx.client.pages.translate(
-      parent_id,
-      locale,
-      resource
-    );
+  for (let i = 0; i < translations.length; i++) {
+    const { page } = translations[i];
+    const locale = selectedLocales[i];
+
+    if (page) {
+      blueprint.translations = {
+        ...blueprint.translations,
+        [locale]: {
+          id: page.id,
+          slug: page.slug,
+          visibility: page.visibility,
+        },
+      };
+    }
+  }
+
+  const revisionInputs = [];
+
+  for (let i = 0; i < translations.length; i++) {
+    const { errors, page } = translations[i];
+    const locale = selectedLocales[i];
 
     if (errors) {
       return {
@@ -130,13 +194,15 @@ const create = async (ctx) => {
 
     if (page) {
       translationIds.push(`${locale}:${page.id}`);
+      revisionInputs.push({ pageId: page.id, locale });
     }
+  }
 
-    const { errors: revisionErrors } = await ctx.client.pageRevisions.create(
-      page.id,
-      locale
-    );
+  const revisionResults =
+    await ctx.client.pageRevisions.createBatch(revisionInputs);
 
+  for (let i = 0; i < revisionResults.length; i++) {
+    const { errors: revisionErrors } = revisionResults[i];
     if (revisionErrors) {
       return {
         assigns: {
@@ -146,7 +212,7 @@ const create = async (ctx) => {
             languages: formLanguages,
           },
           blueprint,
-          targetLocale: locale,
+          targetLocale: selectedLocales[i],
           errors: {
             resource: ctx.client.pages.formatErrors(revisionErrors),
           },

package/src/helpers/AuthHelper.js

@@ -33,12 +33,12 @@ const AuthHelper = {
     auth_callback_url,
   }) => {
     if (
-      [
+      ![
         gateway_url,
         gateway_project,
         gateway_user_pool,
         auth_callback_url,
-      ].join() === ""
+      ].every(Boolean)
     )
       throw new Error("Invalid ENVs for authentication configuration");
 

package/src/tests/handlers/TagsHandler.test/create.test.js

@@ -0,0 +1,96 @@
+import Tags from "../../../cloud/Tags";
+import TagsHandler from "../../../handlers/TagsHandler";
+import Factory from "../../support/factory";
+
+describe("Tags Handler", () => {
+  function buildCtx(tag) {
+    return {
+      client: {
+        tags: new Tags(() => ({}), "token"),
+      },
+      resourceParams: {
+        tag: {
+          name: tag.name,
+          slug: tag.slug,
+        },
+      },
+      locale: "en",
+    };
+  }
+
+  test("create successful", async () => {
+    const tag = Factory.build("tag", {
+      name: "Test Tag",
+      slug: "test-tag",
+    });
+    const ctx = buildCtx(tag);
+
+    const mockedCreate = jest
+      .spyOn(ctx.client.tags, "create")
+      .mockImplementation(() => ({ tag, errors: null }));
+
+    const result = await TagsHandler.create(ctx);
+
+    expect(mockedCreate).toHaveBeenCalledWith(
+      {
+        name: tag.name,
+        slug: tag.slug,
+      },
+      "en"
+    );
+
+    expect(result).toEqual({
+      redirect: "/en/tags",
+    });
+  });
+
+  test("create failed", async () => {
+    const tag = Factory.build("tag", {
+      name: "Test Tag",
+      slug: "test-tag",
+    });
+    const ctx = buildCtx(tag);
+
+    const errors = [{ key: "name", message: "already taken" }];
+
+    const mockedCreate = jest
+      .spyOn(ctx.client.tags, "create")
+      .mockImplementation(() => ({
+        tag: null,
+        errors,
+      }));
+
+    const mockedFormatErrors = jest
+      .spyOn(ctx.client.tags, "formatErrors")
+      .mockImplementation(() => ({
+        name: "already taken",
+      }));
+
+    const result = await TagsHandler.create(ctx);
+
+    expect(mockedCreate).toHaveBeenCalledWith(
+      {
+        name: tag.name,
+        slug: tag.slug,
+      },
+      "en"
+    );
+
+    expect(mockedFormatErrors).toHaveBeenCalledWith(errors);
+
+    expect(result).toEqual({
+      assigns: {
+        tag: {
+          name: tag.name,
+          slug: tag.slug,
+        },
+        errors: {
+          tag: {
+            name: "already taken",
+          },
+        },
+        _translations: [],
+      },
+    });
+  });
+});

package/src/tests/handlers/TagsHandler.test/create_form.test.js

@@ -0,0 +1,25 @@
+import Tags from "../../../cloud/Tags";
+import TagsHandler from "../../../handlers/TagsHandler";
+
+describe("Tags Handler", () => {
+  function buildCtx() {
+    return {
+      client: {
+        tags: new Tags(() => ({}), "token"),
+      },
+    };
+  }
+
+  test("create_form", () => {
+    const ctx = buildCtx();
+    const result = TagsHandler.create_form(ctx);
+
+    expect(result).toEqual({
+      assigns: {
+        tag: {},
+        errors: {},
+        _translations: [],
+      },
+    });
+  });
+});

package/src/tests/handlers/TagsHandler.test/destroy.test.js

@@ -0,0 +1,51 @@
+import Tags from "../../../cloud/Tags";
+import TagsHandler from "../../../handlers/TagsHandler";
+import Factory from "../../support/factory";
+
+describe("Tags Handler", () => {
+  function buildCtx() {
+    return {
+      client: {
+        tags: new Tags(() => ({}), "token"),
+      },
+      params: { id: "1" },
+      locale: "en",
+    };
+  }
+
+  test("destroy successful", async () => {
+    const tag = Factory.build("tag");
+    const ctx = buildCtx();
+
+    const mockedDelete = jest
+      .spyOn(ctx.client.tags, "delete")
+      .mockImplementation(() => ({ tag, errors: null }));
+
+    const result = await TagsHandler.destroy(ctx);
+
+    expect(mockedDelete).toHaveBeenCalledWith("1", "en");
+    expect(result).toEqual({
+      headers: {
+        "HX-redirect": "/en/tags",
+      },
+      json: {},
+    });
+  });
+
+  test("destroy failed", async () => {
+    const ctx = buildCtx();
+
+    const mockedDelete = jest
+      .spyOn(ctx.client.tags, "delete")
+      .mockImplementation(() => ({
+        tag: null,
+        errors: [{ key: "generalError", message: "Not found" }],
+      }));
+
+    expect(() => TagsHandler.destroy(ctx)).rejects.toMatch(
+      "Failed to delete tag #1. WTF?"
+    );
+
+    expect(mockedDelete).toHaveBeenCalledWith("1", "en");
+  });
+});

package/src/tests/handlers/TagsHandler.test/edit_form.test.js

@@ -0,0 +1,60 @@
+import Tags from "../../../cloud/Tags";
+import TagsHandler from "../../../handlers/TagsHandler";
+import Factory from "../../support/factory";
+
+describe("Tags Handler", () => {
+  function buildCtx() {
+    return {
+      client: {
+        tags: new Tags(() => ({}), "token"),
+      },
+      router: {
+        req: {
+          param: () => ({ id: "1" }),
+        },
+      },
+      locale: "en",
+    };
+  }
+
+  test("edit_form", async () => {
+    const tag = Factory.build("tag", { id: "1", name: "Test Tag" });
+    const ctx = buildCtx();
+
+    const mockedFind = jest
+      .spyOn(ctx.client.tags, "find")
+      .mockImplementation(() => tag);
+
+    const result = await TagsHandler.edit_form(ctx);
+
+    expect(mockedFind).toHaveBeenCalledWith("1", "en");
+    expect(result).toEqual({
+      assigns: {
+        id: "1",
+        tag: tag,
+        errors: {},
+        _translations: [],
+      },
+    });
+  });
+
+  test("edit_form when tag does not exist", async () => {
+    const ctx = buildCtx();
+
+    const mockedFind = jest
+      .spyOn(ctx.client.tags, "find")
+      .mockImplementation(() => null);
+
+    const result = await TagsHandler.edit_form(ctx);
+
+    expect(mockedFind).toHaveBeenCalledWith("1", "en");
+    expect(result).toEqual({
+      assigns: {
+        id: "1",
+        tag: null,
+        errors: {},
+        _translations: [],
+      },
+    });
+  });
+});

package/src/tests/handlers/TagsHandler.test/index.test.js

@@ -0,0 +1,37 @@
+import Tags from "../../../cloud/Tags";
+import TagsHandler from "../../../handlers/TagsHandler";
+import Factory from "../../support/factory";
+
+describe("Tags Handler", () => {
+  function buildCtx() {
+    return {
+      client: {
+        tags: new Tags(() => ({}), "token"),
+      },
+      query: { foo: "bar" },
+      locale: "en",
+    };
+  }
+
+  test("index", async () => {
+    const tags = [
+      Factory.build("tag", { id: "1", name: "First Tag" }),
+      Factory.build("tag", { id: "2", name: "Second Tag" }),
+    ];
+
+    const ctx = buildCtx();
+
+    const mockedList = jest
+      .spyOn(ctx.client.tags, "list")
+      .mockImplementation(() => tags);
+
+    const result = await TagsHandler.index(ctx);
+
+    expect(mockedList).toHaveBeenCalledWith({ foo: "bar" }, "en");
+    expect(result).toEqual({
+      assigns: {
+        items: tags,
+      },
+    });
+  });
+});