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