@saltcorn/server 0.9.5-beta.9 → 0.9.6-beta.0

package/routes/search.js

@@ -52,6 +52,12 @@ const searchConfigForm = (tables, views, req) => {
         attributes: { options: ok_views.map((v) => v.name).join() },
       });
   }
+  fields.push({
+    name: "search_table_description",
+    label: req.__("Description header"),
+    sublabel: req.__("Use table description instead of name as header"),
+    type: "Bool",
+  });
   const blurb1 = req.__(
     `Choose views for <a href="/search">search results</a> for each table.<br/>Set to blank to omit table from global search.`
   );
@@ -84,7 +90,11 @@ router.get(
     const views = await View.find({}, { orderBy: "name" });
     const tables = await Table.find();
     const form = searchConfigForm(tables, views, req);
-    form.values = getState().getConfig("globalSearch");
+    form.values = getState().getConfig("globalSearch", {});
+    form.values.search_table_description = getState().getConfig(
+      "search_table_description",
+      false
+    );
     send_infoarch_page({
       res,
       req,
@@ -116,6 +126,13 @@ router.post(
     const result = form.validate(req.body);
 
     if (result.success) {
+      const search_table_description =
+        !!result.success.search_table_description;
+      await getState().setConfig(
+        "search_table_description",
+        search_table_description
+      );
+      delete result.success.search_table_description;
       await getState().setConfig("globalSearch", result.success);
       if (!req.xhr) res.redirect("/search/config");
       else res.json({ success: "ok" });
@@ -175,6 +192,10 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     res.redirect("/");
     return;
   }
+  const search_table_description = getState().getConfig(
+    "search_table_description",
+    false
+  );
   const current_page = parseInt(_page) || 1;
   const offset = (current_page - 1) * page_size;
   let resp = [];
@@ -184,6 +205,11 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     if (!viewName || viewName === "") continue;
     tablesConfigured += 1;
     if (table && tableName !== table) continue;
+    let sectionHeader = tableName;
+    if (search_table_description) {
+      sectionHeader =
+        Table.findOne({ name: tableName })?.description || tableName;
+    }
     const view = await View.findOne({ name: viewName });
     if (!view)
       throw new InvalidConfiguration(
@@ -209,7 +235,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
       tablesWithResults.push(tableName);
       resp.push({
         type: "card",
-        title: span({ id: tableName }, tableName),
+        title: span({ id: tableName }, sectionHeader),
         contents: vresps.map((vr) => vr.html).join("<hr>") + paginate,
       });
     }

package/routes/tag_entries.js

@@ -87,9 +87,9 @@ const formOptions = async (type, tag_id) => {
     case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        triggers: Trigger.find().filter(
-          (value) => ids.indexOf(value.id) === -1
-        ),
+        triggers: (
+          await Trigger.findDB({}, { orderBy: "name", nocase: true })
+        ).filter((value) => ids.indexOf(value.id) === -1),
       };
     }
   }

package/routes/tenant.js

@@ -96,6 +96,7 @@ const tenant_form = (req, base_url) =>
         label: req.__("Application name"),
         input_type: "text",
         postText: text("." + base_url),
+        attributes: { autofocus: true },
       },
     ],
   });

package/routes/utils.js

@@ -203,7 +203,15 @@ const setTenant = (req, res, next) => {
         } else {
           db.runWithTenant(other_domain, () => {
             setLanguage(req, res, state);
-            state.log(5, `${req.method} ${req.originalUrl}`);
+            if (state.logLevel >= 5)
+              state.log(
+                5,
+                `${req.method} ${req.originalUrl}${
+                  state.getConfig("log_ip_address", false)
+                    ? ` IP=${req.ip}`
+                    : ""
+                }`
+              );
             next();
           });
         }
@@ -216,7 +224,15 @@ const setTenant = (req, res, next) => {
         } else {
           db.runWithTenant(ten, () => {
             setLanguage(req, res, state);
-            state.log(5, `${req.method} ${req.originalUrl}`);
+            if (state.logLevel >= 5)
+              state.log(
+                5,
+                `${req.method} ${req.originalUrl}${
+                  state.getConfig("log_ip_address", false)
+                    ? ` IP=${req.ip}`
+                    : ""
+                }`
+              );
             next();
           });
         }

package/routes/view.js

@@ -45,7 +45,12 @@ router.get(
     const view = await View.findOne({ name: viewname });
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const state = getState();
-    state.log(3, `Route /view/${viewname} user=${req.user?.id}`);
+    state.log(
+      3,
+      `Route /view/${viewname} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       state.log(2, `View ${viewname} not found`);
@@ -207,7 +212,9 @@ router.post(
     const state = getState();
     state.log(
       3,
-      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}`
+      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
     );
 
     const view = await View.findOne({ name: viewname });
@@ -240,7 +247,12 @@ router.post(
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const query = { ...req.query };
     const state = getState();
-    state.log(3, `Route /view/${viewname} POST user=${req.user?.id}`);
+    state.log(
+      3,
+      `Route /view/${viewname} POST user=${req.user?.id}${
+        state.getConfig("log_ip_address", false) ? ` IP=${req.ip}` : ""
+      }`
+    );
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));

package/s3storage.js

@@ -64,6 +64,7 @@ module.exports = {
         limits: fileSizeLimit
           ? {
               fileSize: fileSizeLimit,
+              fieldSize: fileSizeLimit,
             }
           : {},
         abortOnLimit: fileSizeLimit !== 0,

package/systemd.js

@@ -43,7 +43,7 @@ const watchDog = (interval, notify, { port }) => {
           });
       }
     } else {
-      getState().log(5, `watchdog with no test`);
+      getState().log(6, `watchdog with no test`);
       notify.watchdog();
       return;
     }

package/tests/page.test.js

@@ -30,7 +30,17 @@ const prepHtmlFiles = async () => {
     const html = `<html><head><title>Landing page</title></head><body><h1>${content}</h1></body></html>`;
     if (!existsSync(scFolder)) await File.new_folder(folder);
     if (!existsSync(join(scFolder, name))) {
-      return await File.from_contents(name, "text/html", html, 1, 1, folder);
+      const file = await File.from_contents(
+        name,
+        "text/html",
+        html,
+        1,
+        1,
+        folder
+      );
+      file.location = File.absPathToServePath(file.location);
+
+      return file;
     } else {
       const file = await File.from_file_on_disk(name, scFolder);
       fs.writeFileSync(file.location, html);