Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,69 @@
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	+ }
	29	+ toggleBooleanFilter(filterName) {
	30	+ this[filterName] = !this[filterName];
	31	+ console.log(this.administratorFilter);
	32	+ }
	33	+ setSearchText(e) {
	34	+ this.searchText = e.target.value;
	35	+ }
	36	+ handleSearch() {
	37	+ // check if text changed
	38	+ console.log(this.searchText);
	39	+ }
	40	+ buildFilter() {
	41	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
	42	+ }
	43	+ render() {
	44	+ return html`
	45	+<div>
	46	+ <div>
	47	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	48	+ <button @click="${this.handleSearch}">Search</button>
	49	+ </div>
	50	+ <div>
	51	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label>
	52	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label>
	53	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label>
	54	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label>
	55	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label>
	56	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label>
	57	+ </div>
	58	+</div>
	59	+`
	60	+ }
	61	+ }
	62	+ customElements.define('clb-unified-search', UnifiedSearch);
	63	+</script>
2	2
	65	+<clb-unified-search></clb-unified-search>
	66	+<!--
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>
	74	+<div class="form-group">
	75	+ <label>
	76	+ <input type="checkbox" data-role-filter="administrator"> Administrator
	77	+ </label>
	78	+ <label>
	79	+ <input type="checkbox" data-role-filter="editor"> Editor
	80	+ </label>
	81	+</div>
10	10
	83	+
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13	13	window.addEventListener('DOMContentLoaded', function() {
	87	+ const filters = {
	88	+ search: '',
	89	+ offset: 0,
	90	+ orderField: 'title',
	91	+ order: 'asc',
	92	+ favorite: false,
	93	+ roles: [] // to be joined as administrator+editor+viewer
	94	+ };
	95	+
	96	+ function addRole(role) {
	97	+ if(filters.roles.indexOf(role) == -1) {
	98	+ filters.roles.push(role);
	99	+ }
	100	+ }
	101	+
	102	+ function removeRole(role) {
	103	+ filters.roles = filters.roles.filter(r => r !== role)
	104	+ }
	105	+
	106	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	107	+
	108	+ filterInputs.forEach(function(filterIpt) {
	109	+ filterIpt.addEventListener('click', function() {
	110	+ const role = this.getAttribute('data-role-filter');
	111	+ if(this.checked) {
	112	+ addRole(role);
	113	+ } else {
	114	+ removeRole(role);
	115	+ }
	116	+ runFilteredRequest();
	117	+ })
	118	+ });
	119	+
	120	+ function runFilteredRequest() {
	121	+ const urlParams = new URLSearchParams();
	122	+ const tmpFilters = filters;
	123	+ tmpFilters.roles = tmpFilters.roles.join("+");
	124	+ for(filter in tmpFilters) {
	125	+ urlParams.set(filter, tmpFilters[filter]);
	126	+ }
	127	+ console.log(urlParams);
	128	+ }
	129	+ // 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()
	145	+ handleXWikiSearch('')
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	149	+ 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,32 +47,31 @@
47	47	].join('\n'),
48	48	input: $('#context-search-text').val()
49	49	}).then(res => {
50		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	165	+ if(callback) {
	166	+ callback(res).then(results => {
	167	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	168	+ })
	169	+ } else {
	170	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	171	+ }
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").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(([collabs, results]) => console.log(collabs, results))
	176	+ function applyAdministratorFilter(results) {
	177	+ return new Promise((resolve, reject) => {
	178	+ //fetch("/rest/v1/collabs?roles=administrator")
	179	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	180	+ .then(res => res.json())
	181	+ .then(collabs => {
	182	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	183	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	184	+ resolve(filtered);
	185	+ })
	186	+
	187	+ })
73	73	}
74	74	});
75		-
76		-
77	77	</script>
	191	+-->
78	78	{{/html}}