@saltcorn/server 1.3.0-beta.11 → 1.3.0-beta.13

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/4645c945c8/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/b4eb491fac/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/4645c945c8/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/b4eb491fac/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/4645c945c8/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/b4eb491fac/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/locales/en.json

@@ -1619,5 +1619,6 @@
 	"Decimal places": "Decimal places",
 	"%s view - %s": "%s view - %s",
 	"Password to encrypt the backup file. Leave empty for no encryption": "Password to encrypt the backup file. Leave empty for no encryption",
-	"Show full error to user on crash, enable editing field type": "Show full error to user on crash, enable editing field type"
+	"Show full error to user on crash, enable editing field type": "Show full error to user on crash, enable editing field type",
+	"Shown to the user if foreign key constraint is violated": "Shown to the user if foreign key constraint is violated"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.0-beta.11",
+  "version": "1.3.0-beta.13",
   "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.11",
-    "@saltcorn/base-plugin": "1.3.0-beta.11",
-    "@saltcorn/builder": "1.3.0-beta.11",
-    "@saltcorn/data": "1.3.0-beta.11",
-    "@saltcorn/filemanager": "1.3.0-beta.11",
-    "@saltcorn/markup": "1.3.0-beta.11",
-    "@saltcorn/plugins-loader": "1.3.0-beta.11",
-    "@saltcorn/sbadmin2": "1.3.0-beta.11",
+    "@saltcorn/admin-models": "1.3.0-beta.13",
+    "@saltcorn/base-plugin": "1.3.0-beta.13",
+    "@saltcorn/builder": "1.3.0-beta.13",
+    "@saltcorn/data": "1.3.0-beta.13",
+    "@saltcorn/filemanager": "1.3.0-beta.13",
+    "@saltcorn/markup": "1.3.0-beta.13",
+    "@saltcorn/plugins-loader": "1.3.0-beta.13",
+    "@saltcorn/sbadmin2": "1.3.0-beta.13",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",
@@ -72,7 +72,7 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "^29.7.0",
+    "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "supertest": "7.0.0"
   },

package/routes/fields.js

@@ -251,6 +251,7 @@ const fieldFlow = (req) =>
       attributes.include_fts = context.include_fts;
       attributes.on_delete_cascade = context.on_delete_cascade;
       attributes.on_delete = context.on_delete;
+      attributes.fkey_error_msg = context.fkey_error_msg;
       attributes.unique_error_msg = context.unique_error_msg;
       if (context.protected) attributes.min_role_write = context.min_role_write;
       else attributes.min_role_write = undefined;
@@ -307,7 +308,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",
@@ -723,6 +724,15 @@ const fieldFlow = (req) =>
                   "If the parent row is deleted, do this to the child rows."
                 ),
               }),
+              new Field({
+                name: "fkey_error_msg",
+                label: req.__("Error message"),
+                type: "String",
+                sublabel: req.__(
+                  "Shown to the user if foreign key constraint is violated"
+                ),
+                showIf: { on_delete: "Fail" },
+              }),
             ],
           });
         },
@@ -1417,7 +1427,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/tables.js

@@ -748,6 +748,7 @@ const attribBadges = (f) => {
           "summary_field",
           "importance",
           "on_delete_cascade",
+          "fkey_error_msg",
           "on_delete",
           "unique_error_msg",
           "ref",