@saltcorn/server 1.0.0-rc.2 → 1.0.0-rc.3

package/help/index.js

@@ -13,7 +13,8 @@ const { getState } = require("@saltcorn/data/db/state");
 const { oneOf } = require("@saltcorn/types/generators");
 const get_md_file = async (topic) => {
   try {
-    const fp = path.join(__dirname, `${File.normalise(topic)}.tmd`);
+    const fp = File.normalise_in_base(__dirname, `${topic}.tmd`);
+    if (!fp) return false;
     const fileBuf = await fs.readFile(fp);
     return fileBuf.toString();
   } catch (e) {

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "1.0.0-rc.2",
-    "@saltcorn/builder": "1.0.0-rc.2",
-    "@saltcorn/data": "1.0.0-rc.2",
-    "@saltcorn/admin-models": "1.0.0-rc.2",
-    "@saltcorn/filemanager": "1.0.0-rc.2",
-    "@saltcorn/markup": "1.0.0-rc.2",
-    "@saltcorn/plugins-loader": "1.0.0-rc.2",
-    "@saltcorn/sbadmin2": "1.0.0-rc.2",
+    "@saltcorn/base-plugin": "1.0.0-rc.3",
+    "@saltcorn/builder": "1.0.0-rc.3",
+    "@saltcorn/data": "1.0.0-rc.3",
+    "@saltcorn/admin-models": "1.0.0-rc.3",
+    "@saltcorn/filemanager": "1.0.0-rc.3",
+    "@saltcorn/markup": "1.0.0-rc.3",
+    "@saltcorn/plugins-loader": "1.0.0-rc.3",
+    "@saltcorn/sbadmin2": "1.0.0-rc.3",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.js

@@ -432,6 +432,20 @@ function saveAndContinue(e, k, event) {
   )
     return;
   var form = $(e).closest("form");
+  let focusedEl = null;
+  if (!event || !event.srcElement) {
+    const el = form.find("select[sc-received-focus]")[0];
+    if (el) {
+      el.removeAttribute("sc-received-focus");
+      if (el.getAttribute("previous-val") === el.value) return;
+    }
+  } else if (
+    event.srcElement.tagName === "SELECT" &&
+    event.srcElement.getAttribute("previous-val") !== undefined
+  ) {
+    focusedEl = event.srcElement;
+  }
+
   const valres = form[0].reportValidity();
   if (!valres) return;
   submitWithEmptyAction(form[0]);
@@ -454,6 +468,7 @@ function saveAndContinue(e, k, event) {
         reloadEmbeddedEditOwnViews(form, res.id);
       }
       common_done(res, form.attr("data-viewname"));
+      if (focusedEl) focusedEl.setAttribute("previous-val", focusedEl.value);
     },
     error: function (request) {
       var ct = request.getResponseHeader("content-type") || "";

package/routes/api.js

@@ -294,11 +294,12 @@ router.get(
           } else {
             const tbl_fields = table.getFields();
             readState(req_query, tbl_fields, req);
-            const qstate = await stateFieldsToWhere({
+            const qstate = stateFieldsToWhere({
               fields: tbl_fields,
               approximate: !!approximate,
               state: req_query,
               table,
+              prefix: "a.",
             });
             const joinFields = {};
             const derefs = Array.isArray(dereference)

package/routes/files.js

@@ -94,11 +94,15 @@ router.get(
     const { dir, no_subdirs } = req.query;
     const noSubdirs = no_subdirs === "true";
     const safeDir = File.normalise(dir || "/");
-    const absFolder = path.join(
+    const absFolder = File.normalise_in_base(
       db.connectObj.file_store,
       db.getTenantSchema(),
-      safeDir
+      dir || "/"
     );
+    if (absFolder === null) {
+      res.json({ error: "Invalid path" });
+      return;
+    }
     const dirOnDisk = await File.from_file_on_disk(
       path.basename(absFolder),
       path.dirname(absFolder)

package/routes/sync.js

@@ -335,16 +335,15 @@ router.post(
   "/clean_sync_dir",
   error_catcher(async (req, res) => {
     const { dir_name } = req.body;
-    const safe_dir_name = File.normalise(dir_name);
     try {
       const rootFolder = await File.rootFolder();
-      const syncDir = path.join(
+      const syncDir = File.normalise_in_base(
         rootFolder.location,
         "mobile_app",
         "sync",
-        safe_dir_name
+        dir_name
       );
-      await fs.rm(syncDir, { recursive: true, force: true });
+      if (syncDir) await fs.rm(syncDir, { recursive: true, force: true });
       res.status(200).send("");
     } catch (error) {
       getState().log(2, `POST /sync/clean_sync_dir: '${error.message}'`);