@saltcorn/server 0.9.6-beta.0 → 0.9.6-beta.10

package/routes/tables.js

@@ -681,6 +681,10 @@ const attribBadges = (f) => {
           "on_delete_cascade",
           "on_delete",
           "unique_error_msg",
+          "ref",
+          "table",
+          "agg_field",
+          "agg_relation",
         ].includes(k)
       )
         return;

package/routes/utils.js

@@ -14,7 +14,7 @@ const {
 } = require("@saltcorn/data/db/state");
 const { get_base_url } = require("@saltcorn/data/models/config");
 const { hash } = require("@saltcorn/data/utils");
-const { input, script, domReady } = require("@saltcorn/markup/tags");
+const { input, script, domReady, a } = require("@saltcorn/markup/tags");
 const session = require("express-session");
 const cookieSession = require("cookie-session");
 const is = require("contractis/is");
@@ -398,7 +398,10 @@ const admin_config_route = ({
           if (restart_required)
             res.json({
               success: "ok",
-              notify: req.__("Restart required for changes to take effect."),
+              notify:
+                req.__("Restart required for changes to take effect.") +
+                " " +
+                a({ href: "/admin/system" }, req.__("Restart here")),
             });
           else res.json({ success: "ok" });
         }

package/routes/view.js

@@ -127,7 +127,7 @@ router.get(
     else {
       const qs = "";
       const contents =
-        typeof contents0 === "string" && !req.xhr
+        typeof contents0 === "string"
           ? div(
               {
                 class: "d-inline",

package/routes/viewedit.js

@@ -371,6 +371,7 @@ router.get(
     const form = await viewForm(req, tableOptions, roles, pages, viewrow);
     const inbound_connected = await viewrow.inbound_connected_objects();
     form.hidden("id");
+    form.onChange = `saveAndContinue(this)`;
     res.sendWrap(req.__(`Edit view`), {
       above: [
         {
@@ -383,6 +384,7 @@ router.get(
         {
           type: "card",
           class: "mt-0",
+          titleAjaxIndicator: true,
           title: req.__(
             `%s view - %s on %s`,
             viewname,
@@ -541,12 +543,14 @@ router.post(
           //console.log(v);
           await View.create(v);
         }
-        res.redirect(
-          addOnDoneRedirect(
-            `/viewedit/config/${encodeURIComponent(v.name)}`,
-            req
-          )
-        );
+        if (req.xhr) res.json({ success: "ok" });
+        else
+          res.redirect(
+            addOnDoneRedirect(
+              `/viewedit/config/${encodeURIComponent(v.name)}`,
+              req
+            )
+          );
       }
     } else {
       sendForm(form);
@@ -902,7 +906,7 @@ router.post(
           ? `/${req.query.on_done_redirect}`
           : "/viewedit";
       res.redirect(redirectTarget);
-    } else res.json({ okay: true, responseText: message });
+    } else res.json({ success: "ok" });
   })
 );
 

package/tests/page.test.js

@@ -76,7 +76,7 @@ describe("page create", () => {
     await request(app)
       .get("/pageedit/new")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
   });
   it("shows new with html file selector", async () => {
     const app = await getApp({ disableCsrf: true });
@@ -237,7 +237,7 @@ describe("pageedit", () => {
     await request(app)
       .get("/pageedit/edit-properties/a_page")
       .set("Cookie", loginCookie)
-      .expect(toInclude("A short name that will be in your URL"));
+      .expect(toInclude("A short name that will be in the page URL"));
 
     //TODO full context
     const ctx = encodeURIComponent(JSON.stringify({}));

package/tests/plugins.test.js

@@ -137,8 +137,10 @@ describe("Plugin dependency resolution and upgrade", () => {
       .expect(toRedirect("/plugins"));
     const quill = await Plugin.findOne({ name: "quill-editor" });
     expect(quill.location).toBe("@saltcorn/quill-editor");
+    expect(quill.name).toBe("quill-editor");
     const html = await Plugin.findOne({ location: "@saltcorn/html" });
     expect(html.location).toBe("@saltcorn/html");
+    expect(html.name).toBe("html");
     const html_type = getState().types.HTML;
     expect(!!html_type.fieldviews.Quill).toBe(true);
   });