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,19 +11,41 @@ 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=true;19 - this. editorFilter = false;20 - this. viewerFilter =false;21 - this. publicFilter=false;22 - 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=true&roles=`); 44 + this.results = []; 23 23 } 24 - toggleFilter(filterName) { 25 - this[filterName] = !this[filterName]; 26 - 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()); 27 27 } 28 28 setSearchText(e) { 29 29 this.searchText = e.target.value; ... ... @@ -30,7 +30,19 @@ 30 30 } 31 31 handleSearch() { 32 32 console.log(this.searchText); 61 + if(this.searchText !== "") { 62 + this.fetchWikiSearch(); 63 + } 33 33 } 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); 68 + } 69 + 70 + 71 + getLink(xwikiDocSpace) { 72 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; 73 + } 34 34 render() { 35 35 return html` 36 36 <div> ... ... @@ -39,146 +39,47 @@ 39 39 <button @click="${this.handleSearch}">Search</button> 40 40 </div> 41 41 <div> 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> 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> 48 48 </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> 49 49 </div> 50 50 ` 51 51 } 52 52 } 53 53 customElements.define('clb-unified-search', UnifiedSearch); 54 -</script> 55 55 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) { 101 + function handleXWikiSearch(searchString) { 102 + return new Promise((resolve) => { 141 141 require(['jquery'], 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() { 104 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); 105 + //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${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 - }); 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 + }); 165 165 }); 166 166 } 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 - } 180 180 }); 121 +</script> 181 181 123 +<clb-unified-search></clb-unified-search> 182 182 183 -</script> 184 184 {{/html}}