@saltcorn/server 1.1.2-beta.18 → 1.1.2-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.2-beta.18",
+  "version": "1.1.2-beta.19",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "^1.14.1",
-    "@saltcorn/base-plugin": "1.1.2-beta.18",
-    "@saltcorn/builder": "1.1.2-beta.18",
-    "@saltcorn/data": "1.1.2-beta.18",
-    "@saltcorn/admin-models": "1.1.2-beta.18",
-    "@saltcorn/filemanager": "1.1.2-beta.18",
-    "@saltcorn/markup": "1.1.2-beta.18",
-    "@saltcorn/plugins-loader": "1.1.2-beta.18",
-    "@saltcorn/sbadmin2": "1.1.2-beta.18",
+    "@saltcorn/base-plugin": "1.1.2-beta.19",
+    "@saltcorn/builder": "1.1.2-beta.19",
+    "@saltcorn/data": "1.1.2-beta.19",
+    "@saltcorn/admin-models": "1.1.2-beta.19",
+    "@saltcorn/filemanager": "1.1.2-beta.19",
+    "@saltcorn/markup": "1.1.2-beta.19",
+    "@saltcorn/plugins-loader": "1.1.2-beta.19",
+    "@saltcorn/sbadmin2": "1.1.2-beta.19",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

package/public/gridedit.js

@@ -164,13 +164,15 @@ function delete_tabulator_row(e, cell) {
     def?.formatterParams?.tableName || window.tabulator_table_name;
 
   const row = cell.getRow().getData();
-  if (!row.id) {
+
+  const pk_name = window.tabulator_table_primary_key || "id";
+  if (!row[pk_name]) {
     cell.getRow().delete();
     return;
   }
   $.ajax({
     type: "DELETE",
-    url: `/api/${tableName}/${row.id}`,
+    url: `/api/${tableName}/${row[pk_name]}`,
     data: row, // to process primary keys different from id
     headers: {
       "CSRF-Token": _sc_globalCsrf,

package/routes/api.js

@@ -78,8 +78,8 @@ function accessAllowedRead(req, user, table, allow_ownership) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return (
     role <= table.min_role_read ||
@@ -101,8 +101,8 @@ function accessAllowedWrite(req, user, table) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return (
     role <= table.min_role_write ||
@@ -122,8 +122,8 @@ function accessAllowed(req, user, trigger) {
     req.user && req.user.id
       ? req.user.role_id
       : user && user.role_id
-      ? user.role_id
-      : 100;
+        ? user.role_id
+        : 100;
 
   return role <= trigger.min_role;
 }
@@ -397,8 +397,8 @@ router.get(
             const derefs = Array.isArray(dereference)
               ? dereference
               : !dereference
-              ? []
-              : [dereference];
+                ? []
+                : [dereference];
             derefs.forEach((f) => {
               const field = table.getField(f);
               if (field?.attributes?.summary_field)
@@ -701,7 +701,7 @@ router.delete(
               );
             } else
               await table.deleteRows(
-                { id },
+                { [table.pk_name]: id },
                 user || req.user || { role_id: 100 }
               );
             res.json({ success: true });

package/routes/list.js

@@ -402,6 +402,7 @@ router.get(
                     col[k] = window[v.substring(2)];
                 })
               })   
+              window.tabulator_table_primary_key = "${table.pk_name}";
               window.tabulator_table = new Tabulator("#jsGrid", {
                   ajaxURL:"/api/${encodeURIComponent(
                     table.name
@@ -421,7 +422,7 @@ router.get(
                   ajaxContentType:"json",
                   sortMode:"remote",
                   initialSort:[
-                    {column:"id", dir:"asc"},
+                    {column:"${table.pk_name}", dir:"asc"},
                   ],                 
               });
               window.tabulator_table.on("cellEdited", function(cell){