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,9 +1,9 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 4 4 --> 5 5 <script type="module"> 6 -import {LitElement, html , css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';6 +import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 7 7 window.addEventListener('DOMContentLoaded', function() { 8 8 9 9 class UnifiedSearch extends LitElement { ... ... @@ -18,31 +18,14 @@ 18 18 privateFilter: { type: Boolean }, 19 19 } 20 20 */ 21 - static properties = { 22 - results: { type: Array } 23 - } 24 - static styles = css` 25 - .result { 26 - margin-top: 1em; 27 - } 28 - .light { 29 - color: var(--color-gray-500, #CCC); 30 - font-size: 14px; 31 - } 32 - a { 33 - color: var(--color-brand-primary, blue); 34 - } 35 - `; 36 36 constructor() { 37 37 super(); 38 38 this.searchText = ""; 39 - this.prevSearchText = ""; 40 40 this.administrator = false; 41 41 this.editor = false; 42 42 this.viewer = false; 43 43 this.rolesFilter = []; 44 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); 45 - this.results = []; 28 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); 46 46 } 47 47 toggleRoleFilter(roleName) { 48 48 if(this.rolesFilter.indexOf(roleName) == -1) { ... ... @@ -52,54 +52,16 @@ 52 52 } 53 53 this[roleName] = !this[roleName]; 54 54 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 - // if search text then apply filter 56 - // else return filters result 57 57 } 58 58 setSearchText(e) { 59 59 this.searchText = e.target.value; 60 60 } 61 61 handleSearch() { 62 - if(this.searchText !== "" && this.searchText !== this.prevSearchText) { 63 - this.prevSearchText = this.searchText; 64 - Promise.all([ 65 - this.fetchWikiSearch(), 66 - this.fetchFilterSearch() 67 - ]).then(([wikiSearchResults, collabSearchResults]) => { 68 - console.log(wikiSearchResults, collabSearchResults); 69 - }); 70 - } else if (this.searchText === this.prevSearchText) { 71 - console.log("Only apply filter on results"); 72 - this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) 73 - } else { 74 - console.log("no search text, should return filter search results if any"); 75 - this.fetchFilterSearch().then(res => res.json()).then(collabs => { 76 - console.log("Format and display collabs", collabs); 77 - }) 78 - } 43 + console.log(this.searchText); 79 79 } 80 - hasActiveFilters() { 81 - // we only look at role filters for POC. 82 - return this.roles.length > 0; 45 + buildFilter() { 46 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 83 83 } 84 - fetchWikiSearch() { 85 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 86 - return handleXWikiSearch(this.searchText); 87 - } 88 - fetchFilterSearch() { 89 - return new Promise((resolve) => { 90 - if(hasActiveFilters) { 91 - fetch(this.filterUrl).then(console.log); 92 - } else { 93 - resolve(null); 94 - } 95 - }); 96 - } 97 - filterResults(filteredCollabs) { 98 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 99 - } 100 - getLink(xwikiDocSpace) { 101 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 102 - } 103 103 render() { 104 104 return html` 105 105 <div> ... ... @@ -112,15 +112,6 @@ 112 112 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 113 113 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 114 114 </div> 115 - <div> 116 - ${this.results.map(result => html` 117 - <div class="result"> 118 - <a href="${this.getLink(result.space)}">${result.title_}</a> 119 - <div>${result.doccontent_.substring(0, 150)} 120 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 121 - </div> 122 - `)} 123 - </div> 124 124 </div> 125 125 ` 126 126 } ... ... @@ -127,22 +127,30 @@ 127 127 } 128 128 customElements.define('clb-unified-search', UnifiedSearch); 129 129 130 - function handleXWikiSearch(searchString) { 131 - return new Promise((resolve) => { 132 - require(['jquery'], function($) { 133 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 134 - //contextSearchButton.addEventListener('click', function() { 135 - $.post(solrServiceURL, { 136 - outputSyntax: 'plain', 137 - media: 'json', 138 - query: [ 139 - 'q="__INPUT__"~100', 140 - 'fq=type:DOCUMENT', 141 - `fq=space:Collabs.*` 142 - ].join('\n'), 143 - input: searchString 144 - }).then(resolve); 145 - //}); 66 + function handleXWikiSearch(space, callback) { 67 + require(['jquery'], function($) { 68 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 69 + const contextSearchButton = document.getElementById("context-search-button"); 70 + const xwikiSpace = space ? `.${space}` : ''; 71 + contextSearchButton.addEventListener('click', function() { 72 + $.post(solrServiceURL, { 73 + outputSyntax: 'plain', 74 + media: 'json', 75 + query: [ 76 + 'q="__INPUT__"~100', 77 + 'fq=type:DOCUMENT', 78 + `fq=space:Collabs${xwikiSpace}.*` 79 + ].join('\n'), 80 + input: $('#context-search-text').val() 81 + }).then(res => { 82 + if(callback) { 83 + callback(res).then(results => { 84 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 85 + }) 86 + } else { 87 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 88 + } 89 + }); 146 146 }); 147 147 }); 148 148 } ... ... @@ -150,5 +150,130 @@ 150 150 </script> 151 151 152 152 <clb-unified-search></clb-unified-search> 97 +<!-- 98 +<select id="context-search-type"> 99 + <option value="all">All</option> 100 + <option value="collabs">Collabs</option> 101 + <option value="current-collab">Current Collab</option> 102 +</select> 103 +<input type="text" id="context-search-text" /> 104 +<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> 153 153 114 + 115 +<pre id="context-search-response"></pre> 116 +<script> 117 + 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 161 + const contextSearchType = document.getElementById("context-search-type"); 162 + const contextSearchText = document.getElementById("context-search-text"); 163 + const contextSearchResponse = document.getElementById("context-search-response"); 164 + const contextSearchButton = document.getElementById("context-search-button"); 165 + contextSearchButton.addEventListener('click', function() { 166 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 167 + const term = contextSearchText.value; 168 + switch(context) { 169 + case 'collabs': 170 + document.location.href = `/bin/view/Collabs/#search=${term}`; 171 + break; 172 + case 'current-collab': 173 + handleXWikiSearch('bougaultx'); 174 + break 175 + default: 176 + handleXWikiSearch('') 177 + } 178 + 179 + }); 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 + }); 205 + }); 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 + } 220 +}); 221 +</script> 222 +--> 154 154 {{/html}}