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,5 +1,100 @@ 1 1 {{html clean="false"}} 2 +<!-- 3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 4 +--> 5 +<script type="module"> 6 +import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 +window.addEventListener('DOMContentLoaded', function() { 2 2 9 + class UnifiedSearch extends LitElement { 10 + /* 11 + static properties = { 12 + searchText: { type: String }, 13 + favoritesFilter: { type: Boolean }, 14 + administratorFilter: { type: Boolean }, 15 + editorFilter: { type: Boolean }, 16 + viewerFilter: { type: Boolean }, 17 + publicFilter: { type: Boolean }, 18 + privateFilter: { type: Boolean }, 19 + } 20 + */ 21 + constructor() { 22 + super(); 23 + this.searchText = ""; 24 + this.administrator = false; 25 + this.editor = false; 26 + this.viewer = false; 27 + this.rolesFilter = []; 28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 29 + this.results = []; 30 + } 31 + toggleRoleFilter(roleName) { 32 + if(this.rolesFilter.indexOf(roleName) == -1) { 33 + this.rolesFilter.push(roleName); 34 + } else { 35 + this.rolesFilter.filter(role => role !== roleName); 36 + } 37 + this[roleName] = !this[roleName]; 38 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 39 + } 40 + setSearchText(e) { 41 + this.searchText = e.target.value; 42 + } 43 + handleSearch() { 44 + console.log(this.searchText); 45 + if(this.searchText !== "") { 46 + this.fetchWikiSearch(); 47 + } 48 + } 49 + fetchWikiSearch() { 50 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 51 + handleXWikiSearch(this.searchText).then(results => this.results = results); 52 + } 53 + buildFilter() { 54 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 55 + } 56 + render() { 57 + return html` 58 +<div> 59 + <div> 60 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 61 + <button @click="${this.handleSearch}">Search</button> 62 + </div> 63 + <div> 64 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 65 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 66 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 67 + </div> 68 +</div> 69 +` 70 + } 71 + } 72 + customElements.define('clb-unified-search', UnifiedSearch); 73 + 74 + function handleXWikiSearch(searchString) { 75 + return new Promise((resolve) => { 76 + require(['jquery'], function($) { 77 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 78 + //contextSearchButton.addEventListener('click', function() { 79 + $.post(solrServiceURL, { 80 + outputSyntax: 'plain', 81 + media: 'json', 82 + query: [ 83 + 'q="__INPUT__"~100', 84 + 'fq=type:DOCUMENT', 85 + `fq=space:Collabs.*` 86 + ].join('\n'), 87 + input: searchString 88 + }).then(resolve); 89 + //}); 90 + }); 91 + }); 92 + } 93 +}); 94 +</script> 95 + 96 +<clb-unified-search></clb-unified-search> 97 +<!-- 3 3 <select id="context-search-type"> 4 4 <option value="all">All</option> 5 5 <option value="collabs">Collabs</option> ... ... @@ -7,21 +7,62 @@ 7 7 </select> 8 8 <input type="text" id="context-search-text" /> 9 9 <button id="context-search-button" class="btn btn-primary">Search</button> 105 +<div class="form-group"> 106 + <label> 107 + <input type="checkbox" data-role-filter="administrator"> Administrator 108 + </label> 109 + <label> 110 + <input type="checkbox" data-role-filter="editor"> Editor 111 + </label> 112 +</div> 10 10 114 + 11 11 <pre id="context-search-response"></pre> 12 12 <script> 13 - /* 14 - async function fetchGlobalSearch(term) { 15 - const res = await fetch(`/rest/wikis/query?q=${term}&media=json`) 16 - const json = await res.json(); 17 - return JSON.stringify(json, null, 2); 18 - } 19 - async function fetchCurrentCollabSearch(term) { 20 - const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`) 21 - const json = await res.json(); 22 - return JSON.stringify(json, null, 2); 23 - } 24 24 window.addEventListener('DOMContentLoaded', function() { 118 + const filters = { 119 + search: '', 120 + offset: 0, 121 + orderField: 'title', 122 + order: 'asc', 123 + favorite: false, 124 + roles: [] // to be joined as administrator+editor+viewer 125 + }; 126 + 127 + function addRole(role) { 128 + if(filters.roles.indexOf(role) == -1) { 129 + filters.roles.push(role); 130 + } 131 + } 132 + 133 + function removeRole(role) { 134 + filters.roles = filters.roles.filter(r => r !== role) 135 + } 136 + 137 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 138 + 139 + filterInputs.forEach(function(filterIpt) { 140 + filterIpt.addEventListener('click', function() { 141 + const role = this.getAttribute('data-role-filter'); 142 + if(this.checked) { 143 + addRole(role); 144 + } else { 145 + removeRole(role); 146 + } 147 + runFilteredRequest(); 148 + }) 149 + }); 150 + 151 + function runFilteredRequest() { 152 + const urlParams = new URLSearchParams(); 153 + const tmpFilters = filters; 154 + tmpFilters.roles = tmpFilters.roles.join("+"); 155 + for(filter in tmpFilters) { 156 + urlParams.set(filter, tmpFilters[filter]); 157 + } 158 + console.log(urlParams); 159 + } 160 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 25 25 const contextSearchType = document.getElementById("context-search-type"); 26 26 const contextSearchText = document.getElementById("context-search-text"); 27 27 const contextSearchResponse = document.getElementById("context-search-response"); ... ... @@ -34,35 +34,54 @@ 34 34 document.location.href = `/bin/view/Collabs/#search=${term}`; 35 35 break; 36 36 case 'current-collab': 37 - fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);173 + handleXWikiSearch('bougaultx'); 38 38 break 39 39 default: 40 - fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);176 + handleXWikiSearch('') 41 41 } 42 42 43 43 }); 44 - }); 45 -*/ 46 - console.log('hello world'); 47 -const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 48 -console.log('xxxxx', solrServiceURL); 49 - 50 -require(['jquery'], function($) { 51 - console.log('ZZZZ'); 52 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 53 - const contextSearchButton = document.getElementById("context-search-button"); 54 - contextSearchButton.addEventListener('click', function() { 55 - $.post(solrServiceURL, { 56 - outputSyntax: 'plain', 57 - media: 'json', 58 - query: [ 59 - 'q=*__INPUT__*', 60 - 'fq=type:DOCUMENT', 61 - 'fq=space:Collabs.bougaultx.*' 62 - ].join('\n'), 63 - input: $('#context-search-text').val() 180 + function handleXWikiSearch(space, callback) { 181 + require(['jquery'], function($) { 182 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 183 + const contextSearchButton = document.getElementById("context-search-button"); 184 + const xwikiSpace = space ? `.${space}` : ''; 185 + contextSearchButton.addEventListener('click', function() { 186 + $.post(solrServiceURL, { 187 + outputSyntax: 'plain', 188 + media: 'json', 189 + query: [ 190 + 'q="__INPUT__"~100', 191 + 'fq=type:DOCUMENT', 192 + `fq=space:Collabs${xwikiSpace}.*` 193 + ].join('\n'), 194 + input: $('#context-search-text').val() 195 + }).then(res => { 196 + if(callback) { 197 + callback(res).then(results => { 198 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 199 + }) 200 + } else { 201 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 202 + } 203 + }); 204 + }); 64 64 }); 65 - }); 206 + } 207 + function applyAdministratorFilter(results) { 208 + return new Promise((resolve, reject) => { 209 + //fetch("/rest/v1/collabs?roles=administrator") 210 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 211 + .then(res => res.json()) 212 + .then(collabs => { 213 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 214 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 215 + resolve(filtered); 216 + }) 217 + 218 + }) 219 + } 66 66 }); 67 67 </script> 222 +--> 68 68 {{/html}}