• R/O
  • HTTP
  • SSH
  • HTTPS

bytom-dashboard: Commit

dashboard of Bytom


Commit MetaInfo

Revision07714b907ddcfe635e70e5e377e733ee4c1c9623 (tree)
Time2019-07-18 16:27:45
AuthorZhiting Lin <zlin035@uott...>
CommiterZhiting Lin

Log Message

update the error message on file selection

Change Summary

Incremental Difference

--- a/src/features/shared/components/FileField.jsx
+++ b/src/features/shared/components/FileField.jsx
@@ -1,5 +1,13 @@
11 import React from 'react'
22 import { FieldLabel } from 'features/shared/components'
3+import pick from 'lodash/pick'
4+
5+const TEXT_FIELD_PROPS = [
6+ 'value',
7+ 'onBlur',
8+ 'onFocus',
9+ 'name'
10+]
311
412 class FileField extends React.Component {
513 constructor(props) {
@@ -13,7 +21,8 @@ class FileField extends React.Component {
1321 }
1422
1523 render() {
16-
24+ const fieldProps = pick(this.props.fieldProps, TEXT_FIELD_PROPS)
25+ const {touched, error} = this.props.fieldProps
1726 return(
1827 <div className='form-group'>
1928 {this.props.title && <FieldLabel>{this.props.title}</FieldLabel>}
@@ -21,6 +30,8 @@ class FileField extends React.Component {
2130 type='file'
2231 onChange={this.onChange}
2332 />
33+
34+ {touched && error && <span className='text-danger'><strong>{error}</strong></span>}
2435 {this.props.hint && <span className='help-block'>{this.props.hint}</span>}
2536 </div>
2637 )
--- a/src/features/shared/components/RestoreKeystore/RestoreKeystore.jsx
+++ b/src/features/shared/components/RestoreKeystore/RestoreKeystore.jsx
@@ -59,6 +59,15 @@ class RestoreKeystore extends React.Component {
5959 }
6060 }
6161
62+const validate = (values, props) => {
63+ const errors = {}
64+ const t = props.t
65+
66+ if (!values.file) {
67+ errors.file = ( t('form.required'))
68+ }
69+ return errors
70+}
6271
6372 export default withNamespaces('translations')( connect(
6473 () => ({}),
@@ -68,4 +77,5 @@ export default withNamespaces('translations')( connect(
6877 )(reduxForm({
6978 form: 'restoreKeystore',
7079 fields: ['file'],
80+ validate
7181 })(RestoreKeystore)))
Show on old repository browser