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

package/routes/index.js

@@ -4,6 +4,43 @@
  * @module routes/index
  * @subcategory routes
  */
+
+/**
+ * All files in the routes module.
+ * @namespace routes_overview
+ * @property {module:routes/actions} actions
+ * @property {module:routes/admin} admin
+ * @property {module:routes/api} api
+ * @property {module:routes/config} config
+ * @property {module:routes/crashlog} crashlog
+ * @property {module:routes/delete} delete
+ * @property {module:routes/edit} edit
+ * @property {module:routes/eventlog} eventlog
+ * @property {module:routes/events} events
+ * @property {module:routes/fields} fields
+ * @property {module:routes/files} files
+ * @property {module:routes/homepage} homepage
+ * @property {module:routes/infoarch} infoarch
+ * @property {module:routes/library} library
+ * @property {module:routes/list} list
+ * @property {module:routes/menu} menu
+ * @property {module:routes/packs} packs
+ * @property {module:routes/page} page
+ * @property {module:routes/pageedit} pageedit
+ * @property {module:routes/plugins} plugins
+ * @property {module:routes/scapi} scapi
+ * @property {module:routes/search} search
+ * @property {module:routes/settings} settings
+ * @property {module:routes/tables} tables
+ * @property {module:routes/tenant} tenant
+ * @property {module:routes/utils} utils
+ * @property {module:routes/view} view
+ * @property {module:routes/viewedit} viewedit
+ * 
+ * @category server
+ * @subcategory routes
+ */
+
 const table = require("./tables");
 const field = require("./fields");
 const list = require("./list");

package/routes/infoarch.js

@@ -35,7 +35,6 @@ module.exports = router;
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.redirect(`/menu`);
@@ -43,7 +42,7 @@ router.get(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const languageForm = (req) =>
@@ -83,7 +82,6 @@ const languageForm = (req) =>
  */
 router.get(
   "/localizer",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const cfgLangs = getState().getConfig("localizer_languages");
@@ -111,13 +109,13 @@ router.get(
               },
               {
                 label: req.__("Default"),
-                key: r=>!!r.is_default
-                ? i({
-                    class: "fas fa-check-circle text-success",
-                  })
-                : "",
+                key: (r) =>
+                  !!r.is_default
+                    ? i({
+                        class: "fas fa-check-circle text-success",
+                      })
+                    : "",
               },
-            
             ],
             Object.values(cfgLangs)
           ),
@@ -143,7 +141,6 @@ router.get(
  */
 router.get(
   "/localizer/add-lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     send_infoarch_page({
@@ -167,7 +164,6 @@ router.get(
  */
 router.get(
   "/localizer/edit/:lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { lang } = req.params;
@@ -175,8 +171,8 @@ router.get(
     const form = languageForm(req);
     form.values = cfgLangs[lang];
     const { is_default } = form.values;
-    const cfgStrings = getState().getConfig("localizer_strings",{});
-    const translation = cfgStrings[lang] || {}
+    const cfgStrings = getState().getConfig("localizer_strings", {});
+    const translation = cfgStrings[lang] || {};
     const strings = getState()
       .getStringsForI18n()
       .map((s) => ({ in_default: s, translated: translation[s] || s }));
@@ -232,16 +228,14 @@ router.get(
  */
 router.post(
   "/localizer/save-string/:lang/:defstring",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { lang, defstring } = req.params;
 
     const cfgStrings = getState().getConfigCopy("localizer_strings");
-    if(cfgStrings[lang])
-    cfgStrings[lang][defstring] = text(req.body.value)
-    else cfgStrings[lang]={[defstring]: text(req.body.value)}
-    await getState().setConfig("localizer_strings", cfgStrings)
+    if (cfgStrings[lang]) cfgStrings[lang][defstring] = text(req.body.value);
+    else cfgStrings[lang] = { [defstring]: text(req.body.value) };
+    await getState().setConfig("localizer_strings", cfgStrings);
     res.redirect(`/site-structure/localizer/edit/${lang}`);
   })
 );
@@ -254,7 +248,6 @@ router.post(
  */
 router.post(
   "/localizer/save-lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = languageForm(req);

package/routes/library.js

@@ -6,7 +6,7 @@
 
 const Library = require("@saltcorn/data/models/library");
 const Router = require("express-promise-router");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { send_infoarch_page } = require("../markup/admin.js");
 const { mkTable, post_delete_btn } = require("@saltcorn/markup");
 const { i } = require("@saltcorn/markup/tags");
@@ -29,7 +29,6 @@ module.exports = router;
  */
 router.post(
   "/savefrombuilder",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     await Library.create(req.body);
@@ -45,7 +44,6 @@ router.post(
  */
 router.get(
   "/list",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const libs = await Library.find({});
@@ -89,7 +87,6 @@ router.get(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/list.js

@@ -14,7 +14,7 @@ const db = require("@saltcorn/data/db");
 const { mkTable, h, link, post_btn } = require("@saltcorn/markup");
 const { a, script, domReady, div, text } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
-const { setTenant, isAdmin, error_catcher } = require("./utils");
+const { isAdmin, error_catcher } = require("./utils");
 const moment = require("moment");
 const { readState } = require("@saltcorn/data/plugin-helper");
 
@@ -39,7 +39,6 @@ module.exports = router;
  */
 router.get(
   "/_versions/:name/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, id } = req.params;
@@ -88,7 +87,6 @@ router.get(
  */
 router.post(
   "/_restore/:name/:id/:_version",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, id, _version } = req.params;
@@ -152,7 +150,7 @@ const typeToJsGridType = (t, field) => {
 
 /**
  * Version Field
- * @param {string} tname 
+ * @param {string} tname
  * @returns {string}
  */
 const versionsField = (tname) => `
@@ -183,7 +181,6 @@ jsGrid.fields.versions = VersionsField;
  */
 router.get(
   "/:tname",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { tname } = req.params;

package/routes/menu.js

@@ -32,8 +32,8 @@ const router = new Router();
 module.exports = router;
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const menuForm = async (req) => {
@@ -157,7 +157,7 @@ const menuForm = async (req) => {
 //create -- new
 
 /**
- * @param {object[]} menu_items 
+ * @param {object[]} menu_items
  * @returns {string}
  */
 const menuEditorScript = (menu_items) => `
@@ -202,8 +202,8 @@ const menuEditorScript = (menu_items) => `
   `;
 
 /**
- * @param {object[]} menu_items 
- * @returns {object[]} 
+ * @param {object[]} menu_items
+ * @returns {object[]}
  */
 const menuTojQME = (menu_items) =>
   (menu_items || []).map((mi) => ({
@@ -214,7 +214,7 @@ const menuTojQME = (menu_items) =>
   }));
 
 /**
- * @param {object[]} menu_items 
+ * @param {object[]} menu_items
  * @returns {object[]}
  */
 const jQMEtoMenu = (menu_items) =>
@@ -233,7 +233,6 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await menuForm(req);
@@ -287,7 +286,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (req.xhr) {

package/routes/packs.js

@@ -5,7 +5,7 @@
  */
 
 const Router = require("express-promise-router");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
 const Table = require("@saltcorn/data/models/table");
@@ -54,7 +54,6 @@ module.exports = router;
  */
 router.get(
   "/create/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find({});
@@ -139,7 +138,6 @@ router.get(
  */
 router.post(
   "/create",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var pack = {
@@ -211,7 +209,7 @@ router.post(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const install_pack_form = (req) =>
@@ -236,7 +234,6 @@ const install_pack_form = (req) =>
  */
 router.get(
   "/install",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`Install Pack`), {
@@ -267,7 +264,6 @@ router.get(
  */
 router.post(
   "/install",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var pack, error;
@@ -326,7 +322,6 @@ router.post(
  */
 router.post(
   "/install-named/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -363,7 +358,6 @@ router.post(
  */
 router.post(
   "/uninstall/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;

package/routes/page.js

@@ -10,14 +10,11 @@ const Page = require("@saltcorn/data/models/page");
 const { div, a, i } = require("@saltcorn/markup/tags");
 const { renderForm } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
-const {
-  setTenant,
-  error_catcher,
-  scan_for_page_title,
-} = require("../routes/utils.js");
+const { error_catcher, scan_for_page_title } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
+const db = require("@saltcorn/data/db");
 
 /**
  * @type {object}
@@ -37,7 +34,6 @@ module.exports = router;
  */
 router.get(
   "/:pagename",
-  setTenant,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
 
@@ -47,7 +43,11 @@ router.get(
       const contents = await db_page.run(req.query, { res, req });
       const title = scan_for_page_title(contents, db_page.title);
       res.sendWrap(
-        { title, description: db_page.description } || `${pagename} page`,
+        {
+          title,
+          description: db_page.description,
+          bodyClass: "page_" + db.sqlsanitize(pagename),
+        } || `${pagename} page`,
         add_edit_bar({
           role,
           title: db_page.name,
@@ -71,7 +71,6 @@ router.get(
  */
 router.post(
   "/:pagename/action/:rndid",
-  setTenant,
   error_catcher(async (req, res) => {
     const { pagename, rndid } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;

package/routes/pageedit.js

@@ -20,7 +20,7 @@ const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
 const { add_to_menu } = require("@saltcorn/data/models/pack");
 const db = require("@saltcorn/data/db");
 
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const {
   mkTable,
   renderForm,
@@ -46,9 +46,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} page 
- * @param {*} roles 
- * @param {object} req 
+ * @param {object} page
+ * @param {*} roles
+ * @param {object} req
  * @returns {Form}
  */
 const editPageRoleForm = (page, roles, req) =>
@@ -60,8 +60,8 @@ const editPageRoleForm = (page, roles, req) =>
   });
 
 /**
- * @param {object} page 
- * @param {object} req 
+ * @param {object} page
+ * @param {object} req
  * @returns {string}
  */
 const page_dropdown = (page, req) =>
@@ -101,8 +101,8 @@ const page_dropdown = (page, req) =>
   ]);
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const pagePropertiesForm = async (req) => {
@@ -146,9 +146,9 @@ const pagePropertiesForm = async (req) => {
 };
 
 /**
- * 
- * @param {object} req 
- * @param {object} context 
+ *
+ * @param {object} req
+ * @param {object} context
  * @returns {Promise<object>}
  */
 const pageBuilderData = async (req, context) => {
@@ -225,9 +225,9 @@ const pageBuilderData = async (req, context) => {
 };
 
 /**
- * @param {*} rows 
- * @param {*} roles 
- * @param {object} req 
+ * @param {*} rows
+ * @param {*} roles
+ * @param {object} req
  * @returns {div}
  */
 const getPageList = (rows, roles, req) => {
@@ -308,7 +308,6 @@ const getRootPageForm = (pages, roles, req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name" });
@@ -339,10 +338,10 @@ router.get(
 );
 
 /**
- * @param {*} contents 
- * @param {*} noCard 
- * @param {object} req 
- * @param {*} page 
+ * @param {*} contents
+ * @param {*} noCard
+ * @param {object} req
+ * @param {*} page
  * @returns {*}
  */
 const wrap = (contents, noCard, req, page) => ({
@@ -372,7 +371,6 @@ const wrap = (contents, noCard, req, page) => ({
  */
 router.get(
   "/edit-properties/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -401,7 +399,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await pagePropertiesForm(req);
@@ -420,7 +417,6 @@ router.get(
  */
 router.post(
   "/edit-properties",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await pagePropertiesForm(req);
@@ -456,7 +452,6 @@ router.post(
  */
 router.get(
   "/edit/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -498,7 +493,6 @@ router.get(
  */
 router.post(
   "/edit/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -529,7 +523,6 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -551,7 +544,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -570,7 +562,6 @@ router.post(
  */
 router.post(
   "/set_root_page",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name" });
@@ -598,7 +589,6 @@ router.post(
  */
 router.post(
   "/add-to-menu/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -628,7 +618,6 @@ router.post(
  */
 router.post(
   "/clone/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -650,7 +639,6 @@ router.post(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;