@raketa-cloud/admin 0.0.30 → 0.0.31

package/src/handlers/page_revisions/CodeHandler.js

@@ -1,24 +1,15 @@
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+  const resource = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const code_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    scripts: JSON.stringify(revision.settings.codes?.scripts || []),
-    structured_data: JSON.stringify(
-      revision.settings.codes?.structured_data || {}
-    ),
-  };
-
   return {
     assigns: {
-      code_settings,
+      resource,
       errors: {},
       _translations: [],
     },
@@ -34,38 +25,21 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.code_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        codes: {
-          scripts: JSON.parse(params.scripts),
-          structured_data: JSON.parse(params.structured_data),
-        },
-      }),
-    }
+    ctx.client.pageRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        code_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
-        },
+        resource,
         errors: {
-          code_settings: ctx.client.pageRevisions.formatErrors(errors),
+          resource: ctx.client.pageRevisions.formatErrors(errors),
         },
         _translations: [],
       },

package/src/handlers/page_revisions/GeneralHandler.js

@@ -1,27 +1,17 @@
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+  const resource = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const general_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    title: revision.title,
-    slug: revision.slug,
-    visibility: revision.visibility,
-    username: revision.settings?.credentials?.user || "",
-    password: revision.settings?.credentials?.password || "",
-  };
-
   return {
     assigns: {
-      general_settings,
-      errors: {},
+      resource,
       visibilityOptions: ctx.client.pages.visibilityOptions(),
+      errors: {},
       _translations: [],
     },
   };
@@ -36,40 +26,23 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.general_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: params.slug,
-      title: params.title,
-      visibility: params.visibility,
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        credentials: {
-          user: params.username,
-          password: params.password,
-        },
-      }),
-    }
+    ctx.client.pageRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        general_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
-        },
+        resource,
+        visibilityOptions: ctx.client.pages.visibilityOptions(),
         errors: {
-          general_settings: ctx.client.pageRevisions.formatErrors(errors),
+          resource: ctx.client.pageRevisions.formatErrors(errors),
         },
-        visibilityOptions: ctx.client.pages.visibilityOptions(),
         _translations: [],
       },
     };

package/src/handlers/page_revisions/LocksHandler.js

@@ -3,14 +3,15 @@ const create_form = async (ctx) => {
 
   const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  const lock_settings = {
-    revision,
+  const resource = {
+    id: revision.id,
+    originalId: revision.originalId,
     message: "",
   };
 
   return {
     assigns: {
-      lock_settings,
+      resource,
       errors: {},
       _translations: [],
     },
@@ -19,7 +20,7 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
-  const { message } = ctx.resourceParams.lock_settings;
+  const { message } = ctx.resourceParams.resource;
 
   const { revision, errors, pageErrors } = await ctx.client.pageRevisions.lock(
     parent_id,
@@ -30,9 +31,13 @@ const create = async (ctx) => {
   if (errors) {
     return {
       assigns: {
-        lock_settings: { revision, message },
+        resource: {
+          id: revision.id,
+          originalId: revision.originalId,
+          message,
+        },
         errors: {
-          lock_settings: ctx.client.pages.formatErrors(errors, "message"),
+          resource: ctx.client.pages.formatErrors(errors, "message"),
         },
         _translations: [],
       },

package/src/handlers/page_revisions/MetaHandler.js

@@ -1,23 +1,15 @@
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+  const resource = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const meta_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    title: revision.settings.meta?.title || "",
-    description: revision.settings.meta?.description || "",
-    image: revision.settings.meta?.image || {},
-  };
-
   return {
     assigns: {
-      meta_settings,
+      resource,
       errors: {},
       _translations: [],
     },
@@ -33,39 +25,21 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.meta_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        meta: {
-          title: params.title,
-          description: params.description,
-          image: JSON.parse(params.image),
-        },
-      }),
-    }
+    ctx.client.pageRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        meta_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
-        },
+        resource,
         errors: {
-          meta_settings: ctx.client.pageRevisions.formatErrors(errors),
+          resource: ctx.client.pageRevisions.formatErrors(errors),
         },
         _translations: [],
       },

package/src/handlers/page_revisions/TagHandler.js

@@ -1,25 +1,23 @@
+import { checkboxesToArray } from "../../utils";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+  const resource = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
   const tags = await ctx.client.tags.all(ctx.locale);
 
-  const tag_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    tags: revision.tags.map((t) => t.id),
-  };
+  resource.tags = resource.tags.map((t) => t.id);
 
   return {
     assigns: {
-      tag_settings,
-      errors: {},
+      resource,
       tags: tags.list,
+      errors: {},
       _translations: [],
     },
   };
@@ -34,22 +32,15 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.tag_settings;
+  const params = ctx.resourceParams.resource ? ctx.resourceParams.resource : {};
+  params.tags = checkboxesToArray(params.tags);
+
+  const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      widgets: JSON.stringify(revision.widgets),
-      tags: params.tags,
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-      }),
-    }
+    ctx.client.pageRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
@@ -57,13 +48,11 @@ const update = async (ctx) => {
 
     return {
       assigns: {
-        tag_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
-        },
-        errors: { tag_settings: ctx.client.pageRevisions.formatErrors(errors) },
+        resource,
         tags: tags.list,
+        errors: {
+          resource: ctx.client.pageRevisions.formatErrors(errors),
+        },
         _translations: [],
       },
     };

package/src/handlers/page_revisions/VisualHandler.js

@@ -1,21 +1,15 @@
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
-  const revision = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
+  const resource = await ctx.client.pageRevisions.find(parent_id, ctx.locale);
 
-  if (!revision) {
+  if (!resource) {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const visual_settings = {
-    id: revision.id,
-    originalId: revision.originalId,
-    layout: revision.settings.layout,
-  };
-
   return {
     assigns: {
-      visual_settings,
+      resource,
       errors: {},
       _translations: [],
     },
@@ -31,35 +25,21 @@ const update = async (ctx) => {
     throw new Error(`Missing revision #${parent_id}`);
   }
 
-  const params = ctx.resourceParams.visual_settings;
+  const params = ctx.resourceParams.resource;
+  const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,
-    {
-      slug: revision.slug,
-      title: revision.title,
-      visibility: revision.visibility,
-      widgets: JSON.stringify(revision.widgets),
-      tags: revision.tags.map((t) => t.id),
-      categories: revision.categories.map((c) => c.id),
-      settings: JSON.stringify({
-        ...revision.settings,
-        layout: params.layout,
-      }),
-    }
+    ctx.client.pageRevisions.selectUpdateParams(resource)
   );
 
   if (errors) {
     return {
       assigns: {
-        visual_settings: {
-          ...params,
-          id: revision.id,
-          originalId: revision.originalId,
-        },
+        resource,
         errors: {
-          visual_settings: ctx.client.pageRevisions.formatErrors(errors),
+          resource: ctx.client.pageRevisions.formatErrors(errors),
         },
         _translations: [],
       },

package/src/handlers/pages/DeletesHandler.js

@@ -8,7 +8,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
-      deleteAction: {
+      resource: {
         id: page.id,
         redirect: "",
       },
@@ -20,7 +20,7 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const { parent_id } = ctx.params;
-  const params = ctx.resourceParams.deleteAction;
+  const params = ctx.resourceParams.resource;
   const page = await ctx.client.pages.find(parent_id, ctx.locale);
 
   if (!page) {
@@ -47,9 +47,9 @@ const create = async (ctx) => {
   if (errors) {
     return {
       assigns: {
-        deleteAction: { ...params, id: page.id },
+        resource: { ...params, id: page.id },
         errors: {
-          deleteAction: ctx.client.pages.formatErrors(errors, "redirect"),
+          resource: ctx.client.pages.formatErrors(errors, "redirect"),
         },
         _translations: [],
       },

package/src/handlers/pages/PagesHandler.js

@@ -55,7 +55,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
-      resource: { ...ctx.client.pages.defaults(), meta_image: {} },
+      resource: { ...ctx.client.pages.defaults() },
       tags: tags.list,
       errors: {},
       visibilityOptions: ctx.client.pages.visibilityOptions(),
@@ -66,30 +66,13 @@ const create_form = async (ctx) => {
 
 const create = async (ctx) => {
   const params = { ...ctx.resourceParams.resource };
-
-  params.meta_image = JSON.parse(params.meta_image || "{}");
+  const resource = ctx.client.pages.deepMerge(
+    ctx.client.pages.defaults(),
+    params
+  );
 
   const { errors } = await ctx.client.pages.create(
-    {
-      title: params.title,
-      slug: params.slug,
-      visibility: params.visibility,
-      settings: {
-        layout: params.layout,
-        meta: {
-          title: params.meta_title,
-          description: params.meta_description,
-          image: params.meta_image,
-        },
-        credentials: {
-          user: params.username || "",
-          password: params.password || "",
-        },
-      },
-      widgets: [],
-      tags: params.tags || [],
-      categories: params.categories || [],
-    },
+    resource,
     ctx.locale,
     ctx.resourceConfig.pageType
   );
@@ -99,7 +82,7 @@ const create = async (ctx) => {
 
     return {
       assigns: {
-        resource: params,
+        resource,
         tags: tags.list,
         errors: { resource: ctx.client.pages.formatErrors(errors) },
         visibilityOptions: ctx.client.pages.visibilityOptions(),

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/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",