@saltcorn/server 0.8.8-beta.5 → 0.8.8-beta.7

package/locales/en.json

@@ -1248,5 +1248,7 @@
 	"include": "include",
 	"Auto public login": "Auto public login",
 	"New user view": "New user view",
-	"A view to show to new users, to finalise registration (if Edit) or as a welcome view": "A view to show to new users, to finalise registration (if Edit) or as a welcome view"
+	"A view to show to new users, to finalise registration (if Edit) or as a welcome view": "A view to show to new users, to finalise registration (if Edit) or as a welcome view",
+	"View decoration": "View decoration",
+	"Title formula": "Title formula"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -702,6 +702,11 @@ function initialize_page() {
       }
     }
   }
+  setTimeout(() => {
+    $("#toasts-area")
+      .find(".show[rendered='server-side'][type='success']")
+      .removeClass("show");
+  }, 5000);
 }
 
 $(initialize_page);
@@ -852,6 +857,68 @@ function tristateClick(nm) {
   }
 }
 
+function buildToast(txt, type, spin) {
+  const realtype = type === "error" ? "danger" : type;
+  const icon =
+    realtype === "success"
+      ? "fa-check-circle"
+      : realtype === "danger"
+      ? "fa-times-circle"
+      : realtype === "warning"
+      ? "fa-exclamation-triangle"
+      : "";
+  const isNode = typeof parent?.saltcorn?.data?.state === "undefined";
+  const rndid = `tab${Math.floor(Math.random() * 16777215).toString(16)}`;
+  return {
+    id: rndid,
+    html: `
+    <div 
+      class="toast show"
+      id="${rndid}"
+      rendered="client-side",
+      role="alert"
+      aria-live="assertive"
+      aria-atomic="true"
+      style="min-width: 350px; max-width: 50vw; width: auto; z-index: 999; ${
+        !isNode ? "transform: translateX(-50%);" : ""
+      }" 
+    >
+      <div class="toast-header bg-${realtype} text-white py-1 ">
+        <i class="fas ${icon} me-2"></i>
+        <strong class="me-auto" >
+          ${type}
+        </strong>
+        ${
+          spin
+            ? ""
+            : `<button 
+                type="button" 
+                class="btn-close btn-close-white" 
+                data-bs-dismiss="toast" 
+                aria-label="Close"
+                style="font-size: 12px;"
+                ></button>`
+        }
+      </div>
+      <div 
+        class="toast-body py-2 fs-6 fw-bold d-flex align-items-center"
+      >
+        <strong>${txt}</strong>
+        ${
+          spin
+            ? `<span 
+                class="spinner-border ms-auto" 
+                role="status" 
+                aria-hidden="true" 
+                style="width: 1.5rem; height: 1.5rem"></span>`
+            : ""
+        }
+      </div>
+    </div>
+  `,
+  };
+}
+
 function notifyAlert(note, spin) {
   if (Array.isArray(note)) {
     note.forEach(notifyAlert);
@@ -865,23 +932,17 @@ function notifyAlert(note, spin) {
     txt = note.text;
     type = note.type;
   }
-
-  $("#alerts-area")
-    .append(`<div class="alert alert-${type} alert-dismissible fade show ${
-    spin ? "d-flex align-items-center" : ""
-  }" role="alert">
-  ${txt}
-  ${
-    spin
-      ? `<div class="spinner-border ms-auto" role="status" aria-hidden="true"></div>`
-      : `<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
-  </button>`
+  const { id, html } = buildToast(txt, type, spin);
+  $("#toasts-area").append(html);
+  if (type === "success") {
+    setTimeout(() => {
+      $(`#${id}`).removeClass("show");
+    }, 5000);
   }
-</div>`);
 }
 
 function emptyAlerts() {
-  $("#alerts-area").html("");
+  $("#toasts-area").html("");
 }
 
 function press_store_button(clicked) {

package/public/saltcorn.css

@@ -467,3 +467,8 @@ div.unread-notify {
 .sc-modal-linkout {
   color: inherit;
 }
+
+.link-style {
+  cursor: pointer;
+  text-decoration: underline;
+}

package/public/saltcorn.js

@@ -1,18 +1,22 @@
-function sortby(k, desc, viewIdentifier) {
-  set_state_fields({
-    [viewIdentifier ? `_${viewIdentifier}_sortby` : "_sortby"]: k,
-    [viewIdentifier ? `_${viewIdentifier}_sortdesc` : "_sortdesc"]: desc
-      ? "on"
-      : { unset: true },
-  });
+function sortby(k, desc, viewIdentifier, e) {
+  set_state_fields(
+    {
+      [viewIdentifier ? `_${viewIdentifier}_sortby` : "_sortby"]: k,
+      [viewIdentifier ? `_${viewIdentifier}_sortdesc` : "_sortdesc"]: desc
+        ? "on"
+        : { unset: true },
+    },
+    false,
+    e
+  );
 }
-function gopage(n, pagesize, viewIdentifier, extra = {}) {
+function gopage(n, pagesize, viewIdentifier, extra = {}, e) {
   const cfg = {
     ...extra,
     [viewIdentifier ? `_${viewIdentifier}_page` : "_page"]: n,
     [viewIdentifier ? `_${viewIdentifier}_pagesize` : "_pagesize"]: pagesize,
   };
-  set_state_fields(cfg);
+  set_state_fields(cfg, false, e);
 }
 
 if (localStorage.getItem("reload_on_init")) {
@@ -72,28 +76,31 @@ function get_current_state_url(e) {
   else return $modal.prop("data-modal-state");
 }
 
-function select_id(id) {
-  pjax_to(updateQueryStringParameter(get_current_state_url(), "id", id));
+function select_id(id, e) {
+  pjax_to(updateQueryStringParameter(get_current_state_url(e), "id", id), e);
 }
 
 function set_state_field(key, value, e) {
   pjax_to(updateQueryStringParameter(get_current_state_url(e), key, value), e);
 }
 
-function check_state_field(that) {
+function check_state_field(that, e) {
   const checked = that.checked;
   const name = that.name;
   const value = encodeURIComponent(that.value);
-  var separator = window.location.href.indexOf("?") !== -1 ? "&" : "?";
+  var separator = get_current_state_url(e).indexOf("?") !== -1 ? "&" : "?";
   let dest;
-  if (checked) dest = get_current_state_url() + `${separator}${name}=${value}`;
-  else dest = get_current_state_url().replace(`${name}=${value}`, "");
-  pjax_to(dest.replace("&&", "&").replace("?&", "?"));
+  if (checked) dest = get_current_state_url(e) + `${separator}${name}=${value}`;
+  else dest = get_current_state_url(e).replace(`${name}=${value}`, "");
+  pjax_to(dest.replace("&&", "&").replace("?&", "?"), e);
 }
 
 function invalidate_pagings(href) {
   let newhref = href;
-  const queryObj = Object.fromEntries(new URL(newhref).searchParams.entries());
+  const prev = new URL(window.location.href);
+  const queryObj = Object.fromEntries(
+    new URL(newhref, prev.origin).searchParams.entries()
+  );
   const toRemove = Object.keys(queryObj).filter((val) => is_paging_param(val));
   for (const k of toRemove) {
     newhref = removeQueryStringParameter(newhref, k);
@@ -173,12 +180,12 @@ function pjax_to(href, e) {
 function href_to(href) {
   window.location.href = href;
 }
-function clear_state(omit_fields_str) {
-  let newUrl = get_current_state_url().split("?")[0];
-  const hash = get_current_state_url().split("#")[1];
+function clear_state(omit_fields_str, e) {
+  let newUrl = get_current_state_url(e).split("?")[0];
+  const hash = get_current_state_url(e).split("#")[1];
   if (omit_fields_str) {
     const omit_fields = omit_fields_str.split(",").map((s) => s.trim());
-    let qs = (get_current_state_url().split("?")[1] || "").split("#")[0];
+    let qs = (get_current_state_url(e).split("?")[1] || "").split("#")[0];
     let params = new URLSearchParams(qs);
     newUrl = newUrl + "?";
     omit_fields.forEach((f) => {
@@ -188,7 +195,7 @@ function clear_state(omit_fields_str) {
   }
   if (hash) newUrl += "#" + hash;
 
-  pjax_to(newUrl);
+  pjax_to(newUrl, e);
 }
 
 function ajax_done(res) {

package/routes/admin.js

@@ -1464,7 +1464,7 @@ const buildDialogScript = () => {
   }
   
   function handleMessages() {
-    notifyAlert("Building the app, please wait.")
+    notifyAlert("Building the app, please wait.", true)
     ${
       getState().getConfig("apple_team_id") &&
       getState().getConfig("apple_team_id") !== "null"

package/routes/common_lists.js

@@ -187,7 +187,7 @@ const viewsList = async (
             label: req.__("Name"),
             key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
             sortlink: !tagId
-              ? `javascript:set_state_field('_sortby', 'name')`
+              ? `set_state_field('_sortby', 'name', this)`
               : undefined,
           },
           // description - currently I dont want to show description in view list
@@ -205,7 +205,7 @@ const viewsList = async (
             label: req.__("Pattern"),
             key: "viewtemplate",
             sortlink: !tagId
-              ? `javascript:set_state_field('_sortby', 'viewtemplate')`
+              ? `set_state_field('_sortby', 'viewtemplate', this)`
               : undefined,
           },
           ...(notable
@@ -215,7 +215,7 @@ const viewsList = async (
                   label: req.__("Table"),
                   key: (r) => link(`/table/${r.table}`, r.table),
                   sortlink: !tagId
-                    ? `javascript:set_state_field('_sortby', 'table')`
+                    ? `set_state_field('_sortby', 'table', this)`
                     : undefined,
                 },
               ]),

package/routes/crashlog.js

@@ -59,7 +59,7 @@ router.get(
         page_opts.pagination = {
           current_page,
           pages: Math.ceil(nrows / rows_per_page),
-          get_page_link: (n) => `javascript:gopage(${n}, ${rows_per_page})`,
+          get_page_link: (n) => `gopage(${n}, ${rows_per_page})`,
         };
       }
     }

package/routes/eventlog.js

@@ -332,7 +332,7 @@ router.get(
         page_opts.pagination = {
           current_page,
           pages: Math.ceil(nrows / rows_per_page),
-          get_page_link: (n) => `javascript:gopage(${n}, ${rows_per_page})`,
+          get_page_link: (n) => `gopage(${n}, ${rows_per_page})`,
         };
       }
     }

package/routes/menu.js

@@ -70,7 +70,7 @@ const menuForm = async (req) => {
       .map(([k, v]) => k),
   ];
   const triggers = Trigger.find({
-    when_trigger: {or: ["API call", "Never"]},
+    when_trigger: { or: ["API call", "Never"] },
   });
   triggers.forEach((tr) => {
     actions.push(tr.name);
@@ -155,6 +155,22 @@ const menuForm = async (req) => {
         class: "item-menu",
         required: false,
       },
+      {
+        name: "target_blank",
+        label: req.__("Open in new tab"),
+        type: "Bool",
+        required: false,
+        class: "item-menu",
+        showIf: { type: ["View", "Page", "Link"] },
+      },
+      {
+        name: "in_modal",
+        label: req.__("Open in popup modal?"),
+        type: "Bool",
+        required: false,
+        class: "item-menu",
+        showIf: { type: ["View", "Page", "Link"] },
+      },
       {
         name: "url",
         label: req.__("URL"),

package/routes/search.js

@@ -201,7 +201,7 @@ const runSearch = async ({ q, _page, table }, req, res) => {
         pages: current_page + (vresps.length === page_size ? 1 : 0),
         trailing_ellipsis: vresps.length === page_size,
         get_page_link: (n) =>
-          `javascript:gopage(${n}, ${page_size}, undefined, {table:'${tableName}'})`,
+          `gopage(${n}, ${page_size}, undefined, {table:'${tableName}'}, this)`,
       });
     }
 

package/routes/viewedit.js

@@ -7,7 +7,7 @@
 
 const Router = require("express-promise-router");
 
-const { renderForm, renderBuilder, alert } = require("@saltcorn/markup");
+const { renderForm, renderBuilder, toast } = require("@saltcorn/markup");
 const tags = require("@saltcorn/markup/tags");
 const { p, a, div, script, text, domReady, code, pre, tbody, tr, th, td } =
   tags;
@@ -65,27 +65,7 @@ router.get(
 
     const viewMarkup = await viewsList(views, req);
     const tables = await Table.find();
-    const viewAccessWarning = (view) => {
-      const table = tables.find((t) => t.name === view.table);
-      if (!table) return false;
-      if (table.name === "users") return false;
-      if (table.ownership_field_id || table.ownership_formula) return false;
 
-      return table.min_role_read < view.min_role;
-    };
-    const hasAccessWarning = views.filter(viewAccessWarning);
-    const accessWarning =
-      hasAccessWarning.length > 0
-        ? alert(
-            "danger",
-            `<p>${req.__(
-              `You have views with a role to access lower than the table role to read, with no table ownership. This may cause a denial of access. Users need to have table read access to any data displayed.`
-            )}</p> 
-      ${req.__("Views potentially affected")}: ${hasAccessWarning
-              .map((v) => v.name)
-              .join(", ")}`
-          )
-        : "";
     res.sendWrap(req.__(`Views`), {
       above: [
         {
@@ -97,7 +77,6 @@ router.get(
           class: "mt-0",
           title: req.__("Your views"),
           contents: [
-            accessWarning,
             viewMarkup,
             tables.length > 0
               ? a(

package/tests/table.test.js

@@ -250,8 +250,11 @@ Gordon Kane, 218`;
       await request(app)
         .get("/table/")
         .set("Cookie", loginCookie)
-        .expect(toInclude("alert-danger"))
-        .expect(toInclude("books"));
+        .expect(
+          toInclude(
+            "cannot drop table books because other objects depend on it"
+          )
+        );
   });
 });
 describe("deletion to table with row ownership", () => {