@saltcorn/server 0.7.4-beta.0 → 0.7.4-beta.1

package/routes/menu.js

@@ -22,6 +22,9 @@ const { renderForm } = require("@saltcorn/markup");
 const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
+const Trigger = require("@saltcorn/data/models/trigger");
+const { run_action_column } = require("@saltcorn/data/plugin-helper");
+
 
 /**
  * @type {object}
@@ -61,6 +64,18 @@ const menuForm = async (req) => {
         dynSectionFieldOptions[table.name].push(field.name);
     }
   }
+  const stateActions = getState().actions;
+  const actions = [
+    ...Object.entries(stateActions)
+      .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
+      .map(([k, v]) => k),
+  ];
+  const triggers = await Trigger.find({
+    when_trigger: { or: ["API call", "Never"] },
+  });
+  triggers.forEach((tr) => {
+    actions.push(tr.name);
+  });
 
   return new Form({
     action: "/menu/",
@@ -92,6 +107,7 @@ const menuForm = async (req) => {
           "Dynamic",
           "Search",
           "Separator",
+          "Action"
         ],
       },
       {
@@ -101,7 +117,7 @@ const menuForm = async (req) => {
         input_type: "text",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Search"],
+          type: ["View", "Page", "Link", "Header", "Dynamic", "Search", "Action"],
         },
       },
       {
@@ -111,7 +127,7 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
-        showIf: { type: ["View", "Page", "Link", "Header"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
       },
       {
         name: "icon",
@@ -149,6 +165,17 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "action_name",
+        label: req.__("Action"),
+        type: "String",
+        class: "item-menu",
+        required: true,
+        attributes: {
+          options: actions,
+        },
+        showIf: { type: "Action" },
+      },
       {
         name: "dyn_table",
         label: req.__("Table"),
@@ -217,7 +244,7 @@ const menuForm = async (req) => {
         class: "item-menu",
         type: "String",
         required: true,
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
         attributes: {
           options: [
             { name: "", label: "Link" },
@@ -239,7 +266,7 @@ const menuForm = async (req) => {
       {
         name: "location",
         label: req.__("Location"),
-        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic", "Action"] },
         sublabel: req.__("Not all themes support all locations"),
         class: "item-menu",
         type: "String",
@@ -404,3 +431,37 @@ router.post(
     res.json({ success: true });
   })
 );
+
+router.post(
+  "/runaction/:name",
+  error_catcher(async (req, res) => {
+    const { name } = req.params;
+    const role = (req.user || {}).role_id || 10;
+    const state = getState();
+    const menu_items = state.getConfig("menu_items");
+    let menu_item;
+    const search = items =>
+      items
+        .filter((item) => role <= +item.min_role)
+        .forEach(item => {
+          if (item.type === "Action" && item.action_name === name)
+            menu_item = item;
+          else if (item.subitems)
+            search(item.subitems);
+        })
+    search(menu_items);
+    if (menu_item)
+      try {
+        const result = await run_action_column({
+          col: menu_item,
+          referrer: req.get("Referrer"),
+          req,
+        });
+        res.json({ success: "ok", ...(result || {}) });
+      } catch (e) {
+        res.status(400).json({ error: e.message || e });
+      }
+
+    else res.status(404).json({ error: "Action not found" });
+  })
+);

package/routes/packs.js

@@ -116,7 +116,7 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Create pack") },
           ],
         },
@@ -184,7 +184,7 @@ router.post(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Create pack") },
           ],
         },
@@ -242,7 +242,7 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings") },
-            { text: req.__("Plugins"), href: "/plugins" },
+            { text: req.__("Modules"), href: "/plugins" },
             { text: req.__("Install pack") },
           ],
         },
@@ -293,7 +293,7 @@ router.post(
             type: "breadcrumbs",
             crumbs: [
               { text: req.__("Settings") },
-              { text: req.__("Plugins"), href: "/plugins" },
+              { text: req.__("Modules"), href: "/plugins" },
               { text: req.__("Install pack") },
             ],
           },

package/routes/plugins.js

@@ -79,7 +79,7 @@ const pluginForm = (req, plugin) => {
         label: req.__("Name"),
         name: "name",
         input_type: "text",
-        sublabel: req.__("Plugin name"),
+        sublabel: req.__("Module name"),
       }),
       new Field({
         label: req.__("Source"),
@@ -88,11 +88,11 @@ const pluginForm = (req, plugin) => {
         required: true,
         attributes: { options: "npm,local,github,git" },
         sublabel: req.__(
-          "Source of plugin for install. Few options:" +
-            "npm - download from npm repository," +
-            "local - get from local file system," +
-            "github - download from github," +
-            "git - get from git"
+          "Source of module for install. Few options:" +
+          "npm - download from npm repository," +
+          "local - get from local file system," +
+          "github - download from github," +
+          "git - get from git"
         ),
       }),
       new Field({
@@ -101,19 +101,19 @@ const pluginForm = (req, plugin) => {
         input_type: "text",
         sublabel: req.__(
           "For npm - name of npm package, e.g. @saltcorn/html or saltcorn-gantt, check at npmjs.com, " +
-            "for local - absolute path to plugin folder in file system, e.g.C:\\gitsrc\\any-bootstrap-theme\\, " +
-            "for github - name of github project."
+          "for local - absolute path to module folder in file system, e.g. C:\\gitsrc\\any-bootstrap-theme\\, " +
+          "for github - name of github project."
         ),
       }),
       ...(schema === db.connectObj.default_schema
         ? [
-            new Field({
-              label: req.__("Version"),
-              name: "version",
-              input_type: "text",
-              sublabel: req.__("Version of plugin, latest is default value"),
-            }),
-          ]
+          new Field({
+            label: req.__("Version"),
+            name: "version",
+            input_type: "text",
+            sublabel: req.__("Version of module, latest is default value"),
+          }),
+        ]
         : []),
       new Field({
         label: req.__("Private SSH key"),
@@ -257,7 +257,7 @@ const store_item_html = (req) => (item) => ({
   title: item.name,
   contents: div(
     div(
-      item.plugin && badge(req.__("Plugin")),
+      item.plugin && badge(req.__("Module")),
       item.pack && badge(req.__("Pack")),
       item.has_theme && badge(req.__("Theme")),
       item.has_auth && badge(req.__("Authentication")),
@@ -269,72 +269,72 @@ const store_item_html = (req) => (item) => ({
     div(item.description || ""),
     item.documentation_link
       ? div(
-          a(
-            { href: item.documentation_link, target: "_blank" },
-            req.__("Documentation")
-          )
+        a(
+          { href: item.documentation_link, target: "_blank" },
+          req.__("Documentation")
         )
+      )
       : ""
   ),
   footer: div(
     div(
       !item.installed &&
-        item.plugin &&
-        post_btn(
-          `/plugins/install/${encodeURIComponent(item.name)}`,
-          req.__("Install"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.plugin &&
+      post_btn(
+        `/plugins/install/${encodeURIComponent(item.name)}`,
+        req.__("Install"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          onClick: "press_store_button(this)",
+        }
+      ),
       !item.installed &&
-        item.pack &&
-        post_btn(
-          `/packs/install-named/${encodeURIComponent(item.name)}`,
-          req.__("Install"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.pack &&
+      post_btn(
+        `/packs/install-named/${encodeURIComponent(item.name)}`,
+        req.__("Install"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          onClick: "press_store_button(this)",
+        }
+      ),
 
       item.installed && item.plugin && cfg_link(req, item),
       item.installed && item.plugin && info_link(req, item),
 
       item.installed &&
-        item.pack &&
-        post_btn(
-          `/packs/uninstall/${encodeURIComponent(item.name)}`,
-          req.__("Uninstall"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            btnClass: "btn-danger",
-            formClass: "d-inline",
-            onClick: "press_store_button(this)",
-          }
-        ),
+      item.pack &&
+      post_btn(
+        `/packs/uninstall/${encodeURIComponent(item.name)}`,
+        req.__("Uninstall"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          btnClass: "btn-danger",
+          formClass: "d-inline",
+          onClick: "press_store_button(this)",
+        }
+      ),
       item.installed &&
-        item.plugin &&
-        item.name !== "base" &&
-        post_btn(
-          `/plugins/delete/${encodeURIComponent(item.name)}`,
-          req.__("Remove"),
-          req.csrfToken(),
-          {
-            klass: "store-install",
-            small: true,
-            btnClass: "btn-danger",
-            formClass: "d-inline",
-            onClick: "press_store_button(this)",
-          }
-        )
+      item.plugin &&
+      item.name !== "base" &&
+      post_btn(
+        `/plugins/delete/${encodeURIComponent(item.name)}`,
+        req.__("Remove"),
+        req.csrfToken(),
+        {
+          klass: "store-install",
+          small: true,
+          btnClass: "btn-danger",
+          formClass: "d-inline",
+          onClick: "press_store_button(this)",
+        }
+      )
     )
   ),
 });
@@ -354,7 +354,7 @@ const storeNavPills = (req) => {
             "nav-link",
             (req.query.set === txt.toLowerCase() ||
               (txt === "All" && !req.query.set)) &&
-              "active",
+            "active",
           ],
         },
         req.__(txt)
@@ -363,7 +363,7 @@ const storeNavPills = (req) => {
   return ul(
     { class: "nav nav-pills plugin-section" },
     link("All"),
-    link("Plugins"),
+    link("Modules"),
     link("Packs"),
     link("Themes"),
     link("Installed")
@@ -407,7 +407,7 @@ const satisfy_q = (p, q) => {
  */
 const filter_items_set = (items, query) => {
   switch (query.set) {
-    case "plugins":
+    case "modules":
       return items.filter((item) => item.plugin && !item.has_theme);
     case "packs":
       return items.filter((item) => item.pack);
@@ -451,23 +451,23 @@ const store_actions_dropdown = (req) =>
         '<i class="fas fa-sync"></i>&nbsp;' + req.__("Refresh")
       ),
       db.getTenantSchema() === db.connectObj.default_schema &&
-        a(
-          {
-            class: "dropdown-item",
-            href: `/plugins/upgrade`,
-            onClick: `notifyAlert('Upgrading plugins...', true)`,
-          },
-          '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
-            req.__("Upgrade installed plugins")
-        ),
+      a(
+        {
+          class: "dropdown-item",
+          href: `/plugins/upgrade`,
+          onClick: `notifyAlert('Upgrading modules...', true)`,
+        },
+        '<i class="far fa-arrow-alt-circle-up"></i>&nbsp;' +
+        req.__("Upgrade installed modules")
+      ),
       db.getTenantSchema() === db.connectObj.default_schema &&
-        a(
-          {
-            class: "dropdown-item",
-            href: `/plugins/new`,
-          },
-          '<i class="fas fa-plus"></i>&nbsp;' + req.__("Add another plugin")
-        ),
+      a(
+        {
+          class: "dropdown-item",
+          href: `/plugins/new`,
+        },
+        '<i class="fas fa-plus"></i>&nbsp;' + req.__("Add another module")
+      ),
 
       a(
         {
@@ -501,7 +501,7 @@ const plugin_store_html = (items, req) => {
         type: "breadcrumbs",
         crumbs: [
           { text: req.__("Settings"), href: "/settings" },
-          { text: req.__("Plugin and pack store") },
+          { text: req.__("Module store") },
         ],
       },
       {
@@ -534,7 +534,7 @@ router.get(
   error_catcher(async (req, res) => {
     const items = await get_store_items();
     const relevant_items = filter_items(items, req.query);
-    res.sendWrap(req.__("Plugins"), plugin_store_html(relevant_items, req));
+    res.sendWrap(req.__("Module store"), plugin_store_html(relevant_items, req));
   })
 );
 
@@ -574,9 +574,8 @@ router.get(
           onclick: "location.reload()",
         },
       ];
-      wfres.renderForm.onChange = `${
-        wfres.renderForm.onChange || ""
-      };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
+      wfres.renderForm.onChange = `${wfres.renderForm.onChange || ""
+        };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
     }
 
     res.sendWrap(req.__(`Configure %s Plugin`, plugin.name), {
@@ -620,9 +619,8 @@ router.post(
             onclick: "location.reload()",
           },
         ];
-        wfres.renderForm.onChange = `${
-          wfres.renderForm.onChange || ""
-        };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
+        wfres.renderForm.onChange = `${wfres.renderForm.onChange || ""
+          };$('#btnReloadNow').removeClass('btn-outline-secondary').addClass('btn-secondary')`;
       }
       res.sendWrap(req.__(`Configure %s Plugin`, plugin.name), {
         type: "card",
@@ -694,13 +692,13 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Plugin and pack store"), href: "/plugins" },
+            { text: req.__("Module store"), href: "/plugins" },
             { text: req.__("New") },
           ],
         },
         {
           type: "card",
-          title: req.__(`Add plugin`),
+          title: req.__(`Add module`),
           contents: renderForm(pluginForm(req), req.csrfToken()),
         },
       ],
@@ -808,35 +806,35 @@ router.get(
             latest || "",
             can_update
               ? a(
-                  {
-                    href: `/plugins/upgrade-plugin/${plugin_db.name}`,
-                    class: "btn btn-primary btn-sm ms-2",
-                  },
-                  req.__("Upgrade")
-                )
+                {
+                  href: `/plugins/upgrade-plugin/${plugin_db.name}`,
+                  class: "btn btn-primary btn-sm ms-2",
+                },
+                req.__("Upgrade")
+              )
               : ""
           )
         ),
         mod.plugin_module.dependencies
           ? tr(
-              th(req.__("Plugin dependencies")),
-              td(
-                mod.plugin_module.dependencies.map((d) =>
-                  span({ class: "badge bg-primary me-1" }, d)
-                )
+            th(req.__("Plugin dependencies")),
+            td(
+              mod.plugin_module.dependencies.map((d) =>
+                span({ class: "badge bg-primary me-1" }, d)
               )
             )
+          )
           : null,
         store_item && store_item.documentation_link
           ? tr(
-              th(req.__("Documentation")),
-              td(
-                link(
-                  store_item.documentation_link,
-                  store_item.documentation_link
-                )
+            th(req.__("Documentation")),
+            td(
+              link(
+                store_item.documentation_link,
+                store_item.documentation_link
               )
             )
+          )
           : null,
         pkgjson && pkgjson.repository
           ? tr(th(req.__("Repository")), td(showRepository(pkgjson.repository)))
@@ -861,13 +859,13 @@ router.get(
           type: "breadcrumbs",
           crumbs: [
             { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Plugin and pack store"), href: "/plugins" },
+            { text: req.__("Module store"), href: "/plugins" },
             { text: plugin_db.name },
           ],
         },
         {
           type: "card",
-          title: req.__(`%s plugin information`, plugin_db.name),
+          title: req.__(`%s module information`, plugin_db.name),
           contents: p(store_item.description) + infoTable,
         },
         ...cards,
@@ -913,7 +911,7 @@ router.get(
     for (const plugin of installed_plugins) {
       await plugin.upgrade_version((p, f) => load_plugins.loadPlugin(p, f));
     }
-    req.flash("success", req.__(`Plugins up-to-date`));
+    req.flash("success", req.__(`Modules up-to-date`));
     await restart_tenant(loadAllPlugins);
     process.send &&
       process.send({ restart_tenant: true, tenant: db.getTenantSchema() });

package/routes/settings.js

@@ -63,9 +63,9 @@ router.get(
           href: "/admin",
         }),
         settingsCard({
-          title: req.__("Plugins"),
-          icon: "fas fa-plug",
-          blurb: req.__("Plugin and pack installation and control"),
+          title: req.__("Modules"),
+          icon: "fas fa-cubes",
+          blurb: req.__("Module installation and control"),
           href: "/plugins",
         }),
         settingsCard({