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,57 +36,40 @@ 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=&roles=`); 45 45 this.results = []; 46 - this.resultsCache = []; 47 47 } 48 48 toggleRoleFilter(roleName) { 49 - if(this.rolesFilter.indexOf(roleName) == =-1) {47 + if(this.rolesFilter.indexOf(roleName) == -1) { 50 50 this.rolesFilter.push(roleName); 51 51 } else { 52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);50 + this.rolesFilter.filter(role => role !== roleName); 53 53 } 54 54 this[roleName] = !this[roleName]; 55 55 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 56 - this.handleSearch(); 54 + // if search text then apply filter 55 + // else return filters result 57 57 } 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 - 62 62 handleSearch() { 63 63 if(this.searchText !== "") { 64 - if(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 - this.resultsCache = wikiSearchResults; 72 - console.log(wikiSearchResults, collabSearchResults); 73 - }); 74 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 75 - this.fetchFilterSearch().then(this.filterResults) 76 - } else { 77 - this.results = this.resultsCache; 78 - } 62 + Promise.all([ 63 + this.fetchWikiSearch(), 64 + this.fetchFilterSearch() 65 + ]) 79 79 } else { 80 - this.clearResults(); 81 81 console.log("no search text, should return filter search results if any"); 82 - this.fetchFilterSearch().then(collabs => { 83 - console.log("Format and display collabs", collabs); 84 - }) 85 85 } 86 86 } 87 87 hasActiveFilters() { 88 88 // we only look at role filters for POC. 89 - return this.roles Filter.length > 0;72 + return this.roles.length > 0; 90 90 } 91 91 fetchWikiSearch() { 92 92 // request should be built from component, not from "external" dependency. Leave it here like this for POC. ... ... @@ -94,21 +94,13 @@ 94 94 } 95 95 fetchFilterSearch() { 96 96 return new Promise((resolve) => { 97 - if( this.hasActiveFilters()){98 - fetch(this.filterUrl).then( res => res.json()).then(resolve);80 + if(hasActiveFilters) { 81 + fetch(this.filterUrl).then(console.log); 99 99 } else { 100 - resolve( []);83 + resolve(null); 101 101 } 102 102 }); 103 103 } 104 - filterResults = (filteredCollabs) => { 105 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 106 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 107 - } 108 - clearResults() { 109 - this.results = []; 110 - this.resultsCache = []; 111 - } 112 112 getLink(xwikiDocSpace) { 113 113 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 114 114 }