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,77 @@ 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 + class UnifiedSearch extends LitElement { 8 + /* 9 + static properties = { 10 + searchText: { type: String }, 11 + favoritesFilter: { type: Boolean }, 12 + administratorFilter: { type: Boolean }, 13 + editorFilter: { type: Boolean }, 14 + viewerFilter: { type: Boolean }, 15 + publicFilter: { type: Boolean }, 16 + privateFilter: { type: Boolean }, 17 + } 18 + */ 19 + constructor() { 20 + super(); 21 + this.searchText = ""; 22 + this.favoritesFilter = false; 23 + this.administrator = false; 24 + this.editor = false; 25 + this.viewer = false; 26 + this.publicFilter = false; 27 + this.privateFilter = false; 28 + this.rolesFilter = []; 29 + this.filterUrl = new URL(document.location.origin); 30 + } 31 + toggleBooleanFilter(filterName) { 32 + this[filterName] = !this[filterName]; 33 + } 34 + toggleRoleFilter(roleName) { 35 + if(this.rolesFilter.indexOf(roleName) == -1) { 36 + this.rolesFilter.push(roleName); 37 + } else { 38 + this.rolesFilter.filter(role => role !== roleName); 39 + } 40 + this.toggleBooleanFilter(roleName); 41 + } 42 + setSearchText(e) { 43 + this.searchText = e.target.value; 44 + } 45 + handleSearch() { 46 + console.log(this.searchText); 47 + } 48 + buildFilter() { 49 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 50 + } 51 + render() { 52 + return html` 53 +<div> 54 + <div> 55 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 56 + <button @click="${this.handleSearch}">Search</button> 57 + </div> 58 + <div> 59 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label> 60 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 61 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 62 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 63 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label> 64 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label> 65 + </div> 66 +</div> 67 +` 68 + } 69 + } 70 + customElements.define('clb-unified-search', UnifiedSearch); 71 +</script> 2 2 73 +<clb-unified-search></clb-unified-search> 74 +<!-- 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> 82 +<div class="form-group"> 83 + <label> 84 + <input type="checkbox" data-role-filter="administrator"> Administrator 85 + </label> 86 + <label> 87 + <input type="checkbox" data-role-filter="editor"> Editor 88 + </label> 89 +</div> 10 10 91 + 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() { 95 + const filters = { 96 + search: '', 97 + offset: 0, 98 + orderField: 'title', 99 + order: 'asc', 100 + favorite: false, 101 + roles: [] // to be joined as administrator+editor+viewer 102 + }; 103 + 104 + function addRole(role) { 105 + if(filters.roles.indexOf(role) == -1) { 106 + filters.roles.push(role); 107 + } 108 + } 109 + 110 + function removeRole(role) { 111 + filters.roles = filters.roles.filter(r => r !== role) 112 + } 113 + 114 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 115 + 116 + filterInputs.forEach(function(filterIpt) { 117 + filterIpt.addEventListener('click', function() { 118 + const role = this.getAttribute('data-role-filter'); 119 + if(this.checked) { 120 + addRole(role); 121 + } else { 122 + removeRole(role); 123 + } 124 + runFilteredRequest(); 125 + }) 126 + }); 127 + 128 + function runFilteredRequest() { 129 + const urlParams = new URLSearchParams(); 130 + const tmpFilters = filters; 131 + tmpFilters.roles = tmpFilters.roles.join("+"); 132 + for(filter in tmpFilters) { 133 + urlParams.set(filter, tmpFilters[filter]); 134 + } 135 + console.log(urlParams); 136 + } 137 + // 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);150 + handleXWikiSearch('bougaultx'); 38 38 break 39 39 default: 40 - fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);153 + 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_facet:Collabs.the-collaboratory' 62 - ].join('\n'), 63 - input: $('#context-search-text').val() 157 + function handleXWikiSearch(space, callback) { 158 + require(['jquery'], function($) { 159 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 160 + const contextSearchButton = document.getElementById("context-search-button"); 161 + const xwikiSpace = space ? `.${space}` : ''; 162 + contextSearchButton.addEventListener('click', function() { 163 + $.post(solrServiceURL, { 164 + outputSyntax: 'plain', 165 + media: 'json', 166 + query: [ 167 + 'q="__INPUT__"~100', 168 + 'fq=type:DOCUMENT', 169 + `fq=space:Collabs${xwikiSpace}.*` 170 + ].join('\n'), 171 + input: $('#context-search-text').val() 172 + }).then(res => { 173 + if(callback) { 174 + callback(res).then(results => { 175 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 176 + }) 177 + } else { 178 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 179 + } 180 + }); 181 + }); 64 64 }); 65 - }); 183 + } 184 + function applyAdministratorFilter(results) { 185 + return new Promise((resolve, reject) => { 186 + //fetch("/rest/v1/collabs?roles=administrator") 187 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 188 + .then(res => res.json()) 189 + .then(collabs => { 190 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 191 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 192 + resolve(filtered); 193 + }) 194 + 195 + }) 196 + } 66 66 }); 67 67 </script> 199 +--> 68 68 {{/html}}