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,119 +1,177 @@ 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() { 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 -<input type="text" id="context-search-text" /> 9 -<button id="context-search-button" class="btn btn-primary">Search</button> 10 -<div class="form-group"> 11 - <label> 12 - <input type="checkbox" data-role-filter="administrator"> Administrator 13 - </label> 14 - <label> 15 - <input type="checkbox" data-role-filter="editor"> Editor 16 - </label> 17 -</div> 18 - 19 - 20 -<pre id="context-search-response"></pre> 21 -<script> 22 - window.addEventListener('DOMContentLoaded', function() { 23 - const filters = { 24 - search: '', 25 - offset: 0, 26 - orderField: 'title', 27 - order: 'asc', 28 - favorite: false, 29 - roles: [] // to be joined as administrator+editor+viewer 30 - }; 31 - 32 - function addRole(role) { 33 - if(filters.roles.indexOf(role) == -1) { 34 - filters.roles.push(role); 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; 35 35 } 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 = []; 36 36 } 37 - 38 - function removeRole(role) { 39 - filters.roles = filters.roles.filter(r => r !== role) 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(); 40 40 } 41 - 42 - const filterInputs = document.querySelectorAll('input[data-role-filter]'); 43 - 44 - filterInputs.forEach(function(filterIpt) { 45 - filterIpt.addEventListener('click', function() { 46 - const role = this.getAttribute('data-role-filter'); 47 - if(this.checked) { 48 - addRole(role); 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.clearResults(); 65 + this.prevSearchText = this.searchText; 66 + this.fetchWikiSearch().then(results => { 67 + console.log(results); 68 + this.resultsCache = results; 69 + if(this.hasActiveFilters()) { 70 + this.fetchFilterSearch().then(this.filterResults); 71 + } else { 72 + this.results = results; 73 + } 74 + }) 75 + /* 76 + Promise.all([ 77 + this.fetchWikiSearch(), 78 + this.fetchFilterSearch() 79 + ]).then(([wikiSearchResults, collabSearchResults]) => { 80 + this.results = wikiSearchResults; 81 + this.resultsCache = wikiSearchResults; 82 + console.log(wikiSearchResults, collabSearchResults); 83 + }); 84 + */ 85 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 86 + this.fetchFilterSearch().then(this.filterResults) 49 49 } else { 50 - re moveRole(role);88 + this.results = this.resultsCache; 51 51 } 52 - }) 53 - }); 54 - 55 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 56 - const contextSearchType = document.getElementById("context-search-type"); 57 - const contextSearchText = document.getElementById("context-search-text"); 58 - const contextSearchResponse = document.getElementById("context-search-response"); 59 - const contextSearchButton = document.getElementById("context-search-button"); 60 - contextSearchButton.addEventListener('click', function() { 61 - const context = contextSearchType.options[contextSearchType.selectedIndex].value; 62 - const term = contextSearchText.value; 63 - switch(context) { 64 - case 'collabs': 65 - document.location.href = `/bin/view/Collabs/#search=${term}`; 66 - break; 67 - case 'current-collab': 68 - handleXWikiSearch('bougaultx'); 69 - break 70 - default: 71 - handleXWikiSearch('') 90 + } else { 91 + this.clearResults(); 92 + console.log("no search text, should return filter search results if any"); 93 + this.fetchFilterSearch().then(collabs => { 94 + console.log("Format and display collabs", collabs); 95 + }) 72 72 } 97 + } 98 + hasActiveFilters() { 99 + // we only look at role filters for POC. 100 + return this.rolesFilter.length > 0; 101 + } 102 + fetchWikiSearch() { 103 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 104 + return handleXWikiSearch(this.searchText); 105 + } 106 + fetchFilterSearch() { 107 + return new Promise((resolve) => { 108 + if(this.hasActiveFilters()) { 109 + fetch(this.filterUrl).then(res => res.json()).then(resolve); 110 + } else { 111 + resolve([]); 112 + } 113 + }); 114 + } 115 + filterResults = (filteredCollabs) => { 116 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 117 + this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 118 + } 119 + clearResults() { 120 + this.results = []; 121 + this.resultsCache = []; 122 + } 123 + getLink(xwikiDocSpace) { 124 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 125 + } 126 + render() { 127 + return html` 128 +<div> 129 + <div> 130 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 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> 148 +` 149 + } 150 + } 151 + customElements.define('clb-unified-search', UnifiedSearch); 73 73 74 - });75 - functionhandleXWikiSearch(space, callback) {153 + function handleXWikiSearch(searchString) { 154 + return new Promise((resolve) => { 76 76 require(['jquery'], function($) { 77 - var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 78 - const contextSearchButton = document.getElementById("context-search-button"); 79 - const xwikiSpace = space ? `.${space}` : ''; 80 - contextSearchButton.addEventListener('click', function() { 156 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 157 + //contextSearchButton.addEventListener('click', function() { 81 81 $.post(solrServiceURL, { 82 - outputSyntax: 'plain', 83 - media: 'json', 84 - query: [ 85 - 'q="__INPUT__"~100', 86 - 'fq=type:DOCUMENT', 87 - `fq=space:Collabs${xwikiSpace}.*` 88 - ].join('\n'), 89 - input: $('#context-search-text').val() 90 - }).then(res => { 91 - if(callback) { 92 - callback(res).then(results => { 93 - contextSearchResponse.innerText = JSON.stringify(results, null, 2); 94 - }) 95 - } else { 96 - contextSearchResponse.innerText = JSON.stringify(res, null, 2); 97 - } 98 - }); 99 - }); 159 + outputSyntax: 'plain', 160 + media: 'json', 161 + query: [ 162 + 'q="__INPUT__"~100', 163 + 'fq=type:DOCUMENT', 164 + `fq=space:Collabs.*` 165 + ].join('\n'), 166 + input: searchString 167 + }).then(resolve); 168 + //}); 169 + }); 100 100 }); 101 101 } 102 - function applyAdministratorFilter(results) { 103 - return new Promise((resolve, reject) => { 104 - //fetch("/rest/v1/collabs?roles=administrator") 105 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 106 - .then(res => res.json()) 107 - .then(collabs => { 108 - const spaces = collabs.map(collab => `Collabs.${collab.name}`); 109 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 110 - resolve(filtered); 111 - }) 112 - 113 - }) 114 - } 115 115 }); 173 +</script> 116 116 175 +<clb-unified-search></clb-unified-search> 117 117 118 -</script> 119 119 {{/html}}