@saltcorn/server 0.7.1 → 0.7.2-beta.0

package/locales/en.json

@@ -888,5 +888,6 @@
 	"Cannot install unsafe plugins on subdomain tenants": "Cannot install unsafe plugins on subdomain tenants",
 	"Default order descending?": "Default order descending?",
 	"This is the view to which the user will be sent when the form is submitted. The view you specify here can be ignored depending on the context of the form, for instance if it appears in a pop-up the redirect will not take place.": "This is the view to which the user will be sent when the form is submitted. The view you specify here can be ignored depending on the context of the form, for instance if it appears in a pop-up the redirect will not take place.",
-	"Destination view": "Destination view"
+	"Destination view": "Destination view",
+	"Finish": "Finish"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.1",
+  "version": "0.7.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.7.1",
-    "@saltcorn/builder": "0.7.1",
-    "@saltcorn/data": "0.7.1",
-    "@saltcorn/admin-models": "0.7.1",
-    "@saltcorn/markup": "0.7.1",
-    "@saltcorn/sbadmin2": "0.7.1",
+    "@saltcorn/base-plugin": "0.7.2-beta.0",
+    "@saltcorn/builder": "0.7.2-beta.0",
+    "@saltcorn/data": "0.7.2-beta.0",
+    "@saltcorn/admin-models": "0.7.2-beta.0",
+    "@saltcorn/markup": "0.7.2-beta.0",
+    "@saltcorn/sbadmin2": "0.7.2-beta.0",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -46,6 +46,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.0",
+    "sharp": "0.30.3",
     "socket.io": "4.2.0",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
@@ -58,6 +59,7 @@
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
     "jest": "26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
     "supertest": "^4.0.2"
   },
   "scripts": {

package/public/jquery-menu-editor.min.js

@@ -117,6 +117,7 @@ function MenuEditor(e, t) {
             (n.prev("div").children(".sortableListsOpener").first().remove(),
             n.remove()),
           MenuEditor.updateButtons(s);
+          l.onUpdate();
       }
     }),
     $(document).on("click", ".btnEdit", function (e) {
@@ -145,11 +146,13 @@ function MenuEditor(e, t) {
       e.preventDefault();
       var t = $(this).closest("li");
       t.prev("li").before(t), MenuEditor.updateButtons(s);
+      l.onUpdate();
     }),
     s.on("click", ".btnDown", function (e) {
       e.preventDefault();
       var t = $(this).closest("li");
       t.next("li").after(t), MenuEditor.updateButtons(s);
+      l.onUpdate();
     }),
     s.on("click", ".btnOut", function (e) {
       e.preventDefault();
@@ -161,6 +164,7 @@ function MenuEditor(e, t) {
           t.remove()),
         MenuEditor.updateButtons(s),
         s.updateLevels();
+        l.onUpdate();
     }),
     s.on("click", ".btnIn", function (e) {
       e.preventDefault();
@@ -174,6 +178,7 @@ function MenuEditor(e, t) {
           l.append(n), n.append(t), l.addClass("sortableListsOpen"), f(l);
         }
       MenuEditor.updateButtons(s), s.updateLevels();
+      l.onUpdate();
     }),
     (this.setForm = function (e) {
       i = e;

package/public/saltcorn.css

@@ -224,3 +224,12 @@ footer.bs-mobile-nav-footer {
 .form-group {
   margin-bottom: 1rem;
 }
+
+.containerbgimage {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+}

package/public/saltcorn.js

@@ -618,6 +618,47 @@ function saveAndContinue(e, k) {
   return false;
 }
 
+function applyViewConfig(e, url) {
+  var form = $(e).closest("form");
+  var form_data = form.serializeArray();
+  const cfg = {};
+  form_data.forEach((item) => {
+    cfg[item.name] = item.value;
+  });
+  $.ajax(url, {
+    type: "POST",
+    dataType: "json",
+    contentType: "application/json",
+    headers: {
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    data: JSON.stringify(cfg),
+    error: function (request) {},
+  });
+
+  return false;
+}
+
+const repeaterCopyValuesToForm = (form, editor) => {
+  const vs = JSON.parse(editor.getString());
+  //console.log(vs)
+  const setVal = (k, ix, v) => {
+    const $e = form.find(`input[name="${k}_${ix}"]`);
+    if ($e.length) $e.val(v);
+    else
+      form.append(
+        `<input type="hidden" name="${k}_${ix}" value="${v}"></input>`
+      );
+  };
+  vs.forEach((v, ix) => {
+    Object.entries(v).forEach(([k, v]) => {
+      //console.log(ix, k, typeof v, v)
+      if (typeof v === "boolean") setVal(k, ix, v ? "on" : "");
+      else setVal(k, ix, v);
+    });
+  });
+};
+
 function ajaxSubmitForm(e) {
   var form = $(e).closest("form");
   var url = form.attr("action");
@@ -834,7 +875,7 @@ const columnSummary = (col) => {
   if (!col) return "Unknown";
   switch (col.type) {
     case "Field":
-      return `Field ${col.field_name} ${col.fieldview}`;
+      return `Field ${col.field_name} ${col.fieldview || ""}`;
     case "Link":
       return `Link ${col.link_text}`;
     case "JoinField":

package/routes/files.js

@@ -9,6 +9,7 @@ const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const { getState } = require("@saltcorn/data/db/state");
 const s3storage = require("../s3storage");
+const sharp = require("sharp");
 
 const {
   mkTable,
@@ -43,6 +44,8 @@ const {
   config_fields_form,
   save_config_from_form,
 } = require("../markup/admin");
+const fsp = require("fs").promises;
+const fs = require("fs");
 
 /**
  * @type {object}
@@ -187,6 +190,54 @@ router.get(
   })
 );
 
+/**
+ * @name get/resize/:id
+ * @function
+ * @memberof module:routes/files~filesRouter
+ * @function
+ */
+router.get(
+  "/resize/:id/:width_str",
+  error_catcher(async (req, res) => {
+    const role = req.user && req.user.id ? req.user.role_id : 10;
+    const user_id = req.user && req.user.id;
+    const { id, width_str } = req.params;
+    let file;
+    if (typeof strictParseInt(id) !== "undefined")
+      file = await File.findOne({ id });
+    else file = await File.findOne({ filename: id });
+
+    if (!file) {
+      res
+        .status(404)
+        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
+      return;
+    }
+    if (role <= file.min_role_read || (user_id && user_id === file.user_id)) {
+      res.type(file.mimetype);
+      const cacheability = file.min_role_read === 10 ? "public" : "private";
+      res.set("Cache-Control", `${cacheability}, max-age=86400`);
+      //TODO s3
+      if (file.s3_store) s3storage.serveObject(file, res, false);
+      else {
+        const width = strictParseInt(width_str);
+        if (!width) {
+          res.sendFile(file.location);
+          return;
+        }
+        const fnm = `${file.location}_w${width}`;
+        if (!fs.existsSync(fnm)) {
+          await sharp(file.location).resize({ width }).toFile(fnm);
+        }
+        res.sendFile(fnm);
+      }
+    } else {
+      req.flash("warning", req.__("Not authorized"));
+      res.redirect("/");
+    }
+  })
+);
+
 /**
  * @name post/setrole/:id
  * @function

package/routes/viewedit.js

@@ -582,8 +582,11 @@ router.get(
       return;
     }
     const configFlow = await view.get_config_flow(req);
+    const hasConfig =
+      view.configuration && Object.keys(view.configuration).length > 0;
     const wfres = await configFlow.run(
       {
+        id: hasConfig ? view.id : undefined,
         table_id: view.table_id,
         exttable_name: view.exttable_name,
         viewname: name,
@@ -704,6 +707,48 @@ router.post(
   })
 );
 
+/**
+ * @name post/saveconfig/:id
+ * @function
+ * @memberof module:routes/viewedit~vieweditRouter
+ * @function
+ */
+router.post(
+  "/saveconfig/:viewname",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { viewname } = req.params;
+
+    if (viewname && req.body) {
+      const view = await View.findOne({ name: viewname });
+      const configFlow = await view.get_config_flow(req);
+      const step = await configFlow.singleStepForm(req.body, req);
+      if (step?.renderForm) {
+        if (!step.renderForm.hasErrors) {
+          let newcfg;
+          if (step.contextField)
+            newcfg = {
+              ...view.configuration,
+              [step.contextField]: {
+                ...view.configuration?.[step.contextField],
+                ...step.renderForm.values,
+              },
+            };
+          else newcfg = { ...view.configuration, ...step.renderForm.values };
+          await View.update({ configuration: newcfg }, view.id);
+          res.json({ success: "ok" });
+        } else {
+          res.json({ error: step.renderForm.errorSummary });
+        }
+      } else {
+        res.json({ error: "no form" });
+      }
+    } else {
+      res.json({ error: "no view" });
+    }
+  })
+);
+
 /**
  * @name post/setrole/:id
  * @function

package/tests/plugins.test.js

@@ -90,7 +90,7 @@ describe("Plugin Endpoints", () => {
       .expect(toInclude("testfilecontents"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
 
@@ -100,7 +100,7 @@ describe("Plugin Endpoints", () => {
       .expect(toRedirect("/plugins"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
   });