Merge pull request #138 from formio/FIO-8848-Error-message-appears-wh…

…en-attempting-to-add-Select-with-Raw-JSON-Data-Source-Type FIO-8848 fixed validation for TextArea with Save as Json
formio · Aug 21, 2024 · d596125 · d596125
2 parents 6c3ff4d + 28a6faa
commit d596125
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/process/validation/rules/__tests__/validateMultiple.test.ts b/src/process/validation/rules/__tests__/validateMultiple.test.ts
@@ -34,7 +34,7 @@ describe('validateMultiple', () => {
             expect(isEligible(component)).to.be.true;
         });
 
-        it('should return false for textArea component with as !== json', () => {
+        it('should return false for textArea component with as !== json if multiple', () => {
             const component: TextAreaComponent = {
                 type: 'textarea',
                 as: 'text',
@@ -50,9 +50,9 @@ describe('validateMultiple', () => {
             expect(isEligible(component)).to.be.false;
         });
 
-        it('should return true for textArea component with as === json', () => {
+        it('should return true for textArea component with as === json if multiple', () => {
             const component: TextAreaComponent = {
-                type: 'textArea',
+                type: 'textarea',
                 as: 'json',
                 input: true,
                 key: 'textAreaJson',
@@ -66,6 +66,21 @@ describe('validateMultiple', () => {
             expect(isEligible(component)).to.be.true;
         });
 
+        it('should return false for textArea component with as === json if not multiple', () => {
+            const component: TextAreaComponent = {
+                type: 'textarea',
+                as: 'json',
+                input: true,
+                key: 'textAreaJson',
+                rows: 4,
+                wysiwyg: true,
+                editor: 'ace',
+                fixedSize: true,
+                inputFormat: 'plain',
+            };
+            expect(isEligible(component)).to.be.false;
+        });
+
         it('should return true for other component types', () => {
             const component: Component = {
                 type: 'textfield',

diff --git a/src/process/validation/rules/validateMultiple.ts b/src/process/validation/rules/validateMultiple.ts
@@ -22,7 +22,8 @@ export const isEligible = (component: Component) => {
     case 'textarea':
       if (
         !(component as TextAreaComponent).as ||
-        (component as TextAreaComponent).as !== 'json'
+        (component as TextAreaComponent).as !== 'json' ||
+        ((component as TextAreaComponent).as === 'json' && !component.multiple)
       ) {
         return false;
       }