@saltcorn/server 1.1.2-beta.16 → 1.1.2-beta.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +9 -9
  2. package/routes/tables.js +5 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@saltcorn/server",
3
- "version": "1.1.2-beta.16",
3
+ "version": "1.1.2-beta.17",
4
4
  "description": "Server app for Saltcorn, open-source no-code platform",
5
5
  "homepage": "https://saltcorn.com",
6
6
  "main": "index.js",
@@ -8,14 +8,14 @@
8
8
  "dependencies": {
9
9
  "@aws-sdk/client-s3": "^3.735.0",
10
10
  "@dr.pogodin/csurf": "^1.14.1",
11
- "@saltcorn/base-plugin": "1.1.2-beta.16",
12
- "@saltcorn/builder": "1.1.2-beta.16",
13
- "@saltcorn/data": "1.1.2-beta.16",
14
- "@saltcorn/admin-models": "1.1.2-beta.16",
15
- "@saltcorn/filemanager": "1.1.2-beta.16",
16
- "@saltcorn/markup": "1.1.2-beta.16",
17
- "@saltcorn/plugins-loader": "1.1.2-beta.16",
18
- "@saltcorn/sbadmin2": "1.1.2-beta.16",
11
+ "@saltcorn/base-plugin": "1.1.2-beta.17",
12
+ "@saltcorn/builder": "1.1.2-beta.17",
13
+ "@saltcorn/data": "1.1.2-beta.17",
14
+ "@saltcorn/admin-models": "1.1.2-beta.17",
15
+ "@saltcorn/filemanager": "1.1.2-beta.17",
16
+ "@saltcorn/markup": "1.1.2-beta.17",
17
+ "@saltcorn/plugins-loader": "1.1.2-beta.17",
18
+ "@saltcorn/sbadmin2": "1.1.2-beta.17",
19
19
  "@socket.io/cluster-adapter": "^0.2.1",
20
20
  "@socket.io/sticky": "^1.0.1",
21
21
  "adm-zip": "0.5.16",
package/routes/tables.js CHANGED
@@ -800,7 +800,9 @@ router.get(
800
800
  let fieldCard;
801
801
  const primaryKeys = fields.filter((f) => f.primary_key);
802
802
  const nPrimaryKeys = primaryKeys.length;
803
- const nonSerialPKS = primaryKeys.some((f) => f.attributes?.NonSerial);
803
+ const nonSerialPKS = primaryKeys.some(
804
+ (f) => f.attributes?.NonSerial && f.type?.name === "Integer"
805
+ );
804
806
 
805
807
  if (fields.length === 0) {
806
808
  fieldCard = [
@@ -864,11 +866,11 @@ router.get(
864
866
  { hover: true }
865
867
  );
866
868
  fieldCard = [
867
- (nPrimaryKeys > 1 || nonSerialPKS) &&
869
+ (nPrimaryKeys !== 1 || nonSerialPKS) &&
868
870
  div(
869
871
  { class: "alert alert-danger", role: "alert" },
870
872
  i({ class: "fas fa-exclamation-triangle" }),
871
- "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.",
873
+ "This table has composite, non-defaulted integer, or no primary keys, which are not supported in Saltcorn. A procedure to introduce a single autoincrementing primary key is available.",
872
874
  post_btn(
873
875
  `/table/repair-composite-primary/${table.id}`,
874
876
  "Add autoincrementing primary key",