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