@saltcorn/server 1.1.2-beta.13 → 1.1.2-beta.15

package/package.json

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

package/routes/tables.js

@@ -67,6 +67,7 @@ const {
   InvalidConfiguration,
   removeAllWhiteSpace,
   comparingCaseInsensitive,
+  validSqlId,
 } = require("@saltcorn/data/utils");
 const { EOL } = require("os");
 
@@ -484,7 +485,10 @@ const buildTableMarkup = (table) => {
   const members = fields
     // .filter((f) => !f.reftable_name)
     .map((f) =>
-      indentString(`${removeAllWhiteSpace(f.type_name)} ${f.name}`, 6)
+      indentString(
+        `${removeAllWhiteSpace(f.type_name)} ${validSqlId(f.name)}`,
+        6
+      )
     )
     .join(EOL);
   const keys = table
@@ -794,7 +798,9 @@ router.get(
     const triggers = table.id ? Trigger.find({ table_id: table.id }) : [];
     triggers.sort(comparingCaseInsensitive("name"));
     let fieldCard;
-    const nPrimaryKeys = fields.filter((f) => f.primary_key).length;
+    const primaryKeys = fields.filter((f) => f.primary_key);
+    const nPrimaryKeys = primaryKeys.length;
+    const nonSerialPKS = primaryKeys.some((f) => f.attributes?.NonSerial);
 
     if (fields.length === 0) {
       fieldCard = [
@@ -858,11 +864,11 @@ router.get(
         { hover: true }
       );
       fieldCard = [
-        nPrimaryKeys > 1 &&
+        (nPrimaryKeys > 1 || nonSerialPKS) &&
           div(
             { class: "alert alert-danger", role: "alert" },
             i({ class: "fas fa-exclamation-triangle" }),
-            "This table has composite primary keys which is not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
+            "This table has composite or non-defaulted primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
             post_btn(
               `/table/repair-composite-primary/${table.id}`,
               "Add autoincrementing primary key",

package/tests/admin.test.js

@@ -472,6 +472,18 @@ describe("actions", () => {
       .set("Cookie", loginCookie)
       .expect(toRedirect("/actions/"));
   });
+  it("post Never trigger with table", async () => {
+    const app = await getApp({ disableCsrf: true });
+    const loginCookie = await getAdminLoginCookie();
+    await request(app)
+      .post("/actions/new")
+      .set("Cookie", loginCookie)
+      .send("action=run_js_code")
+      .send("table_id=2")
+      .send("name=NeverTableTrigger")
+      .send("when_trigger=Never")
+      .expect(302);
+  });
 });
 describe("localizer", () => {
   itShouldRedirectUnauthToLogin("/site-structure/localizer");