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,83 @@ 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() { 9 9 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; 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 +<input type="text" id="context-search-text" /> 9 +<button id="context-search-button" class="btn btn-primary">Search</button> 10 + 11 +<pre id="context-search-response"></pre> 12 +<script> 13 + window.addEventListener('DOMContentLoaded', function() { 14 + const contextSearchType = document.getElementById("context-search-type"); 15 + const contextSearchText = document.getElementById("context-search-text"); 16 + const contextSearchResponse = document.getElementById("context-search-response"); 17 + const contextSearchButton = document.getElementById("context-search-button"); 18 + contextSearchButton.addEventListener('click', function() { 19 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 20 + const term = contextSearchText.value; 21 + switch(context) { 22 + case 'collabs': 23 + document.location.href = `/bin/view/Collabs/#search=${term}`; 24 + break; 25 + case 'current-collab': 26 + handleXWikiSearch('bougaultx'); 27 + break 28 + default: 29 + handleXWikiSearch('', applyAdministratorFilter) 19 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 - constructor() { 37 - super(); 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 = []; 47 - } 48 - firstUpdated() { 49 - this.renderRoot.getElementById('searchInput').focus(); 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 - setSearchText(e) { 62 - this.searchText = e.target.value; 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 - } 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 - render() { 127 - return html` 128 -<div> 129 - <div> 130 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" /> 131 - <button @click="${() => this.handleSearch(true)}">Search</button> 132 - </div> 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> 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 -</div> 158 -` 159 - } 160 - } 161 - customElements.define('clb-unified-search', UnifiedSearch); 162 162 163 - functionhandleXWikiSearch(searchString){164 - return new Promise((resolve)=>{32 + }); 33 + function handleXWikiSearch(space, callback) { 165 165 require(['jquery'], function($) { 166 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 167 - //contextSearchButton.addEventListener('click', function() { 35 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 36 + const contextSearchButton = document.getElementById("context-search-button"); 37 + const xwikiSpace = space ? `.${space}` : ''; 38 + 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 - }); 40 + outputSyntax: 'plain', 41 + media: 'json', 42 + query: [ 43 + 'q="__INPUT__"~100', 44 + 'fq=type:DOCUMENT', 45 + `fq=space:Collabs${xwikiSpace}.*` 46 + ].join('\n'), 47 + input: $('#context-search-text').val() 48 + }).then(res => { 49 + if(callback) { 50 + callback(res).then(results => { 51 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 52 + }) 53 + } else { 54 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 55 + } 56 + }); 57 + }); 180 180 }); 181 181 } 60 + function applyAdministratorFilter(results) { 61 + return new Promise((resolve, reject) => { 62 + fetch("/rest/v1/collabs?roles=administrator") 63 + .then(res => res.json()) 64 + .then(collabs => { 65 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 66 + const filtered = results.filter(result => { 67 + const r = spaces.some(space => { 68 + console.log(result.space, space); 69 + return result.space.startsWith(space) 70 + }) 71 + 72 + return r 73 + }); 74 + resolve(filtered); 75 + }) 76 + 77 + }) 78 + } 182 182 }); 80 + 81 + 183 183 </script> 184 -<clb-unified-search></clb-unified-search> 185 185 {{/html}}