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