@saltcorn/server 0.8.1 → 0.8.2-beta.0

package/auth/roleadmin.js

@@ -17,7 +17,7 @@ const {
 } = require("@saltcorn/markup");
 const { isAdmin, error_catcher, csrfField } = require("../routes/utils");
 const { getState } = require("@saltcorn/data/db/state");
-const { text, form, option, select } = require("@saltcorn/markup/tags");
+const { text, form, option, select, a, i } = require("@saltcorn/markup/tags");
 const { send_users_page } = require("../markup/admin");
 
 /**
@@ -37,8 +37,19 @@ module.exports = router;
  * @param {object} req
  * @returns {Form}
  */
-const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
-  form(
+const editRoleLayoutForm = (role, layouts, layout_by_role, req) => {
+  //console.log(layouts);
+  let edit_link = "";
+  const current_layout = layout_by_role[role.id] || layouts[layouts.length - 1];
+  let plugin = getState().plugins[current_layout];
+
+  if (plugin?.configuration_workflow)
+    edit_link = a(
+      { href: `/plugins/configure/${encodeURIComponent(current_layout)}` },
+      i({ class: "fa fa-cog ms-2" })
+    );
+
+  return form(
     {
       action: `/roleadmin/setrolelayout/${role.id}`,
       method: "post",
@@ -57,8 +68,10 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
           text(layout)
         )
       )
-    )
+    ),
+    edit_link
   );
+};
 
 /**
  *

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.1",
+  "version": "0.8.2-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.1",
-    "@saltcorn/builder": "0.8.1",
-    "@saltcorn/data": "0.8.1",
-    "@saltcorn/admin-models": "0.8.1",
-    "@saltcorn/filemanager": "0.8.1",
-    "@saltcorn/markup": "0.8.1",
-    "@saltcorn/sbadmin2": "0.8.1",
+    "@saltcorn/base-plugin": "0.8.2-beta.0",
+    "@saltcorn/builder": "0.8.2-beta.0",
+    "@saltcorn/data": "0.8.2-beta.0",
+    "@saltcorn/admin-models": "0.8.2-beta.0",
+    "@saltcorn/filemanager": "0.8.2-beta.0",
+    "@saltcorn/markup": "0.8.2-beta.0",
+    "@saltcorn/sbadmin2": "0.8.2-beta.0",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn-common.js

@@ -766,17 +766,34 @@ function unique_field_from_rows(
         return i;
     }
   };
+  const char_to_i = (s) => {
+    switch (char_type) {
+      case "Lowercase Letters":
+        return s.charCodeAt(0) - "a".charCodeAt(0);
+      case "Uppercase Letters":
+        return s.charCodeAt(0) - "A".charCodeAt(0);
+      default:
+        return +s;
+    }
+  };
+  const value_wspace = `${value}${space ? " " : ""}`;
   const vals = rows
     .map((o) => o[field_name])
     .filter((s) => s.startsWith(value));
+
   if (vals.includes(value) || always_append) {
-    for (let i = start || 0; i < vals.length + (start || 0) + 2; i++) {
-      const newname = `${value}${space ? " " : ""}${gen_char(i)}`;
-      if (!vals.includes(newname)) {
-        $("#" + id).val(newname);
-        return;
-      }
+    let newname;
+    const stripped = vals
+      .filter((v) => v !== value)
+      .map((s) => s.replace(value_wspace, ""))
+      .sort();
+    if (stripped.length === 0) newname = `${value_wspace}${gen_char(start)}`;
+    else {
+      const last_i = char_to_i(stripped[stripped.length - 1]);
+
+      newname = `${value_wspace}${gen_char(last_i + 1)}`;
     }
+    $("#" + id).val(newname);
   }
 }
 

package/serve.js

@@ -291,6 +291,7 @@ module.exports =
           auto_backup_now,
           take_snapshot,
         });
+        require("./systemd")({ port });
       }
       Trigger.emitEvent("Startup");
     } else {

package/tests/clientjs.test.js

@@ -64,3 +64,74 @@ test("updateQueryStringParameter hash", () => {
     "/foo?name=Bar#Baz"
   );
 });
+test("unique_field_from_rows test", () => {
+  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar" }, { foo: "bar0" }],
+    "mkuniq",
+    "foo",
+    false,
+    0,
+    false,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq").val()).toBe("bar1");
+
+  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar" }],
+    "mkuniq",
+    "foo",
+    false,
+    9,
+    false,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq").val()).toBe("bar9");
+
+  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar0" }],
+    "mkuniq",
+    "foo",
+    false,
+    9,
+    false,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq").val()).toBe("bar9");
+
+  $("#mkuniq").val("bar");
+  unique_field_from_rows([], "mkuniq", "foo", false, 0, false, "Digits", "bar");
+  expect($("#mkuniq").val()).toBe("bar");
+
+  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar" }, { foo: "bar A" }],
+    "mkuniq",
+    "foo",
+    true,
+    0,
+    false,
+    "Uppercase Letters",
+    "bar"
+  );
+  expect($("#mkuniq").val()).toBe("bar B");
+
+  //skips blanks
+  $("body").append(`<input id="mkuniq" value="bar"></div>`);
+  unique_field_from_rows(
+    [{ foo: "bar" }, { foo: "bar0" }, { foo: "bar1" }, { foo: "bar3" }],
+    "mkuniq",
+    "foo",
+    false,
+    0,
+    false,
+    "Digits",
+    "bar"
+  );
+  expect($("#mkuniq").val()).toBe("bar4");
+});