Merge branch '2.2' into 2

silverstripe · Jun 25, 2024 · bea2d5c · bea2d5c
2 parents 49d5750 + 09ebc84
commit bea2d5c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/Search/Search.js b/client/src/components/Search/Search.js
@@ -125,6 +125,14 @@ class Search extends Component {
       const value = formData[key];
       if (value) {
         data[key] = value;
+        // For has_one relations an autoscaffoled SearchableDropdownField will be used that itself
+        // uses a react-select field which uses objects as values. We need to extract the value
+        if (key.substring(key.length - 2) === 'ID'
+            && typeof value === 'object'
+            && value.hasOwnProperty('value')
+        ) {
+          data[key] = value.value;
+        }
       }
     });
 

diff --git a/client/src/components/SearchableDropdownField/SearchableDropdownField.js b/client/src/components/SearchableDropdownField/SearchableDropdownField.js
@@ -92,11 +92,7 @@ const SearchableDropdownField = ({
       setHasChanges(true);
       setJustChanged(true);
     }
-    if (multi) {
-      onChange(val);
-    } else {
-      onChange(val, { value: val.value });
-    }
+    onChange(val);
   };
 
   /**
@@ -126,15 +122,6 @@ const SearchableDropdownField = ({
 
   let val = value;
 
-  if (typeof val !== 'object' && (options && options.length > 0)) {
-    options.forEach(option => {
-      // eslint-disable-next-line eqeqeq
-      if (option.value == value) {
-        val = option;
-      }
-    });
-  }
-
   // For non-multi only the first value is needed
   if (!multi && val) {
     const keys = Object.keys(val);