@saltcorn/builder 1.1.4-beta.9 → 1.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/builder",
-  "version": "1.1.4-beta.9",
+  "version": "1.2.0-beta.0",
   "description": "Drag and drop view builder for Saltcorn, open-source no-code platform",
   "main": "index.js",
   "homepage": "https://saltcorn.com",
@@ -20,7 +20,7 @@
     "@babel/preset-react": "7.24.7",
     "@craftjs/core": "0.1.0-beta.20",
     "@craftjs/utils": "0.1.0-beta.20",
-    "@saltcorn/common-code": "1.1.4-beta.9",
+    "@saltcorn/common-code": "1.2.0-beta.0",
     "saltcorn-craft-layers-noeye": "0.1.0-beta.22",
     "@fonticonpicker/react-fonticonpicker": "1.2.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",

package/src/components/Toolbox.js

@@ -36,6 +36,7 @@ import {
   TextareaT,
 } from "react-bootstrap-icons";
 import { chunk } from "lodash";
+import { rand_ident } from "./elements/utils";
 
 /**
  *
@@ -468,7 +469,7 @@ const ActionElem = ({ connectors, options }) => (
       confirm={false}
       action_label={""}
       isFormula={{}}
-      rndid={"not_assigned"}
+      rndid={rand_ident()}
       configuration={{}}
     />
   </WrapElem>

package/src/components/elements/RelationBadges.js

@@ -1,13 +1,19 @@
 import React from "react";
 import { removeWhitespaces } from "./utils";
-import { parseLegacyRelation, RelationType } from "@saltcorn/common-code";
+import {
+  parseLegacyRelation,
+  RelationType,
+  Relation,
+} from "@saltcorn/common-code";
 
-const buildBadgeCfgs = (sourceTblName, type, path, caches) => {
+const buildBadgeCfgs = (sourceTblName, type, path, caches, relString) => {
   if (type === RelationType.OWN)
     return [{ table: `${sourceTblName} (same table)` }];
   else if (type === RelationType.INDEPENDENT)
     return [{ table: "None (no relation)" }];
   else if (path.length === 0) return [{ table: "invalid relation" }];
+  else if (relString === Relation.fixedUserRelation)
+    return [{ table: "logged in user" }];
   else {
     const result = [];
     let currentCfg = null;
@@ -83,7 +89,8 @@ export const RelationBadges = ({ view, relation, parentTbl, caches }) => {
           relation.sourceTblName,
           relation.type,
           relation.path,
-          caches
+          caches,
+          relation.relationString
         ).map(buildBadge)}
       </div>
     );
@@ -99,11 +106,18 @@ export const RelationBadges = ({ view, relation, parentTbl, caches }) => {
           {buildBadge({ table: path[0].table }, 0)}
         </div>
       );
-    else
+    else if (relation)
       return (
         <div className="overflow-scroll">
-          {buildBadgeCfgs(parentTbl, type, path, caches).map(buildBadge)}
+          {buildBadgeCfgs(
+            parentTbl,
+            type,
+            path,
+            caches,
+            relation.relationString
+          ).map(buildBadge)}
         </div>
       );
+    else return null;
   }
 };

package/src/components/elements/utils.js

@@ -1551,7 +1551,7 @@ const ButtonOrLinkSettingsRows = ({
         ]
       : []),
     values[keyPrefix + "style"] !== "on_page_load" ? (
-      <Fragment>
+      <Fragment key="btnfrag">
         <tr key="btntitle">
           <td>
             <label>Hover title</label>
@@ -1773,7 +1773,16 @@ export const buildLayers = (relations, tableName, tableNameCache) => {
         fkeys: [],
         relPath: relation.relationString,
       });
-    } else {
+    } else if (relation.isFixedRelation()) {
+      currentLevel.fkeys.push({
+        name: "logged in user",
+        table: "users",
+        inboundKeys: [],
+        fkeys: [],
+        relPath: relation.relationString,
+      });
+    }
+    else {
       let currentTbl = relation.sourceTblName;
       for (const pathElement of relation.path) {
         if (pathElement.inboundKey) {