@saltcorn/server 1.1.1-beta.8 → 1.1.1-rc.2

package/routes/common_lists.js

@@ -13,7 +13,17 @@ const {
 } = require("@saltcorn/markup");
 const { get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
-const { h4, p, div, a, i, text, span, nbsp } = require("@saltcorn/markup/tags");
+const {
+  h4,
+  p,
+  div,
+  a,
+  i,
+  text,
+  span,
+  nbsp,
+  button,
+} = require("@saltcorn/markup/tags");
 
 /**
  * @param {string} col
@@ -63,9 +73,11 @@ const tablesList = async (
     getState().getConfig("min_role_edit_tables", 1) >= req.user.role_id;
   const tagBadges = (table) => {
     const myTags = tag_entries.filter((te) => te.table_id === table.id);
-    return myTags
-      .map((te) => tagBadge(tagsById[te.tag_id], "tables"))
-      .join(nbsp);
+    const myTagIds = new Set(myTags.map((t) => t.tag_id));
+    return (
+      myTags.map((te) => tagBadge(tagsById[te.tag_id], "tables")).join(nbsp) +
+      mkAddBtn(tags, "tables", table.id, req, myTagIds)
+    );
   };
 
   return (
@@ -278,6 +290,38 @@ const tagsDropdown = (tags, altHeader) =>
     )
   );
 
+const mkAddBtn = (tags, entityType, id, req, myTagIds) =>
+  div(
+    { class: "dropdown d-inline ms-1" },
+    span(
+      {
+        class: "badge bg-secondary add-tag",
+        "data-bs-toggle": "dropdown",
+        "aria-haspopup": "true",
+        "aria-expanded": "false",
+        "data-boundary": "viewport",
+      },
+      i({ class: "fas fa-plus fa-sm" })
+    ),
+    div(
+      {
+        class: "dropdown-menu dropdown-menu-end",
+      },
+
+      tags
+        .filter((t) => !myTagIds.has(t.id))
+        .map((t) =>
+          post_dropdown_item(
+            `/tag-entries/add-tag-entity/${encodeURIComponent(
+              t.name
+            )}/${entityType}/${id}`,
+            t.name,
+            req
+          )
+        )
+    )
+  );
+
 const viewsList = async (
   views,
   req,
@@ -300,9 +344,12 @@ const viewsList = async (
 
   const tagBadges = (view) => {
     const myTags = tag_entries.filter((te) => te.view_id === view.id);
-    return myTags
-      .map((te) => tagBadge(tagsById[te.tag_id], "views"))
-      .join(nbsp);
+    const myTagIds = new Set(myTags.map((t) => t.tag_id));
+    const addBtn = mkAddBtn(tags, "views", view.id, req, myTagIds);
+    return (
+      myTags.map((te) => tagBadge(tagsById[te.tag_id], "views")).join(nbsp) +
+      addBtn
+    );
   };
 
   return (
@@ -504,9 +551,11 @@ const getPageList = async (
 
   const tagBadges = (page) => {
     const myTags = tag_entries.filter((te) => te.page_id === page.id);
-    return myTags
-      .map((te) => tagBadge(tagsById[te.tag_id], "pages"))
-      .join(nbsp);
+    const myTagIds = new Set(myTags.map((t) => t.tag_id));
+    return (
+      myTags.map((te) => tagBadge(tagsById[te.tag_id], "pages")).join(nbsp) +
+      mkAddBtn(tags, "pages", page.id, req, myTagIds)
+    );
   };
   return mkTable(
     [
@@ -602,7 +651,7 @@ const getPageGroupList = (rows, roles, req) => {
   );
 };
 
-const trigger_dropdown = (trigger, req, on_done_redirect_str = "") =>  
+const trigger_dropdown = (trigger, req, on_done_redirect_str = "") =>
   settingsDropdown(`dropdownMenuButton${trigger.id}`, [
     a(
       {
@@ -643,8 +692,8 @@ const getTriggerList = async (
   const base_url = get_base_url(req);
   const tags = await Tag.find();
   const on_done_redirect_str = on_done_redirect
-  ? `?on_done_redirect=${on_done_redirect}`
-  : "";
+    ? `?on_done_redirect=${on_done_redirect}`
+    : "";
   const tag_entries = await TagEntry.find({
     not: { trigger_id: null },
   });
@@ -657,9 +706,11 @@ const getTriggerList = async (
 
   const tagBadges = (trigger) => {
     const myTags = tag_entries.filter((te) => te.trigger_id === trigger.id);
-    return myTags
-      .map((te) => tagBadge(tagsById[te.tag_id], "triggers"))
-      .join(nbsp);
+    const myTagIds = new Set(myTags.map((t) => t.tag_id));
+    return (
+      myTags.map((te) => tagBadge(tagsById[te.tag_id], "triggers")).join(nbsp) +
+      mkAddBtn(tags, "triggers", trigger.id, req, myTagIds)
+    );
   };
   return mkTable(
     [

package/routes/fields.js

@@ -37,8 +37,8 @@ const {
 } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
-const { applyAsync } = require("@saltcorn/data/utils");
-const { text } = require("@saltcorn/markup/tags");
+const { applyAsync, isWeb } = require("@saltcorn/data/utils");
+const { text, div } = require("@saltcorn/markup/tags");
 const { mkFormContentNoLayout } = require("@saltcorn/markup/form");
 
 /**
@@ -1301,6 +1301,19 @@ router.post(
     // - disabled inputs do not dispactch click events
     const firefox = true;
     const fv = fieldviews[fieldview];
+    field.fieldview === fieldview;
+    field.fieldviewObj = fv;
+    field.attributes = { ...configuration, ...field.attributes };
+    if (field.type === "Key")
+      await field.fill_fkey_options(
+        false,
+        {},
+        {},
+        undefined,
+        undefined,
+        undefined,
+        req.user
+      );
     if (!fv && field.type === "Key" && fieldview === "select")
       res.send(
         `<input ${
@@ -1422,3 +1435,101 @@ router.post(
     res.send(mkFormContentNoLayout(form));
   })
 );
+
+router.post(
+  "/edit-get-fieldview",
+  error_catcher(async (req, res) => {
+    const { field_name, table_name, pk, fieldview, configuration } = req.body;
+    const table = Table.findOne({ name: table_name });
+    const row = await table.getRow(
+      { [table.pk_name]: pk },
+      { forUser: req.user, forPublic: !req.user }
+    );
+    const field = table.getField(field_name);
+    let fv;
+    if (field.is_fkey) {
+      await field.fill_fkey_options(
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        row[field_name],
+        req.user
+      );
+      fv = getState().keyFieldviews.select;
+    } else if (fieldview === "subfield" && field.type?.name === "JSON") {
+      fv = field.type.fieldviews.edit_subfield;
+    } else {
+      //TODO: json subfield is special
+      const fieldviews = field.type.fieldviews;
+      fv = Object.values(fieldviews).find((v) => v.isEdit);
+    }
+    res.send(
+      fv.run(
+        field_name,
+        row[field_name],
+        {
+          ...field.attributes,
+          ...configuration,
+        },
+        "",
+        false,
+        field
+      )
+    );
+  })
+);
+
+router.post(
+  "/save-click-edit",
+  error_catcher(async (req, res) => {
+    const fielddata = JSON.parse(decodeURIComponent(req.body._fielddata));
+    const { field_name, table_name, pk, fieldview, configuration, join_field } =
+      fielddata;
+    const table = Table.findOne({ name: table_name });
+    const field = table.getField(field_name);
+    let val = field.type?.read
+      ? field.type?.read(req.body[field_name])
+      : req.body[field_name];
+    await table.updateRow({ [field_name]: val }, pk, req.user);
+    let fv;
+    if (field.is_fkey) {
+      if (join_field) {
+        const refTable = Table.findOne({ name: field.reftable_name });
+        const refRow = await refTable.getRow({ [refTable.pk_name]: val });
+        val = refRow[join_field];
+        const targetField = refTable.getField(join_field);
+        const fieldviews = targetField.type.fieldviews;
+
+        fv = fieldviews[fieldview];
+      } else fv = { run: (v) => `${v}` };
+    } else {
+      const fieldviews = field.type.fieldviews;
+
+      fv = fieldviews[fieldview];
+
+      if (!fv) {
+        const fv1 = Object.values(fieldviews).find(
+          (v) => !v.isEdit && !v.isFilter
+        );
+        fv = fv1;
+      }
+    }
+
+    res.send(
+      div(
+        {
+          "data-inline-edit-fielddata": req.body._fielddata,
+          "data-inline-edit-ajax": "true",
+          "data-inline-edit-dest-url": `/api/${table.name}/${pk}`,
+          class: !isWeb(req) ? "mobile-data-inline-edit" : "",
+        },
+        fv.run(val, req, {
+          ...field.attributes,
+          ...configuration,
+        })
+      )
+    );
+  })
+);

package/routes/list.js

@@ -402,25 +402,26 @@ router.get(
                 })
               })   
               window.tabulator_table = new Tabulator("#jsGrid", {
-                  ajaxURL:"/api/${encodeURIComponent(table.name)}${
-                  table.versioned ? "?versioncount=on" : ""
+                  ajaxURL:"/api/${encodeURIComponent(
+                    table.name
+                  )}?tabulator_pagination_format=true${
+                  table.versioned ? "&versioncount=on" : ""
                 }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",
                   pagination:true,
-                  paginationSize:20,
+                  paginationMode:"remote",
+                  paginationSize:10,
                   clipboard:true,
                   persistence:true, 
                   persistenceID:"table_tab_${table.name}",
                   movableColumns: true,
+                  ajaxContentType:"json",
+                  sortMode:"remote",
                   initialSort:[
                     {column:"id", dir:"asc"},
-                  ],
-                  ajaxResponse:function(url, params, response){                    
-            
-                    return response.success; //return the tableData property of a response json object
-                  },
+                  ],                 
               });
               window.tabulator_table.on("cellEdited", function(cell){
                 const row = cell.getRow().getData()

package/routes/menu.js

@@ -9,7 +9,7 @@ const Router = require("express-promise-router");
 
 //const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
-const { isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher, isAdminOrHasConfigMinRole } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 //const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
@@ -490,7 +490,7 @@ const menuTojQME = (menu_items) =>
  */
 router.get(
   "/",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_menu"),
   error_catcher(async (req, res) => {
     const form = await menuForm(req);
     const state = getState();
@@ -566,7 +566,7 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.post(
   "/",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_menu"),  
   error_catcher(async (req, res) => {
     const new_menu = req.body;
     const menu_items = jQMEtoMenu(new_menu);

package/routes/search.js

@@ -8,6 +8,8 @@ const Router = require("express-promise-router");
 const { span, h5, h4, nbsp, p, a, div } = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+
 const { isAdmin, error_catcher } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
@@ -58,6 +60,13 @@ const searchConfigForm = (tables, views, req) => {
     sublabel: req.__("Use table description instead of name as header"),
     type: "Bool",
   });
+  fields.push({
+    name: "search_results_decoration",
+    label: req.__("Show results in"),
+    sublabel: req.__("Show results from each table in this type of element"),
+    input_type: "select",
+    options: ["Cards", "Tabs"],
+  });
   const blurb1 = req.__(
     `Choose views for <a href="/search">search results</a> for each table.<br/>Set to blank to omit table from global search.`
   );
@@ -95,6 +104,10 @@ router.get(
       "search_table_description",
       false
     );
+    form.values.search_results_decoration = getState().getConfig(
+      "search_results_decoration",
+      "Cards"
+    );
     send_infoarch_page({
       res,
       req,
@@ -126,13 +139,20 @@ router.post(
     const result = form.validate(req.body);
 
     if (result.success) {
+      const dbversion = await db.getVersion(true);
       const search_table_description =
         !!result.success.search_table_description;
       await getState().setConfig(
         "search_table_description",
         search_table_description
       );
+      await getState().setConfig(
+        "search_results_decoration",
+        result.success.search_results_decoration || "Cards"
+      );
+      await getState().setConfig("search_use_websearch", +dbversion >= 11.0);
       delete result.success.search_table_description;
+      delete result.success.search_results_decoration;
       await getState().setConfig("globalSearch", result.success);
       if (!req.xhr) res.redirect("/search/config");
       else res.json({ success: "ok" });
@@ -196,9 +216,12 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     "search_table_description",
     false
   );
+  const search_results_decoration = getState().getConfig(
+    "search_results_decoration",
+    "Cards"
+  );
   const current_page = parseInt(_page) || 1;
   const offset = (current_page - 1) * page_size;
-  let resp = [];
   let tablesWithResults = [];
   let tablesConfigured = 0;
   for (const [tableName, viewName] of Object.entries(cfg)) {
@@ -206,7 +229,9 @@ const runSearch = async ({ q, _page, table }, req, res) => {
       !viewName ||
       viewName === "" ||
       viewName === "search_table_description" ||
-      tableName === "search_table_description"
+      tableName === "search_table_description" ||
+      viewName === "search_results_decoration" ||
+      tableName === "search_results_decoration"
     )
       continue;
     tablesConfigured += 1;
@@ -238,10 +263,9 @@ const runSearch = async ({ q, _page, table }, req, res) => {
     }
 
     if (vresps.length > 0) {
-      tablesWithResults.push({ tableName, label: sectionHeader });
-      resp.push({
-        type: "card",
-        title: span({ id: tableName }, sectionHeader),
+      tablesWithResults.push({
+        tableName,
+        label: sectionHeader,
         contents: vresps.map((vr) => vr.html).join("<hr>") + paginate,
       });
     }
@@ -251,17 +275,36 @@ const runSearch = async ({ q, _page, table }, req, res) => {
   const form = searchForm();
   form.validate({ q });
 
+  const mkResultDisplay = () => {
+    switch (search_results_decoration) {
+      case "Tabs":
+        const tabContents = {};
+        tablesWithResults.forEach((tblRes) => {
+          tabContents[tblRes.label] = tblRes.contents;
+        });
+        return [{ type: "card", tabContents }];
+
+      default:
+        return tablesWithResults.map((tblRes) => ({
+          type: "card",
+          title: span({ id: tblRes.tableName }, tblRes.label),
+          contents: tblRes.contents,
+        }));
+    }
+  };
+
   // Prepare search result visualization
   const searchResult =
-    resp.length === 0
+    tablesWithResults.length === 0
       ? [{ type: "card", contents: req.__("Not found") }]
-      : resp;
+      : mkResultDisplay();
   res.sendWrap(req.__("Search all tables"), {
     above: [
       {
         type: "card",
         contents: div(
           renderForm(form, false),
+          syntax_help_link(req),
           typeof table !== "undefined" &&
             tablesConfigured > 1 &&
             div(
@@ -296,6 +339,19 @@ const runSearch = async ({ q, _page, table }, req, res) => {
   });
 };
 
+const syntax_help_link = (req) => {
+  const use_websearch = getState().getConfig("search_use_websearch", false);
+  if (use_websearch)
+    return a(
+      {
+        href: "javascript:void(0);",
+        onclick: "ajax_modal('/search/syntax-help')",
+      },
+      req.__("Search syntax")
+    );
+  else return "";
+};
+
 /**
  * Execute search or only show search form
  * @name get
@@ -327,9 +383,33 @@ router.get(
       }
 
       const form = searchForm();
-      form.noSubmitButton = false;
-      form.submitLabel = req.__("Search");
-      res.sendWrap(req.__("Search all tables"), renderForm(form, false));
+      res.sendWrap(req.__("Search all tables"), {
+        type: "card",
+        contents: renderForm(form, false) + syntax_help_link(req),
+      });
     }
   })
 );
+
+router.get(
+  "/syntax-help",
+  error_catcher(async (req, res) => {
+    res.sendWrap(
+      req.__("Search syntax help"),
+      div(
+        p(
+          `Individual words matched independently. Example <code>large cat</code>`
+        ),
+        p(
+          `Double quotes to match phrase as a single unit. Example <code>"large cat"</code> matches "the large cat sat..." but not "the large brown cat".`
+        ),
+        p(
+          `"or" to match either of two phrases. Example <code>cat or mouse</code>`
+        ),
+        p(
+          `"-" to exclude a word or phrase. Example <code>cat -mouse</code> does not match "cat and mouse"`
+        )
+      )
+    );
+  })
+);

package/routes/tables.js

@@ -1533,6 +1533,8 @@ router.get(
                   key: (r) =>
                     r.type === "Unique"
                       ? r.configuration.fields.join(", ")
+                      : r.type === "Index" && r.configuration?.field === "_fts"
+                      ? "Full text search"
                       : r.type === "Index"
                       ? r.configuration.field
                       : r.type === "Formula"
@@ -1629,11 +1631,23 @@ const constraintForm = (req, table, fields, type) => {
         ],
       });
     case "Index":
+      const fieldopts = fields.map((f) => ({ label: f.label, name: f.name }));
+      const hasIncludeFts = fields.filter((f) => f.attributes?.include_fts);
+      if (!db.isSQLite && !hasIncludeFts.length)
+        fieldopts.push({ label: "Full-text search", name: "_fts" });
       return new Form({
         action: `/table/add-constraint/${table.id}/${type}`,
-        blurb: req.__(
-          "Choose the field to be indexed. This make searching the table faster."
-        ),
+        blurb:
+          req.__(
+            "Choose the field to be indexed. This make searching the table faster."
+          ) +
+          " " +
+          (hasIncludeFts.length
+            ? req.__(
+                `Full-text search index is not available as the table contains Key fields (%s) with the "Include in full-text search" option enabled. Disable this before creating a Full-text search index`,
+                hasIncludeFts.map((f) => f.name).join(",")
+              )
+            : ""),
         fields: [
           {
             type: "String",
@@ -1641,7 +1655,7 @@ const constraintForm = (req, table, fields, type) => {
             label: "Field",
             required: true,
             attributes: {
-              options: fields.map((f) => ({ label: f.label, name: f.name })),
+              options: fieldopts,
             },
           },
         ],

package/routes/tag_entries.js

@@ -12,7 +12,13 @@ const Tag = require("@saltcorn/data/models/tag");
 const TagEntry = require("@saltcorn/data/models/tag_entry");
 const Router = require("express-promise-router");
 
-const { isAdmin, error_catcher, csrfField } = require("./utils");
+const {
+  isAdmin,
+  error_catcher,
+  csrfField,
+  isAdminOrHasConfigMinRole,
+  checkEditPermission,
+} = require("./utils");
 
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
@@ -170,6 +176,42 @@ router.post(
   })
 );
 
+router.post(
+  "/add-tag-entity/:tagname/:entitytype/:entityid",
+  isAdminOrHasConfigMinRole([
+    "min_role_edit_tables",
+    "min_role_edit_views",
+    "min_role_edit_pages",
+    "min_role_edit_triggers",
+  ]),
+  error_catcher(async (req, res) => {
+    const { tagname, entitytype, entityid } = req.params;
+    const tag = await Tag.findOne({ name: tagname });
+
+    const fieldName = idField(entitytype);
+    const auth = checkEditPermission(entitytype, req.user);
+    if (!auth) req.flash("error", "Not authorized");
+    else await tag.addEntry({ [fieldName]: +entityid });
+    switch (entitytype) {
+      case "views":
+        res.redirect(`/viewedit`);
+        break;
+      case "pages":
+        res.redirect(`/pageedit`);
+        break;
+      case "tables":
+        res.redirect(`/table`);
+        break;
+      case "triggers":
+        res.redirect(`/actions`);
+        break;
+
+      default:
+        break;
+    }
+  })
+);
+
 // add one object to multiple tags
 router.post(
   "/add/multiple_tags/:entry_type/:object_id",

package/routes/tags.js

@@ -1,6 +1,7 @@
 const { a, text, i, div } = require("@saltcorn/markup/tags");
 
 const Tag = require("@saltcorn/data/models/tag");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
 const Router = require("express-promise-router");
 const Form = require("@saltcorn/data/models/form");
 const User = require("@saltcorn/data/models/user");

package/routes/utils.js

@@ -611,6 +611,20 @@ const getRandomPage = (pageGroup, req) => {
   return Page.findOne({ id: sessionMember.page_id });
 };
 
+const checkEditPermission = (type, user) => {
+  if (user.role_id === 1) return true;
+  switch (type) {
+    case "views":
+      return getState().getConfig("min_role_edit_views", 1) >= user.role_id;
+    case "pages":
+      return getState().getConfig("min_role_edit_pages", 1) >= user.role_id;
+    case "triggers":
+      return getState().getConfig("min_role_edit_triggers", 1) >= user.role_id;
+    default:
+      return false;
+  }
+};
+
 module.exports = {
   sqlsanitize,
   csrfField,
@@ -634,4 +648,5 @@ module.exports = {
   getEligiblePage,
   getRandomPage,
   tenant_letsencrypt_name,
+  checkEditPermission,
 };