Merge pull request #3272 from bettyblocks/fix/default-value-object-co…

…mponents-PAGE-3610 Fix/default value object components page 3610
bettyblocks · Nov 2, 2023 · 127ed4c · 127ed4c
2 parents 60d5f84 + bc241ad
commit 127ed4c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/src/components/radioinput.js b/src/components/radioinput.js
@@ -70,7 +70,9 @@
     let resolvedCurrentValue;
 
     // set the value based on the selected property type (list, relational or object)
-    if (isListProperty || isObjectProperty) {
+    if (isObjectProperty) {
+      resolvedCurrentValue = JSON.stringify({ uuid: defaultValueText });
+    } else if (isListProperty) {
       resolvedCurrentValue = defaultValueText;
     } else if (isPropertyArray && !isObjectProperty) {
       resolvedCurrentValue = parseInt(defaultValueText, 10) || '';

diff --git a/src/components/selectInput.js b/src/components/selectInput.js
@@ -57,7 +57,10 @@
     } = modelProperty;
 
     const isObjectProperty = kind === 'object' || kind === 'OBJECT';
-    const resolvedCurrentValue = defaultValueText || placeholderLabelText;
+
+    const resolvedCurrentValue = isObjectProperty
+      ? JSON.stringify({ uuid: defaultValueText })
+      : defaultValueText || placeholderLabelText;
 
     const [currentValue, setCurrentValue] = useState(resolvedCurrentValue);
     B.defineFunction('Clear', () => setCurrentValue(''));

diff --git a/src/prefabs/questionnaire/dropdownWidget.ts b/src/prefabs/questionnaire/dropdownWidget.ts
@@ -204,7 +204,9 @@ export const dropdownWidget = [
                     value: [''],
                     optionRef: {
                       sourceId: '#dropdownInputPropertyRef',
-                      inherit: [{ name: '$name', id: '$id', type: 'PROPERTY' }],
+                      inherit: [
+                        { id: '$id', type: 'PROPERTY', useKey: 'uuid' },
+                      ],
                     },
                   }),
                   floatLabel: toggle('Place label above input', {

diff --git a/src/prefabs/questionnaire/radioWidget.ts b/src/prefabs/questionnaire/radioWidget.ts
@@ -202,7 +202,11 @@ export const radioWidget = [
                       optionRef: {
                         sourceId: '#radioInputPropertyRef',
                         inherit: [
-                          { name: '$name', id: '$id', type: 'PROPERTY' },
+                          {
+                            id: '$id',
+                            type: 'PROPERTY',
+                            useKey: 'uuid',
+                          },
                         ],
                       },
                     }),

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

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