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