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
-
... ... @@ -58,7 +58,9 @@ 58 58 this.searchText = e.target.value; 59 59 } 60 60 handleSearch() { 61 - if(this.searchText !== "" && this.searchText !== this.prevSearchText) { 61 + if(this.searchText !== "") { 62 + if(this.searchText !== this.prevSearchText) { 63 + console.log(this.searchText, this.prevSearchText); 62 62 this.prevSearchText = this.searchText; 63 63 Promise.all([ 64 64 this.fetchWikiSearch(), ... ... @@ -68,10 +68,11 @@ 68 68 }); 69 69 } else if (this.searchText === this.prevSearchText) { 70 70 console.log("Only apply filter on results"); 71 - this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) 73 + this.fetchFilterSearch().then(this.filterResults) 74 + } 72 72 } else { 73 73 console.log("no search text, should return filter search results if any"); 74 - this.fetchFilterSearch().then( res => res.json()).then(collabs => {77 + this.fetchFilterSearch().then(collabs => { 75 75 console.log("Format and display collabs", collabs); 76 76 }) 77 77 } ... ... @@ -86,15 +86,18 @@ 86 86 } 87 87 fetchFilterSearch() { 88 88 return new Promise((resolve) => { 89 - if(hasActiveFilters) { 90 - fetch(this.filterUrl).then( console.log);92 + if(this.hasActiveFilters) { 93 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 91 91 } else { 92 92 resolve(null); 93 93 } 94 94 }); 95 95 } 96 - filterResults(filteredCollabs) { 99 + filterResults = (filteredCollabs) => { 97 97 console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 101 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 102 + const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); 103 + console.log(filteredResults); 98 98 } 99 99 getLink(xwikiDocSpace) { 100 100 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;