Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,5 +1,52 @@
1	1	{{html clean="false"}}
	2	+<script type="module">
	3	+ import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
	4	+ class UnifiedSearch extends LitElement {
	5	+ static properties = {
	6	+ searchText: { type: String },
	7	+ favoritesFilter: { type: Boolean },
	8	+ administratorFilter: { type: Boolean },
	9	+ editorFilter: { type: Boolean },
	10	+ viewerFilter: { type: Boolean },
	11	+ publicFilter: { type: Boolean },
	12	+ privateFilter: { type: Boolean },
	13	+ }
	14	+ constructor() {
	15	+ super();
	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;
	23	+ }
	24	+ toggleFilter(filter) {
	25	+ filter = !filter
	26	+ }
	27	+ setSearchText(e) {
	28	+ this.searchText = e.target.value;
	29	+ }
	30	+ handleSearch() {
	31	+ console.log(this.searchText);
	32	+ }
	33	+ render() {
	34	+ return html`
	35	+<div>
	36	+ <div>
	37	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	38	+ <button @click="${this.handleSearch}">Search</button>
	39	+ </div>
	40	+ <label><input type="checkbox" @change="${() => toggleFilter(this.administratorFilter)}" .checked="${this.administratorFilter}"/> Administrator</label>
	41	+</div>
	42	+`
	43	+ }
	44	+ }
	45	+ customElements.define('clb-unified-search', UnifiedSearch);
	46	+</script>
2	2
	48	+<clb-unified-search></clb-unified-search>
	49	+
3	3	<select id="context-search-type">
4	4	<option value="all">All</option>
5	5	<option value="collabs">Collabs</option>
...	...	@@ -7,21 +7,62 @@
7	7	</select>
8	8	<input type="text" id="context-search-text" />
9	9	<button id="context-search-button" class="btn btn-primary">Search</button>
	57	+<div class="form-group">
	58	+ <label>
	59	+ <input type="checkbox" data-role-filter="administrator"> Administrator
	60	+ </label>
	61	+ <label>
	62	+ <input type="checkbox" data-role-filter="editor"> Editor
	63	+ </label>
	64	+</div>
10	10
	66	+
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13		- /*
14		- async function fetchGlobalSearch(term) {
15		- const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
16		- const json = await res.json();
17		- return JSON.stringify(json, null, 2);
18		- }
19		- async function fetchCurrentCollabSearch(term) {
20		- const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
21		- const json = await res.json();
22		- return JSON.stringify(json, null, 2);
23		- }
24	24	window.addEventListener('DOMContentLoaded', function() {
	70	+ const filters = {
	71	+ search: '',
	72	+ offset: 0,
	73	+ orderField: 'title',
	74	+ order: 'asc',
	75	+ favorite: false,
	76	+ roles: [] // to be joined as administrator+editor+viewer
	77	+ };
	78	+
	79	+ function addRole(role) {
	80	+ if(filters.roles.indexOf(role) == -1) {
	81	+ filters.roles.push(role);
	82	+ }
	83	+ }
	84	+
	85	+ function removeRole(role) {
	86	+ filters.roles = filters.roles.filter(r => r !== role)
	87	+ }
	88	+
	89	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	90	+
	91	+ filterInputs.forEach(function(filterIpt) {
	92	+ filterIpt.addEventListener('click', function() {
	93	+ const role = this.getAttribute('data-role-filter');
	94	+ if(this.checked) {
	95	+ addRole(role);
	96	+ } else {
	97	+ removeRole(role);
	98	+ }
	99	+ runFilteredRequest();
	100	+ })
	101	+ });
	102	+
	103	+ function runFilteredRequest() {
	104	+ const urlParams = new URLSearchParams();
	105	+ const tmpFilters = filters;
	106	+ tmpFilters.roles = tmpFilters.roles.join("+");
	107	+ for(filter in tmpFilters) {
	108	+ urlParams.set(filter, tmpFilters[filter]);
	109	+ }
	110	+ console.log(urlParams);
	111	+ }
	112	+ // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
25	25	const contextSearchType = document.getElementById("context-search-type");
26	26	const contextSearchText = document.getElementById("context-search-text");
27	27	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -34,29 +34,55 @@
34	34	document.location.href = `/bin/view/Collabs/#search=${term}`;
35	35	break;
36	36	case 'current-collab':
37		- fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
	125	+ handleXWikiSearch('bougaultx');
38	38	break
39	39	default:
40		- fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	128	+ handleXWikiSearch('')
41	41	}
42	42
43	43	});
44		- });
45		-*/
46		-require(['jquery'], function($) {
47		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
48		- console.log('xxxx', solrServiceURL);
49		- $.post(solrServiceURL, {
50		- outputSyntax: 'plain',
51		- media: 'json',
52		- query: [
53		- 'q=*__INPUT__*',
54		- 'fq=type:DOCUMENT',
55		- 'fq=class:XWiki.XWikiUsers',
56		- 'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5'
57		- ].join('\n'),
58		- input: $('#context-search-text').val()
59		- });
	132	+ function handleXWikiSearch(space, callback) {
	133	+ require(['jquery'], function($) {
	134	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	135	+ const contextSearchButton = document.getElementById("context-search-button");
	136	+ const xwikiSpace = space ? `.${space}` : '';
	137	+ contextSearchButton.addEventListener('click', function() {
	138	+ $.post(solrServiceURL, {
	139	+ outputSyntax: 'plain',
	140	+ media: 'json',
	141	+ query: [
	142	+ 'q="__INPUT__"~100',
	143	+ 'fq=type:DOCUMENT',
	144	+ `fq=space:Collabs${xwikiSpace}.*`
	145	+ ].join('\n'),
	146	+ input: $('#context-search-text').val()
	147	+ }).then(res => {
	148	+ if(callback) {
	149	+ callback(res).then(results => {
	150	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	151	+ })
	152	+ } else {
	153	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	154	+ }
	155	+ });
	156	+ });
	157	+ });
	158	+ }
	159	+ function applyAdministratorFilter(results) {
	160	+ return new Promise((resolve, reject) => {
	161	+ //fetch("/rest/v1/collabs?roles=administrator")
	162	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	163	+ .then(res => res.json())
	164	+ .then(collabs => {
	165	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	166	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	167	+ resolve(filtered);
	168	+ })
	169	+
	170	+ })
	171	+ }
60	60	});
	173	+
	174	+
61	61	</script>
62	62	{{/html}}