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
-
... ... @@ -41,14 +41,14 @@ 41 41 this.editor = false; 42 42 this.viewer = false; 43 43 this.rolesFilter = []; 44 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc& limit=10000&favorite=false&roles=`);44 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); 45 45 this.results = []; 46 46 } 47 47 toggleRoleFilter(roleName) { 48 - if(this.rolesFilter.indexOf(roleName) == =-1) {48 + if(this.rolesFilter.indexOf(roleName) == -1) { 49 49 this.rolesFilter.push(roleName); 50 50 } else { 51 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);51 + this.rolesFilter.filter(role => role !== roleName); 52 52 } 53 53 this[roleName] = !this[roleName]; 54 54 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); ... ... @@ -58,22 +58,21 @@ 58 58 this.searchText = e.target.value; 59 59 } 60 60 handleSearch() { 61 - 62 62 if(this.searchText !== "") { 63 - if(this.searchText !== this.prevSearchText) {64 - console.log("1st")65 - console.log(this.searchText,this.prevSearchText);66 - this.prevSearchText = this.searchText;67 - Promise.all([68 - this.fetchWikiSearch(),69 - this.fetchFilterSearch()70 - ]).then(([wikiSearchResults,collabSearchResults]) => {71 - this.results= wikiSearchResults;72 - console.log(wikiSearchResults, collabSearchResults);73 - });74 - } elseif(this.searchText===this.prevSearchText && this.hasActiveFilters()) {75 - this.fetchFilterSearch().then(this.filterResults)76 - }62 + if(this.searchText !== this.prevSearchText) { 63 + console.log(this.searchText, this.prevSearchText); 64 + this.prevSearchText = this.searchText; 65 + Promise.all([ 66 + this.fetchWikiSearch(), 67 + this.fetchFilterSearch() 68 + ]).then(([wikiSearchResults, collabSearchResults]) => { 69 + this.results = wikiSearchResults; 70 + console.log(wikiSearchResults, collabSearchResults); 71 + }); 72 + } else if (this.searchText === this.prevSearchText) { 73 + console.log("Only apply filter on results"); 74 + this.fetchFilterSearch().then(this.filterResults) 75 + } 77 77 } else { 78 78 console.log("no search text, should return filter search results if any"); 79 79 this.fetchFilterSearch().then(collabs => { ... ... @@ -83,6 +83,7 @@ 83 83 } 84 84 hasActiveFilters() { 85 85 // we only look at role filters for POC. 85 + console.log('rolesfilter', this.rolesFilter); 86 86 return this.rolesFilter.length > 0; 87 87 } 88 88 fetchWikiSearch() { ... ... @@ -94,7 +94,7 @@ 94 94 if(this.hasActiveFilters()) { 95 95 fetch(this.filterUrl).then(res => res.json()).then(resolve); 96 96 } else { 97 - resolve( []);97 + resolve(null); 98 98 } 99 99 }); 100 100 } ... ... @@ -102,7 +102,7 @@ 102 102 console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 103 103 const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 104 104 const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 105 - this.results =filteredResults;105 + console.log(filteredResults); 106 106 } 107 107 getLink(xwikiDocSpace) { 108 108 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;