@saltcorn/server 0.7.4 → 0.8.0-beta.1

package/routes/list.js

@@ -11,9 +11,8 @@
 const Router = require("express-promise-router");
 
 const db = require("@saltcorn/data/db");
-const { mkTable, h, link, post_btn } = require("@saltcorn/markup");
+const { mkTable, link, post_btn } = require("@saltcorn/markup");
 const {
-  a,
   script,
   domReady,
   div,
@@ -27,7 +26,6 @@ const {
 const Table = require("@saltcorn/data/models/table");
 const { isAdmin, error_catcher } = require("./utils");
 const moment = require("moment");
-const { readState } = require("@saltcorn/data/plugin-helper");
 
 /**
  * @type {object}
@@ -49,11 +47,11 @@ module.exports = router;
  * @function
  */
 router.get(
-  "/_versions/:name/:id",
+  "/_versions/:tableName/:id",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, id } = req.params;
-    const table = await Table.findOne({ name });
+    const { tableName, id } = req.params;
+    const table = await Table.findOne({ name : tableName });
 
     const fields = await table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
@@ -97,11 +95,11 @@ router.get(
  * @function
  */
 router.post(
-  "/_restore/:name/:id/:_version",
+  "/_restore/:tableName/:id/:_version",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, id, _version } = req.params;
-    const table = await Table.findOne({ name });
+    const { tableName, id, _version } = req.params;
+    const table = await Table.findOne({ name : tableName });
 
     const fields = await table.getFields();
     const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
@@ -217,7 +215,8 @@ jsGrid.fields.versions = VersionsField;
 const arrangeIdFirst = (flds) => {
   const noId = flds.filter((f) => f.name !== "id");
   const id = flds.find((f) => f.name === "id");
-  return [id, ...noId];
+  if (id) return [id, ...noId];
+  else return flds
 };
 
 /**
@@ -245,6 +244,7 @@ router.get(
     }
 
     //console.log(fields);
+    // todo remove keyfields - unused
     const keyfields = fields
       .filter((f) => f.type === "Key" || f.type === "File")
       .map((f) => ({ name: f.name, type: f.reftype }));
@@ -369,9 +369,8 @@ router.get(
                 })
               })   
               window.tabulator_table = new Tabulator("#jsGrid", {
-                  ajaxURL:"/api/${table.name}${
-                  table.versioned ? "?versioncount=on" : ""
-                }",                   
+                  ajaxURL:"/api/${table.name}${table.versioned ? "?versioncount=on" : ""
+                  }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",

package/routes/page.js

@@ -7,10 +7,8 @@
 const Router = require("express-promise-router");
 
 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 { error_catcher, scan_for_page_title } = require("../routes/utils.js");
+const { error_catcher, scan_for_page_title, isAdmin } = 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");
@@ -67,6 +65,21 @@ router.get(
   })
 );
 
+router.post(
+  "/:pagename/preview",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { pagename } = req.params;
+    const page = await Page.findOne({ name: pagename });
+    if (!page) {
+      res.send("");
+      return;
+    }
+    const contents = await page.run(req.query, { res, req });
+    res.sendWrap({}, contents);
+  })
+);
+
 /**
  * @name post/:pagename/action/:rndid
  * @function

package/routes/pageedit.js

@@ -100,6 +100,7 @@ const pageBuilderData = async (req, context) => {
   const views = await View.find();
   const pages = await Page.find();
   const images = await File.find({ mime_super: "image" });
+  images.forEach(im => im.location = im.path_to_serve)
   const roles = await User.get_roles();
   const stateActions = getState().actions;
   const actions = [
@@ -130,6 +131,9 @@ const pageBuilderData = async (req, context) => {
     const fs = await view.get_state_fields();
     for (const frec of fs) {
       const f = new Field(frec);
+      if (f.input_type === "hidden") continue;
+      if (f.name === "_fts") continue;
+
       f.required = false;
       if (f.type && f.type.name === "Bool") f.fieldview = "tristate";
 
@@ -156,6 +160,7 @@ const pageBuilderData = async (req, context) => {
       }
     }
   }
+  //console.log(fixed_state_fields.ListTasks);
   return {
     views,
     images,
@@ -569,13 +574,13 @@ router.post(
     const page = await Page.findOne({ id });
     const roles = await User.get_roles();
     const roleRow = roles.find((r) => r.id === +role);
-    if (roleRow && page)
-      req.flash(
-        "success",
-        req.__(`Minimum role for %s updated to %s`, page.name, roleRow.role)
-      );
-    else req.flash("success", req.__(`Minimum role updated`));
-
-    res.redirect("/pageedit");
+    const message =
+      roleRow && page
+        ? req.__(`Minimum role for %s updated to %s`, page.name, roleRow.role)
+        : req.__(`Minimum role updated`);
+    if (!req.xhr) {
+      req.flash("success", message);
+      res.redirect("/pageedit");
+    } else res.json({ okay: true, responseText: message });
   })
 );

package/routes/scapi.js

@@ -185,7 +185,7 @@ router.get(
       { session: false },
       async function (err, user, info) {
         if (accessAllowedRead(req, user)) {
-          const triggers = await Trigger.find({});
+          const triggers = Trigger.find({});
 
           res.json({ success: triggers });
         } else {

package/routes/search.js

@@ -188,7 +188,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
         pages: current_page + (vresps.length === 20 ? 1 : 0),
         trailing_ellipsis: vresps.length === 20,
         get_page_link: (n) =>
-          `javascript:gopage(${n}, 20, {table:'${tableName}'})`,
+          `javascript:gopage(${n}, 20, undefined, {table:'${tableName}'})`,
       });
     }
 

package/routes/tables.js

@@ -8,7 +8,6 @@ const Router = require("express-promise-router");
 
 const db = require("@saltcorn/data/db");
 const Table = require("@saltcorn/data/models/table");
-const Field = require("@saltcorn/data/models/field");
 const File = require("@saltcorn/data/models/file");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
@@ -16,7 +15,6 @@ const {
   mkTable,
   renderForm,
   link,
-  post_btn,
   settingsDropdown,
   post_delete_btn,
   post_dropdown_item,
@@ -29,10 +27,7 @@ const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const {
   span,
-  h5,
   h4,
-  h3,
-  nbsp,
   p,
   a,
   div,
@@ -41,7 +36,6 @@ const {
   label,
   input,
   text,
-  tr,
   script,
   domReady,
   code,
@@ -135,6 +129,7 @@ const tableForm = async (table, req) => {
         name: "min_role_read",
         input_type: "select",
         options: roleOptions,
+        attributes: { asideNext: !table.external }
       },
       ...(table.external
         ? []
@@ -551,14 +546,13 @@ router.get(
       res.redirect(`/table`);
       return;
     }
-    id = table.id;
     const nrows = await table.countRows();
     const fields = await table.getFields();
     const { child_relations } = await table.get_child_relations();
     const inbound_refs = [
       ...new Set(child_relations.map(({ table }) => table.name)),
     ];
-    var fieldCard;
+    let fieldCard;
     if (fields.length === 0) {
       fieldCard = [
         h4(req.__(`No fields defined in %s table`, table.name)),
@@ -865,8 +859,10 @@ router.post(
         res.redirect(`/table/${table.id}`);
       }
     } else if (v.external) {
+      // todo check that works after where change
+      // todo findOne can be have parameter for external table here
       //we can only save min role
-      const table = await Table.findOne(v.name);
+      const table = await Table.findOne( { name : v.name });
       if (table) {
         const exttables_min_role_read = getState().getConfigCopy(
           "exttables_min_role_read",
@@ -885,15 +881,13 @@ router.post(
       const table = await Table.findOne({ id: parseInt(id) });
       const old_versioned = table.versioned;
       let hasError = false;
+      let notify = ""
       if (!rest.versioned) rest.versioned = false;
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
         if (typeof fmlValidRes === "string") {
-          req.flash(
-            "error",
-            req.__(`Invalid ownership formula: %s`, fmlValidRes)
-          );
+          notify = req.__(`Invalid ownership formula: %s`, fmlValidRes)
           hasError = true;
         }
       } else rest.ownership_formula = null;
@@ -911,7 +905,7 @@ router.post(
       else if (!hasError) req.flash("success", req.__("Table saved"));
 
       if (!req.xhr) res.redirect(`/table/${id}`);
-      else res.json({ success: "ok" });
+      else res.json({ success: "ok", notify });
     }
   })
 );
@@ -1149,6 +1143,7 @@ router.get(
 /**
  * Constraint Fields Edition Form
  * Choosing fields for adding to contrain
+ * @param req
  * @param {string} table_id
  * @param {object[]} fields
  * @returns {Form}

package/routes/tag_entries.js

@@ -1,9 +1,6 @@
 const {
-  a,
   div,
-  text,
   button,
-  i,
   form,
   select,
   option,
@@ -81,10 +78,10 @@ const formOptions = async (type, tag_id) => {
         ),
       };
     }
-    case "trigger": {
+    case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        trigger: (await Trigger.find()).filter(
+        triggers: (Trigger.find()).filter(
           (value) => ids.indexOf(value.id) === -1
         ),
       };
@@ -101,7 +98,7 @@ router.get(
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: `Tag entry` }],
+          crumbs: [{ text: req.__(`Tag entry`) }],
         },
         {
           type: "card",
@@ -120,15 +117,19 @@ router.get(
 
 const idField = (entryType) => {
   switch (entryType) {
-    case "tables": {
+    case "tables":
+    case "table": {
       return "table_id";
     }
-    case "views": {
+    case "views":
+    case "view": {
       return "view_id";
     }
-    case "pages": {
+    case "pages":
+    case "page": {
       return "page_id";
     }
+    case "triggers":
     case "trigger": {
       return "trigger_id";
     }
@@ -136,6 +137,7 @@ const idField = (entryType) => {
   return null;
 };
 
+// add multiple objects to one tag
 router.post(
   "/add/:entry_type/:tag_id",
   isAdmin,
@@ -155,6 +157,24 @@ router.post(
   })
 );
 
+// add one object to multiple tags
+router.post(
+  "/add/multiple_tags/:entry_type/:object_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    let { entry_type, object_id } = req.params;
+    let { tag_ids } = req.body;
+    object_id = parseInt(object_id);
+    tag_ids = tag_ids.map((id) => parseInt(id));
+    const tags = (await Tag.find()).filter((tag) => tag_ids.includes(tag.id));
+    const fieldName = idField(entry_type);
+    for (const tag of tags) {
+      await tag.addEntry({ [fieldName]: object_id });
+    }
+    res.json({ tags });
+  })
+);
+
 router.post(
   "/remove/:entry_type/:entry_id/:tag_id",
   isAdmin,
@@ -168,6 +188,7 @@ router.post(
     } else {
       await TagEntry.update(entry.id, { [fieldName]: null });
     }
-    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+    if (!req.xhr) res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+    else res.json({ okay: true });
   })
 );

package/routes/tags.js

@@ -128,18 +128,18 @@ router.get(
     const views = await tag.getViews();
     await setTableRefs(views);
     const pages = await tag.getPages();
-    const trigger = await tag.getTrigger();
+    const triggers = await tag.getTriggers();
     const roles = await User.get_roles();
 
     const tablesDomId = "tablesListId";
     const viewsDomId = "viewsListId";
     const pagesDomId = "pagesDomId";
-    const triggerDomId = "triggerDomId";
+    const triggersDomId = "triggerDomId";
     res.sendWrap(req.__("%s Tag", tag.name), {
       above: [
         {
           type: "breadcrumbs",
-          crumbs: [{ text: `Tag: ${tag.name}` }],
+          crumbs: [{ text: req.__(`Tag: %s`, tag.name) }],
         },
         {
           type: "card",
@@ -211,19 +211,19 @@ router.get(
           type: "card",
           bodyId: "collapseTriggerCard",
           title: headerWithCollapser(
-            req.__("Trigger"),
-            triggerDomId,
-            isShowList(show_list, "trigger")
+            req.__("Triggers"),
+            triggersDomId,
+            isShowList(show_list, "triggers")
           ),
           contents: [
-            getTriggerList(trigger, req, {
+            getTriggerList(triggers, req, {
               tagId: tag.id,
-              domId: triggerDomId,
-              showList: isShowList(show_list, "trigger"),
+              domId: triggersDomId,
+              showList: isShowList(show_list, "triggers"),
             }),
             a(
               {
-                href: `/tag-entries/add/trigger/${tag.id}`,
+                href: `/tag-entries/add/triggers/${tag.id}`,
                 class: "btn btn-primary",
               },
               req.__("Add triggers")