From 4d6066b81b5d799f02c2fef76b6a3903a6bd5938 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Tue, 27 Dec 2016 16:51:57 -0800
Subject: [PATCH] FormField proptypes
---
frontend/src/metabase/components/FormField.jsx | 6 ++++--
.../metabase/questions/containers/CollectionEditorForm.jsx | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/frontend/src/metabase/components/FormField.jsx b/frontend/src/metabase/components/FormField.jsx
index fb884258f82..3000b231d68 100644
--- a/frontend/src/metabase/components/FormField.jsx
+++ b/frontend/src/metabase/components/FormField.jsx
@@ -5,8 +5,10 @@ import cx from "classnames";
export default class FormField extends Component {
static propTypes = {
// redux-form compatible:
- error: PropTypes.object,
name: PropTypes.string,
+ error: PropTypes.any,
+ visited: PropTypes.bool,
+ active: PropTypes.bool,
displayName: PropTypes.string.isRequired,
@@ -16,7 +18,7 @@ export default class FormField extends Component {
};
getError() {
- if (this.props.error) {
+ if (this.props.error && this.props.visited !== false && this.props.active !== true) {
return this.props.error;
}
diff --git a/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx b/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
index a24db8e0900..f6a08a8de34 100644
--- a/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
+++ b/frontend/src/metabase/questions/containers/CollectionEditorForm.jsx
@@ -14,7 +14,7 @@ import { reduxForm } from "redux-form";
validate: (values) => {
const errors = {};
if (!values.name) {
- errors.name = true;
+ errors.name = "Name is required";
}
if (!values.color) {
errors.color = "Color is required";
--
GitLab