@raketa-cloud/admin 0.0.72 → 0.0.73

package/package.json

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

package/src/Adapter.js

@@ -68,13 +68,25 @@ const renderError = (message, stack) => {
   return `<style>${errorCSS}</style><div class="fail-squid">🦑</div><h1>${message}</h1><pre>${escapeHtml(stack)}</pre>`;
 };
 
+function toArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  }
+
+  return [value].filter(Boolean);
+}
+
 function putIn(result, key, value) {
   const segments = key.split(/[\[\]]+/).filter(Boolean);
   let current = result;
 
   segments.forEach((segment, idx) => {
     if (idx === segments.length - 1) {
-      current[segment] = value;
+      if (key.endsWith("[]") || Array.isArray(value)) {
+        current[segment] = toArray(value);
+      } else {
+        current[segment] = value;
+      }
     } else {
       if (!current[segment]) {
         current[segment] = {};

package/src/handlers/article_revisions/TagHandler.js

@@ -1,4 +1,4 @@
-import { toDateTimeInput, checkboxesToArray } from "../../utils";
+import { toDateTimeInput } from "../../utils";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -41,7 +41,6 @@ const update = async (ctx) => {
   }
 
   const params = ctx.resourceParams.resource ? ctx.resourceParams.resource : {};
-  params.tags = checkboxesToArray(params.tags);
 
   const resource = ctx.client.articleRevisions.deepMerge(
     revision,

package/src/handlers/event_revisions/TagHandler.js

@@ -1,4 +1,4 @@
-import { toDateTimeInput, checkboxesToArray } from "../../utils";
+import { toDateTimeInput } from "../../utils";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -37,8 +37,6 @@ const update = async (ctx) => {
   }
 
   const params = ctx.resourceParams.resource ? ctx.resourceParams.resource : {};
-  params.tags = checkboxesToArray(params.tags);
-
   const resource = ctx.client.eventRevisions.deepMerge(
     revision,
     ctx.client.eventRevisions.formatDates(params)

package/src/handlers/page_revisions/TagHandler.js

@@ -1,5 +1,3 @@
-import { checkboxesToArray } from "../../utils";
-
 const fetchDefaultLocaleTags = async (ctx, resource) => {
   if (ctx.locale === ctx.defaultLocale) {
     return { defaultLocaleName: "", defaultLocaleTags: [] };
@@ -68,10 +66,10 @@ const update = async (ctx) => {
   }
 
   const params = ctx.resourceParams.resource ? ctx.resourceParams.resource : {};
-  params.tags = checkboxesToArray(params.tags);
-
   const resource = ctx.client.pageRevisions.deepMerge(revision, params);
 
+  console.log({ params });
+
   const { errors } = await ctx.client.pageRevisions.update(
     revision.id,
     ctx.locale,

package/src/helpers/FormBuilder.js

@@ -207,7 +207,7 @@ export default class FormBuilder extends HTMLBuilder {
   }
 
   checkbox_group(name, opts = {}) {
-    const { value, options = [], hint = "", ...rest } = opts;
+    const { value, options = [], hint = "", name: optsName, ...rest } = opts;
     const selected = value || this.__getValue(name);
 
     const renderedOpts = [];
@@ -219,7 +219,7 @@ export default class FormBuilder extends HTMLBuilder {
 
       const checkbox = this.tag("input", null, {
         type: "checkbox",
-        name: `${opts.name}[]`,
+        name: `${optsName}[]`,
         value: o[0],
         ...additionalOpts,
       });
@@ -227,6 +227,16 @@ export default class FormBuilder extends HTMLBuilder {
       renderedOpts.push(this.tag("label", `${checkbox} ${o[1]}`));
     }
 
+    if (renderedOpts.length) {
+      renderedOpts.push(
+        this.tag("input", null, {
+          type: "hidden",
+          name: `${optsName}[]`,
+          value: "",
+        })
+      );
+    }
+
     return this.withHint(
       this.tag(
         "div",
@@ -234,8 +244,8 @@ export default class FormBuilder extends HTMLBuilder {
         renderedOpts.length
           ? renderedOpts.join("")
           : this.tag("div", "No items available.", {
-            class: "italic opacity-50",
-          }),
+              class: "italic opacity-50",
+            }),
 
         {
           ...rest,

package/src/utils.js

@@ -28,15 +28,3 @@ export function toDateTimeInput(initialDate = null) {
     now.getMinutes().toString().padStart(2, "0"),
   ].join("");
 }
-
-export function checkboxesToArray(value) {
-  if (Array.isArray(value)) {
-    return value;
-  }
-
-  if (!value) {
-    return [];
-  }
-
-  return [value];
-}