@saltcorn/server 1.1.0-beta.13 → 1.1.0-beta.15

package/routes/eventlog.js

@@ -81,6 +81,31 @@ const logSettingsForm = async (req) => {
       input_type: "date",
       attributes: { minDate: new Date(), maxDate: hoursFuture(24 * 7 * 2) },
     },
+    {
+      input_type: "section_header",
+      label: req.__("Delete old workflow runs with status after days"),
+    },
+    {
+      name: "delete_finished_workflows_days",
+      label: req.__("Finished"),
+      type: "Integer",
+    },
+    {
+      name: "delete_error_workflows_days",
+      label: req.__("Error"),
+      type: "Integer",
+    },
+    {
+      name: "delete_waiting_workflows_days",
+      label: req.__("Waiting"),
+      type: "Integer",
+    },
+
+    {
+      name: "delete_running_workflows_days",
+      label: req.__("Running"),
+      type: "Integer",
+    },
     {
       input_type: "section_header",
       label: req.__("Which events should be logged?"),
@@ -143,6 +168,10 @@ router.get(
       "next_weekly_event",
       {}
     );
+    ["error", "finished", "running", "waiting"].forEach((k) => {
+      let cfgk = `delete_${k}_workflows_days`;
+      form.values[cfgk] = getState().getConfig(cfgk);
+    });
 
     send_events_page({
       res,
@@ -348,6 +377,13 @@ router.post(
           delete form.values[k];
         }
       }
+      for (const status of ["error", "finished", "running", "waiting"]) {
+        let k = `delete_${status}_workflows_days`;
+        if (form.values[k]) {
+          await getState().setConfig(k, form.values[k]);
+          delete form.values[k];
+        }
+      }
 
       await getState().setConfig("event_log_settings", form.values);
 

package/routes/fields.js

@@ -301,6 +301,10 @@ const fieldFlow = (req) =>
       if (context.id) {
         const field = await Field.findOne({ id: context.id });
         try {
+          if (fldRow.label && field.label != fldRow.label) {
+            fldRow.name = Field.labelToName(fldRow.label);
+          }
+
           await field.update(fldRow);
         } catch (e) {
           return {

package/routes/tables.js

@@ -56,7 +56,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
-const { tablesList, viewsList } = require("./common_lists");
+const { tablesList, viewsList, getTriggerList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
@@ -757,6 +757,8 @@ 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;
+
     if (fields.length === 0) {
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
@@ -818,28 +820,25 @@ router.get(
         { hover: true }
       );
       fieldCard = [
+        nPrimaryKeys > 1 &&
+          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.",
+            post_btn(
+              `/table/repair-composite-primary/${table.id}`,
+              "Add autoincrementing primary key",
+              req.csrfToken(),
+              { btnClass: "btn-danger" }
+            )
+          ),
+
         tableHtml,
         inbound_refs.length > 0
           ? req.__("Inbound keys: ") +
             inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
             "<br>"
           : "",
-        triggers.length
-          ? req.__("Table triggers: ") +
-            triggers
-              .map((t) =>
-                link(
-                  `/actions/configure/${
-                    t.id
-                  }?on_done_redirect=${encodeURIComponent(
-                    `table/${table.name}`
-                  )}`,
-                  t.name
-                )
-              )
-              .join(", ") +
-            "<br>"
-          : "",
         !table.external &&
           !table.provider_name &&
           a(
@@ -851,7 +850,8 @@ router.get(
           ),
       ];
     }
-    var viewCard;
+    let viewCard;
+    let triggerCard = "";
     if (fields.length > 0) {
       const views = await View.find(
         table.id ? { table_id: table.id } : { exttable_name: table.name }
@@ -884,6 +884,25 @@ router.get(
             req.__("Create view")
           ),
       };
+
+      triggerCard = {
+        type: "card",
+        id: "table-triggers",
+        title: req.__("Triggers on table"),
+        contents:
+          (triggers.length
+            ? await getTriggerList(triggers, req)
+            : p("Triggers run actions in response to events on this table")) +
+          a(
+            {
+              href: `/actions/new?table=${encodeURIComponent(
+                table.name
+              )}&on_done_redirect=${encodeURIComponent(`table/${table.name}`)}`,
+              class: "btn btn-primary",
+            },
+            req.__("Create trigger")
+          ),
+      };
     }
     const models = await Model.find({ table_id: table.id });
     const modelCard = div(
@@ -1078,6 +1097,7 @@ router.get(
             ]
           : []),
         ...(viewCard ? [viewCard] : []),
+        ...(triggerCard ? [triggerCard] : []),
         {
           type: "card",
           title: req.__("Edit table properties"),
@@ -1111,7 +1131,7 @@ router.post(
     const v = req.body;
     if (typeof v.id === "undefined" && typeof v.external === "undefined") {
       // insert
-      v.name = v.name.trim()
+      v.name = v.name.trim();
       const { name, ...rest } = v;
       const alltables = await Table.find({});
       const existing_tables = [
@@ -1162,6 +1182,7 @@ router.post(
       let notify = "";
       if (!rest.versioned) rest.versioned = false;
       if (!rest.has_sync_info) rest.has_sync_info = false;
+      rest.is_user_group = !!rest.is_user_group;
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
@@ -1922,7 +1943,7 @@ router.post(
     const table = Table.findOne({ name });
 
     try {
-      await table.deleteRows({}, req.user);
+      await table.deleteRows({}, req.user, true);
       req.flash("success", req.__("Deleted all rows"));
     } catch (e) {
       req.flash("error", e.message);
@@ -2074,3 +2095,20 @@ router.post(
     respondWorkflow(table, workflow, wfres, req, res);
   })
 );
+
+router.post(
+  "/repair-composite-primary/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+
+    const table = Table.findOne({ id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    await table.repairCompositePrimary();
+    res.redirect(`/table/${table.id}`);
+  })
+);