@saltcorn/server 0.7.2 → 0.7.3-beta.2

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.2",
+  "version": "0.7.3-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.7.2",
-    "@saltcorn/builder": "0.7.2",
-    "@saltcorn/data": "0.7.2",
-    "@saltcorn/admin-models": "0.7.2",
-    "@saltcorn/markup": "0.7.2",
-    "@saltcorn/sbadmin2": "0.7.2",
+    "@saltcorn/base-plugin": "0.7.3-beta.2",
+    "@saltcorn/builder": "0.7.3-beta.2",
+    "@saltcorn/data": "0.7.3-beta.2",
+    "@saltcorn/admin-models": "0.7.3-beta.2",
+    "@saltcorn/markup": "0.7.3-beta.2",
+    "@saltcorn/sbadmin2": "0.7.3-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -48,7 +48,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.0",
-    "sharp": "0.30.3",
+    "resize-with-sharp-or-jimp": "0.1.3",
     "socket.io": "4.2.0",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",

package/public/saltcorn-common.js

@@ -471,7 +471,7 @@ function common_done(res, isWeb = true) {
 
 const repeaterCopyValuesToForm = (form, editor) => {
   const vs = JSON.parse(editor.getString());
-  const allNames = new Set([]);
+
   const setVal = (k, ix, v) => {
     const $e = form.find(`input[name="${k}_${ix}"]`);
     if ($e.length) $e.val(v);
@@ -483,16 +483,22 @@ const repeaterCopyValuesToForm = (form, editor) => {
   vs.forEach((v, ix) => {
     Object.entries(v).forEach(([k, v]) => {
       //console.log(ix, k, typeof v, v)
-      allNames.add(k);
       if (typeof v === "boolean") setVal(k, ix, v ? "on" : "");
       else setVal(k, ix, v);
     });
   });
   //delete
-  [...allNames].forEach((k) => {
-    for (let ix = vs.length; ix < vs.length + 20; ix++) {
-      $(`input[name="${k}_${ix}"]`).remove();
-    }
+  //for (let ix = vs.length; ix < vs.length + 20; ix++) {
+  // $(`input[name="${k}_${ix}"]`).remove();
+  //}
+  $(`input[type=hidden]`).each(function () {
+    const name = $(this).attr("name");
+    if (!name) return;
+    const m = name.match(/_(\d+)$/);
+    if (!m || !m[1]) return;
+    const ix = parseInt(m[1], 10);
+    if (typeof ix !== "number" || isNaN(ix)) return;
+    if (ix >= vs.length) $(this).remove();
   });
 };
 function align_dropdown(id) {
@@ -576,3 +582,9 @@ function unique_field_from_rows(
     }
   }
 }
+
+function cancel_form(form) {
+  if (!form) return;
+  $(form).append(`<input type="hidden" name="_cancel" value="on">`);
+  $(form).submit();
+}

package/public/saltcorn.css

@@ -294,3 +294,7 @@ section.range-slider input:last-of-type::-moz-range-track {
 section.range-slider input[type="range"]::-moz-focus-outer {
   border: 0;
 }
+
+.btn-xs {
+  padding: 0.1rem 0.4rem !important;
+}

package/public/saltcorn.js

@@ -162,6 +162,13 @@ function globalErrorCatcher(message, source, lineno, colno, error) {
   });
 }
 
+function close_saltcorn_modal() {
+  var myModalEl = document.getElementById("scmodal");
+  if (!myModalEl) return;
+  var modal = bootstrap.Modal.getInstance(myModalEl);
+  if (modal) modal.dispose();
+}
+
 function ajax_modal(url, opts = {}) {
   if ($("#scmodal").length === 0) {
     $("body").append(`<div id="scmodal", class="modal">
@@ -179,9 +186,7 @@ function ajax_modal(url, opts = {}) {
     </div>
   </div>`);
   } else if ($("#scmodal").hasClass("show")) {
-    var myModalEl = document.getElementById("scmodal");
-    var modal = bootstrap.Modal.getInstance(myModalEl);
-    modal.dispose();
+    close_saltcorn_modal();
   }
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
@@ -429,7 +434,6 @@ async function fill_formula_btn_click(btn, k) {
   if (k) k();
 }
 
-
 /*
 https://github.com/jeffdavidgreen/bootstrap-html5-history-tabs/blob/master/bootstrap-history-tabs.js
 Copyright (c) 2015 Jeff Green

package/routes/files.js

@@ -10,7 +10,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 resizer = require("resize-with-sharp-or-jimp");
 
 const {
   mkTable,
@@ -214,7 +214,11 @@ router.get(
         }
         const fnm = `${file.location}_w${width}`;
         if (!fs.existsSync(fnm)) {
-          await sharp(file.location).resize({ width }).toFile(fnm);
+          await resizer({
+            fromFileName: file.location,
+            width,
+            toFileName: fnm,
+          });
         }
         res.sendFile(fnm);
       }