@saltcorn/server 0.9.6-beta.2 → 0.9.6-beta.20

package/routes/menu.js

@@ -15,6 +15,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
+const PageGroup = require("@saltcorn/data/models/page_group");
 const { save_menu_items } = require("@saltcorn/data/models/config");
 const db = require("@saltcorn/data/db");
 
@@ -43,6 +44,10 @@ module.exports = router;
 const menuForm = async (req) => {
   const views = await View.find({}, { orderBy: "name", nocase: true });
   const pages = await Page.find({}, { orderBy: "name", nocase: true });
+  const pageGroups = await PageGroup.find(
+    {},
+    { orderBy: "name", nocase: true }
+  );
   const roles = await User.get_roles();
   const tables = await Table.find_with_external({});
   const dynTableOptions = tables.map((t) => t.name);
@@ -101,6 +106,7 @@ const menuForm = async (req) => {
         options: [
           "View",
           "Page",
+          "Page Group",
           "Link",
           "Header",
           "Dynamic",
@@ -141,6 +147,14 @@ const menuForm = async (req) => {
         attributes: { options: views.map((r) => r.select_option) },
         showIf: { type: "View" },
       },
+      {
+        name: "page_group",
+        label: req.__("Page group"),
+        input_type: "select",
+        class: "item-menu",
+        options: pageGroups.map((r) => r.name),
+        showIf: { type: "Page Group" },
+      },
       {
         name: "action_name",
         label: req.__("Action"),
@@ -194,6 +208,14 @@ const menuForm = async (req) => {
         required: true,
         showIf: { type: "Dynamic" },
       },
+      {
+        name: "dyn_tooltip_fml",
+        label: req.__("Tooltip formula"),
+        class: "item-menu",
+        type: "String",
+        required: false,
+        showIf: { type: "Dynamic" },
+      },
       {
         name: "dyn_url_fml",
         label: req.__("URL formula"),
@@ -223,6 +245,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",
@@ -238,13 +261,34 @@ const menuForm = async (req) => {
         attributes: {
           html: `<button type="button" id="myEditor_icon" class="btn btn-outline-secondary"></button>`,
         },
-        showIf: { type: ["View", "Page", "Link", "Header", "Action"] },
+        showIf: {
+          type: ["View", "Page", "Page Group", "Link", "Header", "Action"],
+        },
       },
       {
         name: "icon",
         class: "item-menu",
         input_type: "hidden",
       },
+      {
+        name: "tooltip",
+        label: req.__("Tooltip"),
+        class: "item-menu",
+        input_type: "text",
+        required: false,
+        showIf: {
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Search",
+            "Action",
+          ],
+        },
+      },
       {
         name: "min_role",
         label: req.__("Minimum role"),
@@ -258,6 +302,18 @@ const menuForm = async (req) => {
         type: "Bool",
         class: "item-menu",
         required: false,
+        default: false,
+      },
+      {
+        name: "mobile_item_html",
+        label: req.__("Mobile HTML"),
+        sublabel: req.__(
+          "HTML for the item in the bottom navigation bar. Currently, only supported by the metronic theme."
+        ),
+        type: "String",
+        class: "item-menu",
+        input_type: "textarea",
+        showIf: { disable_on_mobile: false, location: "Mobile Bottom" },
       },
       {
         name: "target_blank",
@@ -265,7 +321,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "in_modal",
@@ -273,7 +329,7 @@ const menuForm = async (req) => {
         type: "Bool",
         required: false,
         class: "item-menu",
-        showIf: { type: ["View", "Page", "Link"] },
+        showIf: { type: ["View", "Page", "Page Group", "Link"] },
       },
       {
         name: "style",
@@ -283,7 +339,15 @@ const menuForm = async (req) => {
         type: "String",
         required: true,
         showIf: {
-          type: ["View", "Page", "Link", "Header", "Dynamic", "Action"],
+          type: [
+            "View",
+            "Page",
+            "Page Group",
+            "Link",
+            "Header",
+            "Dynamic",
+            "Action",
+          ],
         },
         attributes: {
           options: [
@@ -310,6 +374,7 @@ const menuForm = async (req) => {
           type: [
             "View",
             "Page",
+            "Page Group",
             "Link",
             "Header",
             "Dynamic",

package/routes/notifications.js

@@ -13,7 +13,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const Form = require("@saltcorn/data/models/form");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
-const { renderForm } = require("@saltcorn/markup");
+const { renderForm, post_btn } = require("@saltcorn/markup");
 
 const router = new Router();
 module.exports = router;
@@ -31,22 +31,50 @@ router.get(
   "/",
   loggedIn,
   error_catcher(async (req, res) => {
-    const nots = await Notification.find(
-      { user_id: req.user.id },
-      { orderBy: "id", orderDesc: true, limit: 20 }
-    );
+    const { after } = req.query;
+    const where = { user_id: req.user.id };
+    if (after) where.id = { lt: after };
+    const nots = await Notification.find(where, {
+      orderBy: "id",
+      orderDesc: true,
+      limit: 20,
+    });
     await Notification.mark_as_read({
       id: { in: nots.filter((n) => !n.read).map((n) => n.id) },
     });
+    const form = notificationSettingsForm();
+    const user = await User.findOne({ id: req.user?.id });
+    form.values = { notify_email: user?._attributes?.notify_email };
     const notifyCards = nots.length
       ? nots.map((not) => ({
           type: "card",
           class: [!not.read && "unread-notify"],
+          id: `notify-${not.id}`,
           contents: [
             div(
               { class: "d-flex" },
               span({ class: "fw-bold" }, not.title),
-              span({ class: "ms-2 text-muted" }, moment(not.created).fromNow())
+              span(
+                {
+                  class: "ms-2 text-muted",
+                  title: not.created.toLocaleString(req.getLocale()),
+                },
+                moment(not.created).fromNow()
+              ),
+              div(
+                { class: "ms-auto" },
+                post_btn(
+                  `/notifications/delete/${not.id}`,
+                  "",
+                  req.csrfToken(),
+                  {
+                    icon: "fas fa-times-circle",
+                    klass: "btn-link text-muted text-decoration-none p-0",
+                    ajax: true,
+                    onClick: `$('#notify-${not.id}').remove()`,
+                  }
+                )
+              )
             ),
             not.body && p(not.body),
             not.link && a({ href: not.link }, "Link"),
@@ -58,6 +86,35 @@ router.get(
             contents: [h5(req.__("No notifications"))],
           },
         ];
+    const pageLinks = div(
+      { class: "d-flex mt-3 mb-3" },
+      nots.length == 20
+        ? div(
+            after &&
+              a(
+                { href: `/notifications`, class: "me-2" },
+                "← " + req.__("Newest")
+              ),
+            a(
+              { href: `/notifications?after=${nots[19].id}` },
+              req.__("Older") + " →"
+            )
+          )
+        : div(),
+      nots.length > 0 &&
+        div(
+          { class: "ms-auto" },
+          post_btn(
+            `/notifications/delete/read`,
+            req.__("Delete all read"),
+            req.csrfToken(),
+            {
+              icon: "fas fa-trash",
+              klass: "btn-sm btn-danger",
+            }
+          )
+        )
+    );
     res.sendWrap(req.__("Notifications"), {
       above: [
         {
@@ -72,10 +129,10 @@ router.get(
               type: "card",
               contents: [
                 req.__("Receive notifications by:"),
-                renderForm(notificationSettingsForm(), req.csrfToken()),
+                renderForm(form, req.csrfToken()),
               ],
             },
-            { above: notifyCards },
+            { above: [...notifyCards, pageLinks] },
           ],
         },
       ],
@@ -109,9 +166,27 @@ router.post(
   })
 );
 
+router.post(
+  "/delete/:idlike",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const { idlike } = req.params;
+    if (idlike == "read") {
+      await Notification.deleteRead(req.user.id);
+    } else {
+      const id = +idlike;
+      const notif = await Notification.findOne({ id });
+      if (notif?.user_id == req.user?.id) await notif.delete();
+    }
+    if (req.xhr) res.json({ success: "ok" });
+    else res.redirect("/notifications");
+  })
+);
+
 router.get(
-  "/manifest.json",
+  "/manifest.json:opt_cache_bust?",
   error_catcher(async (req, res) => {
+    const { pretty } = req.query;
     const state = getState();
     const manifest = {
       name: state.getConfig("site_name"),
@@ -142,6 +217,11 @@ router.get(
         "red"
       );
     }
-    res.json(manifest);
+    if (!pretty) res.json(manifest);
+    else {
+      const prettyJson = JSON.stringify(manifest, null, 2);
+      res.setHeader("Content-Type", "application/json");
+      res.send(prettyJson);
+    }
   })
 );

package/routes/pageedit.js

@@ -94,7 +94,7 @@ const pagePropertiesForm = async (req, isNew) => {
           if (groups.includes(s) && isNew)
             return req.__("A page group with this name already exists");
         },
-        sublabel: req.__("A short name that will be in your URL"),
+        sublabel: req.__("A short name that will be in the page URL"),
         type: "String",
         attributes: { autofocus: true },
       }),
@@ -107,13 +107,15 @@ const pagePropertiesForm = async (req, isNew) => {
       new Field({
         label: req.__("Description"),
         name: "description",
-        sublabel: req.__("A longer description"),
+        sublabel: req.__(
+          "A longer description that is not visible but appears in the page header and is indexed by search engines"
+        ),
         input_type: "text",
       }),
       {
         name: "min_role",
         label: req.__("Minimum role"),
-        sublabel: req.__("Role required to access page"),
+        sublabel: req.__("User role required to access page"),
         input_type: "select",
         options: roles.map((r) => ({ value: r.id, label: r.role })),
       },
@@ -336,6 +338,15 @@ router.get(
             )
           ),
         },
+        {
+          type: "card",
+          title: req.__("Root pages"),
+          titleAjaxIndicator: true,
+          contents: renderForm(
+            getRootPageForm(pages, pageGroups, roles, req),
+            req.csrfToken()
+          ),
+        },
         {
           type: "card",
           title: req.__("Your page groups"),
@@ -357,15 +368,6 @@ router.get(
             )
           ),
         },
-        {
-          type: "card",
-          title: req.__("Root pages"),
-          titleAjaxIndicator: true,
-          contents: renderForm(
-            getRootPageForm(pages, pageGroups, roles, req),
-            req.csrfToken()
-          ),
-        },
       ],
     });
   })
@@ -392,6 +394,7 @@ const wrap = (contents, noCard, req, page) => ({
     {
       type: noCard ? "container" : "card",
       title: page ? page.name : req.__("New"),
+      titleAjaxIndicator: true,
       contents,
     },
   ],
@@ -418,6 +421,7 @@ router.get(
       form.hidden("id");
       form.values = page;
       form.values.no_menu = page.attributes?.no_menu;
+      form.onChange = `saveAndContinue(this)`;
       res.sendWrap(
         req.__(`Page attributes`),
         wrap(renderForm(form, req.csrfToken()), false, req, page)
@@ -477,7 +481,8 @@ router.post(
           pageRow.layout = {};
         }
         await Page.update(+id, pageRow);
-        res.redirect(`/pageedit/`);
+        if (req.xhr) res.json({ success: "ok" });
+        else res.redirect(`/pageedit/`);
       } else {
         if (!pageRow.layout) pageRow.layout = {};
         if (!pageRow.fixed_states) pageRow.fixed_states = {};

package/routes/plugins.js

@@ -865,9 +865,13 @@ router.get(
     if (!module) {
       module = getState().plugins[getState().plugin_module_names[plugin.name]];
     }
+    const userLayout =
+      user._attributes?.layout?.plugin === plugin.name
+        ? user._attributes.layout.config || {}
+        : {};
     const form = await module.user_config_form({
       ...(plugin.configuration || {}),
-      ...(user._attributes?.layout?.config || {}),
+      ...userLayout,
     });
     form.action = `/plugins/user_configure/${encodeURIComponent(plugin.name)}`;
     form.onChange = `applyViewConfig(this, '/plugins/user_saveconfig/${encodeURIComponent(
@@ -1315,7 +1319,12 @@ router.get(
       await upgrade_all_tenants_plugins((p, f) =>
         load_plugins.loadPlugin(p, f)
       );
-      req.flash("success", req.__(`Modules up-to-date. Please restart server`));
+      req.flash(
+        "success",
+        req.__(`Modules up-to-date. Please restart server`) +
+          ". " +
+          a({ href: "/admin/system" }, req.__("Restart here"))
+      );
     } else {
       const installed_plugins = await Plugin.find({});
       for (const plugin of installed_plugins) {