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,96 +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.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&favorite=&roles=`); 45 - this.results = []; 20 + this.favoritesFilter = false; 21 + this.administratorFilter = false; 22 + this.editorFilter = false; 23 + this.viewerFilter = false; 24 + this.publicFilter = false; 25 + this.privateFilter = false; 46 46 } 47 - toggleRoleFilter(roleName) { 48 - if(this.rolesFilter.indexOf(roleName) == -1) { 49 - this.rolesFilter.push(roleName); 50 - } else { 51 - this.rolesFilter.filter(role => role !== roleName); 52 - } 53 - this[roleName] = !this[roleName]; 54 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 55 - this.handleSearch(); 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 - if(this.searchText !== this.prevSearchText) { 63 - console.log(this.searchText, this.prevSearchText); 64 - this.prevSearchText = this.searchText; 65 - Promise.all([ 66 - this.fetchWikiSearch(), 67 - this.fetchFilterSearch() 68 - ]).then(([wikiSearchResults, collabSearchResults]) => { 69 - this.results = wikiSearchResults; 70 - console.log(wikiSearchResults, collabSearchResults); 71 - }); 72 - } else if (this.searchText === this.prevSearchText) { 73 - console.log("Only apply filter on results"); 74 - this.fetchFilterSearch().then(this.filterResults) 75 - } 76 - } else { 77 - console.log("no search text, should return filter search results if any"); 78 - this.fetchFilterSearch().then(collabs => { 79 - console.log("Format and display collabs", collabs); 80 - }) 81 - } 35 + // check if text changed 36 + console.log(this.searchText); 82 82 } 83 - hasActiveFilters() { 84 - // we only look at role filters for POC. 85 - console.log(this.rolesFilter); 86 - return this.rolesFilter.length > 0; 38 + buildFilter() { 39 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 87 87 } 88 - fetchWikiSearch() { 89 - // request should be built from component, not from "external" dependency. Leave it here like this for POC. 90 - return handleXWikiSearch(this.searchText); 91 - } 92 - fetchFilterSearch() { 93 - return new Promise((resolve) => { 94 - if(this.hasActiveFilters) { 95 - fetch(this.filterUrl).then(res => res.json()).then(resolve); 96 - } else { 97 - resolve(null); 98 - } 99 - }); 100 - } 101 - filterResults = (filteredCollabs) => { 102 - console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 103 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`); 104 - const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space))); 105 - console.log(filteredResults); 106 - } 107 - getLink(xwikiDocSpace) { 108 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 109 - } 110 110 render() { 111 111 return html` 112 112 <div> ... ... @@ -115,47 +115,145 @@ 115 115 <button @click="${this.handleSearch}">Search</button> 116 116 </div> 117 117 <div> 118 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 119 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 120 - <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> 121 121 </div> 122 - <div> 123 - ${this.results.map(result => html` 124 - <div class="result"> 125 - <a href="${this.getLink(result.space)}">${result.title_}</a> 126 - <div>${result.doccontent_.substring(0, 150)} 127 - <div class="light">${result.space.replaceAll('.', ' / ')}</div> 128 - </div> 129 - `)} 130 - </div> 131 131 </div> 132 132 ` 133 133 } 134 134 } 135 135 customElements.define('clb-unified-search', UnifiedSearch); 61 +</script> 136 136 137 - function handleXWikiSearch(searchString) { 138 - 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) { 139 139 require(['jquery'], function($) { 140 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 141 - //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() { 142 142 $.post(solrServiceURL, { 143 - outputSyntax: 'plain', 144 - media: 'json', 145 - query: [ 146 - 'q="__INPUT__"~100', 147 - 'fq=type:DOCUMENT', 148 - `fq=space:Collabs.*` 149 - ].join('\n'), 150 - input: searchString 151 - }).then(resolve); 152 - //}); 153 - }); 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 + }); 154 154 }); 155 155 } 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 + } 156 156 }); 157 157 </script> 158 - 159 -<clb-unified-search></clb-unified-search> 160 - 189 +--> 161 161 {{/html}}