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

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.8-beta.5",
+  "version": "0.8.8-beta.6",
   "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.6",
+    "@saltcorn/builder": "0.8.8-beta.6",
+    "@saltcorn/data": "0.8.8-beta.6",
+    "@saltcorn/admin-models": "0.8.8-beta.6",
+    "@saltcorn/filemanager": "0.8.8-beta.6",
+    "@saltcorn/markup": "0.8.8-beta.6",
+    "@saltcorn/sbadmin2": "0.8.8-beta.6",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

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/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/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)`,
       });
     }