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,60 @@ 1 1 {{html clean="false"}} 2 +<script type="module"> 3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 4 + class UnifiedSearch extends LitElement { 5 + static properties = { 6 + searchText: { type: String }, 7 + favoritesFilter: { type: Boolean }, 8 + administratorFilter: { type: Boolean }, 9 + editorFilter: { type: Boolean }, 10 + viewerFilter: { type: Boolean }, 11 + publicFilter: { type: Boolean }, 12 + privateFilter: { type: Boolean }, 13 + } 14 + constructor() { 15 + super(); 16 + this.searchText = ""; 17 + this.favoritesFilter = false; 18 + this.administratorFilter = true; 19 + this.editorFilter = false; 20 + this.viewerFilter = false; 21 + this.publicFilter = false; 22 + this.privateFilter = false; 23 + } 24 + toggleFilter(filterName) { 25 + this[filterName] = !this[filterName]; 26 + console.log(this.administratorFilter); 27 + } 28 + setSearchText(e) { 29 + this.searchText = e.target.value; 30 + } 31 + handleSearch() { 32 + console.log(this.searchText); 33 + } 34 + render() { 35 + return html` 36 +<div> 37 + <div> 38 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 39 + <button @click="${this.handleSearch}">Search</button> 40 + </div> 41 + <div> 42 + <label><input type="checkbox" @change="${() => this.toggleFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label> 43 + <label><input type="checkbox" @change="${() => this.toggleFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label> 44 + <label><input type="checkbox" @change="${() => this.toggleFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label> 45 + <label><input type="checkbox" @change="${() => this.toggleFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label> 46 + <label><input type="checkbox" @change="${() => this.toggleFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label> 47 + <label><input type="checkbox" @change="${() => this.toggleFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label> 48 + </div> 49 +</div> 50 +` 51 + } 52 + } 53 + customElements.define('clb-unified-search', UnifiedSearch); 54 +</script> 2 2 56 +<clb-unified-search></clb-unified-search> 57 + 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> 65 +<div class="form-group"> 66 + <label> 67 + <input type="checkbox" data-role-filter="administrator"> Administrator 68 + </label> 69 + <label> 70 + <input type="checkbox" data-role-filter="editor"> Editor 71 + </label> 72 +</div> 10 10 74 + 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() { 78 + const filters = { 79 + search: '', 80 + offset: 0, 81 + orderField: 'title', 82 + order: 'asc', 83 + favorite: false, 84 + roles: [] // to be joined as administrator+editor+viewer 85 + }; 86 + 87 + function addRole(role) { 88 + if(filters.roles.indexOf(role) == -1) { 89 + filters.roles.push(role); 90 + } 91 + } 92 + 93 + function removeRole(role) { 94 + filters.roles = filters.roles.filter(r => r !== role) 95 + } 96 + 97 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 98 + 99 + filterInputs.forEach(function(filterIpt) { 100 + filterIpt.addEventListener('click', function() { 101 + const role = this.getAttribute('data-role-filter'); 102 + if(this.checked) { 103 + addRole(role); 104 + } else { 105 + removeRole(role); 106 + } 107 + runFilteredRequest(); 108 + }) 109 + }); 110 + 111 + function runFilteredRequest() { 112 + const urlParams = new URLSearchParams(); 113 + const tmpFilters = filters; 114 + tmpFilters.roles = tmpFilters.roles.join("+"); 115 + for(filter in tmpFilters) { 116 + urlParams.set(filter, tmpFilters[filter]); 117 + } 118 + console.log(urlParams); 119 + } 120 + // 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,36 +35,55 @@ 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'); 133 + handleXWikiSearch('bougaultx'); 40 40 break 41 41 default: 42 - handleXWikiSearch() 43 - //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); 136 + handleXWikiSearch('') 44 44 } 45 45 46 46 }); 47 - }); 48 - 49 -function handleXWikiSearch(space) { 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 - const xwikiSpace = space ? `.${xwikiSpace}` : ''; 55 - contextSearchButton.addEventListener('click', function() { 56 - $.post(solrServiceURL, { 57 - outputSyntax: 'plain', 58 - media: 'json', 59 - query: [ 60 - 'q=*__INPUT__*', 61 - 'fq=type:DOCUMENT', 62 - `fq=space:Collabs${xWikiSpace}.*` 63 - ].join('\n'), 64 - input: $('#context-search-text').val() 65 - }); 140 + function handleXWikiSearch(space, callback) { 141 + require(['jquery'], function($) { 142 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 143 + const contextSearchButton = document.getElementById("context-search-button"); 144 + const xwikiSpace = space ? `.${space}` : ''; 145 + contextSearchButton.addEventListener('click', function() { 146 + $.post(solrServiceURL, { 147 + outputSyntax: 'plain', 148 + media: 'json', 149 + query: [ 150 + 'q="__INPUT__"~100', 151 + 'fq=type:DOCUMENT', 152 + `fq=space:Collabs${xwikiSpace}.*` 153 + ].join('\n'), 154 + input: $('#context-search-text').val() 155 + }).then(res => { 156 + if(callback) { 157 + callback(res).then(results => { 158 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 159 + }) 160 + } else { 161 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 162 + } 163 + }); 164 + }); 66 66 }); 67 - }); 68 -} 166 + } 167 + function applyAdministratorFilter(results) { 168 + return new Promise((resolve, reject) => { 169 + //fetch("/rest/v1/collabs?roles=administrator") 170 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 171 + .then(res => res.json()) 172 + .then(collabs => { 173 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 174 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 175 + resolve(filtered); 176 + }) 177 + 178 + }) 179 + } 180 +}); 181 + 182 + 69 69 </script> 70 70 {{/html}}