Merge branch 'fix/default-value-autocomplete-error-PAGE-8465' into edge

bettyblocks · Dec 18, 2023 · e9018f2 · e9018f2
2 parents 0d3cb26 + da790e6
commit e9018f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/prefabs/autocompleteInput.tsx b/src/prefabs/autocompleteInput.tsx
@@ -293,7 +293,8 @@ const beforeCreate = ({
                 {
                   id: propertyId,
                   type: 'PROPERTY',
-                  name: `{{ ${model?.name}.${name} }}`,
+                  name: `{{ ${model?.name}.${name}.id }}`,
+                  useKey: propertyKind === 'OBJECT' ? 'uuid' : 'id',
                 },
               ];
 

diff --git a/src/prefabs/radioinput.tsx b/src/prefabs/radioinput.tsx
@@ -316,7 +316,7 @@ const beforeCreate = ({
                 {
                   id: propertyId,
                   type: 'PROPERTY',
-                  useKey: 'uuid',
+                  useKey: propertyKind === 'OBJECT' ? 'uuid' : 'id',
                 },
               ];
 

diff --git a/src/prefabs/selectinput.tsx b/src/prefabs/selectinput.tsx
@@ -325,7 +325,7 @@ const beforeCreate = ({
                 {
                   id: propertyId,
                   type: 'PROPERTY',
-                  useKey: 'uuid',
+                  useKey: propertyKind === 'OBJECT' ? 'uuid' : 'id',
                 },
               ];
 

diff --git a/yarn.lock b/yarn.lock
@@ -155,10 +155,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@betty-blocks/cli@^25.85.0":
-  version "25.87.0"
-  resolved "https://registry.npmjs.org/@betty-blocks/cli/-/cli-25.87.0.tgz"
-  integrity sha512-B2ImxZvfDCDvhliiooy7+O7UpyxYCZ5jT+nm84NhV+2ERjLEDpJM0N/FAx986srR2bvUAKGFUuk2JW1dgxJgzw==
+"@betty-blocks/cli@^25.90.0":
+  version "25.90.0"
+  resolved "https://registry.yarnpkg.com/@betty-blocks/cli/-/cli-25.90.0.tgz#4634d2414876ff2bfc37e2f71b0c2ee64f011293"
+  integrity sha512-6On0hTcFtCS7v+XBG4nfGxy7QaNF+scRxXeeKOva3YFgShP8XDsAQK+4wLLS64lFcn41colsjlI5+8TKC6pLbg==
   dependencies:
     "@azure/ms-rest-js" "^2.0.4"
     "@azure/storage-blob" "^10.3.0"
@@ -5335,7 +5335,7 @@ node-releases@^2.0.13:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
   integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
-nodemon@^2.0.15:
+nodemon@^2.0.22:
   version "2.0.22"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
   integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==