@saltcorn/server 0.7.1-beta.3 → 0.7.2-beta.10

package/routes/homepage.js

@@ -1,4 +1,6 @@
 /**
+ * Default Home Page (Wellcome page)
+ * Opens for new site without any data
  * @category server
  * @module routes/homepage
  * @subcategory routes
@@ -10,11 +12,11 @@ const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const Page = require("@saltcorn/data/models/page");
-const { link, renderForm, mkTable, post_btn } = require("@saltcorn/markup");
-const { ul, li, div, small, a, h5, p, i } = require("@saltcorn/markup/tags");
+const { link, mkTable } = require("@saltcorn/markup");
+const { div, a, p, i } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const { fetch_available_packs } = require("@saltcorn/admin-models/models/pack");
-const { restore_backup } = require("../markup/admin");
+// const { restore_backup } = require("../markup/admin");
 const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
@@ -22,6 +24,7 @@ const { fileUploadForm } = require("../markup/forms");
 const { get_base_url } = require("./utils.js");
 
 /**
+ * Tables List
  * @param {*} tables
  * @param {object} req
  * @returns {Table}
@@ -39,6 +42,7 @@ const tableTable = (tables, req) =>
   );
 
 /**
+ * Tables Card
  * @param {*} tables
  * @param {object} req
  * @returns {object}
@@ -68,6 +72,7 @@ const tableCard = (tables, req) => ({
 });
 
 /**
+ * Views List
  * @param {*} views
  * @param {object} req
  * @returns {Table}
@@ -89,6 +94,7 @@ const viewTable = (views, req) =>
   );
 
 /**
+ * Views Card
  * @param {*} views
  * @param {object} req
  * @returns {object}
@@ -120,6 +126,7 @@ const viewCard = (views, req) => ({
 });
 
 /**
+ * Pages List
  * @param {*} pages
  * @param {object} req
  * @returns {Table}
@@ -141,6 +148,7 @@ const pageTable = (pages, req) =>
   );
 
 /**
+ * Page Card
  * @param {*} pages
  * @param {object} req
  * @returns {object}
@@ -173,13 +181,14 @@ const pageCard = (pages, req) => ({
 });
 
 /**
+ * Files Tab
  * @param {object} req
  * @returns {Promise<div>}
  */
 const filesTab = async (req) => {
   const files = await File.find({}, { orderBy: "filename", cached: true });
   return div(
-    files.length == 0
+    files.length === 0
       ? p(req.__("No files"))
       : mkTable(
           [
@@ -197,7 +206,10 @@ const filesTab = async (req) => {
 };
 
 /**
+ * Users Tab
  * @param {object} req
+ * @param users
+ * @param roleMap
  * @returns {Promise<div>}
  */
 const usersTab = async (req, users, roleMap) => {
@@ -221,7 +233,9 @@ const usersTab = async (req, users, roleMap) => {
 };
 
 /**
+ * Actions (Triggers) Tab
  * @param {object} req
+ * @param triggers
  * @returns {Promise<div>}
  */
 const actionsTab = async (req, triggers) => {
@@ -234,7 +248,7 @@ const actionsTab = async (req, triggers) => {
         { class: "mt-2 pe-2" },
         i(req.__("Triggers run actions in response to events."))
       ),
-    triggers.length == 0
+    triggers.length === 0
       ? p(req.__("No triggers"))
       : mkTable(
           [
@@ -260,6 +274,12 @@ const actionsTab = async (req, triggers) => {
     )
   );
 };
+/**
+ * Plugins and Packs Tab
+ * @param req
+ * @param packlist
+ * @returns {*}
+ */
 const packTab = (req, packlist) =>
   div(
     { class: "pb-3 pt-2 pe-4" },
@@ -286,7 +306,11 @@ const packTab = (req, packlist) =>
       req.__("Go to pack store »")
     )
   );
-
+/**
+ * Help Card
+ * @param req
+ * @returns {*}
+ */
 const helpCard = (req) =>
   div(
     { class: "pb-3 pt-2 pe-4" },
@@ -321,6 +345,7 @@ const helpCard = (req) =>
   );
 
 /**
+ * Wellcome page
  * @param {object} req
  * @returns {Promise<object>}
  */
@@ -393,6 +418,7 @@ const welcome_page = async (req) => {
 };
 
 /**
+ * No Views logged in
  * @param {object} req
  * @param {object} res
  * @returns {Promise<void>}
@@ -423,6 +449,7 @@ const no_views_logged_in = async (req, res) => {
 };
 
 /**
+ * Get Config respounce
  * @param {number} role_id
  * @param {object} res
  * @param {object} req
@@ -430,6 +457,7 @@ const no_views_logged_in = async (req, res) => {
  */
 const get_config_response = async (role_id, res, req) => {
   const modernCfg = getState().getConfig("home_page_by_role", false);
+  // predefined roles
   const legacy_role = { 10: "public", 8: "user", 4: "staff", 1: "admin" }[
     role_id
   ];
@@ -472,7 +500,7 @@ module.exports =
       const hasUsers = await User.nonEmpty();
       if (!hasUsers) {
         res.redirect("/auth/create_first_user");
-        return;
+        // return;
       } else res.redirect("/auth/login");
     } else {
       await no_views_logged_in(req, res);

package/routes/menu.js

@@ -1,4 +1,5 @@
 /**
+ * Menu Editor
  * @category server
  * @module routes/menu
  * @subcategory routes
@@ -6,18 +7,18 @@
 
 const Router = require("express-promise-router");
 
-const Field = require("@saltcorn/data/models/field");
+//const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
-const { isAdmin, setTenant, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
-const File = require("@saltcorn/data/models/file");
+//const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
 const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
-const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
+const { renderForm } = require("@saltcorn/markup");
 const { script, domReady, div, ul } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
 const Table = require("@saltcorn/data/models/table");
@@ -33,7 +34,7 @@ const router = new Router();
 module.exports = router;
 
 /**
- *
+ * Menu Form
  * @param {object} req
  * @returns {Promise<Form>}
  */
@@ -246,9 +247,11 @@ const menuForm = async (req) => {
 //create -- new
 
 /**
+ * Menu Editor Script
  * @param {object[]} menu_items
  * @returns {string}
  */
+// todo move to file the content of menuEditorScript
 const menuEditorScript = (menu_items) => `
   var iconPickerOptions = {searchText: "Search icon...", labelHeader: "{0}/{1}"};
   let lastState;
@@ -262,7 +265,7 @@ const menuEditorScript = (menu_items) => `
   }
   var sortableListOptions = {
       placeholderCss: {'background-color': "#cccccc"},
-      onChange: ajax_save_menu,
+      onChange: ajax_save_menu
   };
   editor = new MenuEditor('myEditor', 
               { 
@@ -285,7 +288,7 @@ const menuEditorScript = (menu_items) => `
     editor.update();
     ajax_save_menu(true);
     location.reload();
-});
+  });
   // Calling the add method
   $('#btnAdd').click(function(){
       editor.add();
@@ -360,6 +363,7 @@ router.get(
   })
 );
 /**
+ * jQME to Menu
  * @param {object[]} menu_items
  * @returns {object[]}
  */

package/routes/plugins.js

@@ -652,16 +652,16 @@ router.get(
   error_catcher(async (req, res) => {
     const { plugin } = req.params;
     const filepath = req.params[0];
+    const hasVersion = plugin.includes("@");
     const location =
-      getState().plugin_locations[
-        plugin.includes("@") ? plugin.split("@")[0] : plugin
-      ];
+      getState().plugin_locations[hasVersion ? plugin.split("@")[0] : plugin];
     if (location) {
       const safeFile = path
         .normalize(filepath)
         .replace(/^(\.\.(\/|\\|$))+/, "");
       const fullpath = path.join(location, "public", safeFile);
-      if (fs.existsSync(fullpath)) res.sendFile(fullpath, { maxAge: "1d" });
+      if (fs.existsSync(fullpath))
+        res.sendFile(fullpath, { maxAge: hasVersion ? "100d" : "1d" });
       else res.status(404).send(req.__("Not found"));
     } else {
       res.status(404).send(req.__("Not found"));

package/routes/tables.js

@@ -1437,7 +1437,7 @@ router.post(
       res.redirect(`/table`);
       return;
     }
-
+    //intentionally omit await
     recalculate_for_stored(table);
 
     req.flash("success", req.__("Started recalculating stored fields"));

package/routes/tenant.js

@@ -1,4 +1,5 @@
 /**
+ * Tenant(s) Route
  * @category server
  * @module routes/tenant
  * @subcategory routes
@@ -36,22 +37,23 @@ const {
   code,
 } = require("@saltcorn/markup/tags");
 const db = require("@saltcorn/data/db");
-const url = require("url");
+//const url = require("url");
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
 const { isAdmin, error_catcher } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
   send_infoarch_page,
-  send_admin_page,
+  //send_admin_page,
   config_fields_form,
   save_config_from_form,
 } = require("../markup/admin.js");
 const { getConfig } = require("@saltcorn/data/models/config");
-const {
-  create_backup,
-  restore,
-} = require("@saltcorn/admin-models/models/backup");
+// todo add button backup / restore for particular tenant (available in admin tenants screens)
+//const {
+//  create_backup,
+//  restore,
+//} = require("@saltcorn/admin-models/models/backup");
 
 /**
  * @type {object}
@@ -116,6 +118,7 @@ const is_ip_address = (hostname) => {
 };
 
 /**
+ * Create tenant screen runnning
  * @name get/create
  * @function
  * @memberof module:routes/tenant~tenantRouter
@@ -146,6 +149,7 @@ router.get(
         )
       );
     let create_tenant_warning = "";
+    // todo add custom create tenant  warning message
     if (getState().getConfig("create_tenant_warning"))
       create_tenant_warning = div(
         {
@@ -200,9 +204,8 @@ const getNewURL = (req, subdomain) => {
     if (hosts.length > 1) ports = `:${hosts[1]}`;
   }
   const hostname = req.hostname;
-  const newurl = `${req.protocol}://${subdomain}.${hostname}${ports}/`;
-
-  return newurl;
+  // return newurl
+  return `${req.protocol}://${subdomain}.${hostname}${ports}/`;
 };
 
 /**
@@ -307,7 +310,7 @@ router.post(
 );
 
 /**
- * List tenants HTTP GET Web UI
+ * List tenants ( on /tenant/list)
  * @name get/list
  * @function
  * @memberof module:routes/tenant~tenantRouter

package/routes/viewedit.js

@@ -582,12 +582,15 @@ router.get(
       return;
     }
     const configFlow = await view.get_config_flow(req);
+    const hasConfig =
+      view.configuration && Object.keys(view.configuration).length > 0;
     const wfres = await configFlow.run(
       {
+        ...view.configuration,
+        id: hasConfig ? view.id : undefined,
         table_id: view.table_id,
         exttable_name: view.exttable_name,
         viewname: name,
-        ...view.configuration,
       },
       req
     );
@@ -704,6 +707,48 @@ router.post(
   })
 );
 
+/**
+ * @name post/saveconfig/:id
+ * @function
+ * @memberof module:routes/viewedit~vieweditRouter
+ * @function
+ */
+router.post(
+  "/saveconfig/:viewname",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { viewname } = req.params;
+
+    if (viewname && req.body) {
+      const view = await View.findOne({ name: viewname });
+      const configFlow = await view.get_config_flow(req);
+      const step = await configFlow.singleStepForm(req.body, req);
+      if (step?.renderForm) {
+        if (!step.renderForm.hasErrors) {
+          let newcfg;
+          if (step.contextField)
+            newcfg = {
+              ...view.configuration,
+              [step.contextField]: {
+                ...view.configuration?.[step.contextField],
+                ...step.renderForm.values,
+              },
+            };
+          else newcfg = { ...view.configuration, ...step.renderForm.values };
+          await View.update({ configuration: newcfg }, view.id);
+          res.json({ success: "ok" });
+        } else {
+          res.json({ error: step.renderForm.errorSummary });
+        }
+      } else {
+        res.json({ error: "no form" });
+      }
+    } else {
+      res.json({ error: "no view" });
+    }
+  })
+);
+
 /**
  * @name post/setrole/:id
  * @function
@@ -730,3 +775,12 @@ router.post(
     res.redirect("/viewedit");
   })
 );
+
+router.post(
+  "/test/inserter",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const view = await View.create(req.body);
+    res.json({ view });
+  })
+);

package/serve.js

@@ -43,6 +43,7 @@ const {
   eachTenant,
   getAllTenants,
 } = require("@saltcorn/admin-models/models/tenant");
+const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 
 // helpful https://gist.github.com/jpoehls/2232358
 /**
@@ -135,7 +136,13 @@ const onMessageFromWorker =
     //console.log("worker msg", typeof msg, msg);
     if (msg === "Start" && !masterState.started) {
       masterState.started = true;
-      runScheduler({ port, watchReaper, disableScheduler, eachTenant });
+      runScheduler({
+        port,
+        watchReaper,
+        disableScheduler,
+        eachTenant,
+        auto_backup_now,
+      });
       require("./systemd")({ port });
       return true;
     } else if (msg === "RestartServer") {
@@ -261,6 +268,13 @@ module.exports =
         });
       } else {
         await nonGreenlockWorkerSetup(appargs, port);
+        runScheduler({
+          port,
+          watchReaper,
+          disableScheduler,
+          eachTenant,
+          auto_backup_now,
+        });
       }
       Trigger.emitEvent("Startup");
     } else {

package/tests/admin.test.js

@@ -12,6 +12,7 @@ const {
   respondJsonWith,
 } = require("../auth/testhelp");
 const db = require("@saltcorn/data/db");
+const { sleep } = require("@saltcorn/data/tests/mocks");
 const fs = require("fs").promises;
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
@@ -30,7 +31,12 @@ beforeAll(async () => {
     4
   );
 });
-afterAll(db.close);
+
+afterAll(async () => {
+  await sleep(200);
+  db.close();
+});
+
 const adminPageContains = (specs) =>
   it("adminPageContains " + specs.map((s) => s[1]).join(","), async () => {
     const app = await getApp({ disableCsrf: true });
@@ -456,6 +462,71 @@ describe("actions", () => {
       .expect(toRedirect("/actions/"));
   });
 });
+describe("localizer", () => {
+  itShouldRedirectUnauthToLogin("/site-structure/localizer");
+  itShouldRedirectUnauthToLogin("/site-structure/localizer/add-lang");
+  it("redirects site struct to menu", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure")
+      .set("Cookie", loginCookie)
+      .expect(toRedirect("/menu"));
+  });
+  it("shows languages", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Languages"));
+  });
+  it("shows add language form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer/add-lang")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Locale identifier short code"));
+  });
+  it("add language", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/site-structure/localizer/save-lang")
+      .set("Cookie", loginCookie)
+      .send("name=dansk")
+      .send("locale=da")
+      .expect(toRedirect("/site-structure/localizer/edit/da"));
+  });
+  it("shows new in languages", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("dansk"));
+  });
+
+  it("shows edit language form", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .get("/site-structure/localizer/edit/da")
+      .set("Cookie", loginCookie)
+      .expect(toInclude("Hello world"));
+  });
+  it("set string language", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/site-structure/localizer/save-string/da/Hello%20world")
+      .set("Cookie", loginCookie)
+      .send("value=Hej+verden")
+      .expect(toRedirect("/site-structure/localizer/edit/da"));
+  });
+});
+
 /**
  * Pages tests
  */

package/tests/clientjs.test.js

@@ -14,6 +14,7 @@ const load_script = (fnm) => {
 };
 
 load_script("jquery-3.6.0.min.js");
+load_script("saltcorn-common.js");
 load_script("saltcorn.js");
 
 test("updateQueryStringParameter", () => {

package/tests/plugins.test.js

@@ -90,7 +90,7 @@ describe("Plugin Endpoints", () => {
       .expect(toInclude("testfilecontents"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
 
@@ -100,7 +100,7 @@ describe("Plugin Endpoints", () => {
       .expect(toRedirect("/plugins"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.min.css"
+        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
   });

package/tests/view.test.js

@@ -82,7 +82,7 @@ describe("edit view", () => {
       .post("/view/authoredit")
       .send("author=Chekov")
 
-      .expect(toRedirect("/"));
+      .expect(toRedirect("/view/authorlist"));
   });
 });