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