@raketa-cloud/admin 0.0.92 → 0.0.94

package/jest.config.js

@@ -11,8 +11,8 @@ const config = {
   ],
   coverageThreshold: {
     global: {
-      branches: 71,
-      functions: 74,
+      branches: 72,
+      functions: 75,
       lines: 78,
       statements: 78,
     },

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.92",
+  "version": "0.0.94",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",
-    "test": "jest --coverage --coverageReporters=text --coverageReporters=\"text-summary\""
+    "test": "jest --coverage --coverageReporters=html --coverageReporters=\"text-summary\""
   },
   "devDependencies": {
     "@babel/core": "7.24.7",

package/src/handlers/RedirectsHandler.js

@@ -102,7 +102,7 @@ const destroy = async (ctx) => {
   const { errors } = await ctx.client.redirects.delete(id);
 
   if (errors) {
-    throw `Failed to delete redirect #${id}. WTF?`;
+    throw `Failed to delete redirect #${id}.`;
   }
 
   return {

package/src/handlers/TagsHandler.js

@@ -92,7 +92,7 @@ const destroy = async (ctx) => {
   const { errors } = await ctx.client.tags.delete(id, ctx.locale);
 
   if (errors) {
-    throw `Failed to delete tag #${id}. WTF?`;
+    throw `Failed to delete tag #${id}.`;
   }
 
   return {

package/src/handlers/categories/index.js

@@ -106,7 +106,7 @@ const destroy = async (ctx) => {
 
   return {
     headers: {
-      "HX-redirect": `/${ctx.locale}/${ctx.resourceConfig.categoryTypePlural}`,
+      "HX-Redirect": `/${ctx.locale}/${ctx.resourceConfig.categoryTypePlural}`,
     },
     json: {},
   };

package/src/helpers/FormBuilder.js

@@ -385,7 +385,12 @@ export default class FormBuilder extends HTMLBuilder {
       });
     }
 
-    const defaultLabel = opts?.label || this.__getDefaultLabel(name);
+    let defaultLabel = this.__getDefaultLabel(name);
+
+    if (Object.hasOwn(opts, "label")) {
+      defaultLabel = opts?.label;
+    }
+
     const htmlID = this.__getID(name);
     const error = this.__getError(name);
 

package/src/helpers/HTMLBuilder.js

@@ -31,7 +31,7 @@ export default class HTMLBuilder {
     }, "");
 
     if (children || nonVoid)
-      return `<${tag} ${htmlAttributes}>${children}</${tag}>`;
+      return `<${tag} ${htmlAttributes}>${children ? children : ""}</${tag}>`;
 
     return `<${tag} ${htmlAttributes} />`;
   }

package/src/setupAuthentication.js

@@ -5,13 +5,16 @@ import currentPath from "./currentPath.cjs";
 import AuthHelper from "./helpers/AuthHelper";
 // TODO: Maybe change the encryption mechanism?
 import simpleCipher from "./simpleCipher";
+import getConfig from "../../../apps/admin/src/getConfig";
 
 // Generate a random signing secret on every server restart
-const SIGNING_SECRET = randomBytes(64).toString("hex");
+// const SIGNING_SECRET = randomBytes(64).toString("hex");
 const DELIMITER = ",";
 
 function calculateHash(text) {
-  return createHmac("sha256", SIGNING_SECRET).update(text).digest("hex");
+  return createHmac("sha256", getConfig().secrets.signing_secret)
+    .update(text)
+    .digest("hex");
 }
 
 function obfuscateToken(token) {

package/src/simpleCipher.js

@@ -1,14 +1,8 @@
+import getConfig from "../../../apps/admin/src/getConfig";
+
 const ALPHABET =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,.";
 
-function generateKey() {
-  const shuffled = ALPHABET.split("")
-    .sort(() => Math.random() - 0.5)
-    .join("");
-
-  return shuffled;
-}
-
 function generateEncryptionLookup(key) {
   const lookup = {};
 
@@ -29,22 +23,38 @@ function generateDecryptionLookup(key) {
   return lookup;
 }
 
+// function generateKey() {
+//   const shuffled = ALPHABET.split("")
+//     .sort(() => Math.random() - 0.5)
+//     .join("");
+
+//   return shuffled;
+// }
+
 // Scramble lookup maps on every server restart
-const CIPHER_KEY = generateKey();
-const ENCRYPT_LOOKUP = generateEncryptionLookup(CIPHER_KEY);
-const DECRYPT_LOOKUP = generateDecryptionLookup(CIPHER_KEY);
+// const CIPHER_KEY = generateKey();
+// const ENCRYPT_LOOKUP = generateEncryptionLookup(CIPHER_KEY);
+// const DECRYPT_LOOKUP = generateDecryptionLookup(CIPHER_KEY);
 
 function encrypt(plaintext) {
+  const ecryptLookup = generateEncryptionLookup(
+    getConfig().secrets.crypto_secret
+  );
+
   return plaintext
     .split("")
-    .map((char) => ENCRYPT_LOOKUP[char] || char)
+    .map((char) => ecryptLookup[char] || char)
     .join("");
 }
 
 function decrypt(ciphertext) {
+  const decryptLookup = generateDecryptionLookup(
+    getConfig().secrets.crypto_secret
+  );
+
   return ciphertext
     .split("")
-    .map((char) => DECRYPT_LOOKUP[char] || char)
+    .map((char) => decryptLookup[char] || char)
     .join("");
 }
 

package/src/tests/Logger.test.js

@@ -0,0 +1,33 @@
+import Logger from "../Logger";
+
+describe("Logger", () => {
+  describe("error", () => {
+    test("Logs an error to the console", () => {
+      const logSpy = jest.spyOn(global.console, "error");
+
+      Logger.error({ foo: "BAR" });
+
+      expect(logSpy).toHaveBeenCalledWith("[ERROR]", "{ foo: 'BAR' }");
+    });
+  });
+
+  describe("info", () => {
+    test("Logs info to the console", () => {
+      const logSpy = jest.spyOn(global.console, "info");
+
+      Logger.info({ foo: "BAR" });
+
+      expect(logSpy).toHaveBeenCalledWith("[INFO]", "{ foo: 'BAR' }");
+    });
+  });
+
+  describe("debug", () => {
+    test("Logs debug information to the console", () => {
+      const logSpy = jest.spyOn(global.console, "debug");
+
+      Logger.debug({ foo: "BAR" });
+
+      expect(logSpy).toHaveBeenCalledWith("[DEBUG]", "{ foo: 'BAR' }");
+    });
+  });
+});

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

@@ -45,7 +45,7 @@ describe("Redirects", () => {
       }));
 
     await expect(() => RedirectsHandler.destroy(ctx)).rejects.toMatch(
-      "Failed to delete redirect #1. WTF?"
+      "Failed to delete redirect #1."
     );
 
     expect(mockDelete).toHaveBeenCalledWith(1);

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

@@ -43,7 +43,7 @@ describe("Tags Handler", () => {
       }));
 
     expect(() => TagsHandler.destroy(ctx)).rejects.toMatch(
-      "Failed to delete tag #1. WTF?"
+      "Failed to delete tag #1."
     );
 
     expect(mockedDelete).toHaveBeenCalledWith("1", "en");

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

@@ -1,34 +1,38 @@
-import RedirectsHandler from "../../../handlers/RedirectsHandler";
-import Redirects from "../../../cloud/Redirects";
+import CategoriesHandler from "../../../handlers/categories";
+import Categories from "../../../cloud/Categories";
 
 import Factory from "../../support/factory";
 
 function buildCtx() {
   return {
     client: {
-      redirects: new Redirects(() => ({}), "token"),
+      categories: new Categories(() => ({}), "token"),
     },
     params: { id: 1 },
     locale: "en",
+    resourceConfig: {
+      categoryType: "cat",
+      categoryTypePlural: "cats",
+    },
   };
 }
 
-describe("Redirects", () => {
+describe("Categories", () => {
   test("destroy successful", async () => {
     const redirect = Factory.build("redirect");
     const ctx = buildCtx();
 
     const mockDelete = jest
-      .spyOn(ctx.client.redirects, "delete")
+      .spyOn(ctx.client.categories, "delete")
       .mockImplementation(() => ({ redirect: redirect, errors: null }));
 
-    const result = await RedirectsHandler.destroy(ctx);
+    const result = await CategoriesHandler.destroy(ctx);
 
-    expect(mockDelete).toHaveBeenCalledWith(1);
+    expect(mockDelete).toHaveBeenCalledWith(1, "en");
 
     expect(result).toEqual({
       headers: {
-        "HX-Redirect": "/en/redirects",
+        "HX-Redirect": "/en/cats",
       },
       json: {},
     });
@@ -38,16 +42,16 @@ describe("Redirects", () => {
     const ctx = buildCtx();
 
     const mockDelete = jest
-      .spyOn(ctx.client.redirects, "delete")
+      .spyOn(ctx.client.categories, "delete")
       .mockImplementation(() => ({
         redirect: null,
         errors: [{ key: "generalError", message: "Not found" }],
       }));
 
-    await expect(() => RedirectsHandler.destroy(ctx)).rejects.toMatch(
-      "Failed to delete redirect #1. WTF?"
+    await expect(() => CategoriesHandler.destroy(ctx)).rejects.toEqual(
+      "Failed to delete category #1."
     );
 
-    expect(mockDelete).toHaveBeenCalledWith(1);
+    expect(mockDelete).toHaveBeenCalledWith(1, "en");
   });
 });

package/src/tests/helpers/HTMLBuilder.test.js

@@ -0,0 +1,44 @@
+import HTMLBuilder from "../../helpers/HTMLBuilder";
+
+describe("HTMLBuilder", () => {
+  function normalizeHTML(html) {
+    return html.replace(/>\s+</g, "><").replace(/\s+/g, " ").trim();
+  }
+
+  describe("tag", () => {
+    test("renders a self closing tag", () => {
+      const builder = new HTMLBuilder();
+
+      const result = builder.tag("img", null, { src: "/some-image.jpg" });
+
+      expect(normalizeHTML(result)).toEqual(
+        normalizeHTML('<img src="/some-image.jpg" />')
+      );
+    });
+
+    test("renders a label tag", () => {
+      const builder = new HTMLBuilder();
+
+      const result = builder.tag("label", "Heelo", { for: "some-input-id" });
+
+      expect(normalizeHTML(result)).toEqual(
+        normalizeHTML('<label for="some-input-id">Heelo</label>')
+      );
+    });
+
+    test("renders a textarea tag", () => {
+      const builder = new HTMLBuilder();
+
+      const result = builder.tag(
+        "textarea",
+        undefined,
+        { id: "some-input-id", value: "Text?" },
+        { nonVoid: true }
+      );
+
+      expect(normalizeHTML(result)).toEqual(
+        normalizeHTML('<textarea id="some-input-id" value="Text?"></textarea>')
+      );
+    });
+  });
+});

package/src/views/article_revisions/publishes/_form.ejs

@@ -4,7 +4,7 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- f.field('publishing.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
+  <%- f.field('publishing.type', { as: 'radio_group', label: "", options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
   <%- f.field('publishing.title'), { required: true, hint: "Appears in the history of changes" } %>

package/src/views/articles/show.ejs

@@ -191,14 +191,6 @@
                 <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
               </form>
 
-              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.articleType}_revisions/${revision.id}` %>" hx-confirm="Are you sure?" type="button" class="btn-danger has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
-                <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="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
-                </svg>
-
-                Delete
-              </button>
-
               <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.articleType %>-revisions/<%= revision.id %>/preview" target="_blank" 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" />

package/src/views/event_revisions/publishes/_form.ejs

@@ -4,7 +4,7 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- f.field('publishing.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
+  <%- f.field('publishing.type', { as: 'radio_group', label: "", options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
   <%- f.field('publishing.title'), { required: true, hint: "Appears in the history of changes" } %>

package/src/views/events/show.ejs

@@ -191,14 +191,6 @@
                 <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
               </form>
 
-              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.eventType}_revisions/${revision.id}` %>" hx-confirm="Are you sure?" type="button" class="btn-danger has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
-                <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="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
-                </svg>
-
-                Delete
-              </button>
-
               <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.eventType %>-revisions/<%= revision.id %>/preview" target="_blank" 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" />

package/src/views/page_revisions/publishes/_form.ejs

@@ -4,7 +4,7 @@
   <div class="mb-4 text-red-500">A page with this URL already exists</div>
   <% } %>
 
-  <%- f.field('publishing.type', { as: 'radio_group', options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
+  <%- f.field('publishing.type', { as: 'radio_group', label: "", options: [["now", "Publish now"], ["later", "Schedule for a date"]] }) %>
   <%- f.field('publishing.mergeAt', { type: 'datetime-local', label: 'Publish revision at (UTC)' }) %>
 
   <%- f.field('publishing.title'), { required: true, hint: "Appears in the history of changes" } %>

package/src/views/pages/show.ejs

@@ -192,14 +192,6 @@
                 <%- f.submit('Remove schedule', { class: 'btn-text' }) %>
               </form>
 
-              <button hx-delete="<%= `/${_context.locale}/${_context.resourceConfig.pageType}_revisions/${revision.id}` %>" hx-confirm="Are you sure?" type="button" class="btn-danger has-icon <%= revision.meta && revision.meta.locked ? 'cursor-not-allowed text-gray-400 pointer-events-none' : '' %>">
-                <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="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
-                </svg>
-
-                Delete
-              </button>
-
               <a href="/remote/login?redirect_to=/<%= _context.locale %>/admin/<%= _context.resourceConfig.pageType %>-revisions/<%= revision.id %>/preview" target="_blank" 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" />