@raketa-cloud/admin 0.0.72 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "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/HonoAdapter.js

@@ -38,13 +38,6 @@ export default class HonoAdapter extends Adapter {
     // TODO: Pass in a path to redirect to after login?
     setupAuthentication(
       router,
-      {
-        remote: {
-          domain: "localhost",
-          host: "http://localhost:3000",
-          cookie_key: "cms-starter-slim",
-        },
-      },
       config
     );
 

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,8 +66,6 @@ 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);
 
   const { errors } = await ctx.client.pageRevisions.update(

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/setupAuthentication.js

@@ -9,7 +9,7 @@ function getAuthBearer(c) {
   return authHeader.replace("Bearer ", "");
 }
 
-const setupAuthentication = (app, opts, config) => {
+const setupAuthentication = (app, config) => {
   app.use(async (c, next) => {
     const token = getCookie(c, AuthHelper.cookie_key) || getAuthBearer(c);
 
@@ -67,7 +67,7 @@ const setupAuthentication = (app, opts, config) => {
 
   app.get("/logout", (c) => {
     deleteCookie(c, AuthHelper.cookie_key);
-    deleteCookie(c, opts.remote.cookie_key);
+    deleteCookie(c, config.remoteConfig.cookie_key);
     return c.redirect("/login");
   });
 
@@ -79,14 +79,14 @@ const setupAuthentication = (app, opts, config) => {
       return c.redirect("/login");
     }
 
-    setCookie(c, opts.remote.cookie_key, token, {
+    setCookie(c, config.remoteConfig.cookie_key, token, {
       path: "/",
       httpOnly: true,
       secure: true,
-      domain: opts.remote.domain,
+      domain: config.remoteConfig.domain,
     });
 
-    return c.redirect([opts.remote.host, c.req.query().redirect_to].join(""));
+    return c.redirect([config.remoteConfig.host, c.req.query().redirect_to].join(""));
   });
 
   app.get("/profile", (c) => {

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];
-}

package/src/views/articles/_shared/_history_toolbar.ejs

@@ -12,7 +12,7 @@
   </form>
   <% } %>
 
-  <a href="#" class="btn-text hidden">
+  <a href="/remote-login?redirect_to=/admin/<%= _context.resourceConfig.articleTypePlural %>/<%= resource.id %>/changes/<%= change.version %>" class="btn-text has-icon">
     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
       <path stroke-linecap="round" stroke-linejoin="round" d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
       <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />

package/src/views/events/_shared/_history_toolbar.ejs

@@ -12,7 +12,7 @@
   </form>
   <% } %>
 
-  <a href="#" class="btn-text hidden">
+  <a href="/remote-login?redirect_to=/admin/<%= _context.resourceConfig.eventTypePlural %>/<%= resource.id %>/changes/<%= change.version %>" class="btn-text has-icon">
     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
       <path stroke-linecap="round" stroke-linejoin="round" d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
       <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />

package/src/views/pages/_shared/_history_toolbar.ejs

@@ -12,7 +12,7 @@
   </form>
   <% } %>
 
-  <a href="#" class="btn-text hidden">
+  <a href="/remote-login?redirect_to=/admin/<%= _context.resourceConfig.pageTypePlural %>/<%= resource.id %>/changes/<%= change.version %>" class="btn-text has-icon">
     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
       <path stroke-linecap="round" stroke-linejoin="round" d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
       <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />