FIX TreeDropdownField fails validation if it is empty

silverstripe · Sep 14, 2023 · 2862842 · 2862842
1 parent c9913dc
commit 2862842
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/TreeDropdownField/TreeDropdownField.js b/client/src/components/TreeDropdownField/TreeDropdownField.js
@@ -18,7 +18,7 @@ const SEARCH_DELAY = 500; // ms
 // legacy value for multi-select's empty value
 const MULTI_EMPTY_VALUE = 'unchanged';
 
-const SINGLE_EMPTY_VALUE = 0;
+const SINGLE_EMPTY_VALUE = '';
 
 class TreeDropdownField extends Component {
   constructor(props) {
@@ -174,7 +174,7 @@ class TreeDropdownField extends Component {
     // require an empty option in some instances
     // value is an empty string by react-select cannot find the options
     options.unshift({
-      id: this.props.data.multiple ? '' : SINGLE_EMPTY_VALUE,
+      id: SINGLE_EMPTY_VALUE,
       title: (this.props.data.hasEmptyDefault) ? this.props.data.emptyString : null,
       disabled: !options.length || !this.props.data.hasEmptyDefault,
     });
@@ -330,7 +330,7 @@ class TreeDropdownField extends Component {
     const parent = this.getVisibleTree();
 
     return options.filter((option) => {
-      if ((option.id === SINGLE_EMPTY_VALUE || option.id === '') &&
+      if ((option.id === SINGLE_EMPTY_VALUE) &&
         (!this.props.data.hasEmptyDefault || this.props.visible.length || this.hasSearch())
       ) {
           return false;

diff --git a/client/src/components/TreeDropdownField/tests/TreeDropdownField-test.js b/client/src/components/TreeDropdownField/tests/TreeDropdownField-test.js
@@ -495,7 +495,7 @@ describe('TreeDropdownField', () => {
         <TreeDropdownField {...props} />
       );
       const options = field.getDropdownOptions();
-      expect(options[0].id).toBe(0);
+      expect(options[0].id).toBe('');
     });
 
     it('should return an empty first option if node has no children', () => {
@@ -506,7 +506,7 @@ describe('TreeDropdownField', () => {
       const options = field.getDropdownOptions();
 
       expect(options.length).toBe(1);
-      expect(options[0].id).toBe(0);
+      expect(options[0].id).toBe('');
       expect(options[0].title).toBe(null);
       expect(options[0].disabled).toBe(true);
     });