@saltcorn/server 0.7.3 → 0.7.4-beta.2

package/routes/homepage.js

@@ -54,9 +54,9 @@ const tableCard = (tables, req) => ({
   contents:
     (tables.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(req.__("Tables organise data by fields and rows."))
-        )
+        { class: "mt-2 pe-2" },
+        i(req.__("Tables organise data by fields and rows."))
+      )
       : "") + tableTable(tables, req),
   bodyClass: "py-0 pe-0",
   footer: div(
@@ -107,13 +107,13 @@ const viewCard = (views, req) => ({
   contents:
     (views.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Views display data from tables. A view is a view template applied to a table, with configuration."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Views display data from tables. A view is a view pattern applied to a table, with configuration."
           )
         )
+      )
       : "") +
     (views.length > 0 ? viewTable(views, req) : p(req.__("No views"))),
 
@@ -160,13 +160,13 @@ const pageCard = (pages, req) => ({
   contents:
     (pages.length <= 1
       ? p(
-          { class: "mt-2 pe-2" },
-          i(
-            req.__(
-              "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
-            )
+        { class: "mt-2 pe-2" },
+        i(
+          req.__(
+            "Pages are the web pages of your application built with a drag-and-drop builder. They have static content, and by embedding views, dynamic content."
           )
         )
+      )
       : "") +
     (pages.length > 0
       ? pageTable(pages, req)
@@ -191,16 +191,16 @@ const filesTab = async (req) => {
     files.length === 0
       ? p(req.__("No files"))
       : mkTable(
-          [
-            {
-              label: req.__("Filename"),
-              key: (r) => link(`/files/serve/${r.id}`, r.filename),
-            },
-            { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
-            { label: req.__("Media type"), key: (r) => r.mimetype },
-          ],
-          files
-        ),
+        [
+          {
+            label: req.__("Filename"),
+            key: (r) => link(`/files/serve/${r.id}`, r.filename),
+          },
+          { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+          { label: req.__("Media type"), key: (r) => r.mimetype },
+        ],
+        files
+      ),
     fileUploadForm(req)
   );
 };
@@ -244,30 +244,30 @@ const actionsTab = async (req, triggers) => {
   return div(
     { class: "pb-3" },
     triggers.length <= 1 &&
-      p(
-        { class: "mt-2 pe-2" },
-        i(req.__("Triggers run actions in response to events."))
-      ),
+    p(
+      { class: "mt-2 pe-2" },
+      i(req.__("Triggers run actions in response to events."))
+    ),
     triggers.length === 0
       ? p(req.__("No triggers"))
       : mkTable(
-          [
-            { label: req.__("Name"), key: "name" },
-            { label: req.__("Action"), key: "action" },
-            {
-              label: req.__("Table or Channel"),
-              key: (r) => r.table_name || r.channel,
-            },
-            {
-              label: req.__("When"),
-              key: (a) =>
-                a.when_trigger === "API call"
-                  ? `API: ${base_url}api/action/${a.name}`
-                  : a.when_trigger,
-            },
-          ],
-          triggers
-        ),
+        [
+          { label: req.__("Name"), key: "name" },
+          { label: req.__("Action"), key: "action" },
+          {
+            label: req.__("Table or Channel"),
+            key: (r) => r.table_name || r.channel,
+          },
+          {
+            label: req.__("When"),
+            key: (a) =>
+              a.when_trigger === "API call"
+                ? `API: ${base_url}api/action/${a.name}`
+                : a.when_trigger,
+          },
+        ],
+        triggers
+      ),
     a(
       { href: "/actions/new", class: "btn btn-secondary my-3" },
       req.__("Add trigger")
@@ -385,15 +385,15 @@ const welcome_page = async (req) => {
             tabContents:
               triggers.length > 0
                 ? {
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                    Packs: packTab(req, packlist),
-                  }
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                  Packs: packTab(req, packlist),
+                }
                 : {
-                    Packs: packTab(req, packlist),
-                    Triggers: await actionsTab(req, triggers),
-                    Files: await filesTab(req),
-                  },
+                  Packs: packTab(req, packlist),
+                  Triggers: await actionsTab(req, triggers),
+                  Files: await filesTab(req),
+                },
           },
           {
             type: "card",
@@ -403,13 +403,13 @@ const welcome_page = async (req) => {
             tabContents:
               users.length > 4
                 ? {
-                    Users: await usersTab(req, users, roleMap),
-                    Help: helpCard(req),
-                  }
+                  Users: await usersTab(req, users, roleMap),
+                  Help: helpCard(req),
+                }
                 : {
-                    Help: helpCard(req),
-                    Users: await usersTab(req, users, roleMap),
-                  },
+                  Help: helpCard(req),
+                  Users: await usersTab(req, users, roleMap),
+                },
           },
         ],
       },
@@ -440,8 +440,8 @@ const no_views_logged_in = async (req, res) => {
           packagejson.version,
           latest
         ) +
-          " " +
-          a({ href: "/admin/system" }, req.__("Upgrade here"))
+        " " +
+        a({ href: "/admin/system" }, req.__("Upgrade here"))
       );
 
     res.sendWrap(req.__("Hello"), await welcome_page(req));

package/routes/index.js

@@ -70,6 +70,8 @@ const auth = require("../auth/routes");
 const useradmin = require("../auth/admin");
 const roleadmin = require("../auth/roleadmin");
 const scapi = require("./scapi");
+const tags = require("./tags");
+const tagentries = require("./tag_entries");
 
 module.exports =
   /**
@@ -106,4 +108,6 @@ module.exports =
     app.use("/useradmin", useradmin);
     app.use("/roleadmin", roleadmin);
     app.use("/scapi", scapi);
+    app.use("/tag", tags);
+    app.use("/tag-entries", tagentries);
   };

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/page.js

@@ -36,6 +36,8 @@ router.get(
   "/:pagename",
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
+    const state = getState();
+    state.log(3, `Route /page/${pagename} user=${req.user?.id}`);
 
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const db_page = await Page.findOne({ name: pagename });
@@ -56,10 +58,12 @@ router.get(
           contents,
         })
       );
-    } else
+    } else {
+      state.log(2, `Page $pagename} not found or not authorized`);
       res
         .status(404)
         .sendWrap(`${pagename} page`, req.__("Page %s not found", pagename));
+    }
   })
 );
 

package/routes/pageedit.js

@@ -19,6 +19,7 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
 const db = require("@saltcorn/data/db");
+const { getPageList } = require("./common_lists");
 
 const { isAdmin, error_catcher } = require("./utils.js");
 const {
@@ -32,7 +33,6 @@ const {
   settingsDropdown,
 } = require("@saltcorn/markup");
 const { getActionConfigFields } = require("@saltcorn/data/plugin-helper");
-const { editRoleForm, wizardCardTitle } = require("../markup/forms.js");
 const Library = require("@saltcorn/data/models/library");
 
 /**
@@ -45,61 +45,6 @@ const Library = require("@saltcorn/data/models/library");
 const router = new Router();
 module.exports = router;
 
-/**
- * @param {object} page
- * @param {*} roles
- * @param {object} req
- * @returns {Form}
- */
-const editPageRoleForm = (page, roles, req) =>
-  editRoleForm({
-    url: `/pageedit/setrole/${page.id}`,
-    current_role: page.min_role,
-    roles,
-    req,
-  });
-
-/**
- * @param {object} page
- * @param {object} req
- * @returns {string}
- */
-const page_dropdown = (page, req) =>
-  settingsDropdown(`dropdownMenuButton${page.id}`, [
-    a(
-      {
-        class: "dropdown-item",
-        href: `/page/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/pageedit/edit-properties/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit properties")
-    ),
-    post_dropdown_item(
-      `/pageedit/add-to-menu/${page.id}`,
-      '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
-      req
-    ),
-    post_dropdown_item(
-      `/pageedit/clone/${page.id}`,
-      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
-      req
-    ),
-    div({ class: "dropdown-divider" }),
-    post_dropdown_item(
-      `/pageedit/delete/${page.id}`,
-      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
-      req,
-      true,
-      page.name
-    ),
-  ]);
-
 /**
  *
  * @param {object} req
@@ -180,7 +125,8 @@ const pageBuilderData = async (req, context) => {
   const fixed_state_fields = {};
   for (const view of views) {
     fixed_state_fields[view.name] = [];
-    const table = Table.findOne({ id: view.table_id });
+    const table = Table.findOne(view.table_id || view.exttable_name);
+
     const fs = await view.get_state_fields();
     for (const frec of fs) {
       const f = new Field(frec);
@@ -228,46 +174,6 @@ const pageBuilderData = async (req, context) => {
   };
 };
 
-/**
- * @param {*} rows
- * @param {*} roles
- * @param {object} req
- * @returns {div}
- */
-const getPageList = (rows, roles, req) => {
-  return div(
-    mkTable(
-      [
-        {
-          label: req.__("Name"),
-          key: (r) => link(`/page/${r.name}`, r.name),
-        },
-        {
-          label: req.__("Role to access"),
-          key: (row) => editPageRoleForm(row, roles, req),
-        },
-        {
-          label: req.__("Edit"),
-          key: (r) => link(`/pageedit/edit/${r.name}`, req.__("Edit")),
-        },
-        {
-          label: "",
-          key: (r) => page_dropdown(r, req),
-        },
-      ],
-      rows,
-      { hover: true }
-    ),
-    a(
-      {
-        href: `/pageedit/new`,
-        class: "btn btn-primary",
-      },
-      req.__("Create page")
-    )
-  );
-};
-
 /**
  * Root pages configuration Form
  * Allows to configure root page for each role
@@ -327,7 +233,16 @@ router.get(
           type: "card",
           title: req.__("Your pages"),
           class: "mt-0",
-          contents: getPageList(pages, roles, req),
+          contents: div(
+            getPageList(pages, roles, req),
+            a(
+              {
+                href: `/pageedit/new`,
+                class: "btn btn-primary",
+              },
+              req.__("Create page")
+            )
+          ),
         },
         {
           type: "card",