fix(CODE): ADDON-47714 Fixed dependent field reset issue (#120)

splunk · Oct 31, 2022 · 51d9f58 · 51d9f58
1 parent 1dd963d
commit 51d9f58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ui/src/main/webapp/components/BaseFormView.jsx b/ui/src/main/webapp/components/BaseFormView.jsx
@@ -698,6 +698,8 @@ class BaseFormView extends PureComponent {
                     if (required && !currentValue) {
                         load = false;
                         data[dependency] = null;
+                    } else if (currentValue === 'RESET_VALUE') {
+                        load = true;
                     } else {
                         data[dependency] = currentValue;
                     }

diff --git a/ui/src/main/webapp/components/SingleInputComponent.jsx b/ui/src/main/webapp/components/SingleInputComponent.jsx
@@ -89,7 +89,7 @@ function SingleInputComponent(props) {
         if (dependencyValues) {
             options.params = { ...options.params, ...dependencyValues };
         }
-        if (!dependencies || dependencyValues) {
+        if (!dependencies || (dependencyValues && Object.keys(dependencyValues).length)) {
             setLoading(true);
             axiosCallWrapper(options)
                 .then((response) => {
@@ -107,6 +107,8 @@ function SingleInputComponent(props) {
                         setLoading(false);
                     }
                 });
+        } else {
+            setOptions(null);
         }
         // eslint-disable-next-line consistent-return
         return () => {
@@ -158,7 +160,7 @@ function SingleInputComponent(props) {
                             data-test="clear"
                             appearance="secondary"
                             icon={<Clear />}
-                            onClick={() => restProps.handleChange(field, '')}
+                            onClick={() => restProps.handleChange(field, 'RESET_VALUE')}
                         />
                     ) : null}
                 </>