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