@saltcorn/server 0.8.5-beta.2 → 0.8.5-beta.4

package/routes/tables.js

@@ -439,8 +439,7 @@ router.get(
         title: req.__("Tables"),
         headers: [
           {
-            script:
-              "https://unpkg.com/vis-network@9.1.2/standalone/umd/vis-network.min.js",
+            script: `/static_assets/${db.connectObj.version_tag}/vis-network.min.js`,
           },
         ],
       },
@@ -762,18 +761,22 @@ router.get(
             })
           )
         ),
+      !table.external &&
+        div(
+          { class: "mx-auto" },
+          a(
+            { href: `/table/constraints/${table.id}` },
+            i({ class: "fas fa-2x fa-tasks" }),
+            "<br/>",
+            req.__("Constraints")
+          )
+        ),
+
       // only if table is not external
       !table.external &&
         div(
           { class: "mx-auto" },
           settingsDropdown(`dataMenuButton`, [
-            a(
-              {
-                class: "dropdown-item",
-                href: `/table/constraints/${table.id}`,
-              },
-              '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
-            ),
             // rename table doesnt supported for sqlite
             !db.isSQLite &&
               table.name !== "users" &&
@@ -1154,8 +1157,15 @@ router.get(
               [
                 { label: req.__("Type"), key: "type" },
                 {
-                  label: req.__("Fields"),
-                  key: (r) => r.configuration.fields.join(", "),
+                  label: req.__("What"),
+                  key: (r) =>
+                    r.type === "Unique"
+                      ? r.configuration.fields.join(", ")
+                      : r.type === "Index"
+                      ? r.configuration.field
+                      : r.type === "Formula"
+                      ? r.configuration.formula
+                      : "",
                 },
                 {
                   label: req.__("Delete"),
@@ -1166,7 +1176,12 @@ router.get(
               cons,
               { hover: true }
             ),
-            link(`/table/add-constraint/${id}`, req.__("Add constraint")),
+            req.__("Add constraint: "),
+            link(`/table/add-constraint/${id}/Unique`, req.__("Unique")),
+            " | ",
+            link(`/table/add-constraint/${id}/Formula`, req.__("Formula")),
+            " | ",
+            link(`/table/add-constraint/${id}/Index`, req.__("Index")),
           ],
         },
       ],
@@ -1181,18 +1196,68 @@ router.get(
  * @param {object[]} fields
  * @returns {Form}
  */
-const constraintForm = (req, table_id, fields) =>
-  new Form({
-    action: `/table/add-constraint/${table_id}`,
-    blurb: req.__(
-      "Tick the boxes for the fields that should be jointly unique"
-    ),
-    fields: fields.map((f) => ({
-      name: f.name,
-      label: f.label,
-      type: "Bool",
-    })),
-  });
+const constraintForm = (req, table_id, fields, type) => {
+  switch (type) {
+    case "Formula":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+
+        fields: [
+          {
+            name: "formula",
+            label: req.__("Constraint formula"),
+            validator: expressionValidator,
+            type: "String",
+            class: "validate-expression",
+            sublabel:
+              req.__(
+                "Formula must evaluate to true for valid rows. In scope: "
+              ) +
+              fields
+                .map((f) => f.name)
+                .map((fn) => code(fn))
+                .join(", "),
+          },
+          {
+            name: "errormsg",
+            label: "Error message",
+            sublabel: "Shown the user if formula is false",
+            type: "String",
+          },
+        ],
+      });
+    case "Unique":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+        blurb: req.__(
+          "Tick the boxes for the fields that should be jointly unique"
+        ),
+        fields: fields.map((f) => ({
+          name: f.name,
+          label: f.label,
+          type: "Bool",
+        })),
+      });
+    case "Index":
+      return new Form({
+        action: `/table/add-constraint/${table_id}/${type}`,
+        blurb: req.__(
+          "Choose the field to be indexed. This make searching the table faster."
+        ),
+        fields: [
+          {
+            type: "String",
+            name: "field",
+            label: "Field",
+            required: true,
+            attributes: {
+              options: fields.map((f) => ({ label: f.label, name: f.name })),
+            },
+          },
+        ],
+      });
+  }
+};
 
 /**
  * Add constraint GET handler
@@ -1203,10 +1268,10 @@ const constraintForm = (req, table_id, fields) =>
  * @function
  */
 router.get(
-  "/add-constraint/:id",
+  "/add-constraint/:id/:type",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const { id, type } = req.params;
     const table = await Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
@@ -1214,7 +1279,7 @@ router.get(
       return;
     }
     const fields = await table.getFields();
-    const form = constraintForm(req, table.id, fields);
+    const form = constraintForm(req, table.id, fields, type);
     res.sendWrap(req.__(`Add constraint to %s`, table.name), {
       above: [
         {
@@ -1231,7 +1296,7 @@ router.get(
         },
         {
           type: "card",
-          title: req.__(`Add constraint to %s`, table.name),
+          title: req.__(`Add %s constraint to %s`, type, table.name),
           contents: renderForm(form, req.csrfToken()),
         },
       ],
@@ -1247,10 +1312,10 @@ router.get(
  * @function
  */
 router.post(
-  "/add-constraint/:id",
+  "/add-constraint/:id/:type",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { id } = req.params;
+    const { id, type } = req.params;
     const table = await Table.findOne({ id });
     if (!table) {
       req.flash("error", `Table not found`);
@@ -1258,16 +1323,20 @@ router.post(
       return;
     }
     const fields = await table.getFields();
-    const form = constraintForm(req, table.id, fields);
+    const form = constraintForm(req, table.id, fields, type);
     form.validate(req.body);
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
     else {
+      let configuration = {};
+      if (type === "Unique")
+        configuration.fields = fields
+          .map((f) => f.name)
+          .filter((f) => form.values[f]);
+      else configuration = form.values;
       await TableConstraint.create({
         table_id: table.id,
-        type: "Unique",
-        configuration: {
-          fields: fields.map((f) => f.name).filter((f) => form.values[f]),
-        },
+        type,
+        configuration,
       });
     }
     res.redirect(`/table/constraints/${table.id}`);

package/routes/tenant.js

@@ -426,6 +426,10 @@ const tenant_settings_form = (req) =>
       "create_tenant_warning",
       "create_tenant_warning_text",
       "tenant_template",
+      { section_header: "Tenant application capabilities" },
+      "tenants_install_git",
+      "tenants_set_npm_modules",
+      "tenants_unsafe_plugins",
     ],
     action: "/tenant/settings",
     submitLabel: req.__("Save"),

package/routes/utils.js

@@ -18,6 +18,24 @@ const cookieSession = require("cookie-session");
 const is = require("contractis/is");
 const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
+const si = require("systeminformation");
+
+const get_sys_info = async () => {
+  const disks = await si.fsSize();
+  let size = 0;
+  let used = 0;
+  disks.forEach((d) => {
+    if (d && d.used && d.size) {
+      size += d.size;
+      used += d.used;
+    }
+  });
+  const diskUsage = Math.round(100 * (used / size));
+  const simem = await si.mem();
+  const memUsage = Math.round(100 - 100 * (simem.available / simem.total));
+  const cpuUsage = Math.round((await si.currentLoad()).currentLoad);
+  return { memUsage, diskUsage, cpuUsage };
+};
 
 /**
  * Checks that user logged or not.
@@ -314,4 +332,5 @@ module.exports = {
   get_tenant_from_req,
   addOnDoneRedirect,
   is_relative_url,
+  get_sys_info,
 };

package/tests/api.test.js

@@ -19,7 +19,7 @@ beforeAll(async () => {
 afterAll(db.close);
 
 describe("API read", () => {
-  it("should get books for public", async () => {
+  it("should get books for public simple", async () => {
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .get("/api/books/")
@@ -32,7 +32,7 @@ describe("API read", () => {
         )
       );
   });
-  it("should get books for public", async () => {
+  it("should get books for public fts", async () => {
     const app = await getApp({ disableCsrf: true });
     await request(app)
       .get("/api/books/?_fts=Herman")

package/tests/table.test.js

@@ -5,11 +5,13 @@ const Field = require("@saltcorn/data/models/field");
 const {
   getStaffLoginCookie,
   getAdminLoginCookie,
+  getUserLoginCookie,
   itShouldRedirectUnauthToLogin,
   toInclude,
   toNotInclude,
   toRedirect,
   resetToFixtures,
+  succeedJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
 const User = require("@saltcorn/data/models/user");
@@ -198,11 +200,11 @@ Gordon Kane, 217`;
       .set("Cookie", loginCookie)
       .expect(toInclude("books constraints"));
     await request(app)
-      .get("/table/add-constraint/" + id)
+      .get("/table/add-constraint/" + id + "/Unique")
       .set("Cookie", loginCookie)
       .expect(toInclude("Add constraint to books"));
     await request(app)
-      .post("/table/add-constraint/" + id)
+      .post("/table/add-constraint/" + id + "/Unique")
       .send("author=on")
       .send("pages=on")
       .set("Cookie", loginCookie)
@@ -262,7 +264,22 @@ describe("deletion to table with row ownership", () => {
     const row = await persons.insertRow({ name: "something", owner: user.id });
     expect(await persons.countRows()).toBe(1);
     const loginCookie = await getStaffLoginCookie();
+    const uloginCookie = await getUserLoginCookie();
     const app = await getApp({ disableCsrf: true });
+    await request(app).get("/api/owned").expect(401);
+    await request(app)
+      .get("/api/owned")
+      .set("Cookie", loginCookie)
+      .expect(
+        succeedJsonWith(
+          (rows) => rows.length == 1 && rows[0].name === "something"
+        )
+      );
+    await request(app)
+      .get("/api/owned")
+      .set("Cookie", uloginCookie)
+      .expect(succeedJsonWith((rows) => rows.length == 0));
+
     await request(app)
       .post("/delete/owned/" + row)
       .expect(toRedirect("/list/owned"));

package/wrapper.js

@@ -58,10 +58,22 @@ const get_menu = (req) => {
       ]
     : [
         ...(allow_signup
-          ? [{ link: "/auth/signup", label: req.__("Sign up") }]
+          ? [
+              {
+                link: "/auth/signup",
+                icon: "fas fa-user-plus",
+                label: req.__("Sign up"),
+              },
+            ]
           : []),
         ...(login_menu
-          ? [{ link: "/auth/login", label: req.__("Login") }]
+          ? [
+              {
+                link: "/auth/login",
+                icon: "fas fa-sign-in-alt",
+                label: req.__("Login"),
+              },
+            ]
           : []),
       ];
   // const schema = db.getTenantSchema();