@saltcorn/server 0.9.4-beta.7 → 0.9.4-beta.9

package/locales/en.json

@@ -1352,5 +1352,13 @@
 	"Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.": "Use this to restrict your field to a list of options (separated by commas). For instance, enter <kbd class=\"fst-normal\">Red, Green, Blue</kbd> here if the permissible values are Red, Green and Blue. Leave blank if the string can hold any value.",
 	"Page description": "Page description",
 	"Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>": "Some view patterns accept interpolations. Ex: <code>{{ name }}</code> or <code>{{ row ? `Edit ${row.name}` : `New person` }}</code>",
-	"For search engines. Some view patterns accept interpolations.": "For search engines. Some view patterns accept interpolations."
-}
+	"For search engines. Some view patterns accept interpolations.": "For search engines. Some view patterns accept interpolations.",
+	"Files cache TTL (minutes)": "Files cache TTL (minutes)",
+	"Cache-control max-age for files.": "Cache-control max-age for files.",
+	"Popup min width": "Popup min width",
+	"Add %s to tag %s": "Add %s to tag %s",
+	"Add entries to tag %s": "Add entries to tag %s",
+	"Tag not found": "Tag not found",
+	"Unable to save: No page or no layout": "Unable to save: No page or no layout",
+	"Unable to save: No view": "Unable to save: No view"
+}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.4-beta.7",
+  "version": "0.9.4-beta.9",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.4-beta.7",
-    "@saltcorn/builder": "0.9.4-beta.7",
-    "@saltcorn/data": "0.9.4-beta.7",
-    "@saltcorn/admin-models": "0.9.4-beta.7",
-    "@saltcorn/filemanager": "0.9.4-beta.7",
-    "@saltcorn/markup": "0.9.4-beta.7",
-    "@saltcorn/sbadmin2": "0.9.4-beta.7",
+    "@saltcorn/base-plugin": "0.9.4-beta.9",
+    "@saltcorn/builder": "0.9.4-beta.9",
+    "@saltcorn/data": "0.9.4-beta.9",
+    "@saltcorn/admin-models": "0.9.4-beta.9",
+    "@saltcorn/filemanager": "0.9.4-beta.9",
+    "@saltcorn/markup": "0.9.4-beta.9",
+    "@saltcorn/sbadmin2": "0.9.4-beta.9",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.js

@@ -376,6 +376,7 @@ function ajax_modal(url, opts = {}) {
     success: function (res, textStatus, request) {
       var title = request.getResponseHeader("Page-Title");
       var width = request.getResponseHeader("SaltcornModalWidth");
+      var minwidth = request.getResponseHeader("SaltcornModalMinWidth");
       var saveIndicate = !!request.getResponseHeader(
         "SaltcornModalSaveIndicator"
       );
@@ -386,6 +387,8 @@ function ajax_modal(url, opts = {}) {
       else $(".sc-modal-linkout").hide();
       if (width) $(".modal-dialog").css("max-width", width);
       else $(".modal-dialog").css("max-width", "");
+      if (minwidth) $(".modal-dialog").css("min-width", minwidth);
+      else $(".modal-dialog").css("min-width", "");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));
       $("#scmodal .modal-body").html(res);
       $("#scmodal").prop("data-modal-state", url);
@@ -687,7 +690,7 @@ function make_unique_field(
   );
 }
 function test_formula(tablename, stored) {
-  var formula = $("input[name=expression]").val();
+  var formula = $("input[name=expression],textarea[name=expression]").val();
   ajax_post(`/field/test-formula`, {
     data: { formula, tablename, stored },
     success: (data) => {

package/routes/actions.js

@@ -14,6 +14,8 @@ const {
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { getTriggerList } = require("./common_lists");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
+const Tag = require("@saltcorn/data/models/tag");
 
 /**
  * @type {object}
@@ -77,7 +79,20 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    const triggers = await Trigger.findAllWithTableName();
+    let triggers = await Trigger.findAllWithTableName();
+    let filterOnTag;
+
+    if (req.query._tag) {
+      const tagEntries = await TagEntry.find({
+        tag_id: +req.query._tag,
+        not: { trigger_id: null },
+      });
+      const tagged_trigger_ids = new Set(
+        tagEntries.map((te) => te.trigger_id).filter(Boolean)
+      );
+      triggers = triggers.filter((t) => tagged_trigger_ids.has(t.id));
+      filterOnTag = await Tag.findOne({ id: +req.query._tag });
+    }
     const actions = await getActions();
     send_events_page({
       res,
@@ -89,7 +104,7 @@ router.get(
             type: "card",
             title: req.__("Triggers"),
             contents: div(
-              getTriggerList(triggers, req),
+              await getTriggerList(triggers, req, { filterOnTag }),
               link("/actions/new", req.__("Add trigger"))
             ),
           },

package/routes/common_lists.js

@@ -1,5 +1,7 @@
 const User = require("@saltcorn/data/models/user");
 const Table = require("@saltcorn/data/models/table");
+const Tag = require("@saltcorn/data/models/tag");
+const TagEntry = require("@saltcorn/data/models/tag_entry");
 const { editRoleForm } = require("../markup/forms.js");
 const {
   mkTable,
@@ -7,16 +9,16 @@ const {
   post_delete_btn,
   settingsDropdown,
   post_dropdown_item,
+  badge,
 } = require("@saltcorn/markup");
 const { get_base_url } = require("./utils.js");
-const { h4, p, div, a, i, text } = require("@saltcorn/markup/tags");
+const { h4, p, div, a, i, text, span, nbsp } = require("@saltcorn/markup/tags");
 
 /**
  * @param {string} col
  * @param {string} lbl
  * @returns {string}
  */
-const badge = (col, lbl) => `<span class="badge bg-${col}">${lbl}</span>&nbsp;`;
 
 /**
  * Table badges to show in System Table list views
@@ -42,57 +44,90 @@ const valIfSet = (check, value) => (check ? value : "");
 const listClass = (tagId, showList) =>
   valIfSet(tagId, `collapse ${valIfSet(showList, "show")}`);
 
-const tablesList = async (tables, req, { tagId, domId, showList } = {}) => {
+const tablesList = async (
+  tables,
+  req,
+  { tagId, domId, showList, filterOnTag } = {}
+) => {
   const roles = await User.get_roles();
   const getRole = (rid) => roles.find((r) => r.id === rid)?.role || "?";
-  return tables.length > 0
-    ? mkTable(
-        [
-          {
-            label: req.__("Name"),
-            key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
-          },
-          {
-            label: "",
-            key: (r) => tableBadges(r, req),
-          },
-          {
-            label: req.__("Access Read/Write"),
-            key: (t) =>
-              t.external
-                ? `${getRole(t.min_role_read)} (read only)`
-                : `${getRole(t.min_role_read)}/${getRole(t.min_role_write)}`,
-          },
-          !tagId
-            ? {
-                label: req.__("Delete"),
-                key: (r) =>
-                  r.name === "users" || r.external
-                    ? ""
-                    : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-              }
-            : {
-                label: req.__("Remove From Tag"),
-                key: (r) =>
-                  post_delete_btn(
-                    `/tag-entries/remove/tables/${r.id}/${tagId}`,
-                    req,
-                    `${r.name} from this tag`
-                  ),
+  const tags = await Tag.find();
+  const tag_entries = await TagEntry.find({
+    not: { table_id: null },
+  });
+  const tagsById = {};
+  tags.forEach((t) => (tagsById[t.id] = t));
+
+  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);
+  };
+
+  return (
+    mkTable(
+      [
+        {
+          label: req.__("Name"),
+          key: (r) => link(`/table/${r.id || r.name}`, text(r.name)),
+        },
+        ...(tagId
+          ? []
+          : [
+              {
+                label: tagsDropdown(
+                  tags,
+                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                ),
+                key: (r) => tagBadges(r),
               },
-        ],
-        tables,
+            ]),
         {
-          hover: true,
-          tableClass: listClass(tagId, showList),
-          tableId: domId,
-        }
-      )
-    : div(
-        { class: listClass(tagId, showList), id: domId },
-        h4(req.__("No tables defined")),
-        p(req.__("Tables hold collections of similar data"))
-      );
+          label: "",
+          key: (r) => tableBadges(r, req),
+        },
+
+        {
+          label: req.__("Access Read/Write"),
+          key: (t) =>
+            t.external
+              ? `${getRole(t.min_role_read)} (read only)`
+              : `${getRole(t.min_role_read)}/${getRole(t.min_role_write)}`,
+        },
+        !tagId
+          ? {
+              label: req.__("Delete"),
+              key: (r) =>
+                r.name === "users" || r.external
+                  ? ""
+                  : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
+            }
+          : {
+              label: req.__("Remove From Tag"),
+              key: (r) =>
+                post_delete_btn(
+                  `/tag-entries/remove/tables/${r.id}/${tagId}`,
+                  req,
+                  `${r.name} from this tag`
+                ),
+            },
+      ],
+      tables,
+      {
+        hover: true,
+        tableClass: listClass(tagId, showList),
+        tableId: domId,
+      }
+    ) +
+    (tables.length == 0 && !filterOnTag
+      ? div(
+          { class: listClass(tagId, showList), id: domId },
+          h4(req.__("No tables defined")),
+          p(req.__("Tables hold collections of similar data"))
+        )
+      : "")
+  );
 };
 
 /**
@@ -177,100 +212,176 @@ const setTableRefs = async (views) => {
   return views;
 };
 
+const tagBadge = (tag, type) =>
+  a(
+    {
+      href: `/tag/${tag.id}?show_list=${type}`,
+      class: "badge bg-secondary",
+    },
+    tag.name
+  );
+
+const tagsDropdown = (tags, altHeader) =>
+  div(
+    { class: "dropdown" },
+    div(
+      {
+        class: "link-style",
+        "data-boundary": "viewport",
+        type: "button",
+        id: "tagsselector",
+        "data-bs-toggle": "dropdown",
+        "aria-haspopup": "true",
+        "aria-expanded": "false",
+      },
+      altHeader || "Tags",
+      i({ class: "ms-1 fas fa-caret-down" })
+    ),
+    div(
+      {
+        class: "dropdown-menu",
+        "aria-labelledby": "tagsselector",
+      },
+      a(
+        {
+          class: "dropdown-item",
+          // TODO check url why view for page, what do we need for page group
+          href: `javascript:unset_state_field('_tag', this)`,
+        },
+        "All tags"
+      ),
+      tags.map((tag) =>
+        a(
+          {
+            class: "dropdown-item",
+            // TODO check url why view for page, what do we need for page group
+            href: `javascript:set_state_field('_tag', ${tag.id}, this)`,
+          },
+          tag.name
+        )
+      ),
+      a(
+        {
+          class: "dropdown-item",
+          // TODO check url why view for page, what do we need for page group
+          href: `tag`,
+        },
+        "Manage tags..."
+      )
+    )
+  );
+
 const viewsList = async (
   views,
   req,
-  { tagId, domId, showList, on_done_redirect, notable } = {}
+  { tagId, domId, showList, on_done_redirect, notable, filterOnTag } = {}
 ) => {
   const roles = await User.get_roles();
   const on_done_redirect_str = on_done_redirect
     ? `?on_done_redirect=${on_done_redirect}`
     : "";
-  return views.length > 0
-    ? mkTable(
-        [
-          {
-            label: req.__("Name"),
-            key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-            sortlink: !tagId
-              ? `set_state_field('_sortby', 'name', this)`
-              : undefined,
-          },
-          // description - currently I dont want to show description in view list
-          // because description can be long
-          /*
-       {
-           label: req.__("Description"),
-           key: "description",
-           // this is sorting by column
-           sortlink: `javascript:set_state_field('_sortby', 'description')`,
-       },
-       */
-          // template
-          {
-            label: req.__("Pattern"),
-            key: "viewtemplate",
-            sortlink: !tagId
-              ? `set_state_field('_sortby', 'viewtemplate', this)`
-              : undefined,
-          },
-          ...(notable
-            ? []
-            : [
-                {
-                  label: req.__("Table"),
-                  key: (r) => link(`/table/${r.table}`, r.table),
-                  sortlink: !tagId
-                    ? `set_state_field('_sortby', 'table', this)`
-                    : undefined,
-                },
-              ]),
-          {
-            label: req.__("Role to access"),
-            key: (row) =>
-              row.id
-                ? editViewRoleForm(row, roles, req, on_done_redirect_str)
-                : "admin",
-          },
-          {
-            label: "",
-            key: (r) =>
-              r.id && r.viewtemplateObj?.configuration_workflow
-                ? link(
-                    `/viewedit/config/${encodeURIComponent(
-                      r.name
-                    )}${on_done_redirect_str}`,
-                    req.__("Configure")
-                  )
-                : "",
-          },
-          !tagId
-            ? {
-                label: "",
-                key: (r) => view_dropdown(r, req, on_done_redirect_str),
-              }
-            : {
-                label: req.__("Remove From Tag"),
-                key: (r) =>
-                  post_delete_btn(
-                    `/tag-entries/remove/views/${r.id}/${tagId}`,
-                    req,
-                    `${r.name} from this tag`
-                  ),
+  const tags = await Tag.find();
+  const tag_entries = await TagEntry.find({
+    not: { view_id: null },
+  });
+  const tagsById = {};
+  tags.forEach((t) => (tagsById[t.id] = t));
+
+  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);
+  };
+
+  return (
+    mkTable(
+      [
+        {
+          label: req.__("Name"),
+          key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
+          sortlink: !tagId
+            ? `set_state_field('_sortby', 'name', this)`
+            : undefined,
+        },
+        ...(tagId
+          ? []
+          : [
+              {
+                label: tagsDropdown(
+                  tags,
+                  filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+                ),
+                key: (r) => tagBadges(r),
               },
-        ],
-        views,
+            ]),
         {
-          hover: true,
-          tableClass: listClass(tagId, showList),
-          tableId: domId,
-        }
-      )
-    : div(
-        { class: listClass(tagId, showList), id: domId },
-        h4(req.__("No views defined")),
-        p(req.__("Views define how table rows are displayed to the user"))
-      );
+          label: req.__("Pattern"),
+          key: "viewtemplate",
+          sortlink: !tagId
+            ? `set_state_field('_sortby', 'viewtemplate', this)`
+            : undefined,
+        },
+        ...(notable
+          ? []
+          : [
+              {
+                label: req.__("Table"),
+                key: (r) => link(`/table/${r.table}`, r.table),
+                sortlink: !tagId
+                  ? `set_state_field('_sortby', 'table', this)`
+                  : undefined,
+              },
+            ]),
+        {
+          label: req.__("Role to access"),
+          key: (row) =>
+            row.id
+              ? editViewRoleForm(row, roles, req, on_done_redirect_str)
+              : "admin",
+        },
+        {
+          label: "",
+          key: (r) =>
+            r.id && r.viewtemplateObj?.configuration_workflow
+              ? link(
+                  `/viewedit/config/${encodeURIComponent(
+                    r.name
+                  )}${on_done_redirect_str}`,
+                  req.__("Configure")
+                )
+              : "",
+        },
+        !tagId
+          ? {
+              label: "",
+              key: (r) => view_dropdown(r, req, on_done_redirect_str),
+            }
+          : {
+              label: req.__("Remove From Tag"),
+              key: (r) =>
+                post_delete_btn(
+                  `/tag-entries/remove/views/${r.id}/${tagId}`,
+                  req,
+                  `${r.name} from this tag`
+                ),
+            },
+      ],
+      views,
+      {
+        hover: true,
+        tableClass: listClass(tagId, showList),
+        tableId: domId,
+      }
+    ) +
+    (views.length == 0 && !filterOnTag
+      ? div(
+          { class: listClass(tagId, showList), id: domId },
+          h4(req.__("No views defined")),
+          p(req.__("Views define how table rows are displayed to the user"))
+        )
+      : "")
+  );
 };
 
 const page_group_dropdown = (page_group, req) =>
@@ -371,13 +482,42 @@ const editPageRoleForm = (page, roles, req, isGroup) =>
  * @param {object} req
  * @returns {div}
  */
-const getPageList = (rows, roles, req, { tagId, domId, showList } = {}) => {
+const getPageList = async (
+  rows,
+  roles,
+  req,
+  { tagId, domId, showList, filterOnTag } = {}
+) => {
+  const tags = await Tag.find();
+  const tag_entries = await TagEntry.find({
+    not: { page_id: null },
+  });
+  const tagsById = {};
+  tags.forEach((t) => (tagsById[t.id] = t));
+
+  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);
+  };
   return mkTable(
     [
       {
         label: req.__("Name"),
         key: (r) => link(`/page/${r.name}`, r.name),
       },
+      ...(tagId
+        ? []
+        : [
+            {
+              label: tagsDropdown(
+                tags,
+                filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+              ),
+              key: (r) => tagBadges(r),
+            },
+          ]),
       {
         label: req.__("Role to access"),
         key: (row) => editPageRoleForm(row, roles, req),
@@ -442,11 +582,40 @@ const getPageGroupList = (rows, roles, req) => {
   );
 };
 
-const getTriggerList = (triggers, req, { tagId, domId, showList } = {}) => {
+const getTriggerList = async (
+  triggers,
+  req,
+  { tagId, domId, showList, filterOnTag } = {}
+) => {
   const base_url = get_base_url(req);
+  const tags = await Tag.find();
+
+  const tag_entries = await TagEntry.find({
+    not: { trigger_id: null },
+  });
+  const tagsById = {};
+  tags.forEach((t) => (tagsById[t.id] = t));
+
+  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);
+  };
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
+      ...(tagId
+        ? []
+        : [
+            {
+              label: tagsDropdown(
+                tags,
+                filterOnTag ? `Tag:${filterOnTag.name}` : undefined
+              ),
+              key: (r) => tagBadges(r),
+            },
+          ]),
       { label: req.__("Action"), key: "action" },
       {
         label: req.__("Table or Channel"),

package/routes/fields.js

@@ -479,6 +479,8 @@ const fieldFlow = (req) =>
                 // todo sublabel
                 type: "String",
                 class: "validate-expression",
+                fieldview: "textarea",
+                attributes: { rows: 2 },
                 validator: expressionValidator,
                 showIf: { expression_type: "JavaScript expression" },
               }),
@@ -978,7 +980,7 @@ router.post(
             const reftable = Table.findOne({ name: field.reftable_name });
             if (!oldRow[ref]) break;
             if (role > reftable.min_role_read) {
-              res.status(401).send("");
+              res.status401.send("");
               return;
             }
             const q = { [reftable.pk_name]: oldRow[ref] };
@@ -991,7 +993,14 @@ router.post(
         }
         if (oldRow) {
           const value = oldRow[kpath[kpath.length - 1]];
-          res.send(value);
+          //TODO run fieldview
+          res.send(
+            typeof value === "string"
+              ? value
+              : value?.toString
+              ? value.toString()
+              : `${value}`
+          );
           return;
         }
       }

package/routes/files.js

@@ -205,7 +205,8 @@ router.get(
     ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 100 ? "public" : "private";
-      res.set("Cache-Control", `${cacheability}, max-age=86400`);
+      const maxAge = getState().getConfig("files_cache_maxage", 86400);
+      res.set("Cache-Control", `${cacheability}, max-age=${maxAge}`);
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else res.sendFile(file.location);
     } else {
@@ -565,6 +566,7 @@ const files_settings_form = async (req) => {
     field_names: [
       "min_role_upload",
       "file_accept_filter_default",
+      "files_cache_maxage",
       "file_upload_debug",
       "file_upload_limit",
       "file_upload_timeout",