Changes for page Context Search
Last modified by bougault on 2023/02/20 16:29
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -43,6 +43,7 @@ 43 43 this.rolesFilter = []; 44 44 this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`); 45 45 this.results = []; 46 + this.resultsCache = []; 46 46 } 47 47 toggleRoleFilter(roleName) { 48 48 if(this.rolesFilter.indexOf(roleName) === -1) { ... ... @@ -50,7 +50,6 @@ 50 50 } else { 51 51 this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 52 52 } 53 - console.log(this.rolesFilter); 54 54 this[roleName] = !this[roleName]; 55 55 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 56 56 this.handleSearch(); ... ... @@ -58,11 +58,9 @@ 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 - handleSearch() { 62 - console.log(this.rolesFilter) 63 - if(this.searchText !== "") { 61 + handleSearch(textSearch) { 62 + if(this.searchText !== "" || textSearch) { 64 64 if(this.searchText !== this.prevSearchText) { 65 - console.log(this.searchText, this.prevSearchText); 66 66 this.prevSearchText = this.searchText; 67 67 Promise.all([ 68 68 this.fetchWikiSearch(), ... ... @@ -69,13 +69,16 @@ 69 69 this.fetchFilterSearch() 70 70 ]).then(([wikiSearchResults, collabSearchResults]) => { 71 71 this.results = wikiSearchResults; 70 + this.resultsCache = wikiSearchResults; 72 72 console.log(wikiSearchResults, collabSearchResults); 73 73 }); 74 - } else if (this.searchText === this.prevSearchText) { 75 - console.log("Only apply filter on results"); 73 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 76 76 this.fetchFilterSearch().then(this.filterResults) 75 + } else { 76 + this.results = this.resultsCache; 77 77 } 78 78 } else { 79 + this.clearResults(); 79 79 console.log("no search text, should return filter search results if any"); 80 80 this.fetchFilterSearch().then(collabs => { 81 81 console.log("Format and display collabs", collabs); ... ... @@ -84,7 +84,6 @@ 84 84 } 85 85 hasActiveFilters() { 86 86 // we only look at role filters for POC. 87 - console.log('rolesfilter', this.rolesFilter); 88 88 return this.rolesFilter.length > 0; 89 89 } 90 90 fetchWikiSearch() { ... ... @@ -101,11 +101,13 @@ 101 101 }); 102 102 } 103 103 filterResults = (filteredCollabs) => { 104 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 105 105 const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 106 - const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 107 - this.results = filteredResults; 105 + this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 108 108 } 107 + clearResults() { 108 + this.results = []; 109 + this.resultsCache = []; 110 + } 109 109 getLink(xwikiDocSpace) { 110 110 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 111 111 } ... ... @@ -114,7 +114,7 @@ 114 114 <div> 115 115 <div> 116 116 <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 117 - <button @click="${this.handleSearch}">Search</button> 119 + <button @click="${() => this.handleSearch(true)}">Search</button> 118 118 </div> 119 119 <div> 120 120 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>