Changes for page Context Search

Summary

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

Details

Page properties

Content

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