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