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