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