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

package/restart_watcher.js

@@ -1,157 +1,157 @@
-/**
- * @category server
- * @module restart_watcher
- */
-
-const path = require("path");
-const { spawnSync } = require("child_process");
-const watch = require("node-watch");
-const Plugin = require("@saltcorn/data/models/plugin");
-const db = require("@saltcorn/data/db");
-const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
-
-/**
- * packages that should trigger a server re-start
- */
-const relevantPackages = [
-  "db-common",
-  "postgres",
-  "saltcorn-data",
-  "saltcorn-builder",
-  "saltcorn-admin-models",
-  "saltcorn-markup",
-  "saltcorn-sbadmin2",
-  "server",
-  "sqlite",
-  "filemanager"
-];
-
-/**
- * excluded directories or file name patterns
- */
-const excludePatterns = [
-  /\/node_modules/,
-  /\.git/,
-  /\.docs/,
-  /\.docs/,
-  /\migrations/,
-  /.*test.js/,
-];
-
-/**
- * get the root directory of the saltcorn project
- * @returns {string} project root path
- */
-const getProjectRoot = () => {
-  return path.normalize(`${__dirname}/../../`);
-};
-
-/**
- * get the packages directory of the saltcorn project
- * @returns {string} packages path
- */
-const getPackagesDirectory = () => {
-  return `${getProjectRoot()}/packages`;
-};
-
-/**
- * get all package directories that should trigger a server re-start
- * @returns {string[]} list of paths to relevant directories
- */
-const getRelevantPackages = () => {
-  const packagesDir = getPackagesDirectory();
-  return relevantPackages.map((packageName) => `${packagesDir}/${packageName}`);
-};
-
-/**
- * get all plugin directories that should trigger a server re-start
- * @returns {string[]} list of paths to relevant directories
- */
-const getPluginDirectories = async () => {
-  const getDirs = async () => {
-    const local_plugins = await Plugin.find({ source: "local" });
-    return local_plugins.map((p) => p.location);
-  };
-  const listOfDirs = [];
-  await eachTenant(async () => {
-    listOfDirs.push(await getDirs());
-  });
-  return [...new Set(listOfDirs.flat(1))];
-};
-
-const projectRoot = getProjectRoot();
-
-const watchCfg = {
-  recursive: true,
-  filter(file, skip) {
-    for (const excludePattern of excludePatterns) {
-      if (excludePattern.test(file)) return skip;
-    }
-    return /(\.js|\.ts)$/.test(file);
-  },
-};
-
-let activeWatchers = [];
-
-/**
- * close all open file watchers
- */
-const closeWatchers = () => {
-  for (const activeWatcher of activeWatchers) {
-    if (!activeWatcher.isClosed()) {
-      activeWatcher.close();
-    }
-  }
-};
-
-/**
- * register many file change listener and do re-starts on changes
- * The listener calls process.exit() and assumes
- * that pm2 does the actual re-start.
- * @param {string[]} projectDirs package paths that should trigger re-starts.
- * @param {string[]} pluginDirs plugin paths that should trigger re-starts.
- */
-const listenForChanges = (projectDirs, pluginDirs) => {
-  // watch project dirs
-  for (const projectDir of projectDirs) {
-    activeWatchers.push(
-      watch(
-        projectDir,
-        watchCfg,
-        // event is either 'update' or 'remove'
-        (event, file) => {
-          console.log("'%s' changed \n re-starting now", file);
-          closeWatchers();
-          spawnSync("npm", ["run", "tsc"], {
-            stdio: "inherit",
-          });
-          process.exit();
-        }
-      )
-    );
-  }
-  // watch plugin dirs
-  for (const pluginDir of pluginDirs) {
-    activeWatchers.push(
-      watch(
-        pluginDir,
-        watchCfg,
-        // event is either 'update' or 'remove'
-        (event, file) => {
-          console.log("'%s' changed \n re-starting now", file);
-          closeWatchers();
-          process.exit();
-        }
-      )
-    );
-  }
-};
-
-module.exports = {
-  listenForChanges,
-  getProjectRoot,
-  getPackagesDirectory,
-  getRelevantPackages,
-  getPluginDirectories,
-  closeWatchers,
-};
+/**
+ * @category server
+ * @module restart_watcher
+ */
+
+const path = require("path");
+const { spawnSync } = require("child_process");
+const watch = require("node-watch");
+const Plugin = require("@saltcorn/data/models/plugin");
+const db = require("@saltcorn/data/db");
+const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
+
+/**
+ * packages that should trigger a server re-start
+ */
+const relevantPackages = [
+  "db-common",
+  "postgres",
+  "saltcorn-data",
+  "saltcorn-builder",
+  "saltcorn-admin-models",
+  "saltcorn-markup",
+  "saltcorn-sbadmin2",
+  "server",
+  "sqlite",
+  "filemanager",
+];
+
+/**
+ * excluded directories or file name patterns
+ */
+const excludePatterns = [
+  /\/node_modules/,
+  /\.git/,
+  /\.docs/,
+  /\.docs/,
+  /migrations/,
+  /.*test.js/,
+];
+
+/**
+ * get the root directory of the saltcorn project
+ * @returns {string} project root path
+ */
+const getProjectRoot = () => {
+  return path.normalize(`${__dirname}/../../`);
+};
+
+/**
+ * get the packages directory of the saltcorn project
+ * @returns {string} packages path
+ */
+const getPackagesDirectory = () => {
+  return `${getProjectRoot()}/packages`;
+};
+
+/**
+ * get all package directories that should trigger a server re-start
+ * @returns {string[]} list of paths to relevant directories
+ */
+const getRelevantPackages = () => {
+  const packagesDir = getPackagesDirectory();
+  return relevantPackages.map((packageName) => `${packagesDir}/${packageName}`);
+};
+
+/**
+ * get all plugin directories that should trigger a server re-start
+ * @returns {string[]} list of paths to relevant directories
+ */
+const getPluginDirectories = async () => {
+  const getDirs = async () => {
+    const local_plugins = await Plugin.find({ source: "local" });
+    return local_plugins.map((p) => p.location);
+  };
+  const listOfDirs = [];
+  await eachTenant(async () => {
+    listOfDirs.push(await getDirs());
+  });
+  return [...new Set(listOfDirs.flat(1))];
+};
+
+const projectRoot = getProjectRoot();
+
+const watchCfg = {
+  recursive: true,
+  filter(file, skip) {
+    for (const excludePattern of excludePatterns) {
+      if (excludePattern.test(file)) return skip;
+    }
+    return /(\.js|\.ts)$/.test(file);
+  },
+};
+
+let activeWatchers = [];
+
+/**
+ * close all open file watchers
+ */
+const closeWatchers = () => {
+  for (const activeWatcher of activeWatchers) {
+    if (!activeWatcher.isClosed()) {
+      activeWatcher.close();
+    }
+  }
+};
+
+/**
+ * register many file change listener and do re-starts on changes
+ * The listener calls process.exit() and assumes
+ * that pm2 does the actual re-start.
+ * @param {string[]} projectDirs package paths that should trigger re-starts.
+ * @param {string[]} pluginDirs plugin paths that should trigger re-starts.
+ */
+const listenForChanges = (projectDirs, pluginDirs) => {
+  // watch project dirs
+  for (const projectDir of projectDirs) {
+    activeWatchers.push(
+      watch(
+        projectDir,
+        watchCfg,
+        // event is either 'update' or 'remove'
+        (event, file) => {
+          console.log("'%s' changed \n re-starting now", file);
+          closeWatchers();
+          spawnSync("npm", ["run", "tsc"], {
+            stdio: "inherit",
+          });
+          process.exit();
+        }
+      )
+    );
+  }
+  // watch plugin dirs
+  for (const pluginDir of pluginDirs) {
+    activeWatchers.push(
+      watch(
+        pluginDir,
+        watchCfg,
+        // event is either 'update' or 'remove'
+        (event, file) => {
+          console.log("'%s' changed \n re-starting now", file);
+          closeWatchers();
+          process.exit();
+        }
+      )
+    );
+  }
+};
+
+module.exports = {
+  listenForChanges,
+  getProjectRoot,
+  getPackagesDirectory,
+  getRelevantPackages,
+  getPluginDirectories,
+  closeWatchers,
+};

package/routes/actions.js

@@ -5,11 +5,7 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const {
-  isAdmin,
-  error_catcher,
-  addOnDoneRedirect,
-} = require("./utils.js");
+const { isAdmin, error_catcher, addOnDoneRedirect } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getTriggerList } = require("./common_lists");
@@ -23,10 +19,7 @@ const { getTriggerList } = require("./common_lists");
  */
 const router = new Router();
 module.exports = router;
-const {
-  renderForm,
-  link,
-} = require("@saltcorn/markup");
+const { renderForm, link } = require("@saltcorn/markup");
 const Form = require("@saltcorn/data/models/form");
 const {
   div,
@@ -378,7 +371,7 @@ router.get(
     if (!trigger) {
       req.flash("warning", req.__("Action not found"));
       res.redirect(`/actions/`);
-      return
+      return;
     }
     const action = getState().actions[trigger.action];
     if (!action) {
@@ -575,7 +568,7 @@ router.get(
     };
     let table, row;
     if (trigger.table_id) {
-      table = await Table.findOne( { id: trigger.table_id } );
+      table = await Table.findOne({ id: trigger.table_id });
       row = await table.getRow({});
     }
     try {

package/routes/admin.js

@@ -111,14 +111,17 @@ const site_id_form = (req) =>
     field_names: [
       "site_name",
       "timezone",
+      "base_url",
+      ...(getConfigFile() ? ["multitenancy_enabled"] : []),
+      { section_header: "Logo image" },
       "site_logo_id",
       "favicon_id",
-      "base_url",
+      { section_header: "Custom code" },
       "page_custom_css",
       "page_custom_html",
+      { section_header: "Extension store" },
       "plugins_store_endpoint",
       "packs_store_endpoint",
-      ...(getConfigFile() ? ["multitenancy_enabled"] : []),
     ],
     action: "/admin",
     submitLabel: req.__("Save"),
@@ -1654,11 +1657,11 @@ router.post(
     const childOutputs = [];
     child.stdout.on("data", (data) => {
       // console.log(data.toString());
-      childOutputs.push(data.toString());
+      if (data) childOutputs.push(data.toString());
     });
     child.stderr.on("data", (data) => {
       // console.log(data.toString());
-      childOutputs.push(data.toString());
+      childOutputs.push(data ? data.toString() : req.__("An error occurred"));
     });
     child.on("exit", async function (exitCode, signal) {
       const logFile = exitCode === 0 ? "logs.txt" : "error_logs.txt";
@@ -1681,7 +1684,7 @@ router.post(
         [message, stack].join("\n"),
         (error) => {
           if (error) {
-            console.log(`unable to write '${logFile}' to '${buildDir}'`);
+            console.log(`unable to write logFile to '${buildDir}'`);
             console.log(error);
           }
         }
@@ -1819,7 +1822,12 @@ router.post(
 const dev_form = async (req) => {
   return await config_fields_form({
     req,
-    field_names: ["development_mode", "log_sql", "log_level"],
+    field_names: [
+      "development_mode",
+      "log_sql",
+      "log_client_errors",
+      "log_level",
+    ],
     action: "/admin/dev",
   });
 };

package/routes/api.js

@@ -71,8 +71,8 @@ function accessAllowedRead(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-        ? user.role_id
-        : 10;
+      ? user.role_id
+      : 10;
 
   return role <= table.min_role_read;
 }
@@ -89,8 +89,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-        ? user.role_id
-        : 10;
+      ? user.role_id
+      : 10;
 
   return role <= table.min_role_write;
 }
@@ -106,8 +106,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-        ? user.role_id
-        : 10;
+      ? user.role_id
+      : 10;
 
   return role <= trigger.min_role;
 }
@@ -126,7 +126,7 @@ router.post(
     const view = await View.findOne({ name: viewName });
     const db = require("@saltcorn/data/db");
     if (!view) {
-      res.status(404).json({ 
+      res.status(404).json({
         error: req.__("View %s not found", viewName),
         view: viewName,
         queryName: queryName,
@@ -152,7 +152,7 @@ router.post(
             const resp = await queries[queryName](...args, true);
             res.json({ success: resp, alerts: getFlashes(req) });
           } else {
-            res.status(404).json({ 
+            res.status(404).json({
               error: req.__("Query %s not found", queryName),
               view: viewName,
               queryName: queryName,
@@ -264,7 +264,7 @@ router.get(
               fields: tbl_fields,
               approximate: !!approximate,
               state: req_query,
-              table
+              table,
             });
             rows = await table.getRows(qstate);
           } else {
@@ -381,10 +381,7 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryInsertRow(
-            row,
-            req.user ? +req.user.id : undefined
-          );
+          const ins_res = await table.tryInsertRow(row, req.user);
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);
         } else {
@@ -439,11 +436,7 @@ router.post(
             res.status(400).json({ error: errors.join(", ") });
             return;
           }
-          const ins_res = await table.tryUpdateRow(
-            row,
-            id,
-            req.user ? +req.user.id : undefined
-          );
+          const ins_res = await table.tryUpdateRow(row, id, req.user);
 
           if (ins_res.error) res.status(400).json(ins_res);
           else res.json(ins_res);