Merge branch 'master' into production

Author: kevinkosterr

src/fields/core/FieldCheckbox.vue

@@ -49,5 +49,5 @@ const onFieldValueChanged = ({ target }) => {
   emits('onInput', target.checked)
 }
 
-defineExpose({ hint, noLabel: true })
+defineExpose({ hint, noLabel: true, errors })
 </script>

src/fields/core/FieldChecklist.vue

@@ -61,5 +61,5 @@ const onFieldValueChanged = ({ target }) => {
   })
 }
 
-defineExpose({ hint })
+defineExpose({ hint, errors })
 </script>

src/fields/core/FieldMask.vue

@@ -76,5 +76,5 @@ onBeforeMount(() => {
   }
 })
 
-defineExpose({ unmaskedValue, hint })
+defineExpose({ unmaskedValue, hint, errors })
 </script>

src/fields/core/FieldNumber.vue

@@ -59,5 +59,5 @@ const onFieldValueChanged = ({ target }) => {
   emits('onInput', parseFloat(target.value))
 }
 
-defineExpose({ hint })
+defineExpose({ hint, errors })
 </script>

src/fields/core/FieldPassword.vue

@@ -79,5 +79,5 @@ const onBlur = () => {
   })
 }
 
-defineExpose({ hint })
+defineExpose({ hint, errors })
 </script>

src/fields/core/FieldTextarea.vue

@@ -34,10 +34,10 @@ const { field, model } = toRefs(props)
 
 const { isRequired, isDisabled, isReadonly, hint } = useFieldAttributes(model.value, field.value)
 const { currentModelValue } = useFormModel(model.value, field.value)
-const { validate } = useFieldValidate(model.value, field.value)
+const { validate, errors } = useFieldValidate(model.value, field.value)
 
 const onBlur = () => {
-  validate().then((validationErrors) => {
+  validate(currentModelValue.value).then((validationErrors) => {
     emits('validated',
       validationErrors.length === 0,
       validationErrors,
@@ -47,8 +47,9 @@ const onBlur = () => {
 }
 
 const onFieldValueChanged = (event) => {
+  errors.value = []
   emits('onInput', event.target.value)
 }
 
-defineExpose({ hint })
+defineExpose({ hint, errors })
 </script>

tests/components/fields/FieldPassword.spec.js

@@ -112,4 +112,20 @@ describe('FieldPassword', () => {
     expect(wrapper.vm.errors.length).toBe(1)
   })
 
+  it('Should display error, with minimum length 3', async () => {
+    const schema = { ...form.schema }
+    const validator = (value) => value.length >= 3
+    schema.fields[0].validator = [ validator ]
+
+    const formWrapper = mountFormGenerator(schema, form.model)
+    const wrapper = formWrapper.findComponent(FieldPassword)
+    const input = wrapper.find('input[type=password]')
+    await input.setValue('aa')
+    await input.trigger('blur')
+    expect(wrapper.vm.errors.length).toBe(1)
+    const errorContainer = formWrapper.find('.errors')
+    expect(errorContainer.exists()).toBeTruthy()
+    expect(errorContainer.find('.error').element.innerHTML).toBe('Field is invalid')
+  })
+
 })