@saltcorn/server 0.9.4-beta.18 → 0.9.4-beta.19

package/routes/actions.js

@@ -219,6 +219,17 @@ const triggerForm = async (req, trigger) => {
           "The table for which the trigger condition is checked."
         ),
       },
+      {
+        name: "table_id",
+        label: req.__("Table"),
+        input_type: "select",
+        options: [
+          { value: "", label: "Table not set" },
+          ...tables.map((t) => ({ value: t.id, label: t.name })),
+        ],
+        showIf: { when_trigger: "Never" },
+        sublabel: req.__("Optionally associate a table with this trigger"),
+      },
       {
         name: "channel",
         label: req.__("Time of day"),
@@ -242,9 +253,41 @@ const triggerForm = async (req, trigger) => {
         attributes: {
           calcOptions: ["when_trigger", action_options],
         },
+        showIf: {
+          when_trigger: Trigger.when_options.filter((t) => t !== "Never"),
+        },
+        sublabel: req.__("The action to be taken when the trigger fires"),
+      },
+      {
+        name: "action",
+        label: req.__("Action"),
+        type: "String",
+        required: true,
+        help: { topic: "Actions" },
+        attributes: {
+          options: actionsNotRequiringRow,
+        },
+        showIf: {
+          when_trigger: "Never",
+          table_id: "",
+        },
+        sublabel: req.__("The action to be taken when the trigger fires"),
+      },
+      {
+        name: "action",
+        label: req.__("Action"),
+        type: "String",
+        required: true,
+        help: { topic: "Actions" },
+        attributes: {
+          options: allActions,
+        },
+        showIf: {
+          when_trigger: "Never",
+          table_id: tables.map((t) => t.id),
+        },
         sublabel: req.__("The action to be taken when the trigger fires"),
       },
-
       {
         name: "description",
         label: req.__("Description"),

package/routes/admin.js

@@ -600,7 +600,13 @@ router.post(
         snap.created
       ).fromNow()}`
     );
-    res.redirect(/^[a-z]+$/g.test(type) ? `/${type}edit` : "/");
+    res.redirect(
+      type === "trigger"
+        ? `/actions`
+        : /^[a-z]+$/g.test(type)
+        ? `/${type}edit`
+        : "/"
+    );
   })
 );
 

package/routes/common_lists.js

@@ -583,6 +583,34 @@ const getPageGroupList = (rows, roles, req) => {
   );
 };
 
+const trigger_dropdown = (trigger, req, on_done_redirect_str = "") =>
+  settingsDropdown(`dropdownMenuButton${trigger.id}`, [
+    a(
+      {
+        class: "dropdown-item",
+        href: `/actions/edit/${trigger.id}${on_done_redirect_str}`,
+      },
+      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
+    ),
+
+    a(
+      {
+        class: "dropdown-item",
+        href: `javascript:ajax_modal('/admin/snapshot-restore/trigger/${trigger.name}')`,
+      },
+      '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
+    ),
+    div({ class: "dropdown-divider" }),
+
+    post_dropdown_item(
+      `/actions/delete/${trigger.id}${on_done_redirect_str}`,
+      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
+      req,
+      true,
+      trigger.name
+    ),
+  ]);
+
 const getTriggerList = async (
   triggers,
   req,
@@ -618,13 +646,7 @@ const getTriggerList = async (
             },
           ]),
       { label: req.__("Action"), key: "action" },
-      {
-        label: req.__("Table or Channel"),
-        key: (r) =>
-          r.table_name
-            ? a({ href: `/table/${r.table_name}` }, r.table_name)
-            : r.channel,
-      },
+
       {
         label: req.__("When"),
         key: (act) =>
@@ -639,15 +661,15 @@ const getTriggerList = async (
             : ""),
       },
       {
-        label: req.__("Test run"),
+        label: req.__("Table or Channel"),
         key: (r) =>
-          r.table_id
-            ? ""
-            : link(`/actions/testrun/${r.id}`, req.__("Test run")),
+          r.table_name
+            ? a({ href: `/table/${r.table_name}` }, r.table_name)
+            : r.channel,
       },
       {
-        label: req.__("Edit"),
-        key: (r) => link(`/actions/edit/${r.id}`, req.__("Edit")),
+        label: req.__("Test run"),
+        key: (r) => link(`/actions/testrun/${r.id}`, req.__("Test run")),
       },
       {
         label: req.__("Configure"),
@@ -655,8 +677,8 @@ const getTriggerList = async (
       },
       !tagId
         ? {
-            label: req.__("Delete"),
-            key: (r) => post_delete_btn(`/actions/delete/${r.id}`, req),
+            label: "",
+            key: (r) => trigger_dropdown(r, req),
           }
         : {
             label: req.__("Remove From Tag"),

package/routes/list.js

@@ -288,7 +288,7 @@ router.get(
           },
           //css for jsgrid - grid editor external component
           {
-            css: `/static_assets/${db.connectObj.version_tag}/tabulator_bootstrap5.min.css`,
+            css: `/static_assets/${db.connectObj.version_tag}/tabulator_bootstrap4.min.css`,
           },
 
           // css for date flat picker external component

package/routes/tags.js

@@ -27,6 +27,7 @@ const {
 const db = require("@saltcorn/data/db");
 const { getState } = require("@saltcorn/data/db/state");
 const { create_pack_from_tag } = require("@saltcorn/admin-models/models/pack");
+const Table = require("@saltcorn/data/models/table");
 
 const router = new Router();
 module.exports = router;
@@ -161,6 +162,9 @@ router.get(
     await setTableRefs(views);
     const pages = await tag.getPages();
     const triggers = await tag.getTriggers();
+    triggers.forEach((tr) => {
+      if (tr.table_id) tr.table_name = Table.findOne(tr.table_id)?.name;
+    });
     const roles = await User.get_roles();
 
     const tablesDomId = "tablesListId";

package/wrapper.js

@@ -185,17 +185,25 @@ const get_headers = (req, version_tag, description, extras = []) => {
         },
       ]
     : [];
+  const locale = req.getLocale();
   const stdHeaders = [
     {
       headerTag: `<script>var _sc_loglevel = ${
         state.logLevel
-      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}";</script>`,
+      }, _sc_globalCsrf = "${req.csrfToken()}", _sc_version_tag = "${version_tag}"${
+        locale ? `, _sc_locale = "${locale}"` : ""
+      };</script>`,
     },
     { css: `/static_assets/${version_tag}/saltcorn.css` },
     { script: `/static_assets/${version_tag}/saltcorn-common.js` },
     { script: `/static_assets/${version_tag}/saltcorn.js` },
     { script: `/static_assets/${version_tag}/dayjs.min.js` },
   ];
+  if (locale !== "en") {
+    stdHeaders.push({
+      script: `/static_assets/${version_tag}/dayjslocales/${locale}.js`,
+    });
+  }
   let from_cfg = [];
   if (state.getConfig("page_custom_css", ""))
     from_cfg.push({ style: state.getConfig("page_custom_css", "") });