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,10 +1,13 @@ 1 1 {{html clean="false"}} 2 2 <!-- 3 - !!! POC. Code would needtobe reviewed / optimized and packagedifthis is meant tobeusedin 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 { 10 + /* 8 8 static properties = { 9 9 searchText: { type: String }, 10 10 favoritesFilter: { type: Boolean }, ... ... @@ -14,30 +14,60 @@ 14 14 publicFilter: { type: Boolean }, 15 15 privateFilter: { type: Boolean }, 16 16 } 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 + `; 17 17 constructor() { 18 18 super(); 19 19 this.searchText = ""; 20 - this. favoritesFilter = false;21 - this. administratorFilter= false;22 - this. editorFilter = false;23 - this. viewerFilter =false;24 - this. publicFilter=false;25 - this. privateFilter=false;39 + this.administrator = false; 40 + this.editor = false; 41 + this.viewer = false; 42 + this.rolesFilter = []; 43 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); 44 + this.results = []; 26 26 } 27 - toggleBooleanFilter(filterName) { 28 - this[filterName] = !this[filterName]; 29 - console.log(this.administratorFilter); 46 + toggleRoleFilter(roleName) { 47 + if(this.rolesFilter.indexOf(roleName) == -1) { 48 + this.rolesFilter.push(roleName); 49 + } else { 50 + this.rolesFilter.filter(role => role !== roleName); 51 + } 52 + this[roleName] = !this[roleName]; 53 + this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); 54 + console.log(this.filterUrl.toString()); 30 30 } 31 31 setSearchText(e) { 32 32 this.searchText = e.target.value; 33 33 } 34 34 handleSearch() { 35 - // check if text changed 36 36 console.log(this.searchText); 61 + if(this.searchText !== "") { 62 + this.fetchWikiSearch(); 63 + } 37 37 } 38 - buildFilter() { 39 - //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= 65 + fetchWikiSearch() { 66 + // request should be built from component, not from "external" dependency. Leave it here like this for POC. 67 + handleXWikiSearch(this.searchText).then(results => this.results = results); 40 40 } 69 + 70 + 71 + getLink(xwikiDocSpace) { 72 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 73 + } 41 41 render() { 42 42 return html` 43 43 <div> ... ... @@ -46,145 +46,47 @@ 46 46 <button @click="${this.handleSearch}">Search</button> 47 47 </div> 48 48 <div> 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> 82 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label> 83 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label> 84 + <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label> 55 55 </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> 56 56 </div> 57 57 ` 58 58 } 59 59 } 60 60 customElements.define('clb-unified-search', UnifiedSearch); 61 -</script> 62 62 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) { 101 + function handleXWikiSearch(searchString) { 102 + return new Promise((resolve) => { 148 148 require(['jquery'], 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() { 104 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 105 + //contextSearchButton.addEventListener('click', function() { 153 153 $.post(solrServiceURL, { 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 - }); 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 + }); 172 172 }); 173 173 } 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 - } 187 187 }); 188 188 </script> 189 ---> 122 + 123 +<clb-unified-search></clb-unified-search> 124 + 190 190 {{/html}}