@saltcorn/server 1.3.0-beta.10 → 1.3.0-beta.12

package/docs/variables/_saltcorn_data.models.config.configTypes.html

@@ -20,7 +20,7 @@
 <h1>Variable configTypes</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">config<wbr/>Types</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">ConfigTypes</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-data/models/index.ts#L54">saltcorn-data/models/index.ts:54</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/saltcorn-data/models/index.ts#L54">saltcorn-data/models/index.ts:54</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.models.scheduler.runScheduler.html

@@ -65,7 +65,7 @@
 <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type ">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
 <div class="tsd-comment tsd-typography"></div></li></ul></li></ul></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-data/models/index.ts#L116">saltcorn-data/models/index.ts:116</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/saltcorn-data/models/index.ts#L116">saltcorn-data/models/index.ts:116</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.plugin_helper.run_action_column.html

@@ -19,7 +19,7 @@
 <h1>Variable run_action_column</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">run_<wbr/>action_<wbr/>column</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-data/index.ts#L15">saltcorn-data/index.ts:15</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/saltcorn-data/index.ts#L15">saltcorn-data/index.ts:15</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.utils.NotAuthorized.html

@@ -19,7 +19,7 @@
 <h1>Variable NotAuthorized</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">Not<wbr/>Authorized</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_data.utils.sleep.html

@@ -19,7 +19,7 @@
 <h1>Variable sleep</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">sleep</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">any</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/saltcorn-data/index.ts#L20">saltcorn-data/index.ts:20</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/_saltcorn_db_common.multi_tenant.tenantNamespace.html

@@ -19,7 +19,7 @@
 <h1>Variable tenantNamespace<code class="tsd-tag ts-flagConst">Const</code> </h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">tenant<wbr/>Namespace</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">AsyncLocalStorage</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type ">RequestContext</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol"> = ...</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/220de627d2/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/saltcorn/saltcorn/blob/fafb795597/packages/db-common/multi-tenant.ts#L17">db-common/multi-tenant.ts:17</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/package.json

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

package/public/gridedit.js

@@ -109,7 +109,8 @@ function jsonFormatter(cell, formatterParams, onRendered) {
 function versionsFormatter(cell, formatterParams, onRendered) {
   const value = cell.getValue();
   const row = cell.getRow().getData();
-  return $(`<a href="/list/_versions/${window.tabulator_table_name}/${row.id}">
+  const pk_name = formatterParams?.pk_name || "id";
+  return $(`<a href="/list/_versions/${window.tabulator_table_name}/${row[pk_name]}">
     ${value || 0}&nbsp;<i class="fa-sm fas fa-list"></i></a>`)[0];
 }
 function colorEditor(cell, onRendered, success, cancel) {

package/routes/api.js

@@ -391,8 +391,8 @@ router.get(
               aggregations: {
                 _versions: {
                   table: table.name + "__history",
-                  ref: "id",
-                  field: "id",
+                  ref: table.pk_name,
+                  field: table.pk_name,
                   aggregate: "count",
                 },
               },

package/routes/fields.js

@@ -307,7 +307,7 @@ const fieldFlow = (req) =>
       try {
         await db.withTransaction(async () => {
           if (context.id) {
-            const field = await Field.findOne({ id: context.id });          
+            const field = await Field.findOne({ id: context.id });
             await field.update(fldRow);
             Trigger.emitEvent(
               "AppChange",
@@ -1417,7 +1417,13 @@ router.post(
       return;
     }
 
-    const field = table.getField(fieldName);
+    let field = table.getField(fieldName);
+    if (!field && fieldName.split(".").length === 3) {
+      const [inboundTableName, inboundKey, refField] = fieldName.split(".");
+      const inboundTable = Table.findOne(inboundTableName);
+      field = inboundTable.getField(refField);
+    }
+
     if (!field) {
       res.send(req.query?.accept == "json" ? "[]" : "");
       return;

package/routes/list.js

@@ -65,7 +65,7 @@ router.get(
 
     const fields = table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
-
+    const pk_name = table.pk_name;
     tfields.push({
       label: req.__("Version"),
       key: (r) => r._version,
@@ -82,7 +82,7 @@ router.get(
       label: req.__("Restore"),
       key: (r) =>
         post_btn(
-          `/list/_restore/${table.name}/${r.id}/${r._version}`,
+          `/list/_restore/${table.name}/${r[pk_name]}/${r._version}`,
           req.__("Restore"),
           req.csrfToken()
         ),
@@ -281,6 +281,7 @@ router.get(
         field: "_versions",
         title: "Versions",
         formatter: "__versionsFormatter",
+        formatterParams: { pk_name: table.pk_name },
       });
     }
     jsfields.push({