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,52 +1,5 @@ 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(filter) { 25 - filter = !filter 26 - } 27 - setSearchText(e) { 28 - this.searchText = e.target.value; 29 - } 30 - handleSearch() { 31 - console.log(this.searchText); 32 - } 33 - render() { 34 - return html` 35 -<div> 36 - <div> 37 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 38 - <button @click="${this.handleSearch}">Search</button> 39 - </div> 40 - <label><input type="checkbox" @change="${() => toggleFilter(this.administratorFilter)}" .checked="${this.administratorFilter}"/> Administrator</label> 41 -</div> 42 -` 43 - } 44 - } 45 - customElements.define('clb-unified-search', UnifiedSearch); 46 -</script> 47 47 48 -<clb-unified-search></clb-unified-search> 49 - 50 50 <select id="context-search-type"> 51 51 <option value="all">All</option> 52 52 <option value="collabs">Collabs</option> ... ... @@ -54,62 +54,22 @@ 54 54 </select> 55 55 <input type="text" id="context-search-text" /> 56 56 <button id="context-search-button" class="btn btn-primary">Search</button> 57 -<div class="form-group"> 58 - <label> 59 - <input type="checkbox" data-role-filter="administrator"> Administrator 60 - </label> 61 - <label> 62 - <input type="checkbox" data-role-filter="editor"> Editor 63 - </label> 64 -</div> 65 65 66 - 67 67 <pre id="context-search-response"></pre> 68 68 <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 + */ 69 69 window.addEventListener('DOMContentLoaded', function() { 70 - const filters = { 71 - search: '', 72 - offset: 0, 73 - orderField: 'title', 74 - order: 'asc', 75 - favorite: false, 76 - roles: [] // to be joined as administrator+editor+viewer 77 - }; 78 - 79 - function addRole(role) { 80 - if(filters.roles.indexOf(role) == -1) { 81 - filters.roles.push(role); 82 - } 83 - } 84 - 85 - function removeRole(role) { 86 - filters.roles = filters.roles.filter(r => r !== role) 87 - } 88 - 89 - const filterInputs = document.querySelectorAll('input[data-role-filter]'); 90 - 91 - filterInputs.forEach(function(filterIpt) { 92 - filterIpt.addEventListener('click', function() { 93 - const role = this.getAttribute('data-role-filter'); 94 - if(this.checked) { 95 - addRole(role); 96 - } else { 97 - removeRole(role); 98 - } 99 - runFilteredRequest(); 100 - }) 101 - }); 102 - 103 - function runFilteredRequest() { 104 - const urlParams = new URLSearchParams(); 105 - const tmpFilters = filters; 106 - tmpFilters.roles = tmpFilters.roles.join("+"); 107 - for(filter in tmpFilters) { 108 - urlParams.set(filter, tmpFilters[filter]); 109 - } 110 - console.log(urlParams); 111 - } 112 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 113 113 const contextSearchType = document.getElementById("context-search-type"); 114 114 const contextSearchText = document.getElementById("context-search-text"); 115 115 const contextSearchResponse = document.getElementById("context-search-response"); ... ... @@ -122,55 +122,35 @@ 122 122 document.location.href = `/bin/view/Collabs/#search=${term}`; 123 123 break; 124 124 case 'current-collab': 38 + //fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results); 125 125 handleXWikiSearch('bougaultx'); 126 126 break 127 127 default: 128 - handleXWikiSearch('') 42 + handleXWikiSearch() 43 + //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results); 129 129 } 130 130 131 131 }); 132 - function handleXWikiSearch(space, callback) { 133 - require(['jquery'], function($) { 134 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 135 - const contextSearchButton = document.getElementById("context-search-button"); 136 - const xwikiSpace = space ? `.${space}` : ''; 137 - contextSearchButton.addEventListener('click', function() { 138 - $.post(solrServiceURL, { 139 - outputSyntax: 'plain', 140 - media: 'json', 141 - query: [ 142 - 'q="__INPUT__"~100', 143 - 'fq=type:DOCUMENT', 144 - `fq=space:Collabs${xwikiSpace}.*` 145 - ].join('\n'), 146 - input: $('#context-search-text').val() 147 - }).then(res => { 148 - if(callback) { 149 - callback(res).then(results => { 150 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 151 - }) 152 - } else { 153 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 154 - } 155 - }); 156 - }); 157 - }); 158 - } 159 - function applyAdministratorFilter(results) { 160 - return new Promise((resolve, reject) => { 161 - //fetch("/rest/v1/collabs?roles=administrator") 162 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 163 - .then(res => res.json()) 164 - .then(collabs => { 165 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 166 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 167 - resolve(filtered); 168 - }) 47 + }); 169 169 170 - }) 171 - } 172 -}); 173 - 174 - 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 + }); 65 + }); 66 + }); 67 +} 175 175 </script> 176 176 {{/html}}