ADDON-34289: Updated Text, Radio and CheckBox components

splunk · Mar 5, 2021 · 057b670 · 057b670
1 parent 200b680
commit 057b670
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/CheckBoxComponent.jsx
@@ -7,20 +7,19 @@ class CheckBoxComponent extends Component {
         super(props);
     }
 
-    handleClick = (e) => {
-        this.props.handleClick(this.props.id, e.target.value);
+    handleChange = (e, {value}) => {
+        this.props.handleChange(this.props.id, value);
     };
 
     render() {
         return (
             <Switch
                 key={this.props.field}
                 value={this.props.value}
-                onClick={this.handleClick}
+                onClick={this.handleChange}
                 selected={this.props.value === 1 ? true : false}
                 appearance="checkbox"
             >
-                {this.props.label}
             </Switch>
         );
     }
@@ -31,7 +30,6 @@ CheckBoxComponent.propTypes = {
     value: PropTypes.string,
     handleClick: PropTypes.func.isRequired,
     field: PropTypes.string,
-    label: PropTypes.string,
     controlOptions: PropTypes.object,
 };
 

diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/RadioComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/RadioComponent.jsx
@@ -7,17 +7,17 @@ class RadioComponent extends Component {
         super(props);
     }
 
-    handleChange = (e) => {
-        this.props.handleChange(this.props.id, e.target.value)
+    handleChange = (e, { value }) => {
+        this.props.handleChange(this.props.id, value);
     };
 
     render() {
         return (
             <RadioBar
+                inline
                 onChange={this.handleChange}
                 value={this.props.value}
                 key={this.props.field}
-                style={{ width: 200 }}
             >
                 {this.props.controlOptions.items.map(item => (
                     <RadioBar.Option key={item.value} value={item.value} label={item.label} />
@@ -32,7 +32,7 @@ RadioComponent.propTypes = {
     value: PropTypes.string,
     handleChange: PropTypes.func.isRequired,
     field: PropTypes.string,
-    controlOptions: PropTypes.object 
+    controlOptions: PropTypes.object
 };
 
 

diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TextComponent.jsx
@@ -7,8 +7,8 @@ class TextComponent extends Component {
         super(props);
     }
 
-    handleChange = (e) => {
-        this.props.handleChange(this.props.id, e.target.value);
+    handleChange = (e, {value}) => {
+        this.props.handleChange(this.props.id, value);
     };
 
     render() {
@@ -17,7 +17,7 @@ class TextComponent extends Component {
                 inline
                 placeholder={this.props.controlOptions.placeholder}
                 className={this.props.field}
-                disabled={this.props.controlOptions.display === false ? true : false}
+                disabled={this.props.disabled}
                 value={this.props.value}
                 onChange={this.handleChange}
                 type={this.props.encrypted === true ? 'password' : 'text'}