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