@saltcorn/server 1.1.1-rc.2 → 1.1.1-rc.4

package/locales/en.json

@@ -1551,5 +1551,6 @@
 	"Show results in": "Show results in",
 	"Show results from each table in this type of element": "Show results from each table in this type of element",
 	"Search syntax help": "Search syntax help",
-	"Search syntax": "Search syntax"
+	"Search syntax": "Search syntax",
+	"Maximum role": "Maximum role"
 }

package/package.json

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

package/public/saltcorn-common.js

@@ -2116,6 +2116,17 @@ function select_by_view_click(element, event, required) {
   }
 }
 
+function restrict_options(selector, restriction) {
+  $(selector)
+    .find("option")
+    .each(function () {
+      const $o = $(this);
+      const val = $o.val();
+      if (Array.isArray(restriction))
+        if (val && !restriction.find((rid) => rid == val)) $o.remove();
+    });
+}
+
 const observer = new IntersectionObserver(
   (entries, observer) => {
     entries.forEach((entry) => {

package/routes/api.js

@@ -350,6 +350,13 @@ router.get(
     const orderByField =
       (sortBy || tabulator_sort) && table.getField(sortBy || tabulator_sort);
 
+    const use_limit = tabulator_pagination_format
+      ? +tabulator_size
+      : limit && +limit;
+    const use_offset = tabulator_pagination_format
+      ? +tabulator_size * (+tabulator_page - 1)
+      : offset && +offset;
+
     await passport.authenticate(
       ["api-bearer", "jwt"],
       { session: false },
@@ -360,12 +367,8 @@ router.get(
             const joinOpts = {
               forUser: req.user || user || { role_id: 100 },
               forPublic: !(req.user || user),
-              limit: tabulator_pagination_format
-                ? +tabulator_size
-                : limit && +limit,
-              offset: tabulator_pagination_format
-                ? +tabulator_size * (+tabulator_page - 1)
-                : offset && +offset,
+              limit: use_limit,
+              offset: use_offset,
               orderDesc:
                 (sortDesc && sortDesc !== "false") || tabulator_dir == "desc",
               orderBy: orderByField?.name || "id",
@@ -406,9 +409,10 @@ router.get(
             rows = await table.getJoinedRows({
               where: qstate,
               joinFields,
-              limit: limit && +limit,
-              offset: offset && +offset,
-              orderDesc: sortDesc && sortDesc !== "false",
+              limit: use_limit,
+              offset: use_offset,
+              orderDesc:
+                (sortDesc && sortDesc !== "false") || tabulator_dir == "desc",
               orderBy: orderByField?.name || undefined,
               forPublic: !(req.user || user),
               forUser: req.user || user,

package/routes/list.js

@@ -412,7 +412,7 @@ router.get(
                   height:"100%",
                   pagination:true,
                   paginationMode:"remote",
-                  paginationSize:10,
+                  paginationSize:20,
                   clipboard:true,
                   persistence:true, 
                   persistenceID:"table_tab_${table.name}",

package/routes/menu.js

@@ -9,7 +9,11 @@ const Router = require("express-promise-router");
 
 //const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
-const { isAdmin, error_catcher, isAdminOrHasConfigMinRole } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  isAdminOrHasConfigMinRole,
+} = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 //const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
@@ -307,6 +311,13 @@ const menuForm = async (req) => {
         input_type: "select",
         options: roles.map((r) => ({ label: r.role, value: r.id })),
       },
+      {
+        name: "max_role",
+        label: req.__("Maximum role"),
+        class: "item-menu",
+        input_type: "select",
+        options: roles.map((r) => ({ label: r.role, value: r.id })),
+      },
       {
         name: "disable_on_mobile",
         label: req.__("Disable on mobile"),
@@ -566,7 +577,7 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.post(
   "/",
-  isAdminOrHasConfigMinRole("min_role_edit_menu"),  
+  isAdminOrHasConfigMinRole("min_role_edit_menu"),
   error_catcher(async (req, res) => {
     const new_menu = req.body;
     const menu_items = jQMEtoMenu(new_menu);