@saltcorn/server 1.1.2-beta.9 → 1.1.3-beta.0

package/routes/tables.js

@@ -14,6 +14,7 @@ const User = require("@saltcorn/data/models/user");
 const Model = require("@saltcorn/data/models/model");
 const Trigger = require("@saltcorn/data/models/trigger");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
+const Notification = require("@saltcorn/data/models/notification");
 const {
   mkTable,
   renderForm,
@@ -50,6 +51,10 @@ const {
   code,
   pre,
   button,
+  text_attr,
+  br,
+  select,
+  option,
 } = require("@saltcorn/markup/tags");
 const { stringify } = require("csv-stringify");
 const TableConstraint = require("@saltcorn/data/models/table_constraints");
@@ -66,6 +71,7 @@ const {
   InvalidConfiguration,
   removeAllWhiteSpace,
   comparingCaseInsensitive,
+  validSqlId,
 } = require("@saltcorn/data/utils");
 const { EOL } = require("os");
 
@@ -461,6 +467,15 @@ router.post(
         req.flash("error", parse_res.error);
         res.redirect(`/table/create-from-csv`);
       } else {
+        Trigger.emitEvent(
+          "AppChange",
+          `Table ${parse_res.table.name}`,
+          req.user,
+          {
+            entity_type: "Table",
+            entity_name: parse_res.table.name,
+          }
+        );
         req.flash(
           "success",
           req.__(`Created table %s.`, parse_res.table.name) + parse_res.success
@@ -483,7 +498,10 @@ const buildTableMarkup = (table) => {
   const members = fields
     // .filter((f) => !f.reftable_name)
     .map((f) =>
-      indentString(`${removeAllWhiteSpace(f.type_name)} ${f.name}`, 6)
+      indentString(
+        `${removeAllWhiteSpace(f.type_name)} ${validSqlId(f.name)}`,
+        6
+      )
     )
     .join(EOL);
   const keys = table
@@ -696,7 +714,14 @@ const typeBadges = (f, req) => {
   if (f.primary_key) s += badge("warning", req.__("Primary key"));
   if (f.required) s += badge("primary", req.__("Required"));
   if (f.is_unique) s += badge("success", req.__("Unique"));
-  if (f.calculated) s += badge("info", req.__("Calculated"));
+  if (f.calculated)
+    s += badge(
+      "info",
+      req.__("Calculated"),
+      f.expression && f.expression !== "__aggregation"
+        ? text_attr(f.expression)
+        : undefined
+    );
   if (f.stored) s += badge("warning", req.__("Stored"));
   return s;
 };
@@ -709,8 +734,12 @@ const attribBadges = (f) => {
   let s = "";
   if (f.attributes) {
     Object.entries(f.attributes).forEach(([k, v]) => {
+      if (k === "summary_field") s += badge("secondary", "Summary", v);
+      if (k === "include_fts" && v)
+        s += badge("secondary", "FTS", "Include in full-text search");
       if (
         [
+          "include_fts",
           "summary_field",
           "importance",
           "on_delete_cascade",
@@ -782,7 +811,11 @@ router.get(
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
-    const nPrimaryKeys = fields.filter((f) => f.primary_key).length;
+    const primaryKeys = fields.filter((f) => f.primary_key);
+    const nPrimaryKeys = primaryKeys.length;
+    const nonSerialPKS = primaryKeys.some(
+      (f) => f.attributes?.NonSerial && f.type?.name === "Integer"
+    );
 
     if (fields.length === 0) {
       fieldCard = [
@@ -846,11 +879,13 @@ router.get(
         { hover: true }
       );
       fieldCard = [
-        nPrimaryKeys > 1 &&
+        (nPrimaryKeys !== 1 || nonSerialPKS) &&
+          !table.external &&
+          !table.provider_name &&
           div(
             { class: "alert alert-danger", role: "alert" },
             i({ class: "fas fa-exclamation-triangle" }),
-            "This table has composite primary keys which is not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            "This table has composite, non-defaulted integer, or no primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
             post_btn(
               `/table/repair-composite-primary/${table.id}`,
               "Add autoincrementing primary key",
@@ -978,8 +1013,8 @@ router.get(
               table.name === "users"
                 ? `/useradmin/`
                 : fields.length === 1
-                ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
-                : `/list/${encodeURIComponent(table.name)}`,
+                  ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
+                  : `/list/${encodeURIComponent(table.name)}`,
           },
           i({ class: "fas fa-2x fa-edit" }),
           "<br/>",
@@ -1097,6 +1132,15 @@ router.get(
                 req,
                 true
               ),
+            req.user.role_id === 1 &&
+              table.name !== "users" &&
+              post_dropdown_item(
+                `/table/delete-with-trig-views/${table.id}`,
+                '<i class="fas fa-trash"></i>&nbsp;' +
+                  req.__("Delete table+views+triggers"),
+                req,
+                true
+              ),
           ])
         )
     );
@@ -1191,6 +1235,10 @@ router.post(
       } else {
         delete rest.provider_name;
         const table = await Table.create(name, rest);
+        Trigger.emitEvent("AppChange", `Table ${name}`, req.user, {
+          entity_type: "Table",
+          entity_name: name,
+        });
         req.flash("success", req.__(`Table %s created`, name));
         res.redirect(`/table/${table.id}`);
       }
@@ -1258,6 +1306,50 @@ router.post(
   })
 );
 
+//delete-with-trig-views
+/**
+ * Delete Table Route Handler definition
+ * /delete:/id, where id is table id in _sc_tables
+ * @name post/delete/:id
+ * @function
+ * @memberof module:routes/tables~tablesRouter
+ * @function
+ */
+router.post(
+  "/delete-with-trig-views/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const t = Table.findOne({ id });
+    if (!t) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    if (t.name === "users") {
+      req.flash("error", req.__(`Cannot delete users table`));
+      res.redirect(`/table`);
+      return;
+    }
+    const views = await View.find(
+      t.id ? { table_id: t.id } : { exttable_name: t.name }
+    );
+    for (const view of views) await view.delete();
+    if (t.id) {
+      const triggers = await Trigger.find({ table_id: t.id });
+      for (const trig of triggers) await trig.delete();
+    }
+    try {
+      await t.delete();
+      req.flash("success", req.__(`Table %s deleted`, t.name));
+      res.redirect(`/table`);
+    } catch (err) {
+      req.flash("error", err.message);
+      res.redirect(`/table`);
+    }
+  })
+);
+
 /**
  * Delete Table Route Handler definition
  * /delete:/id, where id is table id in _sc_tables
@@ -1311,6 +1403,10 @@ router.post(
     try {
       await t.delete();
       req.flash("success", req.__(`Table %s deleted`, t.name));
+      Trigger.emitEvent("AppChange", `Table ${t.name} deleted`, req.user, {
+        entity_type: "Table",
+        entity_name: t.name,
+      });
       res.redirect(`/table`);
     } catch (err) {
       req.flash("error", err.message);
@@ -1459,7 +1555,10 @@ router.get(
       res.redirect(`/table/${table.id}`);
       return;
     }
-    const rows = await table.getRows({}, { orderBy: "id", forUser: req.user });
+    const rows = await table.getRows(
+      {},
+      { orderBy: table.pk_name, forUser: req.user }
+    );
     res.setHeader("Content-Type", "text/csv");
     res.setHeader("Content-Disposition", `attachment; filename="${name}.csv"`);
     res.setHeader("Cache-Control", "no-cache");
@@ -1535,12 +1634,12 @@ router.get(
                     r.type === "Unique"
                       ? r.configuration.fields.join(", ")
                       : r.type === "Index" && r.configuration?.field === "_fts"
-                      ? "Full text search"
-                      : r.type === "Index"
-                      ? r.configuration.field
-                      : r.type === "Formula"
-                      ? r.configuration.formula
-                      : "",
+                        ? "Full text search"
+                        : r.type === "Index"
+                          ? r.configuration.field
+                          : r.type === "Formula"
+                            ? r.configuration.formula
+                            : "",
                 },
                 {
                   label: req.__("Delete"),
@@ -1743,6 +1842,15 @@ router.post(
         type,
         configuration,
       });
+      Trigger.emitEvent(
+        "AppChange",
+        `Constraint ${type} on table ${table?.name}`,
+        req.user,
+        {
+          entity_type: "TableConstraint",
+          entity_name: table.name,
+        }
+      );
     }
     res.redirect(`/table/constraints/${table.id}`);
   })
@@ -1889,18 +1997,52 @@ const previewCSV = async ({ newPath, table, req, res, full }) => {
               "Cancel",
               req.csrfToken(),
               {
-                btnClass: "btn-danger",
+                btnClass: "btn-danger mb-2",
                 formClass: "d-inline me-2",
                 icon: "fa fa-times",
               }
             ),
-            post_btn(
-              `/table/finish_upload_to_table/${table.name}/${path.basename(
-                newPath
-              )}`,
-              "Proceed",
-              req.csrfToken(),
-              { icon: "fa fa-check", formClass: "d-inline" }
+            form(
+              {
+                action: `/table/finish_upload_to_table/${table.name}/${path.basename(
+                  newPath
+                )}`,
+                method: "post",
+                class: "d-inline",
+              },
+              input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+              button(
+                { type: "submit", class: "btn btn-primary mb-2" },
+                i({ class: "fa fa-check" }),
+                "Proceed"
+              ),
+              br(),
+              i({ class: "muted" }, "Method"),
+              select(
+                {
+                  name: "import_method",
+                  class: "form-select from-control mb-2",
+                },
+                option("Auto"),
+                option({ value: "copy" }, "COPY (fast but strict)"),
+                option(
+                  { value: "row-by-row" },
+                  "Row-by-row (Slower but more accepting)"
+                )
+              ),
+              div(
+                { class: "form-check" },
+                input({
+                  class: "form-check-input",
+                  type: "checkbox",
+                  id: "import_async",
+                  name: "import_async",
+                }),
+                label(
+                  { class: "form-check-label", for: "import_async" },
+                  "Asynchronous"
+                )
+              )
             )
           ),
         },
@@ -2005,15 +2147,43 @@ router.post(
     const f = await File.findOne(filename);
 
     try {
-      const parse_res = await table.import_csv_file(f.location, {
-        recalc_stored: true,
-      });
-      if (parse_res.error) req.flash("error", parse_res.error);
-      else req.flash("success", parse_res.success);
+      const { import_method, import_async } = req.body || {};
+
+      const promise = table
+        .import_csv_file(f.location, {
+          recalc_stored: true,
+          method: import_method || "Auto",
+        })
+        .finally(() => {
+          fs.unlink(f.location);
+        });
+      if (import_async) {
+        promise
+          .then((parse_res) => {
+            Notification.create({
+              title: "CSV import complete",
+              body: parse_res.error || parse_res.success,
+              user_id: req.user.id,
+            });
+          })
+          .catch((e) => {
+            console.error("CSV upload error", e);
+            Notification.create({
+              title: "Error importing CSV file",
+              body: e.message,
+              user_id: req.user.id,
+            });
+          });
+        req.flash("success", req.__("Processing CSV file"));
+      } else {
+        const parse_res = await promise;
+        if (parse_res.error) req.flash("error", parse_res.error);
+        else req.flash("success", parse_res.success);
+      }
     } catch (e) {
+      console.error("CSV upload error", e);
       req.flash("error", e.message);
     }
-    await fs.unlink(f.location);
     res.redirect(`/table/${table.id}`);
   })
 );
@@ -2186,6 +2356,15 @@ router.post(
       res.redirect(`/table`);
       return;
     }
+    Trigger.emitEvent(
+      "AppChange",
+      `Table ${table.name} configuration`,
+      req.user,
+      {
+        entity_type: "Table",
+        entity_name: table.name,
+      }
+    );
     const workflow = get_provider_workflow(table, req);
     const wfres = await workflow.run(req.body || {}, req);
     respondWorkflow(table, workflow, wfres, req, res);

package/tests/admin.test.js

@@ -472,6 +472,18 @@ describe("actions", () => {
       .set("Cookie", loginCookie)
       .expect(toRedirect("/actions/"));
   });
+  it("post Never trigger with table", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/actions/new")
+      .set("Cookie", loginCookie)
+      .send("action=run_js_code")
+      .send("table_id=2")
+      .send("name=NeverTableTrigger")
+      .send("when_trigger=Never")
+      .expect(302);
+  });
 });
 describe("localizer", () => {
   itShouldRedirectUnauthToLogin("/site-structure/localizer");
@@ -647,6 +659,9 @@ describe("clear all page", () => {
       .send("users=on")
       .send("config=on")
       .send("plugins=on")
+      .send("triggers=on")
+      .send("library=on")
+      .send("eventlog=on")
       .expect(toRedirect("/auth/create_first_user"));
   });
   it("restores backup after clear all", async () => {

package/wrapper.js

@@ -97,6 +97,8 @@ const get_menu = (req) => {
   const canEditPages = state.getConfig("min_role_edit_pages", 1) >= role;
   const canEditTriggers = state.getConfig("min_role_edit_triggers", 1) >= role;
   const canEditMenu = state.getConfig("min_role_edit_menu", 1) >= role;
+  const canEditFiles = state.getConfig("min_role_edit_files", 1) >= role;
+  const canEditSearch = state.getConfig("min_role_edit_search", 1) >= role;
   const isAdmin = role === 1;
   const hasAdmin =
     isAdmin ||
@@ -105,7 +107,9 @@ const get_menu = (req) => {
     canEditPages ||
     canEditViews ||
     canEditMenu ||
-    canEditTriggers;
+    canEditTriggers ||
+    canEditFiles ||
+    canEditSearch;
   /*
    * Admin Menu items
    *
@@ -137,10 +141,10 @@ const get_menu = (req) => {
         icon: "fas fa-calendar-check",
         label: req.__("Triggers"),
       });
-    if (canEditMenu && !isAdmin) {
+    if ((canEditMenu || canEditSearch) && !isAdmin) {
       const subitems = [
         {
-          link: "/menu",
+          link: canEditMenu ? "/menu" : "/search/config",
           altlinks: [
             "/site-structure",
             "/search/config",
@@ -148,7 +152,7 @@ const get_menu = (req) => {
             "/tenant/list",
           ],
           icon: "fas fa-compass",
-          label: req.__("Menu"),
+          label: req.__("Site structure"),
         },
       ];
       if (canEditTriggers)
@@ -158,6 +162,12 @@ const get_menu = (req) => {
           icon: "fas fa-calendar-check",
           label: req.__("Triggers"),
         });
+      if (canEditFiles)
+        subitems.push({
+          link: "/files",
+          icon: "far fa-images",
+          label: req.__("Files"),
+        });
       adminItems.push({
         label: req.__("Settings"),
         icon: "fas fa-wrench",