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