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