@saltcorn/server 0.8.1-rc.3 → 0.8.2-beta.0

package/auth/admin.js

@@ -754,9 +754,7 @@ router.get(
     for (const table of tables) {
       if (table.external) continue;
       const fields = await table.getFields();
-      const userFields = fields
-        .filter((f) => f.reftable_name === "users")
-        .map((f) => ({ value: f.id, label: f.name }));
+      const ownership_opts = await table.ownership_options();
       const form = new Form({
         action: "/table",
         noSubmitButton: true,
@@ -771,7 +769,7 @@ router.get(
             input_type: "select",
             options: [
               { value: "", label: req.__("None") },
-              ...userFields,
+              ...ownership_opts,
               { value: "_formula", label: req.__("Formula") },
             ],
           },

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/locales/en.json

@@ -1080,5 +1080,7 @@
 	"Save indicator": "Save indicator",
 	"Public cache TTL (minutes)": "Public cache TTL (minutes)",
 	"Cache-control max-age for public views and pages. 0 to disable": "Cache-control max-age for public views and pages. 0 to disable",
-	"Files accept filter": "Files accept filter"
+	"Files accept filter": "Files accept filter",
+	"User group": "User group",
+	"Add relations to this table in dropdown options for ownership field": "Add relations to this table in dropdown options for ownership field"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.1-rc.3",
+  "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-rc.3",
-    "@saltcorn/builder": "0.8.1-rc.3",
-    "@saltcorn/data": "0.8.1-rc.3",
-    "@saltcorn/admin-models": "0.8.1-rc.3",
-    "@saltcorn/filemanager": "0.8.1-rc.3",
-    "@saltcorn/markup": "0.8.1-rc.3",
-    "@saltcorn/sbadmin2": "0.8.1-rc.3",
+    "@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/routes/admin.js

@@ -1546,7 +1546,22 @@ router.get(
 const checkFiles = async (outDir, fileNames) => {
   const rootFolder = await File.rootFolder();
   const mobile_app_dir = path.join(rootFolder.location, "mobile_app", outDir);
-  const entries = fs.readdirSync(mobile_app_dir);
+  const unsafeFiles = await Promise.all(
+    fs
+      .readdirSync(mobile_app_dir)
+      .map(
+        async (outFile) => await File.from_file_on_disk(outFile, mobile_app_dir)
+      )
+  );
+  const entries = unsafeFiles
+    .filter(
+      (file) =>
+        file.user_id &&
+        !isNaN(file.user_id) &&
+        file.min_role_read &&
+        !isNaN(file.min_role_read)
+    )
+    .map((file) => file.filename);
   return fileNames.some((fileName) => entries.indexOf(fileName) >= 0);
 };
 
@@ -1639,6 +1654,8 @@ router.post(
       buildDir,
       "-b",
       `${os.userInfo().homedir}/mobile_app_build`,
+      "-u",
+      req.user.email, // ensured by isAdmin
     ];
     if (useDocker) spawnParams.push("-d");
     if (androidPlatform) spawnParams.push("-p", "android");
@@ -1673,29 +1690,36 @@ router.post(
       // console.log(data.toString());
       childOutputs.push(data ? data.toString() : req.__("An error occurred"));
     });
-    child.on("exit", async function (exitCode, signal) {
+    child.on("exit", (exitCode, signal) => {
       const logFile = exitCode === 0 ? "logs.txt" : "error_logs.txt";
       fs.writeFile(
         path.join(buildDir, logFile),
         childOutputs.join("\n"),
-        (error) => {
+        async (error) => {
           if (error) {
             console.log(`unable to write '${logFile}' to '${buildDir}'`);
             console.log(error);
+          } else {
+            // no transaction, '/build-mobile-app/finished' filters for valid attributes
+            await File.set_xattr_of_existing_file(logFile, buildDir, req.user);
           }
         }
       );
     });
-    child.on("error", function (msg) {
+    child.on("error", (msg) => {
       const message = msg.message ? msg.message : msg.code;
       const stack = msg.stack ? msg.stack : "";
+      const logFile = "error_logs.txt";
       fs.writeFile(
         path.join(buildDir, "error_logs.txt"),
         [message, stack].join("\n"),
-        (error) => {
+        async (error) => {
           if (error) {
             console.log(`unable to write logFile to '${buildDir}'`);
             console.log(error);
+          } else {
+            // no transaction, '/build-mobile-app/finished' filters for valid attributes
+            await File.set_xattr_of_existing_file(logFile, buildDir, req.user);
           }
         }
       );

package/routes/tables.js

@@ -73,9 +73,7 @@ const tableForm = async (table, req) => {
     value: r.id,
     label: r.role,
   }));
-  const userFields = fields
-    .filter((f) => f.reftable_name === "users")
-    .map((f) => ({ value: f.id, label: f.name }));
+  const ownership_opts = await table.ownership_options();
   const form = new Form({
     action: "/table",
     noSubmitButton: true,
@@ -92,7 +90,7 @@ const tableForm = async (table, req) => {
               input_type: "select",
               options: [
                 { value: "", label: req.__("None") },
-                ...userFields,
+                ...ownership_opts,
                 { value: "_formula", label: req.__("Formula") },
               ],
             },
@@ -109,6 +107,14 @@ const tableForm = async (table, req) => {
                   .join(", "),
               showIf: { ownership_field_id: "_formula" },
             },
+            {
+              label: req.__("User group"),
+              sublabel: req.__(
+                "Add relations to this table in dropdown options for ownership field"
+              ),
+              name: "is_user_group",
+              type: "Bool",
+            },
           ]
         : []),
       // description of table
@@ -898,6 +904,12 @@ router.post(
           notify = req.__(`Invalid ownership formula: %s`, fmlValidRes);
           hasError = true;
         }
+      } else if (
+        typeof rest.ownership_field_id === "string" &&
+        rest.ownership_field_id.startsWith("Fml:")
+      ) {
+        rest.ownership_formula = rest.ownership_field_id.replace("Fml:", "");
+        rest.ownership_field_id = null;
       } else rest.ownership_formula = null;
       await table.update(rest);
 

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");
+});