@saltcorn/server 1.4.0-beta.3 → 1.4.0-beta.5

package/routes/page.js

@@ -19,7 +19,7 @@ const {
   getRandomPage,
 } = require("../routes/utils.js");
 const { isTest } = require("@saltcorn/data/utils");
-const { add_edit_bar } = require("../markup/admin.js");
+const { add_edit_bar, add_results_to_contents } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
 const db = require("@saltcorn/data/db");
@@ -54,13 +54,22 @@ const runPage = async (page, req, res, tic) => {
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
 
-    if (!isTest()) {
-      Trigger.emitEvent("PageLoad", null, req.user, {
-        text: req.__("Page '%s' was loaded", page.name),
-        type: "page",
-        name: page.name,
-        render_time: ms,
-      });
+    const resultCollector = {};
+    if (!isTest() && !req.xhr) {
+      await Trigger.runTableTriggers(
+        "PageLoad",
+        null,
+        {
+          text: req.__("Page '%s' was loaded", page.name),
+          type: "page",
+          name: page.name,
+          render_time: ms,
+          query: req.query,
+        },
+        resultCollector,
+        req.user,
+        { req }
+      );
     }
     if (contents.html_file) await sendHtmlFile(req, res, contents.html_file);
     else
@@ -72,15 +81,18 @@ const runPage = async (page, req, res, tic) => {
           no_menu: page.attributes?.no_menu,
           requestFluidLayout: page.attributes?.request_fluid_layout,
         } || `${page.name} page`,
-        req.smr
-          ? contents
-          : add_edit_bar({
-              role,
-              title: page.name,
-              what: req.__("Page"),
-              url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
-              contents,
-            })
+        add_results_to_contents(
+          req.smr
+            ? contents
+            : add_edit_bar({
+                role,
+                title: page.name,
+                what: req.__("Page"),
+                url: `/pageedit/edit/${encodeURIComponent(page.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                contents,
+              }),
+          resultCollector
+        )
       );
   } else {
     getState().log(2, `Page ${page.name} not authorized`);

package/routes/tables.js

@@ -787,7 +787,8 @@ router.get(
     let id = parseInt(idorname);
     let table;
     if (id) [table] = await Table.find({ id });
-    else {
+    
+    if (!table) {
       [table] = await Table.find({ name: idorname });
     }
 
@@ -1565,7 +1566,7 @@ router.get(
         },
         {
           type: "card",
-          class: "mt-0",
+          class: "mt-0 card-max-full-screen",
           title: cardHeaderTabs([
             { label: req.__("Your tables"), href: "/table", active: true },
             {
@@ -1573,7 +1574,8 @@ router.get(
               href: "/table/relationship-diagram",
             },
           ]),
-          contents: mainCard + createCard,
+          footer: createCard,
+          contents: mainCard,
         },
       ],
     });

package/routes/view.js

@@ -19,7 +19,7 @@ const {
   setTenant,
   isAdminOrHasConfigMinRole,
 } = require("../routes/utils.js");
-const { add_edit_bar } = require("../markup/admin.js");
+const { add_edit_bar, add_results_to_contents } = require("../markup/admin.js");
 const { InvalidConfiguration, isTest } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 
@@ -150,13 +150,23 @@ router.get(
     }
     const tock = new Date();
     const ms = tock.getTime() - tic.getTime();
-    if (!isTest())
-      Trigger.emitEvent("PageLoad", null, req.user, {
-        text: req.__("View '%s' was loaded", viewname),
-        type: "view",
-        name: viewname,
-        render_time: ms,
-      });
+    const resultCollector = {};
+
+    if (!isTest() && !req.xhr)
+      await Trigger.runTableTriggers(
+        "PageLoad",
+        null,
+        {
+          text: req.__("View '%s' was loaded", viewname),
+          type: "view",
+          name: viewname,
+          render_time: ms,
+          query: req.query,
+        },
+        resultCollector,
+        req.user,
+        { req }
+      );
     if (typeof contents0 === "object" && contents0.goto)
       res.redirect(contents0.goto);
     else {
@@ -174,20 +184,23 @@ router.get(
           : contents0;
       res.sendWrap(
         title,
-        !req.smr && !req.rvr
-          ? add_edit_bar({
-              role,
-              title: view.name,
-              what: req.__("View"),
-              url: `/viewedit/edit/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
-              cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
-              contents,
-              req,
-              view,
-              viewtemplate: view.viewtemplate,
-              table: view.table_id || view.exttable_name,
-            })
-          : contents
+        add_results_to_contents(
+          !req.smr && !req.rvr
+            ? add_edit_bar({
+                role,
+                title: view.name,
+                what: req.__("View"),
+                url: `/viewedit/edit/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                cfgUrl: `/viewedit/config/${encodeURIComponent(view.name)}?on_done_redirect=${encodeURIComponent(req.originalUrl.replace("/", ""))}`,
+                contents,
+                req,
+                view,
+                viewtemplate: view.viewtemplate,
+                table: view.table_id || view.exttable_name,
+              })
+            : contents,
+          resultCollector
+        )
       );
     }
   })

package/routes/viewedit.js

@@ -91,20 +91,22 @@ router.get(
         },
         {
           type: "card",
-          class: "mt-0",
+          class: "mt-0 card-max-full-screen",
           title: req.__("Your views"),
+          footer:
+            tables.length > 0 &&
+            a(
+              { href: `/viewedit/new`, class: "btn btn-primary" },
+              req.__("Create view")
+            ),
           contents: [
             viewMarkup,
-            tables.length > 0
-              ? a(
-                  { href: `/viewedit/new`, class: "btn btn-primary" },
-                  req.__("Create view")
+            tables.length === 0 &&
+              p(
+                req.__(
+                  "You must create at least one table before you can create views."
                 )
-              : p(
-                  req.__(
-                    "You must create at least one table before you can create views."
-                  )
-                ),
+              ),
           ],
         },
       ],

package/serve.js

@@ -518,6 +518,7 @@ const nonGreenlockWorkerSetup = async (appargs, port, host) => {
 };
 
 const tenantFromSocket = (socket, hostPartOffset) => {
+  if (!db.is_it_multi_tenant()) return db.connectObj.default_schema;
   const header = socket.request.headers.host;
   const hostOnly = header?.split(":")[0];
   if (hostOnly) {

package/tests/admin.test.js

@@ -94,7 +94,7 @@ describe("admin page", () => {
     ["/search/config", "Search configuration"],
     ["/library/list", "component assemblies"],
   ]);
-  adminPageContains([["/actions", "Actions available"]]);
+  //adminPageContains([["/actions", "Actions available"]]);
   adminPageContains([["/eventlog", "Event log"]]);
   adminPageContains([["/eventlog/settings", "Which events should be logged?"]]);
   adminPageContains([["/eventlog/custom", "Custom Events"]]);
@@ -365,8 +365,7 @@ describe("actions", () => {
     await request(app)
       .get("/actions")
       .set("Cookie", loginCookie)
-      .expect(toInclude("Actions available"))
-      .expect(toInclude("webhook"));
+      .expect(toInclude("Create trigger"));
   });
   it("show new action", async () => {
     const app = await getApp({ disableCsrf: true });