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,165 +1,113 @@ 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; 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); 27 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 - this.resultsCache = []; 47 47 } 48 - toggleRoleFilter(roleName) { 49 - if(this.rolesFilter.indexOf(roleName) === -1) { 50 - this.rolesFilter.push(roleName); 51 - } else { 52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName); 53 - } 54 - this[roleName] = !this[roleName]; 55 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 56 - this.handleSearch(); 32 + 33 + function removeRole(role) { 34 + filters.roles.filter(r => r !== 'administrator') 57 57 } 58 - setSearchText(e) { 59 - this.searchText = e.target.value; 60 - } 61 - handleSearch(textSearch) { 62 - if(this.searchText !== "" || textSearch) { 63 - if(this.searchText !== this.prevSearchText) { 64 - this.prevSearchText = this.searchText; 65 - Promise.all([ 66 - this.fetchWikiSearch(), 67 - this.fetchFilterSearch() 68 - ]).then(([wikiSearchResults, collabSearchResults]) => { 69 - this.results = wikiSearchResults; 70 - this.resultsCache = wikiSearchResults; 71 - console.log(wikiSearchResults, collabSearchResults); 72 - }); 73 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 74 - this.fetchFilterSearch().then(this.filterResults) 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); 75 75 } else { 76 - this.results = this.resultsCache;43 + removeRole(role); 77 77 } 78 - } else { 79 - this.clearResults(); 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 - }) 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) 84 84 } 85 - } 86 - hasActiveFilters() { 87 - // we only look at role filters for POC. 88 - return this.rolesFilter.length > 0; 89 - } 90 - fetchWikiSearch() { 91 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 92 - return handleXWikiSearch(this.searchText); 93 - } 94 - fetchFilterSearch() { 95 - return new Promise((resolve) => { 96 - if(this.hasActiveFilters()) { 97 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 98 - } else { 99 - resolve([]); 100 - } 101 - }); 102 - } 103 - filterResults = (filteredCollabs) => { 104 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 105 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 106 - } 107 - clearResults() { 108 - this.results = []; 109 - this.resultsCache = []; 110 - } 111 - getLink(xwikiDocSpace) { 112 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 113 - } 114 - render() { 115 - return html` 116 -<div> 117 - <div> 118 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 119 - <button @click="${() => this.handleSearch(true)}">Search</button> 120 - </div> 121 - <div> 122 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 123 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 124 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 125 - </div> 126 - <div> 127 - ${this.results.map(result => html` 128 - <div class="result"> 129 - <a href="${this.getLink(result.space)}">${result.title_}</a> 130 - <div>${result.doccontent_.substring(0, 150)} 131 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 132 - </div> 133 - `)} 134 - </div> 135 -</div> 136 -` 137 - } 138 - } 139 - customElements.define('clb-unified-search', UnifiedSearch); 140 140 141 - functionhandleXWikiSearch(searchString){142 - return new Promise((resolve)=>{68 + }); 69 + function handleXWikiSearch(space, callback) { 143 143 require(['jquery'], function($) { 144 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 145 - //contextSearchButton.addEventListener('click', 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() { 146 146 $.post(solrServiceURL, { 147 - outputSyntax: 'plain', 148 - media: 'json', 149 - query: [ 150 - 'q="__INPUT__"~100', 151 - 'fq=type:DOCUMENT', 152 - `fq=space:Collabs.*` 153 - ].join('\n'), 154 - input: searchString 155 - }).then(resolve); 156 - //}); 157 - }); 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 + }); 158 158 }); 159 159 } 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 + } 160 160 }); 161 -</script> 162 162 163 -<clb-unified-search></clb-unified-search> 164 164 112 +</script> 165 165 {{/html}}