Fixes an issue where folder search would not work in resrouce manager (…

…#4202) Closes #4200 The filtering logic was applied with a null result and removing all the results, I added a check for null which makes the fileting work when the search is used.
dnnsoftware · Oct 16, 2020 · fb38f8d · fb38f8d
1 parent 1b61172
commit fb38f8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...odules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderPicker.jsx b/...odules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderPicker.jsx
@@ -58,14 +58,15 @@ export default class FolderPicker extends React.Component {
         if (this.unmounted) {
             return;
         }
-        
+
         const { props } = this;
         let homeFolderId = props.homeFolderId;
 
         let source = result.Tree;
         let filtered = this.findNode(source, (n) => {return n !== null && n.data.key === homeFolderId.toString();});
-        source.children.splice(0, source.children.length, filtered);
-
+        if (filtered !== null){
+            source.children.splice(0, source.children.length, filtered);
+        }
         this.setState({ folders: result.Tree });
     }
 

diff --git a/...ules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx b/...ules/ResourceManager/ResourceManager.Web/app/components/FolderSelector/FolderSelector.jsx
@@ -51,7 +51,9 @@ export default class FolderSelector extends Component {
         const searchFolderText = e.target.value ? e.target.value : "";
         this.setState({ searchFolderText });
         clearTimeout(this.timeOut);
-        this.timeOut = setTimeout(() => {this.props.searchFolder(searchFolderText.toLowerCase());}, 500);
+        this.timeOut = setTimeout(() => 
+            this.props.searchFolder(searchFolderText.toLowerCase()),
+        500);
     }
 
     clearSearch(e) {
@@ -87,7 +89,7 @@ export default class FolderSelector extends Component {
                             <input 
                                 type="text" 
                                 value={this.state.searchFolderText} 
-                                onChange={this.onChangeSearchFolderText.bind(this) } 
+                                onChange={e => this.onChangeSearchFolderText(e) } 
                                 placeholder={searchFolderPlaceHolder}
                                 aria-label="Search" />
                             {this.state.searchFolderText &&