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,175 +1,121 @@ 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 - this.resultsCache = []; 47 47 } 48 - toggleRoleFilter(roleName) { 49 - if(this.rolesFilter.indexOf(roleName) === -1) { 50 - this.rolesFilter.push(roleName); 51 - } else { 52 - this.rolesFilter = 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.filter(r => r !== role) 57 57 } 58 - setSearchText(e) { 59 - this.searchText = e.target.value; 60 - } 61 - handleSearch(textSearch) { 62 - if(this.searchText !== "" || textSearch) { 63 - if(this.searchText !== this.prevSearchText) { 64 - this.prevSearchText = this.searchText; 65 - this.fetchWikiSearch().then(results => { 66 - this.resultsCache = results; 67 - if(this.hasActiveFilters()) { 68 - this.fetchFilterSearch().then(this.filterResults); 69 - } else { 70 - this.results = results; 71 - } 72 - }) 73 - /* 74 - Promise.all([ 75 - this.fetchWikiSearch(), 76 - this.fetchFilterSearch() 77 - ]).then(([wikiSearchResults, collabSearchResults]) => { 78 - this.results = wikiSearchResults; 79 - this.resultsCache = wikiSearchResults; 80 - console.log(wikiSearchResults, collabSearchResults); 81 - }); 82 - */ 83 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { 84 - 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); 85 85 } else { 86 - this.results = this.resultsCache;51 + removeRole(role); 87 87 } 88 - } else { 89 - this.clearResults(); 90 - console.log("no search text, should return filter search results if any"); 91 - this.fetchFilterSearch().then(collabs => { 92 - console.log("Format and display collabs", collabs); 93 - }) 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) 94 94 } 95 - } 96 - hasActiveFilters() { 97 - // we only look at role filters for POC. 98 - return this.rolesFilter.length > 0; 99 - } 100 - fetchWikiSearch() { 101 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 102 - return handleXWikiSearch(this.searchText); 103 - } 104 - fetchFilterSearch() { 105 - return new Promise((resolve) => { 106 - if(this.hasActiveFilters()) { 107 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 108 - } else { 109 - resolve([]); 110 - } 111 - }); 112 - } 113 - filterResults = (filteredCollabs) => { 114 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 115 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space))); 116 - } 117 - clearResults() { 118 - this.results = []; 119 - this.resultsCache = []; 120 - } 121 - getLink(xwikiDocSpace) { 122 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 123 - } 124 - render() { 125 - return html` 126 -<div> 127 - <div> 128 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 129 - <button @click="${() => this.handleSearch(true)}">Search</button> 130 - </div> 131 - <div> 132 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 133 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 134 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 135 - </div> 136 - <div> 137 - ${this.results.map(result => html` 138 - <div class="result"> 139 - <a href="${this.getLink(result.space)}">${result.title_}</a> 140 - <div>${result.doccontent_.substring(0, 150)} 141 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 142 - </div> 143 - `)} 144 - </div> 145 -</div> 146 -` 147 - } 148 - } 149 - customElements.define('clb-unified-search', UnifiedSearch); 150 150 151 - functionhandleXWikiSearch(searchString){152 - return new Promise((resolve)=>{76 + }); 77 + function handleXWikiSearch(space, callback) { 153 153 require(['jquery'], function($) { 154 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 155 - //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() { 156 156 $.post(solrServiceURL, { 157 - outputSyntax: 'plain', 158 - media: 'json', 159 - query: [ 160 - 'q="__INPUT__"~100', 161 - 'fq=type:DOCUMENT', 162 - `fq=space:Collabs.*` 163 - ].join('\n'), 164 - input: searchString 165 - }).then(resolve); 166 - //}); 167 - }); 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 + }); 168 168 }); 169 169 } 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 + } 170 170 }); 171 -</script> 172 172 173 -<clb-unified-search></clb-unified-search> 174 174 120 +</script> 175 175 {{/html}}