@saltcorn/server 0.9.6-beta.14 → 0.9.6-beta.15

package/locales/en.json

@@ -1427,8 +1427,14 @@
 	"xcodebuild": "xcodebuild",
 	"Provisioning Profile": "Provisioning Profile",
 	"Registry editor": "Registry editor",
+	"Mobile HTML": "Mobile HTML",
+	"HTML for the item in the bottom navigation bar. Currently, only supported by the metronic theme.": "HTML for the item in the bottom navigation bar. Currently, only supported by the metronic theme.",
 	"A short name that will be in the page URL": "A short name that will be in the page URL",
 	"A longer description that is not visible but appears in the page header and is indexed by search engines": "A longer description that is not visible but appears in the page header and is indexed by search engines",
 	"User role required to access page": "User role required to access page",
-	"Example: <code>`/view/TheOtherView?id=${id}`</code>": "Example: <code>`/view/TheOtherView?id=${id}`</code>"
-}
+	"Example: <code>`/view/TheOtherView?id=${id}`</code>": "Example: <code>`/view/TheOtherView?id=${id}`</code>",
+	"Older": "Older",
+	"Newest": "Newest",
+	"Delete all read": "Delete all read",
+	"Trigger %s duplicated as %s": "Trigger %s duplicated as %s"
+}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.6-beta.14",
+  "version": "0.9.6-beta.15",
   "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.6-beta.14",
-    "@saltcorn/builder": "0.9.6-beta.14",
-    "@saltcorn/data": "0.9.6-beta.14",
-    "@saltcorn/admin-models": "0.9.6-beta.14",
-    "@saltcorn/filemanager": "0.9.6-beta.14",
-    "@saltcorn/markup": "0.9.6-beta.14",
-    "@saltcorn/plugins-loader": "0.9.6-beta.14",
-    "@saltcorn/sbadmin2": "0.9.6-beta.14",
+    "@saltcorn/base-plugin": "0.9.6-beta.15",
+    "@saltcorn/builder": "0.9.6-beta.15",
+    "@saltcorn/data": "0.9.6-beta.15",
+    "@saltcorn/admin-models": "0.9.6-beta.15",
+    "@saltcorn/filemanager": "0.9.6-beta.15",
+    "@saltcorn/markup": "0.9.6-beta.15",
+    "@saltcorn/plugins-loader": "0.9.6-beta.15",
+    "@saltcorn/sbadmin2": "0.9.6-beta.15",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -8,6 +8,23 @@ jQuery.fn.swapWith = function (to) {
   });
 };
 
+function monospace_block_click(e) {
+  let e1 = $(e).next("pre");
+  let mine = $(e).html();
+  $(e).html($(e1).html());
+  $(e1).html(mine);
+}
+
+function copy_monospace_block(e) {
+  let e1 = $(e).next("pre");
+  let e2 = $(e1).next("pre");
+  if (!e2.length) return navigator.clipboard.writeText($(el).text());
+  const e1t = e1.text();
+  const e2t = e2.text();
+  if (e1t.length > e2t.length) return navigator.clipboard.writeText(e1t);
+  else return navigator.clipboard.writeText(e2t);
+}
+
 function setScreenInfoCookie() {
   document.cookie = `_sc_screen_info_=${JSON.stringify({
     width: window.screen.width,
@@ -837,11 +854,12 @@ function initialize_page() {
         const url = new URL(path);
         path = `${url.pathname}${url.search}`;
       }
-      if (path.startsWith("/view/")) {
+      if (path.startsWith("/view/") || path.startsWith("/page/")) {
         const jThis = $(this);
         const skip = jThis.attr("skip-mobile-adjust");
         if (!skip) {
-          jThis.attr("href", `javascript:execLink('${path}')`);
+          jThis.removeAttr("href");
+          jThis.attr("onclick", `execLink('${path}')`);
           if (jThis.find("i,img").length === 0 && !jThis.css("color")) {
             jThis.css(
               "color",

package/public/saltcorn.css

@@ -514,3 +514,25 @@ ul.katetree {
 ul.katetree details ul {
   list-style-type: none;
 }
+
+pre.monospace-block {
+  font-family: monospace;
+  color: unset;
+  background: unset;
+  padding: unset;
+  border-radius: unset;
+}
+
+.d-none-prefer {
+  display: none;
+}
+
+button.monospace-copy-btn:has(+ pre.monospace-block:hover) {
+  display: block !important ;
+}
+button.monospace-copy-btn:hover {
+  display: block !important ;
+}
+button.monospace-copy-btn {
+  position: absolute;
+}

package/restart_watcher.js

@@ -23,6 +23,7 @@ const relevantPackages = [
   "saltcorn-admin-models",
   "saltcorn-markup",
   "saltcorn-sbadmin2",
+  "saltcorn-types",
   "server",
   "sqlite",
   "filemanager",

package/routes/actions.js

@@ -887,3 +887,24 @@ router.get(
     }
   })
 );
+
+/**
+ * @name post/clone/:id
+ * @function
+ * @memberof module:routes/actions~actionsRouter
+ * @function
+ */
+router.post(
+  "/clone/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const trig = await Trigger.findOne({ id });
+    const newtrig = await trig.clone();
+    req.flash(
+      "success",
+      req.__("Trigger %s duplicated as %s", trig.name, newtrig.name)
+    );
+    res.redirect(`/actions`);
+  })
+);

package/routes/common_lists.js

@@ -304,6 +304,18 @@ const viewsList = async (
             ? `set_state_field('_sortby', 'name', this)`
             : undefined,
         },
+        {
+          label: "",
+          key: (r) =>
+            r.id && r.viewtemplateObj?.configuration_workflow
+              ? link(
+                  `/viewedit/config/${encodeURIComponent(
+                    r.name
+                  )}${on_done_redirect_str}`,
+                  req.__("Configure")
+                )
+              : "",
+        },
         ...(tagId
           ? []
           : [
@@ -340,18 +352,6 @@ const viewsList = async (
               ? 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: "",
@@ -428,13 +428,6 @@ const page_dropdown = (page, req) =>
       },
       '<i class="fas fa-running"></i>&nbsp;' + req.__("Run")
     ),
-    a(
-      {
-        class: "dropdown-item",
-        href: `/pageedit/edit-properties/${encodeURIComponent(page.name)}`,
-      },
-      '<i class="fas fa-edit"></i>&nbsp;' + req.__("Edit properties")
-    ),
     post_dropdown_item(
       `/pageedit/add-to-menu/${page.id}`,
       '<i class="fas fa-bars"></i>&nbsp;' + req.__("Add to menu"),
@@ -507,6 +500,22 @@ const getPageList = async (
         label: req.__("Name"),
         key: (r) => link(`/page/${encodeURIComponent(r.name)}`, r.name),
       },
+      {
+        label: "",
+        key: (r) =>
+          link(
+            `/pageedit/edit/${encodeURIComponent(r.name)}`,
+            req.__("Configure")
+          ),
+      },
+      {
+        label: "",
+        key: (r) =>
+          link(
+            `/pageedit/edit-properties/${encodeURIComponent(r.name)}`,
+            req.__("Edit")
+          ),
+      },
       ...(tagId
         ? []
         : [
@@ -522,11 +531,7 @@ const getPageList = async (
         label: req.__("Role to access"),
         key: (row) => editPageRoleForm(row, roles, req),
       },
-      {
-        label: req.__("Edit"),
-        key: (r) =>
-          link(`/pageedit/edit/${encodeURIComponent(r.name)}`, req.__("Edit")),
-      },
+
       !tagId
         ? {
             label: "",
@@ -600,6 +605,11 @@ const trigger_dropdown = (trigger, req, on_done_redirect_str = "") =>
       },
       '<i class="fas fa-undo-alt"></i>&nbsp;' + req.__("Restore")
     ),
+    post_dropdown_item(
+      `/actions/clone/${trigger.id}`,
+      '<i class="far fa-copy"></i>&nbsp;' + req.__("Duplicate"),
+      req
+    ),
     div({ class: "dropdown-divider" }),
 
     post_dropdown_item(
@@ -634,6 +644,14 @@ const getTriggerList = async (
   return mkTable(
     [
       { label: req.__("Name"), key: "name" },
+      {
+        label: req.__("Test run"),
+        key: (r) => link(`/actions/testrun/${r.id}`, req.__("Test run")),
+      },
+      {
+        label: req.__("Configure"),
+        key: (r) => link(`/actions/configure/${r.id}`, req.__("Configure")),
+      },
       ...(tagId
         ? []
         : [
@@ -667,14 +685,6 @@ const getTriggerList = async (
             ? a({ href: `/table/${r.table_name}` }, r.table_name)
             : r.channel,
       },
-      {
-        label: req.__("Test run"),
-        key: (r) => link(`/actions/testrun/${r.id}`, req.__("Test run")),
-      },
-      {
-        label: req.__("Configure"),
-        key: (r) => link(`/actions/configure/${r.id}`, req.__("Configure")),
-      },
       !tagId
         ? {
             label: "",

package/routes/menu.js

@@ -258,6 +258,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",

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,6 +166,23 @@ 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",
   error_catcher(async (req, res) => {

package/routes/tables.js

@@ -754,6 +754,14 @@ router.get(
                   r.typename +
                     span({ class: "badge bg-danger ms-1" }, "Unknown type"),
           },
+          ...(table.external
+            ? []
+            : [
+                {
+                  label: req.__("Edit"),
+                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
+                },
+              ]),
           {
             label: "",
             key: (r) => typeBadges(r, req),
@@ -763,14 +771,6 @@ router.get(
             key: (r) => attribBadges(r),
           },
           { label: req.__("Variable name"), key: (t) => code(t.name) },
-          ...(table.external
-            ? []
-            : [
-                {
-                  label: req.__("Edit"),
-                  key: (r) => link(`/field/${r.id}`, req.__("Edit")),
-                },
-              ]),
           ...(table.external || db.isSQLite
             ? []
             : [