@saltcorn/server 1.1.2-beta.3 → 1.1.2-beta.5

package/app.js

@@ -131,6 +131,7 @@ const getApp = async (opts = {}) => {
     "cross_domain_iframe",
     false
   );
+  app.set("query parser", "extended");
 
   const helmetOptions = {
     contentSecurityPolicy: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.3",
+  "version": "1.1.2-beta.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.2-beta.3",
-    "@saltcorn/builder": "1.1.2-beta.3",
-    "@saltcorn/data": "1.1.2-beta.3",
-    "@saltcorn/admin-models": "1.1.2-beta.3",
-    "@saltcorn/filemanager": "1.1.2-beta.3",
-    "@saltcorn/markup": "1.1.2-beta.3",
-    "@saltcorn/plugins-loader": "1.1.2-beta.3",
-    "@saltcorn/sbadmin2": "1.1.2-beta.3",
+    "@saltcorn/base-plugin": "1.1.2-beta.5",
+    "@saltcorn/builder": "1.1.2-beta.5",
+    "@saltcorn/data": "1.1.2-beta.5",
+    "@saltcorn/admin-models": "1.1.2-beta.5",
+    "@saltcorn/filemanager": "1.1.2-beta.5",
+    "@saltcorn/markup": "1.1.2-beta.5",
+    "@saltcorn/plugins-loader": "1.1.2-beta.5",
+    "@saltcorn/sbadmin2": "1.1.2-beta.5",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/saltcorn-common.js

@@ -103,15 +103,26 @@ function rep_del(e) {
   var myrep = $(e).closest(".form-repeat");
   var ix = myrep.index();
   var parent = myrep.parent();
-  myrep.remove();
   parent.children().each(function (childix, element) {
     if (childix > ix) {
       reindex(element, childix, childix - 1);
     }
   });
+  myrep.remove();
 }
 
 function reindex(element, oldix, newix) {
+  $(element)
+    .find("input,textarea")
+    .each(function () {
+      $(this).attr("value", $(this).val());
+    });
+  $(element)
+    .find("select")
+    .each(function () {
+      $(this).find(":selected").attr("selected", "selected");
+    });
+
   $(element).html(
     $(element)
       .html()

package/public/saltcorn.css

@@ -812,3 +812,11 @@ tr span.add-tag {
 tr:hover span.add-tag {
   opacity: 1;
 }
+
+#saltcorn-file-manager .filelist tr {
+  cursor: pointer;
+}
+
+#saltcorn-file-manager .filelist tr.selected td {
+  background-color: var(--bs-secondary-bg-subtle, var(--tblr-secondary-bg-subtle, gray));;
+}

package/routes/admin.js

@@ -657,9 +657,11 @@ router.get(
           {
             label: req.__("When"),
             key: (r) =>
-              `${moment(
-                r.created
-              ).fromNow()}<br><small>${localeDateTime(r.created, {}, locale)}</small>`,
+              `${moment(r.created).fromNow()}<br><small>${localeDateTime(
+                r.created,
+                {},
+                locale
+              )}</small>`,
           },
           {
             label: req.__("Name"),
@@ -1193,10 +1195,10 @@ router.get(
                     th({ valign: "top" }, req.__("Saltcorn version")),
                     td(
                       packagejson.version,
-                      isRoot && can_update
+                      isRoot 
                         ? post_btn(
                             "/admin/upgrade",
-                            req.__("Upgrade"),
+                            req.__("Upgrade") + " (latest)",
                             req.csrfToken(),
                             {
                               btnClass: "btn-primary btn-sm",

package/routes/common_lists.js

@@ -290,7 +290,7 @@ const tagsDropdown = (tags, altHeader) =>
     )
   );
 
-const mkAddBtn = (tags, entityType, id, req, myTagIds) =>
+const mkAddBtn = (tags, entityType, id, req, myTagIds, on_done_redirect_str) =>
   div(
     { class: "dropdown d-inline ms-1" },
     span(
@@ -314,7 +314,7 @@ const mkAddBtn = (tags, entityType, id, req, myTagIds) =>
           post_dropdown_item(
             `/tag-entries/add-tag-entity/${encodeURIComponent(
               t.name
-            )}/${entityType}/${id}`,
+            )}/${entityType}/${id}${on_done_redirect_str||""}`,
             t.name,
             req
           )
@@ -345,7 +345,7 @@ const viewsList = async (
   const tagBadges = (view) => {
     const myTags = tag_entries.filter((te) => te.view_id === view.id);
     const myTagIds = new Set(myTags.map((t) => t.tag_id));
-    const addBtn = mkAddBtn(tags, "views", view.id, req, myTagIds);
+    const addBtn = mkAddBtn(tags, "views", view.id, req, myTagIds, on_done_redirect_str);
     return (
       myTags.map((te) => tagBadge(tagsById[te.tag_id], "views")).join(nbsp) +
       addBtn
@@ -709,7 +709,7 @@ const getTriggerList = async (
     const myTagIds = new Set(myTags.map((t) => t.tag_id));
     return (
       myTags.map((te) => tagBadge(tagsById[te.tag_id], "triggers")).join(nbsp) +
-      mkAddBtn(tags, "triggers", trigger.id, req, myTagIds)
+      mkAddBtn(tags, "triggers", trigger.id, req, myTagIds, on_done_redirect_str)
     );
   };
   return mkTable(

package/routes/fields.js

@@ -1378,6 +1378,7 @@ router.post(
       agg_outcome_type,
       agg_fieldview,
       agg_field,
+      mode,
       _columndef,
     } = req.body || {};
     const table = Table.findOne({ name: tableName });
@@ -1389,7 +1390,9 @@ router.post(
         return;
       }
       const field = table.getField(agg_field);
-      const cfgfields = await applyAsync(fv.configFields, field || { table });
+      const cfgfields = await applyAsync(fv.configFields, field || { table }, {
+        mode,
+      });
       res.json(cfgfields);
       return;
     }
@@ -1412,7 +1415,12 @@ router.post(
       res.send(req.query?.accept == "json" ? "[]" : "");
       return;
     }
-    const fieldViewConfigForms = await calcfldViewConfig([field], false, 0);
+    const fieldViewConfigForms = await calcfldViewConfig(
+      [field],
+      false,
+      0,
+      mode
+    );
     const formFields = fieldViewConfigForms[field.name][fv_name];
     if (!formFields) {
       res.send(req.query?.accept == "json" ? "[]" : "");

package/routes/plugins.js

@@ -558,6 +558,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
+        gy:3,
         widths: items.map(() => 4),
       },
     ],

package/routes/tables.js

@@ -1582,7 +1582,7 @@ const constraintForm = (req, table, fields, type) => {
     case "Formula":
       return new Form({
         action: `/table/add-constraint/${table.id}/${type}`,
-
+        onSubmit: "press_store_button(this)",
         fields: [
           {
             name: "formula",
@@ -1617,6 +1617,7 @@ const constraintForm = (req, table, fields, type) => {
         blurb: req.__(
           "Tick the boxes for the fields that should be jointly unique"
         ),
+        onSubmit: "press_store_button(this)",
         fields: [
           ...fields.map((f) => ({
             name: f.name,
@@ -1641,7 +1642,7 @@ const constraintForm = (req, table, fields, type) => {
         blurb: req.__(
           "Choose the field to be indexed. This make searching the table faster."
         ),
-
+        onSubmit: "press_store_button(this)",
         fields: [
           {
             type: "String",

package/routes/tag_entries.js

@@ -18,6 +18,7 @@ const {
   csrfField,
   isAdminOrHasConfigMinRole,
   checkEditPermission,
+  is_relative_url,
 } = require("./utils");
 
 const Table = require("@saltcorn/data/models/table");
@@ -192,18 +193,23 @@ router.post(
     const auth = checkEditPermission(entitytype, req.user);
     if (!auth) req.flash("error", "Not authorized");
     else await tag.addEntry({ [fieldName]: +entityid });
+    let redirectTarget =
+      req.query.on_done_redirect &&
+      is_relative_url("/" + req.query.on_done_redirect)
+        ? `/${req.query.on_done_redirect}`
+        : null;
     switch (entitytype) {
       case "views":
-        res.redirect(`/viewedit`);
+        res.redirect(redirectTarget || `/viewedit`);
         break;
       case "pages":
-        res.redirect(`/pageedit`);
+        res.redirect(redirectTarget || `/pageedit`);
         break;
       case "tables":
-        res.redirect(`/table`);
+        res.redirect(redirectTarget || `/table`);
         break;
       case "triggers":
-        res.redirect(`/actions`);
+        res.redirect(redirectTarget || `/actions`);
         break;
 
       default: