@saltcorn/server 0.7.3 → 0.7.4-beta.2

package/routes/tags.js

@@ -0,0 +1,266 @@
+const { a, text } = require("@saltcorn/markup/tags");
+
+const Tag = require("@saltcorn/data/models/tag");
+const Router = require("express-promise-router");
+const Form = require("@saltcorn/data/models/form");
+const User = require("@saltcorn/data/models/user");
+
+const { isAdmin, error_catcher, csrfField } = require("./utils");
+const { send_admin_page } = require("../markup/admin");
+
+const {
+  mkTable,
+  post_delete_btn,
+  link,
+  renderForm,
+} = require("@saltcorn/markup");
+
+const {
+  tablesList,
+  setTableRefs,
+  viewsList,
+  getPageList,
+  getTriggerList,
+} = require("./common_lists");
+
+const router = new Router();
+module.exports = router;
+
+router.get(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const rows = await Tag.find();
+    send_admin_page({
+      res,
+      req,
+      active_sub: "Tags",
+      contents: [
+        mkTable(
+          [
+            {
+              label: req.__("Tagname"),
+              key: (r) =>
+                link(`/tag/${r.id || r.name}?show_list=tables`, text(r.name)),
+            },
+            {
+              label: req.__("Delete"),
+              key: (r) => post_delete_btn(`/tag/delete/${r.id}`, req, r.name),
+            },
+          ],
+          rows,
+          {}
+        ),
+        a(
+          {
+            href: `/tag/new`,
+            class: "btn btn-primary",
+          },
+          req.__("Create tag")
+        ),
+      ],
+    });
+  })
+);
+
+router.get(
+  "/new",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    res.sendWrap(req.__(`New tag`), {
+      above: [
+        {
+          type: "card",
+          title: req.__(`New tag`),
+          contents: renderForm(
+            new Form({
+              action: "/tag",
+              submitLabel: req.__("Create"),
+              fields: [
+                {
+                  label: req.__("Tag name"),
+                  name: "name",
+                  input_type: "text",
+                  required: true,
+                },
+              ],
+            }),
+            req.csrfToken()
+          ),
+        },
+      ],
+    });
+  })
+);
+
+const headerWithCollapser = (title, cardId, showList) =>
+  a(
+    {
+      class: `card-header-left-collapse ${!showList ? "collapsed" : ""} ps-3`,
+      "data-bs-toggle": "collapse",
+      href: `#${cardId}`,
+      "aria-expanded": "false",
+      "aria-controls": cardId,
+      role: "button",
+    },
+    title
+  );
+
+const isShowList = (showList, listType) => showList === listType;
+
+router.get(
+  "/:idorname",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { idorname } = req.params;
+    const { show_list } = req.query;
+    const id = parseInt(idorname);
+    const tag = await Tag.findOne(id ? { id } : { name: idorname });
+    if (!tag) {
+      req.flash("error", req.__("Tag not found"));
+      return res.redirect(`/tag`);
+    }
+    const tables = await tag.getTables();
+    const views = await tag.getViews();
+    await setTableRefs(views);
+    const pages = await tag.getPages();
+    const trigger = await tag.getTrigger();
+    const roles = await User.get_roles();
+
+    const tablesDomId = "tablesListId";
+    const viewsDomId = "viewsListId";
+    const pagesDomId = "pagesDomId";
+    const triggerDomId = "triggerDomId";
+    res.sendWrap(req.__("%s Tag", tag.name), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [{ text: `Tag: ${tag.name}` }],
+        },
+        {
+          type: "card",
+          title: headerWithCollapser(
+            req.__("Tables"),
+            tablesDomId,
+            isShowList(show_list, "tables")
+          ),
+          contents: [
+            await tablesList(tables, req, {
+              tagId: tag.id,
+              domId: tablesDomId,
+              showList: isShowList(show_list, "tables"),
+            }),
+            a(
+              {
+                href: `/tag-entries/add/tables/${tag.id}`,
+                class: "btn btn-primary",
+              },
+              req.__("Add tables")
+            ),
+          ],
+        },
+        {
+          type: "card",
+          title: headerWithCollapser(
+            req.__("Views"),
+            viewsDomId,
+            isShowList(show_list, "views")
+          ),
+          contents: [
+            await viewsList(views, req, {
+              tagId: tag.id,
+              domId: viewsDomId,
+              showList: isShowList(show_list, "views"),
+            }),
+            a(
+              {
+                href: `/tag-entries/add/views/${tag.id}`,
+                class: "btn btn-primary",
+              },
+              req.__("Add views")
+            ),
+          ],
+        },
+        {
+          type: "card",
+          title: headerWithCollapser(
+            req.__("Pages"),
+            pagesDomId,
+            isShowList(show_list, "pages")
+          ),
+          contents: [
+            getPageList(pages, roles, req, {
+              tagId: tag.id,
+              domId: pagesDomId,
+              showList: isShowList(show_list, "pages"),
+            }),
+            a(
+              {
+                href: `/tag-entries/add/pages/${tag.id}`,
+                class: "btn btn-primary",
+              },
+              req.__("Add tages")
+            ),
+          ],
+        },
+        {
+          type: "card",
+          bodyId: "collapseTriggerCard",
+          title: headerWithCollapser(
+            req.__("Trigger"),
+            triggerDomId,
+            isShowList(show_list, "trigger")
+          ),
+          contents: [
+            getTriggerList(trigger, req, {
+              tagId: tag.id,
+              domId: triggerDomId,
+              showList: isShowList(show_list, "trigger"),
+            }),
+            a(
+              {
+                href: `/tag-entries/add/trigger/${tag.id}`,
+                class: "btn btn-primary",
+              },
+              req.__("Add trigger")
+            ),
+          ],
+        },
+      ],
+    });
+  })
+);
+
+// create
+router.post(
+  "/",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { name } = req.body;
+    const tag = await Tag.create({ name });
+    req.flash("success", req.__(`Tag %s created`, name));
+    res.redirect(`/tag/${tag.id}?show_list=tables`);
+  })
+);
+
+// delete
+router.post(
+  "/delete/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const tag = await Tag.findOne({ id });
+    if (!tag) {
+      req.flash("error", req.__("Tag not found"));
+      return res.redirect("/tag");
+    }
+    try {
+      await tag.delete();
+      req.flash("success", req.__("Tag %s deleted", tag.name));
+      res.redirect(`/tag`);
+    } catch (error) {
+      req.flash("error", error.message);
+      res.redirect(`/tag`);
+    }
+  })
+);

package/routes/tenant.js

@@ -161,32 +161,32 @@ router.get(
           req.__(
             "Hosting on this site is provided for free and with no guarantee of availability or security of your application. "
           ) +
-            " " +
-            req.__(
-              "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
-            ) +
-            " " +
-            req.__(
-              "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
-            ) +
-            " " +
-            req.__(
-              'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
-            )
+          " " +
+          req.__(
+            "This facility is intended solely for you to evaluate the suitability of Saltcorn. "
+          ) +
+          " " +
+          req.__(
+            "If you would like to store private information that needs to be secure, please use self-hosted Saltcorn. "
+          ) +
+          " " +
+          req.__(
+            'See <a href="https://github.com/saltcorn/saltcorn">GitHub repository</a> for instructions<p>'
+          )
         )
       );
 
     res.sendWrap(
       req.__("Create application"),
       create_tenant_warning +
-        renderForm(tenant_form(req), req.csrfToken()) +
-        p(
-          { class: "mt-2" },
-          req.__("To login to a previously created application, go to: "),
-          code(`${req.protocol}://`) +
-            i(req.__("Application name")) +
-            code("." + req.hostname)
-        )
+      renderForm(tenant_form(req), req.csrfToken()) +
+      p(
+        { class: "mt-2" },
+        req.__("To login to a previously created application, go to: "),
+        code(`${req.protocol}://`) +
+        i(req.__("Application name")) +
+        code("." + req.hostname)
+      )
     );
   })
 );
@@ -294,13 +294,13 @@ router.post(
                 " " +
                 hasTemplate
                 ? req.__(
-                    'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
-                    newurl,
-                    newurl
-                  )
+                  'Use this link: <a href="%s">%s</a> to revisit your application at any time.',
+                  newurl,
+                  newurl
+                )
                 : req.__(
-                    "Use this link to revisit your application at any time."
-                  )
+                  "Use this link to revisit your application at any time."
+                )
             )
           )
         );
@@ -586,7 +586,7 @@ router.get(
                   td(a({ href: info.base_url + "actions" }, info.nactions))
                 ),
                 tr(
-                  th(req.__("Plugins")),
+                  th(req.__("Modules")),
                   td(a({ href: info.base_url + "plugins" }, info.nplugins))
                 ),
                 tr(

package/routes/utils.js

@@ -128,6 +128,7 @@ const setTenant = (req, res, next) => {
       } else {
         db.runWithTenant(other_domain, () => {
           setLanguage(req, res, state);
+          state.log(5, `${req.method} ${req.originalUrl}`);
           next();
         });
       }
@@ -140,12 +141,14 @@ const setTenant = (req, res, next) => {
       } else {
         db.runWithTenant(ten, () => {
           setLanguage(req, res, state);
+          state.log(5, `${req.method} ${req.originalUrl}`);
           next();
         });
       }
     }
   } else {
     setLanguage(req, res);
+    getState().log(5, `${req.method} ${req.originalUrl}`);
     next();
   }
 };
@@ -240,4 +243,5 @@ module.exports = {
   getGitRevision,
   getSessionStore,
   setTenant,
+  get_tenant_from_req
 };

package/routes/view.js

@@ -20,6 +20,7 @@ const {
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { InvalidConfiguration } = require("@saltcorn/data/utils");
+const { getState } = require("@saltcorn/data/db/state");
 
 /**
  * @type {object}
@@ -44,8 +45,11 @@ router.get(
     const query = { ...req.query };
     const view = await View.findOne({ name: viewname });
     const role = req.user && req.user.id ? req.user.role_id : 10;
+    const state = getState();
+    state.log(3, `Route /view/${viewname} user=${req.user?.id}`);
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
       return;
     }
@@ -56,6 +60,7 @@ router.get(
       !(await view.authorise_get({ query, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} not authorized`);
       res.redirect("/");
       return;
     }
@@ -123,13 +128,21 @@ router.post(
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 10;
+    const state = getState();
+    state.log(
+      3,
+      `Route /view/${viewname} viewroute ${route} user=${req.user?.id}`
+    );
 
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
     } else if (role > view.min_role) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} viewroute ${route} not authorized`);
+
       res.redirect("/");
     } else {
       await view.runRoute(route, req.body, res, { res, req });
@@ -150,10 +163,12 @@ router.post(
     const { viewname } = req.params;
     const role = req.user && req.user.id ? req.user.role_id : 10;
     const query = { ...req.query };
-
+    const state = getState();
+    state.log(3, `Route /view/${viewname} POST user=${req.user?.id}`);
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
+      state.log(2, `View ${viewname} not found`);
       res.redirect("/");
       return;
     }
@@ -164,6 +179,8 @@ router.post(
       !(await view.authorise_post({ body: req.body, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
+      state.log(2, `View ${viewname} POST not authorized`);
+
       res.redirect("/");
     } else if (!view.runPost) {
       throw new InvalidConfiguration(

package/routes/viewedit.js

@@ -31,6 +31,7 @@ const {
 
 const { getState } = require("@saltcorn/data/db/state");
 const { isAdmin, error_catcher } = require("./utils.js");
+const { setTableRefs, viewsList } = require("./common_lists");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
@@ -38,10 +39,10 @@ const View = require("@saltcorn/data/models/view");
 const Workflow = require("@saltcorn/data/models/workflow");
 const User = require("@saltcorn/data/models/user");
 const Page = require("@saltcorn/data/models/page");
+const Tag = require("@saltcorn/data/models/tag");
 const db = require("@saltcorn/data/db");
 
 const { add_to_menu } = require("@saltcorn/admin-models/models/pack");
-const { editRoleForm } = require("../markup/forms.js");
 
 /**
  * @type {object}
@@ -53,61 +54,6 @@ const { editRoleForm } = require("../markup/forms.js");
 const router = new Router();
 module.exports = router;
 
-/**
- * @param {object} view
- * @param {object[]} roles
- * @param {object} req
- * @returns {Form}
- */
-const editViewRoleForm = (view, roles, req) =>
-  editRoleForm({
-    url: `/viewedit/setrole/${view.id}`,
-    current_role: view.min_role,
-    roles,
-    req,
-  });
-
-/**
- * @param {object} view
- * @param {object} req
- * @returns {div}
- */
-const view_dropdown = (view, req) =>
-  settingsDropdown(`dropdownMenuButton${view.id}`, [
-    a(
-      {
-        class: "dropdown-item",
-        href: `/view/${encodeURIComponent(view.name)}`,
-      },
-      '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
-    ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/viewedit/edit/${encodeURIComponent(view.name)}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit")
-    ),
-    post_dropdown_item(
-      `/viewedit/add-to-menu/${view.id}`,
-      '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
-      req
-    ),
-    post_dropdown_item(
-      `/viewedit/clone/${view.id}`,
-      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
-      req
-    ),
-    div({ class: "dropdown-divider" }),
-    post_dropdown_item(
-      `/viewedit/delete/${view.id}`,
-      '<i class="far fa-trash-alt"></i>&nbsp;' + req.__("Delete"),
-      req,
-      true,
-      view.name
-    ),
-  ]);
-
 /**
  * @name get
  * @function
@@ -118,77 +64,18 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
-    var orderBy = "name";
+    let orderBy = "name";
     if (req.query._sortby === "viewtemplate") orderBy = "viewtemplate";
+    const views = await View.find({}, { orderBy, nocase: true });
+    await setTableRefs(views);
 
-    var views = await View.find({}, { orderBy, nocase: true });
-    const tables = await Table.find();
-    const getTable = (tid) => tables.find((t) => t.id === tid).name;
-    views.forEach((v) => {
-      if (v.table_id) v.table = getTable(v.table_id);
-      else if (v.exttable_name) v.table = v.exttable_name;
-      else v.table = "";
-    });
     if (req.query._sortby === "table")
       views.sort((a, b) =>
         a.table.toLowerCase() > b.table.toLowerCase() ? 1 : -1
       );
-    const roles = await User.get_roles();
 
-    const viewMarkup =
-      views.length > 0
-        ? mkTable(
-            [
-              {
-                label: req.__("Name"),
-                key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-                sortlink: `javascript:set_state_field('_sortby', 'name')`,
-              },
-              // 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.__("Template"),
-                key: "viewtemplate",
-                sortlink: `javascript:set_state_field('_sortby', 'viewtemplate')`,
-              },
-              {
-                label: req.__("Table"),
-                key: (r) => link(`/table/${r.table}`, r.table),
-                sortlink: `javascript:set_state_field('_sortby', 'table')`,
-              },
-              {
-                label: req.__("Role to access"),
-                key: (row) => editViewRoleForm(row, roles, req),
-              },
-              {
-                label: "",
-                key: (r) =>
-                  link(
-                    `/viewedit/config/${encodeURIComponent(r.name)}`,
-                    req.__("Configure")
-                  ),
-              },
-              {
-                label: "",
-                key: (r) => view_dropdown(r, req),
-              },
-            ],
-            views,
-            { hover: true }
-          )
-        : div(
-            h4(req.__("No views defined")),
-            p(req.__("Views define how table rows are displayed to the user"))
-          );
+    const viewMarkup = await viewsList(views, req);
+    const tables = await Table.find();
     res.sendWrap(req.__(`Views`), {
       above: [
         {
@@ -263,10 +150,12 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         ),
       }),
       new Field({
-        label: req.__("Template"),
+        label: req.__("View pattern"),
         name: "viewtemplate",
         input_type: "select",
-        sublabel: req.__("Views are based on a view template"),
+        sublabel: req.__(
+          "The view pattern sets the foundation of how the view relates to the table and the behaviour of the view"
+        ),
         options: Object.keys(getState().viewtemplates),
         attributes: {
           explainers: mapObjectValues(
@@ -320,15 +209,15 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
       }),
       ...(isEdit
         ? [
-            new Field({
-              name: "viewtemplate",
-              input_type: "hidden",
-            }),
-            new Field({
-              name: "table_name",
-              input_type: "hidden",
-            }),
-          ]
+          new Field({
+            name: "viewtemplate",
+            input_type: "hidden",
+          }),
+          new Field({
+            name: "table_name",
+            input_type: "hidden",
+          }),
+        ]
         : []),
     ],
     values,
@@ -355,7 +244,8 @@ router.get(
     }
     const tables = await Table.find_with_external();
     const currentTable = tables.find(
-      (t) => t.id === viewrow.table_id || t.name === viewrow.exttable_name
+      (t) =>
+        (t.id && t.id === viewrow.table_id) || t.name === viewrow.exttable_name
     );
     viewrow.table_name = currentTable && currentTable.name;
     if (viewrow.slug && currentTable) {