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