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