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
-
... ... @@ -36,12 +36,11 @@ 36 36 constructor() { 37 37 super(); 38 38 this.searchText = ""; 39 - this.prevSearchText = ""; 40 40 this.administrator = false; 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=`);43 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 45 45 this.results = []; 46 46 } 47 47 toggleRoleFilter(roleName) { ... ... @@ -52,59 +52,23 @@ 52 52 } 53 53 this[roleName] = !this[roleName]; 54 54 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 - this.handleSearch(); 56 56 } 57 57 setSearchText(e) { 58 58 this.searchText = e.target.value; 59 59 } 60 60 handleSearch() { 61 - console.log(this. rolesFilter)59 + console.log(this.searchText); 62 62 if(this.searchText !== "") { 63 - if(this.searchText !== this.prevSearchText) { 64 - console.log(this.searchText, this.prevSearchText); 65 - this.prevSearchText = this.searchText; 66 - Promise.all([ 67 - this.fetchWikiSearch(), 68 - this.fetchFilterSearch() 69 - ]).then(([wikiSearchResults, collabSearchResults]) => { 70 - this.results = wikiSearchResults; 71 - console.log(wikiSearchResults, collabSearchResults); 72 - }); 73 - } else if (this.searchText === this.prevSearchText) { 74 - console.log("Only apply filter on results"); 75 - this.fetchFilterSearch().then(this.filterResults) 76 - } 77 - } else { 78 - console.log("no search text, should return filter search results if any"); 79 - this.fetchFilterSearch().then(collabs => { 80 - console.log("Format and display collabs", collabs); 81 - }) 61 + this.fetchWikiSearch(); 82 82 } 83 83 } 84 - hasActiveFilters() { 85 - // we only look at role filters for POC. 86 - console.log('rolesfilter', this.rolesFilter); 87 - return this.rolesFilter.length > 0; 88 - } 89 89 fetchWikiSearch() { 90 90 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 91 - returnhandleXWikiSearch(this.searchText);66 + handleXWikiSearch(this.searchText).then(results => this.results = results); 92 92 } 93 - fetchFilterSearch() { 94 - return new Promise((resolve) => { 95 - if(this.hasActiveFilters()) { 96 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 97 - } else { 98 - resolve(null); 99 - } 100 - }); 68 + buildFilter() { 69 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 101 101 } 102 - filterResults = (filteredCollabs) => { 103 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 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); 107 - } 108 108 getLink(xwikiDocSpace) { 109 109 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 110 110 } ... ... @@ -158,5 +158,4 @@ 158 158 </script> 159 159 160 160 <clb-unified-search></clb-unified-search> 161 - 162 162 {{/html}}