Merge pull request #936 from rvsia/mergemaster

Merge master to V3

Author: Hyperkid123

.github/ISSUE_TEMPLATE/issue.md

@@ -1,6 +1,6 @@
 ---
 name: Issue
-about: This is a general issue for Data Driven Forms library.
+about: Issues are intended for reporting bugs. If you have questions/ideas or if you need any help, please use Discussions first.
 title: ''
 labels: ''
 assignees: ''

.github/pull_request_template.md

@@ -0,0 +1,27 @@
+Fixes #(issue) *(if applicable)*
+
+**Description**
+
+Please include a summary of the change.
+
+**Schema** *(if applicable)*
+
+```jsx
+```
+
+**Checklist:** *(please see [documentation page](https://data-driven-forms.org/development-setup) for more information)*
+
+- [ ] `Yarn build` passes
+- [ ] `Yarn lint` passes
+- [ ] `Yarn test` passes
+- [ ] Test coverage for new code *(if applicable)*
+- [ ] Documentation update *(if applicable)*
+- [ ] Correct commit message
+   - format `fix|feat({scope}): {description}`
+   - i.e. `fix(pf3): wizard correctly handles next button`
+   - fix will release a new \_.\_.X version
+   - feat will release a new \_.X.\_ version (use when you introduce new features)
+     - we want to avoid any breaking changes, please contact us, if there is no way how to avoid them
+   - scope: package
+   - if you update the documentation or tests, do not use this format
+     - i.e. `Fix button on documenation example page`

packages/ant-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/ant-component-mapper",
-  "version": "2.17.0",
+  "version": "2.19.1",
   "description": "Component mapper for Ant Design component mapper form data-driven-forms.",
   "main": "index.js",
   "module": "esm/index.js",

packages/ant-component-mapper/src/common/helpers.js

@@ -1,7 +1,7 @@
 export const validationError = (meta, validateOnMount) => {
   if (validateOnMount) {
-    return meta.error;
+    return meta.error || meta.submitError;
   }
 
-  return meta.touched && meta.error;
+  return meta.touched && (meta.error || meta.submitError);
 };

packages/ant-component-mapper/src/field-array/field-array.js

@@ -134,7 +134,7 @@ const DynamicArray = ({ ...props }) => {
     ...buttonLabels
   };
 
-  const { dirty, submitFailed, error } = meta;
+  const { dirty, submitFailed, error, submitError } = meta;
   const isError = (dirty || submitFailed) && error && typeof error === 'string';
   return (
     <FormGroup
@@ -228,10 +228,10 @@ const DynamicArray = ({ ...props }) => {
                   )}
                 </Row>
               </Col>
-              {isError && (
+              {(isError || submitError) && (
                 <Col span={12}>
                   <Typography.Text type="danger" {...ErrorMessageProps}>
-                    {typeof error === 'object' ? error.name : error}
+                    {typeof error === 'object' ? error.name : error || submitError}
                   </Typography.Text>
                 </Col>
               )}

packages/ant-component-mapper/src/tests/components.test.js

@@ -15,6 +15,7 @@ describe('formFields generated tests', () => {
       FormTemplate={(props) => <FormTemplate {...props} />}
       schema={schema}
       componentMapper={componentMapper}
+      subscription={{ submitFailed: true }}
       {...props}
     />
   );
@@ -288,6 +289,21 @@ describe('formFields generated tests', () => {
             ).toEqual(true);
           }
         });
+
+        it('renders with submitError', async () => {
+          const wrapper = mount(<RendererWrapper schema={schema} onSubmit={() => ({ [field.name]: errorText })} />);
+          await act(async () => {
+            wrapper.find('form').simulate('submit');
+          });
+          wrapper.update();
+          expect(
+            wrapper
+              .find('.ant-form-item-explain')
+              .last()
+              .text()
+          ).toEqual(errorText);
+          expect(wrapper.find('.ant-form-item-has-error').length).toBeGreaterThanOrEqual(1);
+        });
       });
     });
   });

packages/blueprint-component-mapper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-driven-forms/blueprint-component-mapper",
-  "version": "2.17.0",
+  "version": "2.19.1",
   "description": "Blueprint component mapper for data-driven-forms.",
   "main": "index.js",
   "module": "esm/index.js",

packages/blueprint-component-mapper/src/field-array/field-array.js

@@ -68,8 +68,8 @@ const FieldArray = (props) => {
 
   const { required } = useContext(BlueprintContext);
 
-  const { error, touched } = meta;
-  const showError = (validateOnMount || touched) && error;
+  const { error, touched, submitError } = meta;
+  const showError = (validateOnMount || touched) && (error || submitError);
 
   const text = showError ? error : helperText || description;
 

packages/blueprint-component-mapper/src/form-group/form-group.js

@@ -22,8 +22,8 @@ export const FormGroupInternal = ({
 }) => {
   const { required } = useContext(BlueprintContext);
 
-  const { error, touched, warning } = meta;
-  const showError = (validateOnMount || touched) && error;
+  const { error, touched, warning, submitError } = meta;
+  const showError = (validateOnMount || touched) && (error || submitError);
   const showWarning = (validateOnMount || touched) && warning;
 
   const text = showError || showWarning || helperText || description;

packages/blueprint-component-mapper/src/tests/components.test.js

@@ -15,6 +15,7 @@ describe('formFields generated tests', () => {
       FormTemplate={(props) => <FormTemplate {...props} />}
       schema={schema}
       componentMapper={componentMapper}
+      subscription={{ submitFailed: true }}
       {...props}
     />
   );
@@ -263,6 +264,18 @@ describe('formFields generated tests', () => {
             }
           }
         });
+
+        it('renders with error', () => {
+          const wrapper = mount(<RendererWrapper schema={schema} onSubmit={() => ({ [field.name]: errorText })} />);
+          wrapper.find('form').simulate('submit');
+          expect(
+            wrapper
+              .find('.bp3-form-helper-text')
+              .last()
+              .text()
+          ).toEqual(errorText);
+          expect(wrapper.find('.bp3-intent-danger').length).toBeGreaterThanOrEqual(1);
+        });
       });
     });
   });