fix schema property minItems (#493)

alibaba · Dec 11, 2019 · 26e12aa · 26e12aa
1 parent 2de0b32
commit 26e12aa
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 6 deletions.
diff --git a/packages/react-schema-renderer/src/__tests__/json-schema.spec.tsx b/packages/react-schema-renderer/src/__tests__/json-schema.spec.tsx
@@ -3,17 +3,48 @@ import {
   registerFormField,
   connect,
   SchemaMarkupForm as SchemaForm,
-  SchemaMarkupField as Field
+  SchemaMarkupField as Field,
+  registerFieldMiddleware
 } from '../index'
+import '@testing-library/jest-dom/extend-expect'
+import { toArr } from '@uform/shared'
 import { render, fireEvent, wait } from '@testing-library/react'
 
+registerFieldMiddleware(Field => {
+  return props => {
+    const index = props.schema['x-props'] && props.schema['x-props'].index
+    return (
+      <div>
+        <Field {...props} />
+        <div data-testid={`test-errors-${index}`}>{props.errors}</div>
+      </div>
+    )
+  }
+})
+
 registerFormField(
   'string',
   connect()(props => (
     <input {...props} data-testid={props.testid} value={props.value || ''} />
   ))
 )
 
+registerFormField('array', props => {
+  const { value, renderField } = props
+  return (
+    <Fragment>
+      {toArr(value).map((item, index) => {
+        return (
+          <div data-testid="item" key={index}>
+            {renderField(index)}
+          </div>
+        )
+      })}
+    </Fragment>
+  )
+})
+
+
 describe('test all apis', () => {
   //todo
   test('title', () => {
@@ -56,11 +87,11 @@ describe('test all apis', () => {
     //todo
   })
 
-  test('exclusiveMaximum', () => {
+  test('minimum', () => {
     //todo
   })
 
-  test('minimum', () => {
+  test('exclusiveMaximum', () => {
     //todo
   })
 
@@ -84,9 +115,33 @@ describe('test all apis', () => {
     //todo
   })
 
-  test('minItems', () => {
-    //todo
+  test('array minItems', async () => {
+    const handleSubmit = jest.fn()
+    const handleValidateFailed = jest.fn()
+    const TestComponent = () => (
+      <SchemaForm onSubmit={handleSubmit} onValidateFailed={handleValidateFailed}>
+        <Fragment>
+          <Field name="text" type="array" minItems={2}>
+            <Field type="string"/>
+          </Field>
+          <button type="submit" data-testid="btn">
+            Submit
+          </button>
+        </Fragment>
+      </SchemaForm>
+    )
+
+    const { getByTestId, getByText } = render(<TestComponent />)
+
+    fireEvent.click(getByTestId('btn'))
+    await wait()
+    fireEvent.click(getByTestId('btn'))
+    await wait()
+    expect(handleSubmit).toHaveBeenCalledTimes(0)
+    expect(handleValidateFailed).toHaveBeenCalledTimes(2)
+    expect(getByText('The length or number of entries must be at least 2')).toBeVisible()
   })
+
   test('uniqueItems', () => {
     //todo
   })

diff --git a/packages/react-schema-renderer/src/shared/schema.ts b/packages/react-schema-renderer/src/shared/schema.ts
@@ -166,7 +166,7 @@ export class Schema implements ISchema {
       rules.push({ max: this.maxItems })
     }
     if (isValid(this.minItems)) {
-      rules.push({ max: this.minItems })
+      rules.push({ min: this.minItems })
     }
     if (isValid(this.maxLength)) {
       rules.push({ max: this.maxLength })