@raketa-cloud/admin 0.0.98 → 0.0.99

package/package.json

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

package/src/Adapter.js

@@ -10,6 +10,7 @@ import form_for from "./helpers/form_for";
 import history from "./helpers/historyUtils";
 import pagination from "./helpers/pagination_helper";
 import sort_button from "./helpers/sort_button";
+import utils from "./helpers/utils";
 
 function escapeHtml(string) {
   var matchHtmlRegExp = /["'&<>]/;
@@ -172,6 +173,7 @@ export default class Adapter {
       f,
       form_for: form_for(viewHelpersConfig),
       history,
+      utils,
       sort_button,
       pagination,
       Inflector,

package/src/helpers/utils.js

@@ -0,0 +1,21 @@
+function includedInCollection(value, collection) {
+  if (!collection) {
+    return false;
+  }
+
+  if (typeof collection === "string") {
+    return value === collection;
+  }
+
+  if (Array.isArray(collection)) {
+    return collection.includes(value);
+  }
+
+  throw new Error(
+    "Invalid input for collection. Expected a string or an array."
+  );
+}
+
+export default {
+  includedInCollection,
+};

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

@@ -0,0 +1,27 @@
+import utils from "../../helpers/utils";
+
+describe("includedInCollection", () => {
+  it("returns true when the given collection is a string equal to the given value", () => {
+    expect(utils.includedInCollection("key", "key")).toEqual(true);
+  });
+
+  it("returns false when the given collection is a string not equal to the given value", () => {
+    expect(utils.includedInCollection("key", "key-2")).toEqual(false);
+  });
+
+  it("returns true when the given collection is an array including the given value", () => {
+    expect(utils.includedInCollection("key", ["key"])).toEqual(true);
+  });
+
+  it("returns false when the given collection is an array not including the given value", () => {
+    expect(utils.includedInCollection("key", ["key-2"])).toEqual(false);
+  });
+
+  it("returns false when the given collection null", () => {
+    expect(utils.includedInCollection("key", null)).toEqual(false);
+  });
+
+  it("returns false when the given collection undefined", () => {
+    expect(utils.includedInCollection("key", undefined)).toEqual(false);
+  });
+});

package/src/views/articles/history/index.ejs

@@ -58,7 +58,7 @@
       <div class="checkbox-group mb-4">
         <% Object.entries(history.changeTypes(_context.resourceConfig.articleType)).forEach(([key, {label}])=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:change_type"] || []).includes(key)) { %>
+          <% if (utils.includedInCollection(key, _context.query["f:change_type"])) { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' checked value="<%= key %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' value="<%= key %>" class="hover:cursor-pointer">

package/src/views/articles/index.ejs

@@ -144,7 +144,7 @@
       <div class="checkbox-group mb-4">
         <% tags.forEach((item,idx)=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:tags"] || []).includes(item.id)) { %>
+          <% if (utils.includedInCollection(item.id, _context.query["f:tags"])) { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' checked value="<%= item.id %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' value="<%= item.id %>" class="hover:cursor-pointer">

package/src/views/events/history/index.ejs

@@ -58,7 +58,7 @@
       <div class="checkbox-group mb-4">
         <% Object.entries(history.changeTypes(_context.resourceConfig.eventType)).forEach(([key, {label}])=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:change_type"] || []).includes(key)) { %>
+          <% if (utils.includedInCollection(key, _context.query["f:change_type"])) { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' checked value="<%= key %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' value="<%= key %>" class="hover:cursor-pointer">

package/src/views/events/index.ejs

@@ -144,7 +144,7 @@
       <div class="checkbox-group mb-4">
         <% tags.forEach((item,idx)=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:tags"] || []).includes(item.id)) { %>
+          <% if (utils.includedInCollection(item.id, _context.query["f:tags"])) { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' checked value="<%= item.id %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' value="<%= item.id %>" class="hover:cursor-pointer">

package/src/views/pages/history/index.ejs

@@ -58,7 +58,7 @@
       <div class="checkbox-group mb-4">
         <% Object.entries(history.changeTypes(_context.resourceConfig.pageType)).forEach(([key, {label}])=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:change_type"] || []).includes(key)) { %>
+          <% if (utils.includedInCollection(key, _context.query["f:change_type"])) { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' checked value="<%= key %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:change_type" id='change-<%= key %>' value="<%= key %>" class="hover:cursor-pointer">

package/src/views/pages/index.ejs

@@ -139,7 +139,7 @@
       <div class="checkbox-group mb-4">
         <% tags.forEach((item,idx)=> { %>
         <div class="flex items-center gap-1">
-          <% if (Array.from(_context.query["f:tags"] || []).includes(item.id)) { %>
+          <% if (utils.includedInCollection(item.id, _context.query["f:tags"])) { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' checked value="<%= item.id %>" class="hover:cursor-pointer">
           <% } else { %>
           <input type="checkbox" name="f:tags" id='tag-<%= item.id %>' value="<%= item.id %>" class="hover:cursor-pointer">