@saltcorn/server 0.8.1-beta.0 → 0.8.1-beta.2

package/locales/en.json

@@ -1067,5 +1067,11 @@
 	"Maximum upload file size in kilobytes": "Maximum upload file size in kilobytes",
 	"File upload timeout": "File upload timeout",
 	"Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ": "Defines how long to wait for data before aborting file upload. Set to 0 if you want to turn off timeout checks. ",
-	"Files settings": "Files settings"
+	"Files settings": "Files settings",
+	"NPM packages in code": "NPM packages in code",
+	"Comma-separated list of packages which will be available in JavaScript actions": "Comma-separated list of packages which will be available in JavaScript actions",
+	"Become user": "Become user",
+	"Your are now logged in as %s. Logout and login again to assume your usual identity": "Your are now logged in as %s. Logout and login again to assume your usual identity",
+	"Done": "Done",
+	"Configure trigger %s": "Configure trigger %s"
 }

package/locales/it.json

@@ -484,5 +484,6 @@
 	"Table access": "Table access",
 	"HTTP": "HTTP",
 	"Rights": "Rights",
-	"Permissions": "Permissions"
+	"Permissions": "Permissions",
+	"Become user": "Become user"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.1-beta.0",
+  "version": "0.8.1-beta.2",
   "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-beta.0",
-    "@saltcorn/builder": "0.8.1-beta.0",
-    "@saltcorn/data": "0.8.1-beta.0",
-    "@saltcorn/admin-models": "0.8.1-beta.0",
-    "@saltcorn/filemanager": "0.8.1-beta.0",
-    "@saltcorn/markup": "0.8.1-beta.0",
-    "@saltcorn/sbadmin2": "0.8.1-beta.0",
+    "@saltcorn/base-plugin": "0.8.1-beta.2",
+    "@saltcorn/builder": "0.8.1-beta.2",
+    "@saltcorn/data": "0.8.1-beta.2",
+    "@saltcorn/admin-models": "0.8.1-beta.2",
+    "@saltcorn/filemanager": "0.8.1-beta.2",
+    "@saltcorn/markup": "0.8.1-beta.2",
+    "@saltcorn/sbadmin2": "0.8.1-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",

package/public/saltcorn-common.js

@@ -444,10 +444,19 @@ function initialize_page() {
       setTimeout(() => {
         codes.forEach((el) => {
           //console.log($(el).attr("mode"), el);
-          CodeMirror.fromTextArea(el, {
+          const cm = CodeMirror.fromTextArea(el, {
             lineNumbers: true,
             mode: $(el).attr("mode"),
           });
+          cm.on(
+            "change",
+            $.debounce(() => {
+              $(el).closest("form").trigger("change");
+            }),
+            500,
+            null,
+            true
+          );
         });
       }, 100);
     });

package/public/saltcorn.js

@@ -97,7 +97,7 @@ function invalidate_pagings(href) {
   return newhref;
 }
 
-function set_state_fields(kvs) {
+function set_state_fields(kvs, disable_pjax) {
   let newhref = get_current_state_url();
   if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
     newhref = invalidate_pagings(newhref);
@@ -107,7 +107,8 @@ function set_state_fields(kvs) {
       newhref = removeQueryStringParameter(newhref, kv[0]);
     else newhref = updateQueryStringParameter(newhref, kv[0], kv[1]);
   });
-  pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
+  if (disable_pjax) href_to(newhref.replace("&&", "&").replace("?&", "?"));
+  else pjax_to(newhref.replace("&&", "&").replace("?&", "?"));
 }
 function unset_state_field(key) {
   pjax_to(removeQueryStringParameter(get_current_state_url(), key));

package/routes/actions.js

@@ -401,7 +401,7 @@ router.get(
         sub2_page: "Configure",
         contents: {
           type: "card",
-          title: req.__("Configure trigger"),
+          title: req.__("Configure trigger %s", trigger.name),
           contents: {
             widths: [8, 4],
             besides: [
@@ -456,6 +456,8 @@ router.get(
       // create form
       const form = new Form({
         action: addOnDoneRedirect(`/actions/configure/${id}`, req),
+        onChange: "saveAndContinue(this)",
+        submitLabel: req.__("Done"),
         fields: cfgFields,
       });
       // populate form values
@@ -468,7 +470,7 @@ router.get(
         sub2_page: "Configure",
         contents: {
           type: "card",
-          title: req.__("Configure trigger"),
+          title: req.__("Configure trigger %s", trigger.name),
           contents: renderForm(form, req.csrfToken()),
         },
       });
@@ -512,6 +514,10 @@ router.post(
       });
     } else {
       await Trigger.update(trigger.id, { configuration: form.values });
+      if (req.xhr) {
+        res.json({ success: "ok" });
+        return;
+      }
       req.flash("success", "Action configuration saved");
       res.redirect(
         req.query.on_done_redirect

package/routes/admin.js

@@ -59,6 +59,7 @@ const {
   getState,
   restart_tenant,
   getTenant,
+  getRootState,
   //get_other_domain_tenant,
   get_process_init_time,
 } = require("@saltcorn/data/db/state");
@@ -1820,6 +1821,11 @@ router.post(
  * @returns {Promise<Form>} form
  */
 const dev_form = async (req) => {
+  const role_to_create_tenant = +getRootState().getConfig(
+    "role_to_create_tenant"
+  );
+  const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
+
   return await config_fields_form({
     req,
     field_names: [
@@ -1827,6 +1833,9 @@ const dev_form = async (req) => {
       "log_sql",
       "log_client_errors",
       "log_level",
+      ...(isRoot || role_to_create_tenant < 10
+        ? ["npm_available_js_code"]
+        : []),
     ],
     action: "/admin/dev",
   });

package/routes/fields.js

@@ -707,17 +707,27 @@ router.post(
     const { tableName, fieldName, fieldview } = req.params;
     const table = await Table.findOne({ name: tableName });
     const role = req.user && req.user.id ? req.user.role_id : 10;
-    if (role > table.min_role_read) {
+
+    const fields = await table.getFields();
+    let row = { ...req.body };
+    if (row && Object.keys(row).length > 0) readState(row, fields);
+    const id = req.query.id || row.id;
+    if (id) {
+      let dbrow = await table.getRow({ id });
+      row = { ...dbrow, ...row };
+      //prevent overwriting ownership field
+      if (table.ownership_field_id) {
+        const ofield = fields.find((f) => f.id === table.ownership_field_id);
+        row[ofield.name] = dbrow[ofield.name];
+      }
+    }
+    if (
+      role > table.min_role_read &&
+      !(req.user && table.is_owner(req.user, row))
+    ) {
       res.status(401).send("");
       return;
     }
-    const fields = await table.getFields();
-    let row = { ...req.body };
-    if (!row || Object.keys(row).length === 0) {
-      const { id } = req.query;
-      if (id) row = await table.getRow({ id });
-    } else readState(row, fields);
-
     if (fieldName.includes(".")) {
       //join field
       const kpath = fieldName.split(".");

package/routes/tenant.js

@@ -385,7 +385,7 @@ router.get(
               },
               {
                 label: req.__("Created"),
-                key: (r) => localeDateTime(r.created),
+                key: (r) => (r.created ? localeDateTime(r.created) : ""),
               },
               {
                 label: req.__("Information"),