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

package/auth/routes.js

@@ -1133,7 +1133,10 @@ router.post(
     }
     if (getState().get2FApolicy(req.user) === "Mandatory") {
       res.redirect("/auth/twofa/setup/totp");
-    } else if (req.body.dest && is_relative_url(req.body.dest)) {
+    } else if (
+      req.body.dest &&
+      is_relative_url(decodeURIComponent(req.body.dest))
+    ) {
       res.redirect(decodeURIComponent(req.body.dest));
     } else res.redirect("/");
   })

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "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.1",
-    "@saltcorn/builder": "1.0.0-rc.1",
-    "@saltcorn/data": "1.0.0-rc.1",
-    "@saltcorn/admin-models": "1.0.0-rc.1",
-    "@saltcorn/filemanager": "1.0.0-rc.1",
-    "@saltcorn/markup": "1.0.0-rc.1",
-    "@saltcorn/plugins-loader": "1.0.0-rc.1",
-    "@saltcorn/sbadmin2": "1.0.0-rc.1",
+    "@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",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/gridedit.js

@@ -87,7 +87,9 @@ function isoDateFormatter(cell, formatterParams, onRendered) {
   if (formatterParams && formatterParams.format)
     return dayjs(val).format(formatterParams.format);
 
-  return new Date(val).toLocaleDateString(window.detected_locale || "en");
+  return new Date(val).toLocaleDateString(window.detected_locale || "en", {
+    timeZone: "UTC",
+  });
 }
 function colorFormatter(cell, formatterParams, onRendered) {
   const val = cell.getValue();

package/public/saltcorn-builder.css

@@ -525,10 +525,3 @@ div.componets-and-library-accordion {
 .toolbox-card:nth-child(2) {
   margin-bottom: 0px;
 }
-#builder-main-canvas {
-  height: calc(100dvh - 50px) !important;
-  min-height: 600px;
-}
-#builder-main-canvas.h-100 {
-  height: 100% !important;
-}

package/public/saltcorn.js

@@ -350,16 +350,18 @@ function expand_thumbnail(img_id, filename) {
 }
 
 function ajax_modal(url, opts = {}) {
-  ensure_modal_exists_and_closed();
-  $("#scmodal").removeClass("no-submit-reload");
-  $("#scmodal").attr("data-on-close-reload-view", opts.reload_view || null);
-
-  if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   $.ajax(url, {
     headers: {
       SaltcornModalRequest: "true",
     },
     success: function (res, textStatus, request) {
+      ensure_modal_exists_and_closed();
+      $("#scmodal").removeClass("no-submit-reload");
+      $("#scmodal").attr("data-on-close-reload-view", opts.reload_view || null);
+
+      if (opts.submitReload === false)
+        $("#scmodal").addClass("no-submit-reload");
+
       var title = request.getResponseHeader("Page-Title");
       var width = request.getResponseHeader("SaltcornModalWidth");
       var minwidth = request.getResponseHeader("SaltcornModalMinWidth");

package/routes/actions.js

@@ -755,7 +755,7 @@ router.post(
       req.flash("success", req.__("Action configuration saved"));
       res.redirect(
         req.query.on_done_redirect &&
-          is_relative_url(req.query.on_done_redirect)
+          is_relative_url("/" + req.query.on_done_redirect)
           ? `/${req.query.on_done_redirect}`
           : "/actions/"
       );

package/routes/delete.js

@@ -38,7 +38,10 @@ router.post(
     try {
       if (role <= table.min_role_write)
         await table.deleteRows({ id }, req.user || { role_id: 100 });
-      else if (table.ownership_field_id && req.user) {
+      else if (
+        (table.ownership_field_id || table.ownership_formula) &&
+        req.user
+      ) {
         const row = await table.getRow(
           { id },
           { forUser: req.user, forPublic: !req.user }

package/routes/files.js

@@ -594,6 +594,9 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await storage_form(req);
+    form.blurb = [
+      `<div class="alert alert-warning">S3 storage options may not work for this release. Enabling S3 storage is not recommended</div>`,
+    ];
     send_files_page({
       res,
       req,

package/routes/list.js

@@ -411,7 +411,7 @@ router.get(
                   ajax_indicator(false);
                   //if (item._versions) item._versions = +item._versions + 1;
                   //data.resolve(fixKeys(item));
-                  if(resp.success &&typeof resp.success ==="number" && !row.id) {
+                  if(resp.success &&(typeof resp.success ==="number" || typeof resp.success ==="string") && !row.id) {
                     window.tabulator_table.updateRow(cell.getRow(), {id: resp.success});
                   }
 

package/routes/pageedit.js

@@ -648,7 +648,8 @@ router.post(
     const { pagename } = req.params;
 
     let redirectTarget =
-      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+      req.query.on_done_redirect &&
+      is_relative_url("/" + req.query.on_done_redirect)
         ? `/${req.query.on_done_redirect}`
         : "/pageedit";
     const page = await Page.findOne({ name: pagename });

package/routes/viewedit.js

@@ -766,7 +766,8 @@ router.post(
       )
     );
     let redirectTarget =
-      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+      req.query.on_done_redirect &&
+      is_relative_url("/" + req.query.on_done_redirect)
         ? `/${req.query.on_done_redirect}`
         : "/viewedit";
     res.redirect(redirectTarget);
@@ -791,7 +792,8 @@ router.post(
       req.__("View %s duplicated as %s", view.name, newview.name)
     );
     let redirectTarget =
-      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+      req.query.on_done_redirect &&
+      is_relative_url("/" + req.query.on_done_redirect)
         ? `/${req.query.on_done_redirect}`
         : "/viewedit";
     res.redirect(redirectTarget);
@@ -812,7 +814,8 @@ router.post(
     await View.delete({ id });
     req.flash("success", req.__("View deleted"));
     let redirectTarget =
-      req.query.on_done_redirect && is_relative_url(req.query.on_done_redirect)
+      req.query.on_done_redirect &&
+      is_relative_url("/" + req.query.on_done_redirect)
         ? `/${req.query.on_done_redirect}`
         : "/viewedit";
     res.redirect(redirectTarget);
@@ -910,7 +913,7 @@ router.post(
       req.flash("success", message);
       let redirectTarget =
         req.query.on_done_redirect &&
-        is_relative_url(req.query.on_done_redirect)
+        is_relative_url("/" + req.query.on_done_redirect)
           ? `/${req.query.on_done_redirect}`
           : "/viewedit";
       res.redirect(redirectTarget);