Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,9 @@
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	+</script>
2	2
	6	+
3	3	<select id="context-search-type">
4	4	<option value="all">All</option>
5	5	<option value="collabs">Collabs</option>
...	...	@@ -7,10 +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>
	14	+<div class="form-group">
	15	+ <label>
	16	+ <input type="checkbox" data-role-filter="administrator"> Administrator
	17	+ </label>
	18	+ <label>
	19	+ <input type="checkbox" data-role-filter="editor"> Editor
	20	+ </label>
	21	+</div>
10	10
	23	+
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13	13	window.addEventListener('DOMContentLoaded', function() {
	27	+ const filters = {
	28	+ search: '',
	29	+ offset: 0,
	30	+ orderField: 'title',
	31	+ order: 'asc',
	32	+ favorite: false,
	33	+ roles: [] // to be joined as administrator+editor+viewer
	34	+ };
	35	+
	36	+ function addRole(role) {
	37	+ if(filters.roles.indexOf(role) == -1) {
	38	+ filters.roles.push(role);
	39	+ }
	40	+ }
	41	+
	42	+ function removeRole(role) {
	43	+ filters.roles = filters.roles.filter(r => r !== role)
	44	+ }
	45	+
	46	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	47	+
	48	+ filterInputs.forEach(function(filterIpt) {
	49	+ filterIpt.addEventListener('click', function() {
	50	+ const role = this.getAttribute('data-role-filter');
	51	+ if(this.checked) {
	52	+ addRole(role);
	53	+ } else {
	54	+ removeRole(role);
	55	+ }
	56	+ runFilteredRequest();
	57	+ })
	58	+ });
	59	+
	60	+ function runFilteredRequest() {
	61	+ const urlParams = new URLSearchParams();
	62	+ const tmpFilters = filters;
	63	+ tmpFilters.roles = tmpFilters.roles.join("+");
	64	+ for(filter in tmpFilters) {
	65	+ urlParams.set(filter, tmpFilters[filter]);
	66	+ }
	67	+ console.log(urlParams);
	68	+ }
	69	+ // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
14	14	const contextSearchType = document.getElementById("context-search-type");
15	15	const contextSearchText = document.getElementById("context-search-text");
16	16	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -18,7 +18,6 @@
18	18	contextSearchButton.addEventListener('click', function() {
19	19	const context = contextSearchType.options[contextSearchType.selectedIndex].value;
20	20	const term = contextSearchText.value;
21		- searchWithAdministratorFilter(term);
22	22	switch(context) {
23	23	case 'collabs':
24	24	document.location.href = `/bin/view/Collabs/#search=${term}`;
...	...	@@ -27,11 +27,11 @@
27	27	handleXWikiSearch('bougaultx');
28	28	break
29	29	default:
30		- handleXWikiSearch()
	85	+ handleXWikiSearch('')
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	89	+ function handleXWikiSearch(space, callback) {
35	35	require(['jquery'], function($) {
36	36	var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
37	37	const contextSearchButton = document.getElementById("context-search-button");
...	...	@@ -47,29 +47,29 @@
47	47	].join('\n'),
48	48	input: $('#context-search-text').val()
49	49	}).then(res => {
50		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	105	+ if(callback) {
	106	+ callback(res).then(results => {
	107	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	108	+ })
	109	+ } else {
	110	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	111	+ }
51	51	});
52	52	});
53	53	});
54	54	}
55		- function searchWithAdministratorFilter(term) {
56		- let xwikiSpace = "";
57		- // parameters are set according to ticked filter. Hardcoded for POC
58		- Promise.all(
59		- fetch("/rest/v1/collabs?roles=administrator"),
60		- fetch("/bin/get/XWiki/SuggestSolrService", {
61		- method: "POST",
62		- body: {
63		- outputSyntax: 'plain',
64		- media: 'json',
65		- query: [
66		- 'q="__INPUT__"~100',
67		- 'fq=type:DOCUMENT',
68		- `fq=space:Collabs${xwikiSpace}.*`
69		- ].join('\n'),
70		- input: term
71		- }})
72		- ).then(res => console.log("Search with administrator", res))
	116	+ function applyAdministratorFilter(results) {
	117	+ return new Promise((resolve, reject) => {
	118	+ //fetch("/rest/v1/collabs?roles=administrator")
	119	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	120	+ .then(res => res.json())
	121	+ .then(collabs => {
	122	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	123	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	124	+ resolve(filtered);
	125	+ })
	126	+
	127	+ })
73	73	}
74	74	});
75	75