@saltcorn/server 0.8.0-beta.4 → 0.8.1-beta.0

package/serve.js

@@ -30,7 +30,11 @@ const { getConfig } = require("@saltcorn/data/models/config");
 const { migrate } = require("@saltcorn/data/migrate");
 const socketio = require("socket.io");
 const { createAdapter, setupPrimary } = require("@socket.io/cluster-adapter");
-const { setTenant, getSessionStore, get_tenant_from_req } = require("./routes/utils");
+const {
+  setTenant,
+  getSessionStore,
+  get_tenant_from_req,
+} = require("./routes/utils");
 const passport = require("passport");
 const { authenticate } = require("passport");
 const View = require("@saltcorn/data/models/view");
@@ -106,8 +110,8 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     });
   }
   if (!getState()) {
-    console.error("no State for tenant", tenant)
-    return
+    console.error("no State for tenant", tenant);
+    return;
   }
   if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
   if (msg.createTenant) {
@@ -142,33 +146,33 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
  */
 const onMessageFromWorker =
   (masterState, { port, watchReaper, disableScheduler, pid }) =>
-    (msg) => {
-      //console.log("worker msg", typeof msg, msg);
-      if (msg === "Start" && !masterState.started) {
-        masterState.started = true;
-        runScheduler({
-          port,
-          watchReaper,
-          disableScheduler,
-          eachTenant,
-          auto_backup_now,
-          take_snapshot,
-        });
-        require("./systemd")({ port });
-        return true;
-      } else if (msg === "RestartServer") {
-        process.exit(0);
-        return true;
-      } else if (msg.tenant || msg.createTenant) {
-        ///ie from saltcorn
-        //broadcast
-        Object.entries(cluster.workers).forEach(([wpid, w]) => {
-          if (wpid !== pid) w.send(msg);
-        });
-        workerDispatchMsg(msg); //also master
-        return true;
-      }
-    };
+  (msg) => {
+    //console.log("worker msg", typeof msg, msg);
+    if (msg === "Start" && !masterState.started) {
+      masterState.started = true;
+      runScheduler({
+        port,
+        watchReaper,
+        disableScheduler,
+        eachTenant,
+        auto_backup_now,
+        take_snapshot,
+      });
+      require("./systemd")({ port });
+      return true;
+    } else if (msg === "RestartServer") {
+      process.exit(0);
+      return true;
+    } else if (msg.tenant || msg.createTenant) {
+      ///ie from saltcorn
+      //broadcast
+      Object.entries(cluster.workers).forEach(([wpid, w]) => {
+        if (wpid !== pid) w.send(msg);
+      });
+      workerDispatchMsg(msg); //also master
+      return true;
+    }
+  };
 
 module.exports =
   /**
@@ -381,7 +385,7 @@ const setupSocket = (...servers) => {
         } catch (err) {
           getState().log(1, `Socket join_room error: ${err.stack}`);
         }
-      }
+      };
       if (ten && ten !== "public") db.runWithTenant(ten, f);
       else f();
     });

package/systemd.js

@@ -5,9 +5,9 @@
 const fetch = require("node-fetch");
 
 /**
- * @param {number} interval 
- * @param {object} notify 
- * @param {object} opts 
+ * @param {number} interval
+ * @param {object} notify
+ * @param {object} opts
  * @param {string} opts.port
  * @returns {void}
  */
@@ -48,22 +48,24 @@ const watchDog = (interval, notify, { port }) => {
   }
 };
 
-module.exports = 
-/**
- * @function
- * @name "module.exports function"
- * @param {object} opts 
- */
-(opts) => {
-  try {
-    const notify = require("sd-notify");
-    notify.ready();
-    const watchdogInterval = notify.watchdogInterval();
-    if (watchdogInterval && watchdogInterval > 0) {
-      const interval = Math.floor(watchdogInterval / 2);
-      setInterval(() => {
-        watchDog(interval, notify, opts);
-      }, interval);
+module.exports =
+  /**
+   * @function
+   * @name "module.exports function"
+   * @param {object} opts
+   */
+  (opts) => {
+    try {
+      const notify = require("sd-notify");
+      notify.ready();
+      const watchdogInterval = notify.watchdogInterval();
+      if (watchdogInterval && watchdogInterval > 0) {
+        const interval = Math.floor(watchdogInterval / 2);
+        setInterval(() => {
+          watchDog(interval, notify, opts);
+        }, interval);
+      }
+    } catch {
+      //ignore, systemd lib not installed
     }
-  } catch {}
-};
+  };

package/tests/fields.test.js

@@ -367,3 +367,26 @@ describe("Field Endpoints", () => {
       .expect((r) => +r.body > 1);
   });
 });
+
+describe("Fieldview config", () => {
+  //itShouldRedirectUnauthToLogin("/field/2");
+  it("should return fieldview options", async () => {
+    const loginCookie = await getAdminLoginCookie();
+
+    const app = await getApp({ disableCsrf: true });
+
+    await request(app)
+      .post("/field/fieldviewcfgform/books")
+      .set("Cookie", loginCookie)
+      .send({
+        type: "Field",
+        field_name: "pages",
+        fieldview: "progress_bar",
+      })
+      .expect(
+        toInclude(
+          `<div class="form-group"><div><label for="inputmax">max</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="max" name="max" id="inputmax" step="1" required></div></div><div class="form-group"><div><label for="inputbar_color">Bar color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bar_color" name="bar_color" id="inputbar_color"></div></div><div class="form-group"><div><label for="inputbg_color">Background color</label></div><div><input type="color" class="form-control  item-menu" data-fieldname="bg_color" name="bg_color" id="inputbg_color"></div></div><div class="form-group"><div><label for="inputpx_height">Height in px</label></div><div><input type="number" class="form-control  item-menu" data-fieldname="px_height" name="px_height" id="inputpx_height" step="1"></div></div>`
+        )
+      );
+  });
+});

package/wrapper.js

@@ -45,12 +45,12 @@ const get_extra_menu = (role, state, req) => {
           item.type === "Link"
             ? item.url
             : item.type === "Action"
-              ? `javascript:ajax_post_json('/menu/runaction/${item.action_name}')`
-              : item.type === "View"
-                ? `/view/${encodeURIComponent(item.viewname)}`
-                : item.type === "Page"
-                  ? `/page/${encodeURIComponent(item.pagename)}`
-                  : undefined,
+            ? `javascript:ajax_post_json('/menu/runaction/${item.action_name}')`
+            : item.type === "View"
+            ? `/view/${encodeURIComponent(item.viewname)}`
+            : item.type === "Page"
+            ? `/page/${encodeURIComponent(item.pagename)}`
+            : undefined,
         ...(item.subitems ? { subitems: transform(item.subitems) } : {}),
       }));
   return transform(cfg);
@@ -70,34 +70,34 @@ const get_menu = (req) => {
   const extra_menu = get_extra_menu(role, state, req);
   const authItems = isAuth
     ? [
-      {
-        label: req.__("User"),
-        icon: "far fa-user",
-        isUser: true,
-        subitems: [
-          { label: small((req.user.email || "").split("@")[0]) },
-          {
-            label: req.__("User Settings"),
-            icon: "fas fa-user-cog",
+        {
+          label: req.__("User"),
+          icon: "far fa-user",
+          isUser: true,
+          subitems: [
+            { label: small((req.user.email || "").split("@")[0]) },
+            {
+              label: req.__("User Settings"),
+              icon: "fas fa-user-cog",
 
-            link: "/auth/settings",
-          },
-          {
-            link: "/auth/logout",
-            icon: "fas fa-sign-out-alt",
-            label: req.__("Logout"),
-          },
-        ],
-      },
-    ]
+              link: "/auth/settings",
+            },
+            {
+              link: "/auth/logout",
+              icon: "fas fa-sign-out-alt",
+              label: req.__("Logout"),
+            },
+          ],
+        },
+      ]
     : [
-      ...(allow_signup
-        ? [{ link: "/auth/signup", label: req.__("Sign up") }]
-        : []),
-      ...(login_menu
-        ? [{ link: "/auth/login", label: req.__("Login") }]
-        : []),
-    ];
+        ...(allow_signup
+          ? [{ link: "/auth/signup", label: req.__("Sign up") }]
+          : []),
+        ...(login_menu
+          ? [{ link: "/auth/login", label: req.__("Login") }]
+          : []),
+      ];
   // const schema = db.getTenantSchema();
   // Admin role id (todo move to common constants)
   const isAdmin = role === 1;
@@ -163,7 +163,6 @@ const get_menu = (req) => {
       items: authItems,
     },
   ].filter((s) => s);
-
 };
 /**
  * Get Headers
@@ -179,17 +178,17 @@ const get_headers = (req, version_tag, description, extras = []) => {
 
   const iconHeader = favicon
     ? [
-      {
-        headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
-      },
-    ]
+        {
+          headerTag: `<link rel="icon" type="image/png" href="/files/serve/${favicon}">`,
+        },
+      ]
     : [];
   const meta_description = description
     ? [
-      {
-        headerTag: `<meta name="description" content="${description}">`,
-      },
-    ]
+        {
+          headerTag: `<meta name="description" content="${description}">`,
+        },
+      ]
     : [];
   const stdHeaders = [
     {
@@ -204,6 +203,8 @@ const get_headers = (req, version_tag, description, extras = []) => {
     from_cfg.push({ style: state.getConfig("page_custom_css", "") });
   if (state.getConfig("page_custom_html", ""))
     from_cfg.push({ headerTag: state.getConfig("page_custom_html", "") });
+  if (state.getConfig("log_client_errors", false))
+    from_cfg.push({ scriptBody: `enable_error_catcher()` });
   const state_headers = [];
   for (const hs of Object.values(state.headers)) {
     state_headers.push(...hs);
@@ -351,7 +352,7 @@ const defaultRenderToHtml = (s, role) =>
   typeof s === "string"
     ? s
     : renderLayout({
-      blockDispatch: {},
-      role,
-      layout: s,
-    });
+        blockDispatch: {},
+        role,
+        layout: s,
+      });