@saltcorn/server 0.7.1-beta.3 → 0.7.1

package/locales/en.json

@@ -885,5 +885,8 @@
 	"On delete cascade": "On delete cascade",
 	"If the parent row is deleted, automatically delete the child rows.": "If the parent row is deleted, automatically delete the child rows.",
 	"Extra state Formula": "Extra state Formula",
-	"Cannot install unsafe plugins on subdomain tenants": "Cannot install unsafe plugins on subdomain tenants"
+	"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"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.7.1-beta.3",
+  "version": "0.7.1",
   "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-beta.3",
-    "@saltcorn/builder": "0.7.1-beta.3",
-    "@saltcorn/data": "0.7.1-beta.3",
-    "@saltcorn/admin-models": "0.7.1-beta.3",
-    "@saltcorn/markup": "0.7.1-beta.3",
-    "@saltcorn/sbadmin2": "0.7.1-beta.3",
+    "@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",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "aws-sdk": "^2.1037.0",
@@ -57,7 +57,7 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "^25.1.0",
+    "jest": "26.6.3",
     "supertest": "^4.0.2"
   },
   "scripts": {

package/public/saltcorn.js

@@ -567,6 +567,10 @@ function ajax_modal(url, opts = {}) {
       </div>
     </div>
   </div>`);
+  } else if ($("#scmodal").hasClass("show")) {
+    var myModalEl = document.getElementById("scmodal");
+    var modal = bootstrap.Modal.getInstance(myModalEl);
+    modal.dispose();
   }
   if (opts.submitReload === false) $("#scmodal").addClass("no-submit-reload");
   else $("#scmodal").removeClass("no-submit-reload");
@@ -836,7 +840,7 @@ const columnSummary = (col) => {
     case "JoinField":
       return `Join ${col.join_field}`;
     case "ViewLink":
-      return `View ${col.view_label || col.view.split(":")[1] || ""}`;
+      return `View link ${col.view_label || col.view.split(":")[1] || ""}`;
     case "Action":
       return `Action ${col.action_label || col.action_name}`;
     case "Aggregation":

package/routes/plugins.js

@@ -652,16 +652,16 @@ router.get(
   error_catcher(async (req, res) => {
     const { plugin } = req.params;
     const filepath = req.params[0];
+    const hasVersion = plugin.includes("@");
     const location =
-      getState().plugin_locations[
-        plugin.includes("@") ? plugin.split("@")[0] : plugin
-      ];
+      getState().plugin_locations[hasVersion ? plugin.split("@")[0] : plugin];
     if (location) {
       const safeFile = path
         .normalize(filepath)
         .replace(/^(\.\.(\/|\\|$))+/, "");
       const fullpath = path.join(location, "public", safeFile);
-      if (fs.existsSync(fullpath)) res.sendFile(fullpath, { maxAge: "1d" });
+      if (fs.existsSync(fullpath))
+        res.sendFile(fullpath, { maxAge: hasVersion ? "100d" : "1d" });
       else res.status(404).send(req.__("Not found"));
     } else {
       res.status(404).send(req.__("Not found"));

package/tests/view.test.js

@@ -82,7 +82,7 @@ describe("edit view", () => {
       .post("/view/authoredit")
       .send("author=Chekov")
 
-      .expect(toRedirect("/"));
+      .expect(toRedirect("/view/authorlist"));
   });
 });