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