@saltcorn/server 0.6.2-beta.1 → 0.6.2-beta.5

package/routes/menu.js

@@ -15,11 +15,13 @@ 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 { script, domReady, div, ul } = require("@saltcorn/markup/tags");
 const { send_infoarch_page } = require("../markup/admin.js");
+const Table = require("@saltcorn/data/models/table");
 
 /**
  * @type {object}
@@ -32,14 +34,33 @@ const router = new Router();
 module.exports = router;
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
   const roles = await User.get_roles();
+  const tables = await Table.find({});
+  const dynTableOptions = tables.map((t) => t.name);
+  const dynOrderFieldOptions = {},
+    dynSectionFieldOptions = {};
+  for (const table of tables) {
+    dynOrderFieldOptions[table.name] = [""];
+    dynSectionFieldOptions[table.name] = [""];
+    const fields = await table.getFields();
+    for (const field of fields) {
+      dynOrderFieldOptions[table.name].push(field.name);
+      if (
+        field.type &&
+        field.type.name === "String" &&
+        field.attributes &&
+        field.attributes.options
+      )
+        dynSectionFieldOptions[table.name].push(field.name);
+    }
+  }
 
   return new Form({
     action: "/menu/",
@@ -50,6 +71,11 @@ const menuForm = async (req) => {
     additionalButtons: [
       { label: "Update", id: "btnUpdate", class: "btn btn-primary" },
       { label: "Add", id: "btnAdd", class: "btn btn-primary" },
+      {
+        label: "Recalculate dynamic",
+        id: "btnRecalc",
+        class: "btn btn-primary",
+      },
     ],
     fields: [
       {
@@ -58,7 +84,7 @@ const menuForm = async (req) => {
         input_type: "select",
         class: "menutype item-menu",
         required: true,
-        options: ["View", "Page", "Link", "Header"],
+        options: ["View", "Page", "Link", "Header", "Dynamic", "Search"],
       },
       {
         name: "text",
@@ -74,6 +100,7 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
+        showIf: { type: ["View", "Page", "Link", "Header"] },
       },
       {
         name: "icon",
@@ -111,6 +138,67 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "dyn_table",
+        label: req.__("Table"),
+        class: "item-menu",
+        type: "String",
+        attributes: {
+          options: dynTableOptions,
+        },
+        required: true,
+        showIf: { type: "Dynamic" },
+      },
+      {
+        name: "dyn_order",
+        label: req.__("Order field"),
+        class: "item-menu",
+        type: "String",
+        attributes: {
+          calcOptions: ["dyn_table", dynOrderFieldOptions],
+        },
+        showIf: { type: "Dynamic" },
+      },
+      {
+        name: "dyn_section_field",
+        label: req.__("Section field"),
+        class: "item-menu",
+        type: "String",
+        attributes: {
+          calcOptions: ["dyn_table", dynSectionFieldOptions],
+        },
+        sublabel: req.__(
+          "Optional. String type with options, each of which will become a menu section"
+        ),
+        showIf: { type: "Dynamic" },
+      },
+      {
+        name: "dyn_label_fml",
+        label: req.__("Label formula"),
+        class: "item-menu",
+        type: "String",
+        required: true,
+        showIf: { type: "Dynamic" },
+      },
+      {
+        name: "dyn_url_fml",
+        label: req.__("URL formula"),
+        class: "item-menu",
+        type: "String",
+        required: true,
+        showIf: { type: "Dynamic" },
+      },
+      {
+        name: "dyn_include_fml",
+        label: req.__("Include formula"),
+        sublabel: req.__(
+          "If specified, only include in menu rows that evaluate to true"
+        ),
+        class: "item-menu",
+        type: "String",
+        required: true,
+        showIf: { type: "Dynamic" },
+      },
       {
         name: "style",
         label: req.__("Style"),
@@ -118,6 +206,7 @@ const menuForm = async (req) => {
         class: "item-menu",
         type: "String",
         required: true,
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
         attributes: {
           options: [
             { name: "", label: "Link" },
@@ -139,6 +228,7 @@ const menuForm = async (req) => {
       {
         name: "location",
         label: req.__("Location"),
+        showIf: { type: ["View", "Page", "Link", "Header", "Dynamic"] },
         sublabel: req.__("Not all themes support all locations"),
         class: "item-menu",
         type: "String",
@@ -157,16 +247,16 @@ const menuForm = async (req) => {
 //create -- new
 
 /**
- * @param {object[]} menu_items 
+ * @param {object[]} menu_items
  * @returns {string}
  */
 const menuEditorScript = (menu_items) => `
   var iconPickerOptions = {searchText: "Search icon...", labelHeader: "{0}/{1}"};
   let lastState;
   let editor;  
-  function ajax_save_menu() {
+  function ajax_save_menu(skip_check) {
     const s = editor.getString()    
-    if(s===lastState) return;
+    if(s===lastState && !skip_check) return;
     lastState=s;
     ajax_post('/menu', {data: s, 
       success: ()=>{}, dataType : 'json', contentType: 'application/json;charset=UTF-8'})
@@ -192,6 +282,11 @@ const menuEditorScript = (menu_items) => `
       editor.update();
       ajax_save_menu();
   });
+  $("#btnRecalc").click(function(){
+    editor.update();
+    ajax_save_menu(true);
+    location.reload();
+});
   // Calling the add method
   $('#btnAdd').click(function(){
       editor.add();
@@ -202,8 +297,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) => ({
@@ -213,18 +308,6 @@ const menuTojQME = (menu_items) =>
     ...(mi.subitems ? { children: menuTojQME(mi.subitems) } : {}),
   }));
 
-/**
- * @param {object[]} menu_items 
- * @returns {object[]}
- */
-const jQMEtoMenu = (menu_items) =>
-  menu_items.map((mi) => ({
-    ...mi,
-    label: mi.text,
-    children: undefined,
-    ...(mi.children ? { subitems: jQMEtoMenu(mi.children) } : {}),
-  }));
-
 /**
  * @name get
  * @function
@@ -233,7 +316,6 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await menuForm(req);
@@ -278,6 +360,17 @@ router.get(
     });
   })
 );
+/**
+ * @param {object[]} menu_items
+ * @returns {object[]}
+ */
+const jQMEtoMenu = (menu_items) =>
+  menu_items.map((mi) => ({
+    ...mi,
+    label: mi.text,
+    children: undefined,
+    ...(mi.children ? { subitems: jQMEtoMenu(mi.children) } : {}),
+  }));
 
 /**
  * @name post
@@ -287,19 +380,12 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
-    if (req.xhr) {
-      const new_menu = req.body;
-      await getState().setConfig("menu_items", jQMEtoMenu(new_menu));
-      res.json({ success: true });
-    } else {
-      const new_menu = JSON.parse(req.body.menu);
-      await getState().setConfig("menu_items", jQMEtoMenu(new_menu));
-      req.flash("success", req.__(`Menu updated`));
+    const new_menu = req.body;
+    const menu_items = jQMEtoMenu(new_menu);
+    await save_menu_items(menu_items);
 
-      res.redirect(`/menu`);
-    }
+    res.json({ success: true });
   })
 );

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,11 +10,7 @@ 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");
@@ -38,7 +34,6 @@ module.exports = router;
  */
 router.get(
   "/:pagename",
-  setTenant,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
 
@@ -76,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;