@saltcorn/server 0.7.3 → 0.7.4-beta.2

package/routes/tables.js

@@ -56,6 +56,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
+const { tablesList } = require("./common_lists");
 
 /**
  * @type {object}
@@ -88,33 +89,33 @@ const tableForm = async (table, req) => {
     fields: [
       ...(!table.external
         ? [
-            {
-              label: req.__("Ownership field"),
-              name: "ownership_field_id",
-              sublabel: req.__(
-                "The user referred to in this field will be the owner of the row"
-              ),
-              input_type: "select",
-              options: [
-                { value: "", label: req.__("None") },
-                ...userFields,
-                { value: "_formula", label: req.__("Formula") },
-              ],
-            },
-            {
-              name: "ownership_formula",
-              label: req.__("Ownership formula"),
-              validator: expressionValidator,
-              type: "String",
-              class: "validate-expression",
-              sublabel:
-                req.__("User is treated as owner if true. In scope: ") +
-                ["user", ...fields.map((f) => f.name)]
-                  .map((fn) => code(fn))
-                  .join(", "),
-              showIf: { ownership_field_id: "_formula" },
-            },
-          ]
+          {
+            label: req.__("Ownership field"),
+            name: "ownership_field_id",
+            sublabel: req.__(
+              "The user referred to in this field will be the owner of the row"
+            ),
+            input_type: "select",
+            options: [
+              { value: "", label: req.__("None") },
+              ...userFields,
+              { value: "_formula", label: req.__("Formula") },
+            ],
+          },
+          {
+            name: "ownership_formula",
+            label: req.__("Ownership formula"),
+            validator: expressionValidator,
+            type: "String",
+            class: "validate-expression",
+            sublabel:
+              req.__("User is treated as owner if true. In scope: ") +
+              ["user", ...fields.map((f) => f.name)]
+                .map((fn) => code(fn))
+                .join(", "),
+            showIf: { ownership_field_id: "_formula" },
+          },
+        ]
         : []),
       // description of table
       {
@@ -129,7 +130,7 @@ const tableForm = async (table, req) => {
       {
         label: req.__("Minimum role to read"),
         sublabel: req.__(
-          "User must have this role or higher to read rows from the table"
+          "User must have this role or higher to read rows from the table, unless they are the owner"
         ),
         name: "min_role_read",
         input_type: "select",
@@ -138,24 +139,24 @@ const tableForm = async (table, req) => {
       ...(table.external
         ? []
         : [
-            {
-              label: req.__("Minimum role to write"),
-              name: "min_role_write",
-              input_type: "select",
-              sublabel: req.__(
-                "User must have this role or higher to edit or create new rows in the table"
-              ),
-              options: roleOptions,
-            },
-            {
-              label: req.__("Version history"),
-              sublabel: req.__(
-                "Version history allows to track table data changes"
-              ),
-              name: "versioned",
-              type: "Bool",
-            },
-          ]),
+          {
+            label: req.__("Minimum role to write"),
+            name: "min_role_write",
+            input_type: "select",
+            sublabel: req.__(
+              "User must have this role or higher to edit or create new rows in the table, unless they are the owner"
+            ),
+            options: roleOptions,
+          },
+          {
+            label: req.__("Version history"),
+            sublabel: req.__(
+              "Version history allows to track table data changes"
+            ),
+            name: "versioned",
+            type: "Bool",
+          },
+        ]),
     ],
   });
   if (table) {
@@ -222,11 +223,11 @@ const discoverForm = (tables, req) => {
     blurb:
       tables.length > 0
         ? req.__(
-            "The following tables in your database can be imported into Saltcorn:"
-          )
+          "The following tables in your database can be imported into Saltcorn:"
+        )
         : req.__(
-            "There are no tables in the database that can be imported into Saltcorn."
-          ),
+          "There are no tables in the database that can be imported into Saltcorn."
+        ),
     submitLabel: req.__("Import"),
     fields: tables.map((t) => ({
       name: t.table_name,
@@ -579,11 +580,11 @@ router.get(
             key: (r) =>
               r.type === "Key"
                 ? `Key to ` +
-                  a({ href: `/table/${r.reftable_name}` }, r.reftable_name)
+                a({ href: `/table/${r.reftable_name}` }, r.reftable_name)
                 : (r.type && r.type.name) ||
-                  r.type ||
-                  r.typename +
-                    span({ class: "badge bg-danger ms-1" }, "Unknown type"),
+                r.type ||
+                r.typename +
+                span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
           {
             label: "",
@@ -597,23 +598,23 @@ router.get(
           ...(table.external
             ? []
             : [
-                {
-                  label: req.__("Edit"),
-                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
-                },
-              ]),
+              {
+                label: req.__("Edit"),
+                key: (r) => link(`/field/${r.id}`, req.__("Edit")),
+              },
+            ]),
           ...(table.external || db.isSQLite
             ? []
             : [
-                {
-                  label: req.__("Delete"),
-                  key: (r) =>
-                    (table.name === "users" && r.name === "email") ||
+              {
+                label: req.__("Delete"),
+                key: (r) =>
+                  (table.name === "users" && r.name === "email") ||
                     r.primary_key
-                      ? ""
-                      : post_delete_btn(`/field/delete/${r.id}`, req, r.name),
-                },
-              ]),
+                    ? ""
+                    : post_delete_btn(`/field/delete/${r.id}`, req, r.name),
+              },
+            ]),
         ],
         fields,
         { hover: true }
@@ -622,17 +623,17 @@ router.get(
         tableHtml,
         inbound_refs.length > 0
           ? req.__("Inbound keys: ") +
-            inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
-            "<br>"
+          inbound_refs.map((tnm) => link(`/table/${tnm}`, tnm)).join(", ") +
+          "<br>"
           : "",
         !table.external &&
-          a(
-            {
-              href: `/field/new/${table.id}`,
-              class: "btn btn-primary add-field mt-2",
-            },
-            req.__("Add field")
-          ),
+        a(
+          {
+            href: `/field/new/${table.id}`,
+            class: "btn btn-primary add-field mt-2",
+          },
+          req.__("Add field")
+        ),
       ];
     }
     var viewCard;
@@ -645,7 +646,7 @@ router.get(
         viewCardContents = mkTable(
           [
             { label: req.__("Name"), key: "name" },
-            { label: req.__("Template"), key: "viewtemplate" },
+            { label: req.__("Pattern"), key: "viewtemplate" },
             {
               label: req.__("Run"),
               key: (r) =>
@@ -704,8 +705,8 @@ router.get(
               table.name === "users"
                 ? `/useradmin/`
                 : fields.length === 1
-                ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
-                : `/list/${table.name}`,
+                  ? `javascript:;` // Fix problem with edition of table with only one column ID / Primary Key
+                  : `/list/${table.name}`,
           },
           i({ class: "fas fa-2x fa-edit" }),
           "<br/>",
@@ -725,74 +726,74 @@ router.get(
         )
       ),
       !table.external &&
-        div(
-          { class: "mx-auto" },
-          form(
-            {
-              method: "post",
-              action: `/table/upload_to_table/${table.name}`,
-              encType: "multipart/form-data",
-            },
-            input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
-            label(
-              { class: "btn-link", for: "upload_to_table" },
-              i({ class: "fas fa-2x fa-upload" }),
-              "<br/>",
-              req.__("Upload CSV")
-            ),
-            input({
-              id: "upload_to_table",
-              name: "file",
-              type: "file",
-              accept: "text/csv,.csv",
-              onchange: "this.form.submit();",
-            })
-          )
-        ),
+      div(
+        { class: "mx-auto" },
+        form(
+          {
+            method: "post",
+            action: `/table/upload_to_table/${table.name}`,
+            encType: "multipart/form-data",
+          },
+          input({ type: "hidden", name: "_csrf", value: req.csrfToken() }),
+          label(
+            { class: "btn-link", for: "upload_to_table" },
+            i({ class: "fas fa-2x fa-upload" }),
+            "<br/>",
+            req.__("Upload CSV")
+          ),
+          input({
+            id: "upload_to_table",
+            name: "file",
+            type: "file",
+            accept: "text/csv,.csv",
+            onchange: "this.form.submit();",
+          })
+        )
+      ),
       // only if table is not external
       !table.external &&
-        div(
-          { class: "mx-auto" },
-          settingsDropdown(`dataMenuButton`, [
-            a(
-              {
-                class: "dropdown-item",
-                href: `/table/constraints/${table.id}`,
-              },
-              '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
-            ),
-            // rename table doesnt supported for sqlite
-            !db.isSQLite &&
-              table.name !== "users" &&
-              a(
-                {
-                  class: "dropdown-item",
-                  href: `/table/rename/${table.id}`,
-                },
-                '<i class="fas fa-edit"></i>&nbsp;' + req.__("Rename table")
-              ),
-            post_dropdown_item(
-              `/table/recalc-stored/${table.name}`,
-              '<i class="fas fa-sync"></i>&nbsp;' +
-                req.__("Recalculate stored fields"),
-              req
-            ),
-            post_dropdown_item(
-              `/table/delete-all-rows/${table.name}`,
-              '<i class="far fa-trash-alt"></i>&nbsp;' +
-                req.__("Delete all rows"),
-              req,
-              true
-            ),
-            table.name !== "users" &&
-              post_dropdown_item(
-                `/table/forget-table/${table.id}`,
-                '<i class="fas fa-recycle"></i>&nbsp;' + req.__("Forget table"),
-                req,
-                true
-              ),
-          ])
-        )
+      div(
+        { class: "mx-auto" },
+        settingsDropdown(`dataMenuButton`, [
+          a(
+            {
+              class: "dropdown-item",
+              href: `/table/constraints/${table.id}`,
+            },
+            '<i class="fas fa-ban"></i>&nbsp;' + req.__("Constraints")
+          ),
+          // rename table doesnt supported for sqlite
+          !db.isSQLite &&
+          table.name !== "users" &&
+          a(
+            {
+              class: "dropdown-item",
+              href: `/table/rename/${table.id}`,
+            },
+            '<i class="fas fa-edit"></i>&nbsp;' + req.__("Rename table")
+          ),
+          post_dropdown_item(
+            `/table/recalc-stored/${table.name}`,
+            '<i class="fas fa-sync"></i>&nbsp;' +
+            req.__("Recalculate stored fields"),
+            req
+          ),
+          post_dropdown_item(
+            `/table/delete-all-rows/${table.name}`,
+            '<i class="far fa-trash-alt"></i>&nbsp;' +
+            req.__("Delete all rows"),
+            req,
+            true
+          ),
+          table.name !== "users" &&
+          post_dropdown_item(
+            `/table/forget-table/${table.id}`,
+            '<i class="fas fa-recycle"></i>&nbsp;' + req.__("Forget table"),
+            req,
+            true
+          ),
+        ])
+      )
     );
     // add table form
     if (table.ownership_formula && !table.ownership_field_id)
@@ -815,12 +816,12 @@ router.get(
         },
         ...(fields.length > 0
           ? [
-              {
-                type: "card",
-                title: req.__("Table data"),
-                contents: dataCard,
-              },
-            ]
+            {
+              type: "card",
+              title: req.__("Table data"),
+              contents: dataCard,
+            },
+          ]
           : []),
         ...(viewCard ? [viewCard] : []),
         {
@@ -888,7 +889,6 @@ router.post(
       if (rest.ownership_field_id === "_formula") {
         rest.ownership_field_id = null;
         const fmlValidRes = expressionValidator(rest.ownership_formula);
-        console.log({ fmlValidRes });
         if (typeof fmlValidRes === "string") {
           req.flash(
             "error",
@@ -1011,42 +1011,7 @@ router.get(
     const rows = await Table.find_with_external({}, { orderBy: "name" });
     const roles = await User.get_roles();
     const getRole = (rid) => roles.find((r) => r.id === rid).role;
-    const mainCard =
-      rows.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
-                      )}`,
-              },
-              {
-                label: req.__("Delete"),
-                key: (r) =>
-                  r.name === "users" || r.external
-                    ? ""
-                    : post_delete_btn(`/table/delete/${r.id}`, req, r.name),
-              },
-            ],
-            rows,
-            { hover: true }
-          )
-        : div(
-            h4(req.__("No tables defined")),
-            p(req.__("Tables hold collections of similar data"))
-          );
+    const mainCard = await tablesList(rows, req);
     const createCard = div(
       h5(req.__("Create table")),
       a(
@@ -1063,11 +1028,11 @@ router.get(
         req.__("Create from CSV upload")
       ),
       !db.isSQLite &&
-        a(
-          { href: `/table/discover`, class: "btn btn-secondary mt-1" },
-          i({ class: "fas fa-map-signs me-1" }),
-          req.__("Discover tables")
-        )
+      a(
+        { href: `/table/discover`, class: "btn btn-secondary mt-1" },
+        i({ class: "fas fa-map-signs me-1" }),
+        req.__("Discover tables")
+      )
     );
     res.sendWrap(req.__("Tables"), {
       above: [

package/routes/tag_entries.js

@@ -0,0 +1,173 @@
+const {
+  a,
+  div,
+  text,
+  button,
+  i,
+  form,
+  select,
+  option,
+  label,
+} = 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 { isAdmin, error_catcher, csrfField } = require("./utils");
+
+const Table = require("@saltcorn/data/models/table");
+const View = require("@saltcorn/data/models/view");
+const Page = require("@saltcorn/data/models/page");
+const Trigger = require("@saltcorn/data/models/trigger");
+
+const router = new Router();
+module.exports = router;
+
+const buildFields = (entryType, formOptions, req) => {
+  return Object.entries(formOptions).map(([type, list]) => {
+    return div(
+      { class: "form-group row" },
+      div({ class: "col-sm-2" }, label("type")),
+      div(
+        { class: "col-sm-10" },
+        select(
+          { name: "ids", class: "form-control form-select", multiple: true },
+          list.map((entry) => {
+            return option({ value: entry.id, label: entry.name });
+          })
+        )
+      ),
+      div(
+        { class: "col-sm-12" },
+        button({ type: "submit", class: "btn btn-primary" }, req.__("Save"))
+      )
+    );
+  });
+};
+
+const buildForm = (entryType, tag_id, formOptions, req) => {
+  return form(
+    { action: `/tag-entries/add/${entryType}/${tag_id}`, method: "post" },
+    csrfField(req),
+    buildFields(entryType, formOptions, req)
+  );
+};
+
+const formOptions = async (type, tag_id) => {
+  const tag = await Tag.findOne({ id: tag_id });
+  switch (type) {
+    case "tables": {
+      const ids = await tag.getTableIds();
+      return {
+        tables: (await Table.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "views": {
+      const ids = await tag.getViewIds();
+      return {
+        views: (await View.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "pages": {
+      const ids = await tag.getPageIds();
+      return {
+        pages: (await Page.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+    case "trigger": {
+      const ids = await tag.getTriggerIds();
+      return {
+        trigger: (await Trigger.find()).filter(
+          (value) => ids.indexOf(value.id) === -1
+        ),
+      };
+    }
+  }
+};
+
+router.get(
+  "/add/:entry_type/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { entry_type, tag_id } = req.params;
+    res.sendWrap(req.__("Add %s to tag"), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [{ text: `Tag entry` }],
+        },
+        {
+          type: "card",
+          title: `Add entries to tag`,
+          contents: buildForm(
+            entry_type,
+            tag_id,
+            await formOptions(entry_type, tag_id),
+            req
+          ),
+        },
+      ],
+    });
+  })
+);
+
+const idField = (entryType) => {
+  switch (entryType) {
+    case "tables": {
+      return "table_id";
+    }
+    case "views": {
+      return "view_id";
+    }
+    case "pages": {
+      return "page_id";
+    }
+    case "trigger": {
+      return "trigger_id";
+    }
+  }
+  return null;
+};
+
+router.post(
+  "/add/:entry_type/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { entry_type, tag_id } = req.params;
+    const { ids } = req.body;
+    if (!ids) {
+      req.flash("error", req.__("Please select at least on item"));
+      return res.redirect(`/tag-entries/add/${entry_type}/${tag_id}`);
+    }
+    const fieldName = idField(entry_type);
+    const tag = await Tag.findOne({ id: tag_id });
+    for (const id of ids) {
+      await tag.addEntry({ [fieldName]: id });
+    }
+    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+  })
+);
+
+router.post(
+  "/remove/:entry_type/:entry_id/:tag_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { tag_id, entry_type, entry_id } = req.params;
+    const fieldName = idField(entry_type);
+    const entry = await TagEntry.findOne({ tag_id, [fieldName]: entry_id });
+    entry[fieldName] = undefined;
+    if (entry.isEmpty()) {
+      await entry.delete();
+    } else {
+      await TagEntry.update(entry.id, { [fieldName]: null });
+    }
+    res.redirect(`/tag/${tag_id}?show_list=${entry_type}`);
+  })
+);