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,12 +43,13 @@ 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 - if(this.rolesFilter.indexOf(roleName) == -1) { 49 + if(this.rolesFilter.indexOf(roleName) === -1) { 49 49 this.rolesFilter.push(roleName); 50 50 } else { 51 - this.rolesFilter.filter(role => role !== roleName); 52 + this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 52 52 } 53 53 this[roleName] = !this[roleName]; 54 54 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); ... ... @@ -57,11 +57,9 @@ 57 57 setSearchText(e) { 58 58 this.searchText = e.target.value; 59 59 } 60 - handleSearch() { 61 - console.log(this.rolesFilter) 62 - if(this.searchText !== "") { 61 + handleSearch(textSearch) { 62 + if(this.searchText !== "" || textSearch) { 63 63 if(this.searchText !== this.prevSearchText) { 64 - console.log(this.searchText, this.prevSearchText); 65 65 this.prevSearchText = this.searchText; 66 66 Promise.all([ 67 67 this.fetchWikiSearch(), ... ... @@ -68,13 +68,16 @@ 68 68 this.fetchFilterSearch() 69 69 ]).then(([wikiSearchResults, collabSearchResults]) => { 70 70 this.results = wikiSearchResults; 70 + this.resultsCache = wikiSearchResults; 71 71 console.log(wikiSearchResults, collabSearchResults); 72 72 }); 73 - } else if (this.searchText === this.prevSearchText) { 74 - console.log("Only apply filter on results"); 73 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 75 75 this.fetchFilterSearch().then(this.filterResults) 75 + } else { 76 + this.results = this.resultsCache; 76 76 } 77 77 } else { 79 + this.clearResults(); 78 78 console.log("no search text, should return filter search results if any"); 79 79 this.fetchFilterSearch().then(collabs => { 80 80 console.log("Format and display collabs", collabs); ... ... @@ -83,7 +83,6 @@ 83 83 } 84 84 hasActiveFilters() { 85 85 // we only look at role filters for POC. 86 - console.log('rolesfilter', this.rolesFilter); 87 87 return this.rolesFilter.length > 0; 88 88 } 89 89 fetchWikiSearch() { ... ... @@ -95,16 +95,18 @@ 95 95 if(this.hasActiveFilters()) { 96 96 fetch(this.filterUrl).then(res => res.json()).then(resolve); 97 97 } else { 98 - resolve( null);99 + resolve([]); 99 99 } 100 100 }); 101 101 } 102 102 filterResults = (filteredCollabs) => { 103 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 104 104 const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 105 - const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 106 - console.log(filteredResults); 105 + this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 107 107 } 107 + clearResults() { 108 + this.results = []; 109 + this.resultsCache = []; 110 + } 108 108 getLink(xwikiDocSpace) { 109 109 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 110 110 }