fix: enforce logic for displaying clear button for singleselect when …

…its disabled
splunk · Jun 17, 2021 · d430c85 · d430c85
1 parent 61011a3
commit d430c85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ui/src/main/webapp/components/BaseFormView.jsx b/ui/src/main/webapp/components/BaseFormView.jsx
@@ -169,7 +169,7 @@ class BaseFormView extends PureComponent {
                             oauth: 'OAuth 2.0 Authentication',
                         };
                         entity.options = {};
-                        entity.options.isClearable = true;
+                        entity.options.hideClearBtn = true;
                         entity.options.autoCompleteFields = authType.map((type) => {
                             return { label: content[type], value: type };
                         });

diff --git a/ui/src/main/webapp/components/SingleInputComponent.jsx b/ui/src/main/webapp/components/SingleInputComponent.jsx
@@ -41,7 +41,7 @@ function SingleInputComponent(props) {
         disableSearch,
         labelField,
         autoCompleteFields,
-        isClearable,
+        hideClearBtn,
     } = controlOptions;
 
     function handleChange(e, obj) {
@@ -120,6 +120,8 @@ function SingleInputComponent(props) {
 
     const effectiveDisabled = loading ? true : disabled;
     const effectivePlaceholder = loading ? _('Loading') : placeholder;
+    // hideClearBtn=true only passed for OAuth else its undefined
+    const effectiveIsClearable = effectiveDisabled ? false : !hideClearBtn;
 
     return (
         <>
@@ -153,7 +155,7 @@ function SingleInputComponent(props) {
                     >
                         {options && options.length > 0 && options}
                     </SelectWrapper>
-                    {isClearable !== true ? (
+                    {effectiveIsClearable ? (
                         <Button
                             data-test="clear"
                             appearance="secondary"
@@ -185,7 +187,7 @@ SingleInputComponent.propTypes = {
         referenceName: PropTypes.string,
         disableSearch: PropTypes.bool,
         labelField: PropTypes.string,
-        isClearable: PropTypes.bool,
+        hideClearBtn: PropTypes.bool,
     }),
 };