@raketa-cloud/admin 0.0.30 → 0.0.33

package/src/handlers/pages/TranslationsHandler.js

@@ -3,29 +3,17 @@ const create_form = async (ctx) => {
   const target_locate_tags = await ctx.client.tags.all(target_locale);
 
   const { parent_id } = ctx.params;
-  const blueprint_resource = await ctx.client.pages.find(parent_id, ctx.locale);
+  const blueprint = await ctx.client.pages.find(parent_id, ctx.locale);
 
-  const translation = {
-    title: blueprint_resource.title,
-    slug: blueprint_resource.slug,
-    visibility: blueprint_resource.visibility,
-    layout: blueprint_resource.settings.layout,
-    meta_title: blueprint_resource.settings.meta.title,
-    meta_description: blueprint_resource.settings.meta.description,
-    meta_image: blueprint_resource.settings.meta?.image || {},
-    username: blueprint_resource.settings.credentials?.user || "",
-    password: blueprint_resource.settings.credentials?.password || "",
-    tags: [],
-    // categories: blueprint_resource.categories, # TODO: this will be added later?
-  };
+  const resource = structuredClone(blueprint);
+  resource.tags = [];
 
   return {
     assigns: {
-      resource: blueprint_resource,
-      translation: translation,
+      resource,
+      blueprint,
       targetLocale: target_locale,
       tags: target_locate_tags.list,
-      blueprint_tags: blueprint_resource.tags,
       errors: {},
       visibilityOptions: ctx.client.pages.visibilityOptions(),
       _translations: [],
@@ -35,37 +23,27 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
-  const blueprint_resource = await ctx.client.pages.find(parent_id, ctx.locale);
+  const blueprint = await ctx.client.pages.find(parent_id, ctx.locale);
 
   const { target_locale } = ctx.resourceParams;
-  const translation = { ...ctx.resourceParams.translation };
+  const params = { ...ctx.resourceParams.resource };
 
-  translation.meta_image = JSON.parse(translation.meta_image || "{}");
+  const resource = ctx.client.pages.deepMerge(
+    {
+      settings: {
+        ...blueprint.settings,
+      },
+      widgets: blueprint.widgets,
+      categories: blueprint.categories.map((category) => category.id),
+      tags: [],
+    },
+    params
+  );
 
   const { errors } = await ctx.client.pages.translate(
     parent_id,
     target_locale,
-    {
-      title: translation.title,
-      slug: translation.slug,
-      visibility: translation.visibility,
-      settings: {
-        ...blueprint_resource.settings,
-        layout: translation.layout,
-        meta: {
-          title: translation.meta_title,
-          description: translation.meta_description,
-          image: translation.meta_image,
-        },
-        credentials: {
-          user: translation.username || "",
-          password: translation.password || "",
-        },
-      },
-      widgets: blueprint_resource.widgets,
-      tags: translation.tags || [],
-      categories: blueprint_resource.categories.map((category) => category.id),
-    }
+    resource
   );
 
   if (errors) {
@@ -73,11 +51,11 @@ const create = async (ctx) => {
 
     return {
       assigns: {
-        resource: blueprint_resource,
-        translation: translation,
-        targetLocale: translation.target_locate,
+        resource,
+        blueprint,
+        targetLocale: target_locale,
         tags: tags.list,
-        errors: {},
+        errors: { resource: ctx.client.pages.formatErrors(errors) },
         visibilityOptions: ctx.client.pages.visibilityOptions(),
         _translations: [],
       },

package/src/handlers/pages/URLsHandler.js

@@ -10,7 +10,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
-      change: {
+      resource: {
         id: page.id,
         slug: page.slug,
         redirect: null,
@@ -23,7 +23,7 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
-  const change = ctx.resourceParams.change;
+  const resource = ctx.resourceParams.resource;
 
   const page = await ctx.client.pages.find(parent_id, ctx.locale);
 
@@ -35,10 +35,10 @@ const create = async (ctx) => {
 
   let redirectParams = null;
 
-  if (change.redirect) {
+  if (resource.redirect) {
     redirectParams = {
       url: ctx.remoteConfig.resourcePath(page, page.pageType.slug, ctx.locale),
-      destination: change.slug,
+      destination: resource.slug,
       httpResponseCode: 301,
       note: `Created with changed URL for a ${ctx.resourceConfig.pageType}`,
     };
@@ -46,7 +46,7 @@ const create = async (ctx) => {
 
   const { errors } = await ctx.client.pages.updateSlug(
     parent_id,
-    change.slug,
+    resource.slug,
     ctx.locale,
     redirectParams
   );
@@ -54,8 +54,8 @@ const create = async (ctx) => {
   if (errors) {
     return {
       assigns: {
-        change: { ...change, id: page.id },
-        errors: { change: ctx.client.pages.formatErrors(errors, "redirect") },
+        resource: { ...resource, id: page.id },
+        errors: { resource: ctx.client.pages.formatErrors(errors, "redirect") },
         _translations: [],
       },
     };

package/src/helpers/FormBuilder.js

@@ -109,8 +109,7 @@ export default class FormBuilder extends HTMLBuilder {
   }
 
   __getID(name) {
-    const field = this.__getFieldName(name);
-    return `f_${field}`;
+    return `f_${name.replaceAll(".", "_")}`;
   }
 
   __getDefaultLabel(name) {

package/src/helpers/Inflector.js

@@ -0,0 +1,6 @@
+const Inflector = {
+  capitalize: (str) => str[0].toUpperCase() + str.slice(1),
+};
+
+export default Inflector;
+

package/src/index.js

@@ -88,3 +88,5 @@ export { default as EventURLsHandler } from "./handlers/events/URLsHandler";
 export { default as EventsHandler } from "./handlers/events/EventsHandler";
 
 export { default as Factory } from "./tests/support/factory";
+export { default as Logger } from "./Logger";
+

package/src/styles/application.css

@@ -6,17 +6,12 @@
   --background: 255, 255, 255;
   --foreground: 0, 0, 0;
 
-  /* --primary: 110, 110, 178; */
-  /* --primary: 0, 0, 0; */
-  /* --primary: 15, 82, 186; */
-  /* --primary: 0, 67, 206; */
   --primary: 91, 95, 198;
 
-  /* --primary-dark: 88, 88, 142; */
-  /* --primary-dark: 0, 0, 0; */
   --primary-dark: var(--primary);
 }
 
+/*
 @media (prefers-color-scheme: dark) {
   :root {
     --foreground: 255, 255, 255;
@@ -24,12 +19,14 @@
     --primary: 130, 133, 212;
   }
 }
+*/
 
 body {
   @apply text-raketa-foreground bg-raketa-background;
 }
 
 @layer components {
+
   /* Utils */
   .dbg {
     @apply outline-1 outline-dashed outline-red-500;
@@ -278,7 +275,7 @@ body {
   .pagination {
     @apply text-center py-8 text-raketa-foreground/50;
 
-    & > div {
+    &>div {
       @apply inline-flex items-center gap-4;
     }
 
@@ -521,6 +518,7 @@ body {
   0% {
     transform: scale(1);
   }
+
   100% {
     transform: scale(1.5);
   }
@@ -534,9 +532,11 @@ body {
   0% {
     transform: translatey(0px);
   }
+
   50% {
     transform: translatey(-40px);
   }
+
   100% {
     transform: translatey(0px);
   }

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

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx(redirect) {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     resourceParams: {
       redirect: {

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

@@ -4,7 +4,7 @@ import Redirects from "../../../cloud/Redirects";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
   };

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

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
     locale: "en",

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

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
   };

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

@@ -7,7 +7,7 @@ describe("Redirects", () => {
   function buildCtx() {
     return {
       client: {
-        redirects: new Redirects({}, "token"),
+        redirects: new Redirects(() => ({}), "token"),
       },
       query: { foo: "bar" },
       req: {

package/src/tests/handlers/RedirectsHandler.test/show.test.js

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: 1 },
   };

package/src/tests/handlers/RedirectsHandler.test/update.test.js

@@ -6,7 +6,7 @@ import Factory from "../../support/factory";
 function buildCtx(redirect) {
   return {
     client: {
-      redirects: new Redirects({}, "token"),
+      redirects: new Redirects(() => ({}), "token"),
     },
     params: { id: redirect.id },
     resourceParams: {

package/src/tests/handlers/article_revisions/ArticleRevisionsHandler.test/create.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(articleID) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: articleID },
     locale: "en",

package/src/tests/handlers/article_revisions/ArticleRevisionsHandler.test/destroy.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revisionID) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { id: revisionID },
     locale: "en",

package/src/tests/handlers/article_revisions/CodesHandler.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,9 @@ function buildCtx(revision) {
 
 describe("Article revision code settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,11 +30,9 @@ describe("Article revision code settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          scripts: JSON.stringify([]),
-          structured_data: JSON.stringify({}),
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
         },
         errors: {},
         _translations: [],

package/src/tests/handlers/article_revisions/CodesHandler.test/update.test.js

@@ -6,11 +6,11 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      code_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -22,11 +22,17 @@ function buildCtx(revision, updateSettings) {
 
 describe("Article revision code settings", () => {
   test("update successful", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
 
     const updateSettings = {
-      scripts: JSON.stringify([{ type: "bla" }]),
-      structured_data: JSON.stringify({ type: "article" }),
+      settings: {
+        codes: {
+          scripts: JSON.stringify([{ type: "bla" }]),
+          structured_data: JSON.stringify({ type: "article" }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -50,16 +56,16 @@ describe("Article revision code settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
@@ -68,11 +74,17 @@ describe("Article revision code settings", () => {
   });
 
   test("update failed", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
 
     const updateSettings = {
-      scripts: JSON.stringify([{ type: "bla" }]),
-      structured_data: JSON.stringify({ type: "article" }),
+      settings: {
+        codes: {
+          scripts: JSON.stringify([{ type: "bla" }]),
+          structured_data: JSON.stringify({ type: "article" }),
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -96,27 +108,33 @@ describe("Article revision code settings", () => {
       title: revision.title,
       visibility: revision.visibility,
       publishAt: revision.publishAt,
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
         codes: {
           scripts: [{ type: "bla" }],
           structured_data: { type: "article" },
         },
-      }),
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        code_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
+          settings: {
+            ...revision.settings,
+            codes: {
+              scripts: [{ type: "bla" }],
+              structured_data: { type: "article" },
+            },
+          },
         },
         errors: {
-          code_settings: { generalError: "some error" },
+          resource: { generalError: "some error" },
         },
         _translations: [],
       },

package/src/tests/handlers/article_revisions/GeneralHandler.test/edit_form.test.js

@@ -7,8 +7,8 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
-      articles: new Articles({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      articles: new Articles(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -32,15 +32,9 @@ describe("Article revision genereal settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          title: revision.title,
-          slug: revision.slug,
-          visibility: revision.visibility,
-          publish_at: "2024-08-30T16:05:00",
-          username: revision.settings?.credentials?.user || "",
-          password: revision.settings?.credentials?.password || "",
+        resource: {
+          ...revision,
+          publishAt: "2024-08-30T16:05:00",
         },
         errors: {},
         visibilityOptions: ctx.client.articles.visibilityOptions(),

package/src/tests/handlers/article_revisions/GeneralHandler.test/update.test.js

@@ -7,12 +7,12 @@ import Factory from "../../../support/factory";
 function buildCtx(revision, updateSettings) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
-      articles: new Articles({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
+      articles: new Articles(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     resourceParams: {
-      general_settings: updateSettings,
+      resource: updateSettings,
     },
     locale: "en",
     resourceConfig: {
@@ -30,9 +30,13 @@ describe("Article revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -56,16 +60,13 @@ describe("Article revision general settings", () => {
       title: updateSettings.title,
       visibility: updateSettings.visibility,
       publishAt: "2024-08-30T19:05:00Z",
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        credentials: {
-          user: updateSettings.username,
-          password: updateSettings.password,
-        },
-      }),
+        ...updateSettings.settings,
+      },
     });
 
     expect(result).toEqual({
@@ -80,9 +81,13 @@ describe("Article revision general settings", () => {
       title: "Updated title",
       slug: "/updated-url",
       visibility: "protected",
-      publish_at: "2024-08-30T19:05",
-      username: "user",
-      password: "admin123!@#",
+      publishAt: "2024-08-30T19:05",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
     };
 
     const ctx = buildCtx(revision, updateSettings);
@@ -106,27 +111,30 @@ describe("Article revision general settings", () => {
       title: updateSettings.title,
       visibility: updateSettings.visibility,
       publishAt: "2024-08-30T19:05:00Z",
-      widgets: JSON.stringify(revision.widgets),
+      widgets: revision.widgets,
       tags: revision.tags.map((t) => t.id),
       categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
+      settings: {
         ...revision.settings,
-        credentials: {
-          user: updateSettings.username,
-          password: updateSettings.password,
-        },
-      }),
+        ...updateSettings.settings,
+      },
     });
 
     expect(result).toEqual({
       assigns: {
-        general_settings: {
-          ...updateSettings,
-          id: revision.id,
-          originalId: revision.originalId,
+        resource: {
+          ...revision,
+          slug: updateSettings.slug,
+          title: updateSettings.title,
+          visibility: updateSettings.visibility,
+          publishAt: "2024-08-30T19:05:00",
+          settings: {
+            ...revision.settings,
+            ...updateSettings.settings,
+          },
         },
         errors: {
-          general_settings: { slug: "has invalid format" },
+          resource: { slug: "has invalid format" },
         },
         visibilityOptions: ctx.client.articles.visibilityOptions(),
         _translations: [],

package/src/tests/handlers/article_revisions/MetaHandler.test/edit_form.test.js

@@ -6,7 +6,7 @@ import Factory from "../../../support/factory";
 function buildCtx(revision) {
   return {
     client: {
-      articleRevisions: new ArticleRevisions({}, "token"),
+      articleRevisions: new ArticleRevisions(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
@@ -15,7 +15,9 @@ function buildCtx(revision) {
 
 describe("Article revision meta settings", () => {
   test("edit_form when a revision exists", async () => {
-    const revision = Factory.build("article_revision");
+    const revision = Factory.build("article_revision", {
+      publishAt: "2024-10-10T07:05:00Z",
+    });
     const ctx = buildCtx(revision);
 
     const mockFind = jest
@@ -28,12 +30,9 @@ describe("Article revision meta settings", () => {
 
     expect(result).toEqual({
       assigns: {
-        meta_settings: {
-          id: revision.id,
-          originalId: revision.originalId,
-          title: revision.settings.meta.title,
-          description: revision.settings.meta.description,
-          image: revision.settings.meta.image,
+        resource: {
+          ...revision,
+          publishAt: "2024-10-10T07:05:00",
         },
         errors: {},
         _translations: [],