From fa251e76ffca327f1949bb4d1cee02908eefda8c Mon Sep 17 00:00:00 2001
From: Kyle Doherty <kdoh@users.noreply.github.com>
Date: Mon, 14 Aug 2017 12:38:11 -0500
Subject: [PATCH] clean up EditReferenceHeader and Detail inputs (#5719)
---
.../metabase/reference/components/Detail.jsx | 2 +-
.../components/EditableReferenceHeader.jsx | 23 +++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/frontend/src/metabase/reference/components/Detail.jsx b/frontend/src/metabase/reference/components/Detail.jsx
index b59fc544554..ca98acc90f7 100644
--- a/frontend/src/metabase/reference/components/Detail.jsx
+++ b/frontend/src/metabase/reference/components/Detail.jsx
@@ -21,7 +21,7 @@ const Detail = ({ name, description, placeholder, subtitleClass, url, icon, isEd
<textarea
className={S.detailTextarea}
placeholder={placeholder}
- {...field}
+ onChange={field.onChange}
//FIXME: use initialValues from redux forms instead of default value
// to allow for reinitializing on cancel (see GettingStartedGuide.jsx)
defaultValue={description}
diff --git a/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx b/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
index 4e7cbb0e52d..0ea58d8248a 100644
--- a/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
+++ b/frontend/src/metabase/reference/components/EditableReferenceHeader.jsx
@@ -10,6 +10,7 @@ import E from "metabase/reference/components/EditButton.css";
import IconBorder from "metabase/components/IconBorder.jsx";
import Icon from "metabase/components/Icon.jsx";
+import Input from "metabase/components/Input.jsx";
import Ellipsified from "metabase/components/Ellipsified.jsx";
import EditButton from "metabase/reference/components/EditButton.jsx";
@@ -54,21 +55,19 @@ const EditableReferenceHeader = ({
style={isEditing && name === 'Details' ? {alignItems: "flex-start"} : {}}
>
{ isEditing && name === 'Details' ?
- hasDisplayName ?
- <input
+ <Input
className={S.headerTextInput}
type="text"
placeholder={entity.name}
- {...displayNameFormField}
- defaultValue={entity.display_name}
- /> :
- <input
- className={S.headerTextInput}
- type="text"
- placeholder={entity.name}
- {...nameFormField}
- defaultValue={entity.name}
- /> :
+ onChange={
+ hasDisplayName ? displayNameFormField.onChange : nameFormField.onChange
+ }
+ defaultValue={
+ hasDisplayName ? entity.display_name : entity.name
+ }
+
+ />
+ :
[
<Ellipsified
key="1"
--
GitLab