fix: only allow a array as value in variable option (#474)

* fix: only allow a array as value in variable option * fix: fix tests --------- Co-authored-by: Jordy Quak <[email protected]>
bettyblocks · Nov 13, 2024 · 7705f02 · 7705f02
1 parent 66f7e0b
commit 7705f02
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 6 deletions.
diff --git a/__tests__/validations/component.test.tsx b/__tests__/validations/component.test.tsx
@@ -1069,6 +1069,32 @@ test('Success when the optionRefs of the prefabs are valid', (t: Context): void
   t.notThrows(() => validatePrefabs(prefabs, {}));
 });
 
+test('Throws error when value is an empty string in variable option', (t: Context): void => {
+  const prefabs: Prefab[] = [
+    {
+      name: 'Test Component',
+      icon: 'PencilIcon',
+      category: 'LAYOUT',
+      structure: [
+        {
+          name: 'option',
+          options: [
+            {
+              value: '',
+              label: 'label',
+              key: 'key',
+              type: 'VARIABLE',
+            },
+          ],
+          descendants: [],
+        },
+      ],
+    },
+  ];
+
+  t.throws(() => validatePrefabs(prefabs, {}));
+});
+
 test('Does not throw when wrapper option has a optionRef', (t: Context): void => {
   const prefabs = [
     {
@@ -1123,3 +1149,29 @@ test('Does not throw when wrapper option has a optionRef', (t: Context): void =>
 
   t.notThrows(() => validatePrefabs(prefabs, {}));
 });
+
+test('Success when value is an array with empty string in variable option', (t: Context): void => {
+  const prefabs: Prefab[] = [
+    {
+      name: 'Component Name',
+      icon: 'TitleIcon',
+      category: 'CONTENT',
+      structure: [
+        {
+          name: 'something',
+          options: [
+            {
+              value: [''],
+              label: 'something',
+              key: 'something',
+              type: 'VARIABLE',
+            },
+          ],
+          descendants: [],
+        },
+      ],
+    },
+  ];
+
+  t.notThrows(() => validatePrefabs(prefabs, {}));
+});
diff --git a/src/types.ts b/src/types.ts
@@ -275,7 +275,7 @@ export interface PrefabComponentOptionBase {
 }
 
 export interface ValueDefault {
-  value: string | ValueConfig;
+  value: string | string[] | ValueConfig;
   ref?: { id?: string };
 }
 

diff --git a/src/validations/prefab/componentOption.ts b/src/validations/prefab/componentOption.ts
@@ -138,18 +138,24 @@ const OptionRefInheritObject = Joi.object({
   useKey: Joi.string(),
 });
 
+const optionValueSchema = Joi.when('ref', {
+  is: Joi.object({ value: Joi.exist() }).exist(),
+  then: Joi.forbidden(),
+  otherwise: Joi.any(),
+}).when('type', {
+  is: 'VARIABLE',
+  then: Joi.array().items(Joi.string().allow('')).required(),
+  otherwise: Joi.any(),
+});
+
 export const optionSchema = Joi.object({
   label: Joi.string().required(),
   key: Joi.string().required(),
   type: Joi.string()
     .valid(...OPTIONS)
     .required(),
   configuration: optionConfigurationSchema,
-  value: Joi.when('ref', {
-    is: Joi.object({ value: Joi.exist() }).exist(),
-    then: Joi.forbidden(),
-    otherwise: Joi.any(),
-  }),
+  value: optionValueSchema,
   showInAddChild: Joi.boolean(),
   showInReconfigure: Joi.boolean(),
   ref: refSchema,