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,9 +1,11 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code wouldmust be reviewed / optimized and packaged for use in production !!!3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!! 4 4 --> 5 5 <script type="module"> 6 - import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; 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 + 7 7 class UnifiedSearch extends LitElement { 8 8 /* 9 9 static properties = { ... ... @@ -16,29 +16,88 @@ 16 16 privateFilter: { type: Boolean }, 17 17 } 18 18 */ 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 + `; 19 19 constructor() { 20 20 super(); 21 21 this.searchText = ""; 22 - this. favoritesFilter =false;23 - this.administrator Filter= false;24 - this.editor Filter= false;25 - this.viewer Filter= false;26 - this. publicFilter =false;27 - this. privateFilter=false;28 - this. filterUrl = new URL(`//${document.location.host}`);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 = []; 29 29 } 30 - toggleBooleanFilter(filterName) { 31 - this[filterName] = !this[filterName]; 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 + // if search text then apply filter 56 + // else return filters result 32 32 } 33 33 setSearchText(e) { 34 34 this.searchText = e.target.value; 35 35 } 36 36 handleSearch() { 37 - console.log(this.searchText); 62 + if(this.searchText !== "" && this.searchText !== this.prevSearchText) { 63 + this.prevSearchText = this.searchText; 64 + Promise.all([ 65 + this.fetchWikiSearch(), 66 + this.fetchFilterSearch() 67 + ]).then(([wikiSearchResults, collabSearchResults]) => { 68 + console.log(wikiSearchResults, collabSearchResults); 69 + }); 70 + } else if (this.searchText === this.prevSearchText) { 71 + console.log("Only apply filter on results"); 72 + this.fetchFilterSearch().then(res => res.json()).then(this.filterResults) 73 + } else { 74 + console.log("no search text, should return filter search results if any"); 75 + this.fetchFilterSearch().then(res => res.json()).then(collabs => { 76 + console.log("Format and display collabs", collabs); 77 + }) 78 + } 38 38 } 39 - buildFilter() { 40 - //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 80 + hasActiveFilters() { 81 + // we only look at role filters for POC. 82 + return this.roles.length > 0; 41 41 } 84 + fetchWikiSearch() { 85 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 86 + return handleXWikiSearch(this.searchText); 87 + } 88 + fetchFilterSearch() { 89 + return new Promise((resolve) => { 90 + if(hasActiveFilters) { 91 + fetch(this.filterUrl).then(console.log); 92 + } else { 93 + resolve(null); 94 + } 95 + }); 96 + } 97 + filterResults(filteredCollabs) { 98 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results); 99 + } 100 + getLink(xwikiDocSpace) { 101 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 102 + } 42 42 render() { 43 43 return html` 44 44 <div> ... ... @@ -47,145 +47,47 @@ 47 47 <button @click="${this.handleSearch}">Search</button> 48 48 </div> 49 49 <div> 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> 111 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 112 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 113 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 56 56 </div> 115 + <div> 116 + ${this.results.map(result => html` 117 + <div class="result"> 118 + <a href="${this.getLink(result.space)}">${result.title_}</a> 119 + <div>${result.doccontent_.substring(0, 150)} 120 + <div class="light">${result.space.replaceAll('.', ' / ')}</div> 121 + </div> 122 + `)} 123 + </div> 57 57 </div> 58 58 ` 59 59 } 60 60 } 61 61 customElements.define('clb-unified-search', UnifiedSearch); 62 -</script> 63 63 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) { 130 + function handleXWikiSearch(searchString) { 131 + return new Promise((resolve) => { 149 149 require(['jquery'], 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() { 133 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 134 + //contextSearchButton.addEventListener('click', function() { 154 154 $.post(solrServiceURL, { 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 - }); 136 + outputSyntax: 'plain', 137 + media: 'json', 138 + query: [ 139 + 'q="__INPUT__"~100', 140 + 'fq=type:DOCUMENT', 141 + `fq=space:Collabs.*` 142 + ].join('\n'), 143 + input: searchString 144 + }).then(resolve); 145 + //}); 146 + }); 173 173 }); 174 174 } 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 - } 188 188 }); 189 189 </script> 190 ---> 151 + 152 +<clb-unified-search></clb-unified-search> 153 + 191 191 {{/html}}