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