@raketa-cloud/admin 0.0.69 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.69",
+  "version": "0.0.70",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/handlers/articles/TranslationsHandler.js

@@ -1,25 +1,73 @@
-import { toDateTimeInput } from "../../utils";
+const index = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const { translations } = ctx.query;
+  let translatedArticles = [];
+
+  if (translations) {
+    const translationPairs = translations.split(";").map((pair) => {
+      const [locale, id] = pair.split(":");
+      return { locale, id };
+    });
+
+    translatedArticles = await Promise.all(
+      translationPairs.map(async ({ locale, id }) => {
+        const article = await ctx.client.articles.find(id, locale);
+
+        if (!article) {
+          throw new Error(
+            `Cannot find translated article with id ${id} and locale ${locale}`
+          );
+        }
+
+        const revisions = await ctx.client.articleRevisions.all(id, locale);
+        const openRevision = revisions.list[0];
+
+        return {
+          ...article,
+          translationLocale: locale,
+          revisionId: openRevision?.id,
+        };
+      })
+    );
+  }
+
+  const items = await ctx.client.articles.list(
+    ctx.query,
+    ctx.locale,
+    ctx.resourceConfig.articleType
+  );
+
+  const originalArticle = await ctx.client.articles.find(parent_id, ctx.locale);
+
+  return {
+    assigns: {
+      items,
+      visibilityOptions: ctx.client.articles.visibilityOptions(),
+      translations: translatedArticles,
+      parent_id,
+      articleTitle: originalArticle.title,
+    },
+  };
+};
 
 const create_form = async (ctx) => {
-  const { target_locale } = ctx.query;
-  const target_locate_tags = await ctx.client.tags.all(target_locale);
+  const { target_locale = "" } = ctx.query;
 
   const { parent_id } = ctx.params;
   const blueprint = await ctx.client.articles.find(parent_id, ctx.locale);
+
+  if (!blueprint) {
+    throw new Error(`Cannot find article with id ${parent_id}`);
+  }
+
   const resource = structuredClone(blueprint);
 
   return {
     assigns: {
-      resource: {
-        ...resource,
-        tags: [],
-        publishAt: toDateTimeInput(blueprint.publishAt),
-      },
+      resource,
       blueprint,
       targetLocale: target_locale,
-      tags: target_locate_tags.list,
       errors: {},
-      visibilityOptions: ctx.client.articles.visibilityOptions(),
       _translations: [],
     },
   };
@@ -27,54 +75,91 @@ 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 { target_locale } = ctx.resourceParams;
-  const params = { ...ctx.resourceParams.resource };
-
-  const resource = ctx.client.articles.deepMerge(
-    {
-      settings: {
-        ...blueprint.settings,
-      },
-      widgets: blueprint.widgets,
-      categories: blueprint.categories.map((category) => category.id),
-      tags: [],
-    },
-    ctx.client.articles.formatDates(params)
-  );
+  const formLanguages = Array.isArray(ctx.resourceParams.resource.languages)
+    ? ctx.resourceParams.resource.languages
+    : [ctx.resourceParams.resource.languages].filter(Boolean);
 
-  const { errors } = await ctx.client.articles.translate(
-    parent_id,
-    target_locale,
-    resource
+  const existingTranslations = Object.keys(blueprint.translations || {});
+  const selectedLocales = formLanguages.filter(
+    (locale) =>
+      locale !== originalLocale && !existingTranslations.includes(locale)
   );
 
-  if (errors) {
-    const tags = await ctx.client.tags.all(target_locale);
+  const params = {
+    settings: blueprint.settings,
+    widgets: blueprint.widgets,
+    categories: blueprint.categories.map((category) => category.id),
+    publishAt: blueprint.publishAt,
+    title: blueprint.title,
+    slug: blueprint.slug,
+    tags: [],
+  };
+
+  const translationIds = [];
+
+  for (const locale of selectedLocales) {
+    const resource = ctx.client.articles.deepMerge(params, {
+      visibility: "private",
+    });
+
+    const { errors, article } = await ctx.client.articles.translate(
+      parent_id,
+      locale,
+      resource
+    );
+
+    if (errors) {
+      return {
+        assigns: {
+          resource: {
+            ...resource,
+            translations: blueprint.translations || {},
+            languages: formLanguages,
+          },
+          blueprint,
+          targetLocale: locale,
+          errors: { resource: ctx.client.articles.formatErrors(errors) },
+        },
+      };
+    }
+
+    if (article) {
+      translationIds.push(`${locale}:${article.id}`);
+    }
+
+    const { errors: revisionErrors } = await ctx.client.articleRevisions.create(
+      article.id,
+      locale
+    );
 
-    return {
-      assigns: {
-        resource: {
-          ...resource,
-          publishAt: toDateTimeInput(resource.publishAt),
+    if (revisionErrors) {
+      return {
+        assigns: {
+          resource: {
+            ...resource,
+            translations: blueprint.translations || {},
+            languages: formLanguages,
+          },
+          blueprint,
+          targetLocale: locale,
+          errors: {
+            resource: ctx.client.articles.formatErrors(revisionErrors),
+          },
         },
-        blueprint,
-        targetLocale: target_locale,
-        tags: tags.list,
-        errors: { resource: ctx.client.pages.formatErrors(errors) },
-        visibilityOptions: ctx.client.articles.visibilityOptions(),
-        _translations: [],
-      },
-    };
+      };
+    }
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleTypePlural}/${parent_id}`,
+    redirect: `/${originalLocale}/${ctx.resourceConfig.articleTypePlural}/${parent_id}/translations?translations=${translationIds.join(";")}`,
   };
 };
 
 export default {
+  index,
   create_form,
   create,
 };

package/src/handlers/events/TranslationsHandler.js

@@ -1,29 +1,73 @@
-import { toDateTimeInput } from "../../utils";
+const index = async (ctx) => {
+  const { parent_id } = ctx.params;
+  const { translations } = ctx.query;
+  let translatedEvents = [];
+
+  if (translations) {
+    const translationPairs = translations.split(";").map((pair) => {
+      const [locale, id] = pair.split(":");
+      return { locale, id };
+    });
+
+    translatedEvents = await Promise.all(
+      translationPairs.map(async ({ locale, id }) => {
+        const event = await ctx.client.events.find(id, locale);
+
+        if (!event) {
+          throw new Error(
+            `Cannot find translated event with id ${id} and locale ${locale}`
+          );
+        }
+
+        const revisions = await ctx.client.eventRevisions.all(id, locale);
+        const openRevision = revisions.list[0];
+
+        return {
+          ...event,
+          translationLocale: locale,
+          revisionId: openRevision?.id,
+        };
+      })
+    );
+  }
+
+  const items = await ctx.client.events.list(
+    ctx.query,
+    ctx.locale,
+    ctx.resourceConfig.eventType
+  );
+
+  const originalEvent = await ctx.client.events.find(parent_id, ctx.locale);
+
+  return {
+    assigns: {
+      items,
+      visibilityOptions: ctx.client.events.visibilityOptions(),
+      translations: translatedEvents,
+      parent_id,
+      eventTitle: originalEvent.title,
+    },
+  };
+};
 
 const create_form = async (ctx) => {
-  // const tags = await ctx.client.tags.all(ctx.locale);
-  const { target_locale } = ctx.query;
-  const target_locate_tags = await ctx.client.tags.all(target_locale);
+  const { target_locale = "" } = ctx.query;
 
   const { parent_id } = ctx.params;
   const blueprint = await ctx.client.events.find(parent_id, ctx.locale);
 
+  if (!blueprint) {
+    throw new Error(`Cannot find event with id ${parent_id}`);
+  }
+
   const resource = structuredClone(blueprint);
 
   return {
     assigns: {
-      resource: {
-        ...resource,
-        tags: [],
-        publishAt: toDateTimeInput(blueprint.publishAt),
-        startsAt: toDateTimeInput(blueprint.startsAt),
-        endsAt: toDateTimeInput(blueprint.endsAt),
-      },
+      resource,
       blueprint,
       targetLocale: target_locale,
-      tags: target_locate_tags.list,
       errors: {},
-      visibilityOptions: ctx.client.events.visibilityOptions(),
       _translations: [],
     },
   };
@@ -31,54 +75,93 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
+  const originalLocale = ctx.locale;
   const blueprint = await ctx.client.events.find(parent_id, ctx.locale);
 
-  const { target_locale } = ctx.resourceParams;
-  const params = { ...ctx.resourceParams.resource };
-
-  const resource = ctx.client.events.deepMerge(
-    {
-      settings: {
-        ...blueprint.settings,
-      },
-      widgets: blueprint.widgets,
-      categories: blueprint.categories.map((category) => category.id),
-      tags: [],
-    },
-    ctx.client.events.formatDates(params)
-  );
+  const formLanguages = Array.isArray(ctx.resourceParams.resource.languages)
+    ? ctx.resourceParams.resource.languages
+    : [ctx.resourceParams.resource.languages].filter(Boolean);
 
-  const { errors } = await ctx.client.events.translate(
-    parent_id,
-    target_locale,
-    resource
+  const existingTranslations = Object.keys(blueprint.translations || {});
+  const selectedLocales = formLanguages.filter(
+    (locale) =>
+      locale !== originalLocale && !existingTranslations.includes(locale)
   );
 
-  if (errors) {
-    const tags = await ctx.client.tags.all(target_locale);
-    return {
-      assigns: {
-        resource: {
-          ...resource,
-          publishAt: toDateTimeInput(resource.publishAt),
-          startsAt: toDateTimeInput(resource.startsAt),
-          endsAt: toDateTimeInput(resource.endsAt),
+  const params = {
+    settings: blueprint.settings,
+    widgets: blueprint.widgets,
+    categories: blueprint.categories.map((category) => category.id),
+    publishAt: blueprint.publishAt,
+    startsAt: blueprint.startsAt,
+    endsAt: blueprint.endsAt,
+    title: blueprint.title,
+    slug: blueprint.slug,
+    tags: [],
+  };
+
+  const translationIds = [];
+
+  for (const locale of selectedLocales) {
+    const resource = ctx.client.events.deepMerge(params, {
+      visibility: "private",
+    });
+
+    const { errors, event } = await ctx.client.events.translate(
+      parent_id,
+      locale,
+      resource
+    );
+
+    if (errors) {
+      return {
+        assigns: {
+          resource: {
+            ...resource,
+            translations: blueprint.translations || {},
+            languages: formLanguages,
+          },
+          blueprint,
+          targetLocale: locale,
+          errors: { resource: ctx.client.events.formatErrors(errors) },
+        },
+      };
+    }
+
+    if (event) {
+      translationIds.push(`${locale}:${event.id}`);
+    }
+
+    const { errors: revisionErrors } = await ctx.client.eventRevisions.create(
+      event.id,
+      locale
+    );
+
+    if (revisionErrors) {
+      return {
+        assigns: {
+          resource: {
+            ...resource,
+            translations: blueprint.translations || {},
+            languages: formLanguages,
+          },
+          blueprint,
+          targetLocale: locale,
+          errors: {
+            resource: ctx.client.events.formatErrors(revisionErrors),
+          },
         },
-        blueprint,
-        targetLocale: target_locale,
-        tags: tags.list,
-        errors: { resource: ctx.client.pages.formatErrors(errors) },
-        visibilityOptions: ctx.client.events.visibilityOptions(),
-        _translations: [],
-      },
-    };
+      };
+    }
   }
+
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventTypePlural}/${parent_id}`,
+    redirect: `/${originalLocale}/${ctx.resourceConfig.eventTypePlural}/${parent_id}/translations?translations=${translationIds.join(";")}`,
   };
 };
 
 export default {
+  index,
   create_form,
   create,
 };