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
-
... ... @@ -1,7 +1,6 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 - !!! Many optimisations can be done !!! 3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 5 5 --> 6 6 <script type="module"> 7 7 import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; ... ... @@ -23,9 +23,6 @@ 23 23 results: { type: Array } 24 24 } 25 25 static styles = css` 26 - :host > div { 27 - padding-bottom: 4em; 28 - } 29 29 .result { 30 30 margin-top: 1em; 31 31 } ... ... @@ -40,96 +40,47 @@ 40 40 constructor() { 41 41 super(); 42 42 this.searchText = ""; 43 - this.prevSearchText = ""; 44 44 this.administrator = false; 45 45 this.editor = false; 46 46 this.viewer = false; 47 47 this.rolesFilter = []; 48 - 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=`); 49 49 this.results = []; 50 - this.resultsCache = []; 51 51 } 52 - firstUpdated() { 53 - this.renderRoot.getElementById('searchInput').focus(); 54 - } 55 55 toggleRoleFilter(roleName) { 56 - if(this.rolesFilter.indexOf(roleName) == =-1) {47 + if(this.rolesFilter.indexOf(roleName) == -1) { 57 57 this.rolesFilter.push(roleName); 58 58 } else { 59 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);50 + this.rolesFilter.filter(role => role !== roleName); 60 60 } 61 61 this[roleName] = !this[roleName]; 62 62 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 63 - this. handleSearch();54 + console.log(this.filterUrl.toString()); 64 64 } 65 65 setSearchText(e) { 66 66 this.searchText = e.target.value; 67 67 } 68 - handleSearch(textSearch) { 69 - if(this.searchText !== "" || textSearch) { 70 - if(this.searchText !== this.prevSearchText) { 71 - this.clearResults(); 72 - this.prevSearchText = this.searchText; 73 - this.fetchWikiSearch().then(results => { 74 - this.resultsCache = results; 75 - if(this.hasActiveFilters()) { 76 - this.fetchFilterSearch().then(this.filterResults); 77 - } else { 78 - this.results = results; 79 - } 80 - }) 81 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 82 - this.fetchFilterSearch().then(this.filterResults) 83 - } else { 84 - this.results = this.resultsCache; 85 - } 86 - } else { 87 - this.clearResults(); 88 - console.log("no search text, should return filter search results if any"); 89 - this.fetchFilterSearch().then(collabs => { 90 - console.log("Format and display collabs", collabs); 91 - }) 59 + handleSearch() { 60 + console.log(this.searchText); 61 + if(this.searchText !== "") { 62 + this.fetchWikiSearch(); 92 92 } 93 93 } 94 - hasActiveFilters() { 95 - // we only look at role filters for POC. 96 - return this.rolesFilter.length > 0; 97 - } 98 98 fetchWikiSearch() { 99 99 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 100 - returnhandleXWikiSearch(this.searchText);67 + handleXWikiSearch(this.searchText).then(results => this.results = results); 101 101 } 102 - fetchFilterSearch() { 103 - return new Promise((resolve) => { 104 - if(this.hasActiveFilters()) { 105 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 106 - } else { 107 - resolve([]); 108 - } 109 - }); 110 - } 111 - filterResults = (filteredCollabs) => { 112 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 113 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 114 - } 115 - clearResults() { 116 - this.results = []; 117 - this.resultsCache = []; 118 - } 69 + 70 + 119 119 getLink(xwikiDocSpace) { 120 120 return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 121 121 } 122 - handleKeyPress(e) { 123 - if (e.keyCode === 13) { 124 - this.handleSearch(true); 125 - } 126 - } 127 127 render() { 128 128 return html` 129 129 <div> 130 130 <div> 131 - <input id="searchInput"@change="${this.setSearchText}" type="text" placeholder="Search..."@keypress="${this.handleKeyPress}"/>132 - <button @click="${ () =>this.handleSearch(true)}">Search</button>78 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 79 + <button @click="${this.handleSearch}">Search</button> 133 133 </div> 134 134 <div> 135 135 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> ... ... @@ -172,5 +172,7 @@ 172 172 } 173 173 }); 174 174 </script> 122 + 175 175 <clb-unified-search></clb-unified-search> 124 + 176 176 {{/html}}