@saltcorn/server 0.6.1-beta.3 → 0.6.2-beta.2

package/markup/admin.js

@@ -213,6 +213,22 @@ const send_users_page = (args) => {
   });
 };
 
+/**
+ * @param {object} args
+ * @returns {void}
+ */
+const send_files_page = (args) => {
+  return send_settings_page({
+    main_section: "Files",
+    main_section_href: "/files",
+    sub_sections: [
+      { text: "Files", href: "/files" },
+      { text: "Storage", href: "/files/storage" },
+    ],
+    ...args,
+  });
+};
+
 /**
  * @param {object} args
  * @returns {void}
@@ -464,6 +480,7 @@ module.exports = {
   send_users_page,
   send_events_page,
   send_admin_page,
+  send_files_page,
   save_config_from_form,
   flash_restart_if_required,
   flash_restart,

package/markup/index.js

@@ -4,4 +4,17 @@
  * @category server
  * @module markup/index
  * @subcategory markup
- */
+ */
+
+/**
+ * All files in the auth module.
+ * @namespace markup_overview
+ * @property {module:markup/admin} admin
+ * @property {module:markup/blockly} blockly
+ * @property {module:markup/expression_blurb} expression_blurb
+ * @property {module:markup/forms} forms
+ * @property {module:markup/plugin-store} plugin-store
+ * 
+ * @category server
+ * @subcategory markup
+ */

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.1-beta.3",
+  "version": "0.6.2-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.1-beta.3",
-    "@saltcorn/builder": "0.6.1-beta.3",
-    "@saltcorn/data": "0.6.1-beta.3",
+    "@saltcorn/base-plugin": "0.6.2-beta.2",
+    "@saltcorn/builder": "0.6.2-beta.2",
+    "@saltcorn/data": "0.6.2-beta.2",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.1-beta.3",
-    "@saltcorn/sbadmin2": "0.6.1-beta.3",
+    "@saltcorn/markup": "0.6.2-beta.2",
+    "@saltcorn/sbadmin2": "0.6.2-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -33,13 +33,19 @@
     "live-plugin-manager": "^0.16.0",
     "moment": "^2.27.0",
     "node-fetch": "2.6.2",
+    "node-watch": "^0.7.2",
     "passport": "^0.4.1",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "socket.io": "4.2.0",
-    "tmp-promise": "^3.0.2"
+    "tmp-promise": "^3.0.2",
+    "multer-s3": "^2.10.0",
+    "multer": "^1.4.3",
+    "aws-sdk": "^2.1037.0",
+    "uuid": "^8.2.0",
+    "content-disposition": "^0.5.3"
   },
   "optionalDependencies": {
     "sd-notify": "^2.8.0"
@@ -51,7 +57,9 @@
   },
   "scripts": {
     "dev": "nodemon index.js",
-    "test": "jest --runInBand"
+    "test": "jest --runInBand",
+    "tsc": "echo \"Error: no TypeScript support yet\"",
+    "clean": "echo \"Error: no TypeScript support yet\""
   },
   "jest": {
     "testEnvironment": "node",
@@ -62,7 +70,12 @@
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/plugin_packages/"
-    ]
+    ],
+    "moduleNameMapper": {
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1"
+    }
   },
   "publishConfig": {
     "access": "public"

package/public/saltcorn.css

@@ -65,11 +65,11 @@ div.testrunoutput code {
 }
 
 div[data-inline-edit-dest-url] .editicon {
-  display: none;
+  visibility: hidden;
 }
 
 div[data-inline-edit-dest-url]:hover .editicon {
-  display: inline;
+  visibility: visible;
 }
 .searchbar-dropdown {
   left: unset;

package/public/saltcorn.js

@@ -306,6 +306,18 @@ function select_id(id) {
 function set_state_field(key, value) {
   pjax_to(updateQueryStringParameter(window.location.href, key, value));
 }
+
+function check_state_field(that) {
+  const checked = that.checked;
+  const name = that.name;
+  const value = that.value;
+  var separator = window.location.href.indexOf("?") !== -1 ? "&" : "?";
+  let dest;
+  if (checked) dest = window.location.href + `${separator}${name}=${value}`;
+  else dest = window.location.href.replace(`${name}=${value}`, "");
+  pjax_to(dest.replace("&&", "&").replace("?&", "?"));
+}
+
 function set_state_fields(kvs) {
   var newhref = window.location.href;
   Object.entries(kvs).forEach((kv) => {

package/restart_watcher.js

@@ -0,0 +1,155 @@
+/**
+ * @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/data/models/tenant");
+
+/**
+ * packages that should trigger a server re-start
+ */
+const relevantPackages = [
+  "db-common",
+  "postgres",
+  "saltcorn-data",
+  "saltcorn-markup",
+  "server",
+  "sqlite",
+];
+
+/**
+ * excluded directories or file name patterns
+ */
+const excludePatterns = [
+  /\/node_modules/,
+  /\/public/,
+  /\.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",
+            cwd: projectRoot,
+          });
+          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,12 +5,7 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const {
-  isAdmin,
-  setTenant,
-  error_catcher,
-  get_base_url,
-} = require("./utils.js");
+const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 
@@ -87,7 +82,6 @@ const getActions = async () => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const triggers = await Trigger.findAllWithTableName();
@@ -288,7 +282,6 @@ const triggerForm = async (req, trigger) => {
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await triggerForm(req);
@@ -314,7 +307,6 @@ router.get(
  */
 router.get(
   "/edit/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -344,7 +336,6 @@ router.get(
  */
 router.post(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await triggerForm(req);
@@ -384,7 +375,6 @@ router.post(
  */
 router.post(
   "/edit/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -427,7 +417,6 @@ router.post(
  */
 router.get(
   "/configure/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -543,7 +532,6 @@ router.get(
  */
 router.post(
   "/configure/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -585,7 +573,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -602,7 +589,6 @@ router.post(
  */
 router.get(
   "/testrun/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/admin.js

@@ -5,12 +5,7 @@
  */
 const Router = require("express-promise-router");
 
-const {
-  setTenant,
-  isAdmin,
-  error_catcher,
-  getGitRevision,
-} = require("./utils.js");
+const { isAdmin, error_catcher, getGitRevision } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
 const File = require("@saltcorn/data/models/file");
@@ -52,6 +47,7 @@ const load_plugins = require("../load_plugins");
 const {
   restore_backup,
   send_admin_page,
+  send_files_page,
   config_fields_form,
   save_config_from_form,
   flash_restart_if_required,
@@ -66,6 +62,7 @@ const {
   is_hsts_tld,
 } = require("../markup/admin");
 const moment = require("moment");
+const View = require("@saltcorn/data/models/view");
 
 /**
  * @type {object}
@@ -78,7 +75,7 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const site_id_form = (req) =>
@@ -131,7 +128,6 @@ const email_form = async (req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -156,7 +152,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await site_id_form(req);
@@ -189,7 +184,6 @@ router.post(
  */
 router.get(
   "/email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await email_form(req);
@@ -223,7 +217,6 @@ router.get(
  */
 router.get(
   "/send-test-email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const from = getState().getConfig("email_from");
@@ -254,7 +247,6 @@ router.get(
  */
 router.post(
   "/email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await email_form(req);
@@ -285,7 +277,6 @@ router.post(
  */
 router.get(
   "/backup",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     send_admin_page({
@@ -330,7 +321,6 @@ router.get(
  */
 router.get(
   "/system",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -450,7 +440,6 @@ router.get(
  */
 router.post(
   "/restart",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
@@ -473,7 +462,6 @@ router.post(
  */
 router.post(
   "/upgrade",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() !== db.connectObj.default_schema) {
@@ -510,7 +498,6 @@ router.post(
  */
 router.post(
   "/backup",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const fileName = await create_backup();
@@ -531,7 +518,6 @@ router.post(
  */
 router.post(
   "/restore",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const newPath = File.get_new_path();
@@ -547,7 +533,7 @@ router.post(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const clearAllForm = (req) =>
@@ -628,7 +614,6 @@ const clearAllForm = (req) =>
  */
 router.post(
   "/enable-letsencrypt",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
@@ -706,7 +691,6 @@ router.post(
  */
 router.get(
   "/clear-all",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`Admin`), {
@@ -736,7 +720,6 @@ router.get(
  */
 router.post(
   "/clear-all",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = clearAllForm(req);
@@ -746,7 +729,7 @@ router.post(
       await db.deleteWhere("_sc_pages");
     }
     if (form.values.views) {
-      await db.deleteWhere("_sc_views");
+      await View.delete({});
     }
     //user fields
     const users = await Table.findOne({ name: "users" });