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,60 +52,20 @@ 52 52 } 53 53 this[roleName] = !this[roleName]; 54 54 this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 - this.handleSearch(); 56 56 } 57 57 setSearchText(e) { 58 58 this.searchText = e.target.value; 59 59 } 60 60 handleSearch() { 61 - if(this.searchText !== "") { 62 - if(this.searchText !== this.prevSearchText) { 63 - console.log(this.searchText, this.prevSearchText); 64 - this.prevSearchText = this.searchText; 65 - Promise.all([ 66 - this.fetchWikiSearch(), 67 - this.fetchFilterSearch() 68 - ]).then(([wikiSearchResults, collabSearchResults]) => { 69 - this.results = wikiSearchResults; 70 - console.log(wikiSearchResults, collabSearchResults); 71 - }); 72 - } else if (this.searchText === this.prevSearchText) { 73 - console.log("Only apply filter on results"); 74 - this.fetchFilterSearch().then(this.filterResults) 75 - } 76 - } else { 77 - console.log("no search text, should return filter search results if any"); 78 - this.fetchFilterSearch().then(collabs => { 79 - console.log("Format and display collabs", collabs); 80 - }) 81 - } 43 + console.log(this.searchText); 82 82 } 83 - hasActiveFilters() { 84 - // we only look at role filters for POC. 85 - return this.rolesFilter.length > 0; 86 - } 87 87 fetchWikiSearch() { 88 88 // request should be built from component, not from "external" dependency. Leave it here like this for POC. 89 - returnhandleXWikiSearch(this.searchText);47 + handleXWikiSearch(this.searchText).then(results => console.log(results)); 90 90 } 91 - fetchFilterSearch() { 92 - return new Promise((resolve) => { 93 - if(this.hasActiveFilters) { 94 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 95 - } else { 96 - resolve(null); 97 - } 98 - }); 49 + buildFilter() { 50 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 99 99 } 100 - filterResults = (filteredCollabs) => { 101 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 102 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 103 - const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); 104 - console.log(filteredResults); 105 - } 106 - getLink(xwikiDocSpace) { 107 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 108 - } 109 109 render() { 110 110 return html` 111 111 <div> ... ... @@ -118,15 +118,6 @@ 118 118 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 119 119 <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 120 120 </div> 121 - <div> 122 - ${this.results.map(result => html` 123 - <div class="result"> 124 - <a href="${this.getLink(result.space)}">${result.title_}</a> 125 - <div>${result.doccontent_.substring(0, 150)} 126 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 127 - </div> 128 - `)} 129 - </div> 130 130 </div> 131 131 ` 132 132 } ... ... @@ -136,8 +136,8 @@ 136 136 function handleXWikiSearch(searchString) { 137 137 return new Promise((resolve) => { 138 138 require(['jquery'], function($) { 139 - constsolrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');140 - //contextSearchButton.addEventListener('click', function() {73 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 74 + contextSearchButton.addEventListener('click', function() { 141 141 $.post(solrServiceURL, { 142 142 outputSyntax: 'plain', 143 143 media: 'json', ... ... @@ -148,7 +148,7 @@ 148 148 ].join('\n'), 149 149 input: searchString 150 150 }).then(resolve); 151 - //});85 + }); 152 152 }); 153 153 }); 154 154 } ... ... @@ -156,5 +156,130 @@ 156 156 </script> 157 157 158 158 <clb-unified-search></clb-unified-search> 93 +<!-- 94 +<select id="context-search-type"> 95 + <option value="all">All</option> 96 + <option value="collabs">Collabs</option> 97 + <option value="current-collab">Current Collab</option> 98 +</select> 99 +<input type="text" id="context-search-text" /> 100 +<button id="context-search-button" class="btn btn-primary">Search</button> 101 +<div class="form-group"> 102 + <label> 103 + <input type="checkbox" data-role-filter="administrator"> Administrator 104 + </label> 105 + <label> 106 + <input type="checkbox" data-role-filter="editor"> Editor 107 + </label> 108 +</div> 159 159 110 + 111 +<pre id="context-search-response"></pre> 112 +<script> 113 + window.addEventListener('DOMContentLoaded', function() { 114 + const filters = { 115 + search: '', 116 + offset: 0, 117 + orderField: 'title', 118 + order: 'asc', 119 + favorite: false, 120 + roles: [] // to be joined as administrator+editor+viewer 121 + }; 122 + 123 + function addRole(role) { 124 + if(filters.roles.indexOf(role) == -1) { 125 + filters.roles.push(role); 126 + } 127 + } 128 + 129 + function removeRole(role) { 130 + filters.roles = filters.roles.filter(r => r !== role) 131 + } 132 + 133 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 134 + 135 + filterInputs.forEach(function(filterIpt) { 136 + filterIpt.addEventListener('click', function() { 137 + const role = this.getAttribute('data-role-filter'); 138 + if(this.checked) { 139 + addRole(role); 140 + } else { 141 + removeRole(role); 142 + } 143 + runFilteredRequest(); 144 + }) 145 + }); 146 + 147 + function runFilteredRequest() { 148 + const urlParams = new URLSearchParams(); 149 + const tmpFilters = filters; 150 + tmpFilters.roles = tmpFilters.roles.join("+"); 151 + for(filter in tmpFilters) { 152 + urlParams.set(filter, tmpFilters[filter]); 153 + } 154 + console.log(urlParams); 155 + } 156 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 157 + const contextSearchType = document.getElementById("context-search-type"); 158 + const contextSearchText = document.getElementById("context-search-text"); 159 + const contextSearchResponse = document.getElementById("context-search-response"); 160 + const contextSearchButton = document.getElementById("context-search-button"); 161 + contextSearchButton.addEventListener('click', function() { 162 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 163 + const term = contextSearchText.value; 164 + switch(context) { 165 + case 'collabs': 166 + document.location.href = `/bin/view/Collabs/#search=${term}`; 167 + break; 168 + case 'current-collab': 169 + handleXWikiSearch('bougaultx'); 170 + break 171 + default: 172 + handleXWikiSearch('') 173 + } 174 + 175 + }); 176 + function handleXWikiSearch(space, callback) { 177 + require(['jquery'], function($) { 178 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 179 + const contextSearchButton = document.getElementById("context-search-button"); 180 + const xwikiSpace = space ? `.${space}` : ''; 181 + contextSearchButton.addEventListener('click', function() { 182 + $.post(solrServiceURL, { 183 + outputSyntax: 'plain', 184 + media: 'json', 185 + query: [ 186 + 'q="__INPUT__"~100', 187 + 'fq=type:DOCUMENT', 188 + `fq=space:Collabs${xwikiSpace}.*` 189 + ].join('\n'), 190 + input: $('#context-search-text').val() 191 + }).then(res => { 192 + if(callback) { 193 + callback(res).then(results => { 194 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 195 + }) 196 + } else { 197 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 198 + } 199 + }); 200 + }); 201 + }); 202 + } 203 + function applyAdministratorFilter(results) { 204 + return new Promise((resolve, reject) => { 205 + //fetch("/rest/v1/collabs?roles=administrator") 206 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 207 + .then(res => res.json()) 208 + .then(collabs => { 209 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 210 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 211 + resolve(filtered); 212 + }) 213 + 214 + }) 215 + } 216 +}); 217 +</script> 218 +--> 160 160 {{/html}}