fix: bug fixes related to input and configuration page

splunk · May 17, 2021 · ca21343 · ca21343
1 parent b5eb568
commit ca21343
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/ui/src/main/webapp/components/BaseFormView.jsx b/ui/src/main/webapp/components/BaseFormView.jsx
@@ -159,6 +159,7 @@ class BaseFormView extends PureComponent {
                             oauth: 'OAuth 2.0 Authentication',
                         };
                         entity.options = {};
+                        entity.options.isClearable = true;
                         entity.options.autoCompleteFields = authType.map((type) => {
                             return { label: content[type], value: type };
                         });
@@ -520,7 +521,7 @@ class BaseFormView extends PureComponent {
                 this.saveData();
             }
         };
-        if (this.hook && typeof this.hook.onSave === 'function') {
+        if (this.hook && typeof this.hook.onSave === 'function' && typeof  this.onSavePromise !== 'undefined') {
             this.onSavePromise.then(() => {
                 executeValidationSubmit();
             });
@@ -947,6 +948,10 @@ class BaseFormView extends PureComponent {
                         }
                         const temState = this.state.data[e.field];
 
+                        if(temState.placeholder) {
+                            e = { ...e, options: { ...e.options, placeholder: temState.placeholder }}
+                        }
+
                         return (
                             <ControlWrapper
                                 key={e.field}

diff --git a/ui/src/main/webapp/components/ComboBoxWrapper.jsx b/ui/src/main/webapp/components/ComboBoxWrapper.jsx
@@ -5,7 +5,7 @@ import styled from 'styled-components';
 
 const StyledDiv = styled.div`
     div:first-child {
-        width: 300px !important;
+        width: 320px !important;
     }
 `;
 

diff --git a/ui/src/main/webapp/components/DeleteModal.jsx b/ui/src/main/webapp/components/DeleteModal.jsx
@@ -27,6 +27,9 @@ class DeleteModal extends Component {
     }
 
     handleRequestClose = () => {
+        // set ErrorMsg to empty string on close or cancel
+        // so that on again open of modal it does not show the same ErrorMsg
+        this.state.ErrorMsg = '';
         this.props.handleRequestClose();
     };
 
@@ -43,9 +46,7 @@ class DeleteModal extends Component {
                     handleError: false,
                 })
                     .catch((err) => {
-                        const errorSubmitMsg = parseErrorMsg(
-                            err?.response?.data?.messages[0]?.text
-                        );
+                        const errorSubmitMsg = parseErrorMsg(err);
                         this.setState({ ErrorMsg: errorSubmitMsg, isDeleting: false });
                         return Promise.reject(err);
                     })

diff --git a/ui/src/main/webapp/components/SingleInputComponent.jsx b/ui/src/main/webapp/components/SingleInputComponent.jsx
@@ -36,6 +36,7 @@ function SingleInputComponent(props) {
         disableSearch,
         labelField,
         autoCompleteFields,
+        isClearable,
     } = controlOptions;
 
     function handleChange(e, obj) {
@@ -147,11 +148,15 @@ function SingleInputComponent(props) {
                     >
                         {options && options.length > 0 && options}
                     </SelectWrapper>
-                    <Button
-                        appearance="secondary"
-                        icon={<Clear />}
-                        onClick={() => restProps.handleChange(field, '')}
-                    />
+                    { isClearable !== true ? (
+                        <Button
+                            appearance="secondary"
+                            icon={<Clear />}
+                            onClick={() => restProps.handleChange(field, '')}
+                        />
+                    ) : (
+                        <></>
+                    )}
                 </>
             )}
         </>
@@ -176,6 +181,7 @@ SingleInputComponent.propTypes = {
         referenceName: PropTypes.string,
         disableSearch: PropTypes.bool,
         labelField: PropTypes.string,
+        isClearable: PropTypes.bool,
     }),
 };
 

diff --git a/ui/src/main/webapp/util/messageUtil.js b/ui/src/main/webapp/util/messageUtil.js
@@ -22,7 +22,7 @@ export const parseErrorMsg = (err) => {
     let matches;
     try {
         const msg = err.response.data.messages[0].text;
-        regex = /.+"REST Error \[[\d]+\]:\s+.+\s+--\s+([\s\S]*)"\.\s*See splunkd\.log(\/python.log)? for more details\./;
+        regex = /.+"REST Error \[[\d]+\]:\s+.+\s+--\s+(?:b'([\s\S]*)'|([\s\S]*))"\.\s*See splunkd\.log(\/python.log)? for more details\./;
         matches = regex.exec(msg);
         if (matches && matches[1]) {
             try {