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,12 +1,9 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 - !!! Many optimisations can be done !!! 3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! 5 5 --> 6 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 - 6 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 10 10 class UnifiedSearch extends LitElement { 11 11 /* 12 12 static properties = { ... ... @@ -19,149 +19,176 @@ 19 19 privateFilter: { type: Boolean }, 20 20 } 21 21 */ 22 - static properties = { 23 - results: { type: Array } 24 - } 25 - static styles = css` 26 - .result { 27 - margin-top: 1em; 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 37 constructor() { 38 38 super(); 39 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 = []; 22 + this.favoritesFilter = false; 23 + this.administratorFilter = false; 24 + this.editorFilter = false; 25 + this.viewerFilter = false; 26 + this.publicFilter = false; 27 + this.privateFilter = false; 28 + this.filterUrl = new URL(document.location.origin); 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(); 30 + toggleBooleanFilter(filterName) { 31 + this[filterName] = !this[filterName]; 58 58 } 59 59 setSearchText(e) { 60 60 this.searchText = e.target.value; 61 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) 77 - } else { 78 - this.results = this.resultsCache; 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 - }) 86 - } 36 + handleSearch() { 37 + console.log(this.searchText); 87 87 } 88 - hasActiveFilters() { 89 - // we only look at role filters for POC. 90 - return this.rolesFilter.length > 0; 39 + buildFilter() { 40 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 91 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 116 render() { 117 117 return html` 118 118 <div> 119 119 <div> 120 120 <input @change="${this.setSearchText}" type="text" placeholder="Search..." /> 121 - <button @click="${ () =>this.handleSearch(true)}">Search</button>47 + <button @click="${this.handleSearch}">Search</button> 122 122 </div> 123 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> 50 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label> 51 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label> 52 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label> 53 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label> 54 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label> 55 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label> 127 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 137 </div> 138 138 ` 139 139 } 140 140 } 141 141 customElements.define('clb-unified-search', UnifiedSearch); 62 +</script> 142 142 143 - function handleXWikiSearch(searchString) { 144 - return new Promise((resolve) => { 64 +<clb-unified-search></clb-unified-search> 65 +<!-- 66 +<select id="context-search-type"> 67 + <option value="all">All</option> 68 + <option value="collabs">Collabs</option> 69 + <option value="current-collab">Current Collab</option> 70 +</select> 71 +<input type="text" id="context-search-text" /> 72 +<button id="context-search-button" class="btn btn-primary">Search</button> 73 +<div class="form-group"> 74 + <label> 75 + <input type="checkbox" data-role-filter="administrator"> Administrator 76 + </label> 77 + <label> 78 + <input type="checkbox" data-role-filter="editor"> Editor 79 + </label> 80 +</div> 81 + 82 + 83 +<pre id="context-search-response"></pre> 84 +<script> 85 + window.addEventListener('DOMContentLoaded', function() { 86 + const filters = { 87 + search: '', 88 + offset: 0, 89 + orderField: 'title', 90 + order: 'asc', 91 + favorite: false, 92 + roles: [] // to be joined as administrator+editor+viewer 93 + }; 94 + 95 + function addRole(role) { 96 + if(filters.roles.indexOf(role) == -1) { 97 + filters.roles.push(role); 98 + } 99 + } 100 + 101 + function removeRole(role) { 102 + filters.roles = filters.roles.filter(r => r !== role) 103 + } 104 + 105 + const filterInputs = document.querySelectorAll('input[data-role-filter]'); 106 + 107 + filterInputs.forEach(function(filterIpt) { 108 + filterIpt.addEventListener('click', function() { 109 + const role = this.getAttribute('data-role-filter'); 110 + if(this.checked) { 111 + addRole(role); 112 + } else { 113 + removeRole(role); 114 + } 115 + runFilteredRequest(); 116 + }) 117 + }); 118 + 119 + function runFilteredRequest() { 120 + const urlParams = new URLSearchParams(); 121 + const tmpFilters = filters; 122 + tmpFilters.roles = tmpFilters.roles.join("+"); 123 + for(filter in tmpFilters) { 124 + urlParams.set(filter, tmpFilters[filter]); 125 + } 126 + console.log(urlParams); 127 + } 128 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator 129 + const contextSearchType = document.getElementById("context-search-type"); 130 + const contextSearchText = document.getElementById("context-search-text"); 131 + const contextSearchResponse = document.getElementById("context-search-response"); 132 + const contextSearchButton = document.getElementById("context-search-button"); 133 + contextSearchButton.addEventListener('click', function() { 134 + const context = contextSearchType.options[contextSearchType.selectedIndex].value; 135 + const term = contextSearchText.value; 136 + switch(context) { 137 + case 'collabs': 138 + document.location.href = `/bin/view/Collabs/#search=${term}`; 139 + break; 140 + case 'current-collab': 141 + handleXWikiSearch('bougaultx'); 142 + break 143 + default: 144 + handleXWikiSearch('') 145 + } 146 + 147 + }); 148 + function handleXWikiSearch(space, callback) { 145 145 require(['jquery'], function($) { 146 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 147 - //contextSearchButton.addEventListener('click', function() { 150 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 151 + const contextSearchButton = document.getElementById("context-search-button"); 152 + const xwikiSpace = space ? `.${space}` : ''; 153 + 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 - }); 155 + outputSyntax: 'plain', 156 + media: 'json', 157 + query: [ 158 + 'q="__INPUT__"~100', 159 + 'fq=type:DOCUMENT', 160 + `fq=space:Collabs${xwikiSpace}.*` 161 + ].join('\n'), 162 + input: $('#context-search-text').val() 163 + }).then(res => { 164 + if(callback) { 165 + callback(res).then(results => { 166 + contextSearchResponse.innerText = JSON.stringify(results, null, 2); 167 + }) 168 + } else { 169 + contextSearchResponse.innerText = JSON.stringify(res, null, 2); 170 + } 171 + }); 172 + }); 160 160 }); 161 161 } 175 + function applyAdministratorFilter(results) { 176 + return new Promise((resolve, reject) => { 177 + //fetch("/rest/v1/collabs?roles=administrator") 178 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") 179 + .then(res => res.json()) 180 + .then(collabs => { 181 + const spaces = collabs.map(collab => `Collabs.${collab.name}`); 182 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); 183 + resolve(filtered); 184 + }) 185 + 186 + }) 187 + } 162 162 }); 163 163 </script> 164 - 165 -<clb-unified-search></clb-unified-search> 166 - 190 +--> 167 167 {{/html}}