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,14 +43,15 @@ 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 = []; 47 47 } 48 48 toggleRoleFilter(roleName) { 48 + console.log("toggleRoleFilter", roleName, this.rolesFilter, this.rolesFilter.indexOf(roleName)); 49 49 if(this.rolesFilter.indexOf(roleName) === -1) { 50 50 this.rolesFilter.push(roleName); 51 51 } else { 52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);52 + this.rolesFilter.filter(role => role !== roleName); 53 53 } 54 + 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,37 +58,24 @@ 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 - handleSearch(textSearch) { 62 - if(this.searchText !== "" || textSearch) { 62 + handleSearch() { 63 + console.log(this.rolesFilter) 64 + if(this.searchText !== "") { 63 63 if(this.searchText !== this.prevSearchText) { 64 - this. clearResults();66 + console.log(this.searchText, this.prevSearchText); 65 65 this.prevSearchText = this.searchText; 66 - this.fetchWikiSearch().then(results => { 67 - console.log(results); 68 - this.resultsCache = results; 69 - if(this.hasActiveFilters()) { 70 - this.fetchFilterSearch().then(this.filterResults); 71 - } else { 72 - this.results = results; 73 - } 74 - }) 75 - /* 76 76 Promise.all([ 77 77 this.fetchWikiSearch(), 78 78 this.fetchFilterSearch() 79 79 ]).then(([wikiSearchResults, collabSearchResults]) => { 80 80 this.results = wikiSearchResults; 81 - this.resultsCache = wikiSearchResults; 82 82 console.log(wikiSearchResults, collabSearchResults); 83 83 }); 84 - */85 - }elseif(this.searchText===this.prevSearchText && this.hasActiveFilters()) {75 + } else if (this.searchText === this.prevSearchText) { 76 + console.log("Only apply filter on results"); 86 86 this.fetchFilterSearch().then(this.filterResults) 87 - } else { 88 - this.results = this.resultsCache; 89 89 } 90 90 } else { 91 - this.clearResults(); 92 92 console.log("no search text, should return filter search results if any"); 93 93 this.fetchFilterSearch().then(collabs => { 94 94 console.log("Format and display collabs", collabs); ... ... @@ -97,6 +97,7 @@ 97 97 } 98 98 hasActiveFilters() { 99 99 // we only look at role filters for POC. 88 + console.log('rolesfilter', this.rolesFilter); 100 100 return this.rolesFilter.length > 0; 101 101 } 102 102 fetchWikiSearch() { ... ... @@ -108,18 +108,16 @@ 108 108 if(this.hasActiveFilters()) { 109 109 fetch(this.filterUrl).then(res => res.json()).then(resolve); 110 110 } else { 111 - resolve( []);100 + resolve(null); 112 112 } 113 113 }); 114 114 } 115 115 filterResults = (filteredCollabs) => { 105 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 116 116 const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 117 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 107 + const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 108 + console.log(filteredResults); 118 118 } 119 - clearResults() { 120 - this.results = []; 121 - this.resultsCache = []; 122 - } 123 123 getLink(xwikiDocSpace) { 124 124 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 125 125 } ... ... @@ -128,7 +128,7 @@ 128 128 <div> 129 129 <div> 130 130 <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 131 - <button @click="${ () =>this.handleSearch(true)}">Search</button>118 + <button @click="${this.handleSearch}">Search</button> 132 132 </div> 133 133 <div> 134 134 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>