Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,112 @@
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	+window.addEventListener('DOMContentLoaded', function() {
2	2
	9	+ class UnifiedSearch extends LitElement {
	10	+ /*
	11	+ static properties = {
	12	+ searchText: { type: String },
	13	+ favoritesFilter: { type: Boolean },
	14	+ administratorFilter: { type: Boolean },
	15	+ editorFilter: { type: Boolean },
	16	+ viewerFilter: { type: Boolean },
	17	+ publicFilter: { type: Boolean },
	18	+ privateFilter: { type: Boolean },
	19	+ }
	20	+ */
	21	+ static properties = {
	22	+ results: { type: Array }
	23	+ }
	24	+ constructor() {
	25	+ super();
	26	+ this.searchText = "";
	27	+ this.administrator = false;
	28	+ this.editor = false;
	29	+ this.viewer = false;
	30	+ this.rolesFilter = [];
	31	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
	32	+ this.results = [];
	33	+ }
	34	+ toggleRoleFilter(roleName) {
	35	+ if(this.rolesFilter.indexOf(roleName) == -1) {
	36	+ this.rolesFilter.push(roleName);
	37	+ } else {
	38	+ this.rolesFilter.filter(role => role !== roleName);
	39	+ }
	40	+ this[roleName] = !this[roleName];
	41	+ this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	42	+ }
	43	+ setSearchText(e) {
	44	+ this.searchText = e.target.value;
	45	+ }
	46	+ handleSearch() {
	47	+ console.log(this.searchText);
	48	+ if(this.searchText !== "") {
	49	+ this.fetchWikiSearch();
	50	+ }
	51	+ }
	52	+ fetchWikiSearch() {
	53	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	54	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
	55	+ }
	56	+ buildFilter() {
	57	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
	58	+ }
	59	+ render() {
	60	+ return html`
	61	+<div>
	62	+ <div>
	63	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	64	+ <button @click="${this.handleSearch}">Search</button>
	65	+ </div>
	66	+ <div>
	67	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
	68	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
	69	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	70	+ </div>
	71	+ <div>
	72	+ ${this.results.map(result => html`
	73	+ <div>
	74	+ <a href="#">${result.title}</a>
	75	+ <div>${result.id}</div>
	76	+ <div>${result.doccontent_.substring(0, 150)}
	77	+ </div>
	78	+ `)}
	79	+ </div>
	80	+</div>
	81	+`
	82	+ }
	83	+ }
	84	+ customElements.define('clb-unified-search', UnifiedSearch);
	85	+
	86	+ function handleXWikiSearch(searchString) {
	87	+ return new Promise((resolve) => {
	88	+ require(['jquery'], function($) {
	89	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	90	+ //contextSearchButton.addEventListener('click', function() {
	91	+ $.post(solrServiceURL, {
	92	+ outputSyntax: 'plain',
	93	+ media: 'json',
	94	+ query: [
	95	+ 'q="__INPUT__"~100',
	96	+ 'fq=type:DOCUMENT',
	97	+ `fq=space:Collabs.*`
	98	+ ].join('\n'),
	99	+ input: searchString
	100	+ }).then(resolve);
	101	+ //});
	102	+ });
	103	+ });
	104	+ }
	105	+});
	106	+</script>
	107	+
	108	+<clb-unified-search></clb-unified-search>
	109	+<!--
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>
	117	+<div class="form-group">
	118	+ <label>
	119	+ <input type="checkbox" data-role-filter="administrator"> Administrator
	120	+ </label>
	121	+ <label>
	122	+ <input type="checkbox" data-role-filter="editor"> Editor
	123	+ </label>
	124	+</div>
10	10
	126	+
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13	13	window.addEventListener('DOMContentLoaded', function() {
	130	+ const filters = {
	131	+ search: '',
	132	+ offset: 0,
	133	+ orderField: 'title',
	134	+ order: 'asc',
	135	+ favorite: false,
	136	+ roles: [] // to be joined as administrator+editor+viewer
	137	+ };
	138	+
	139	+ function addRole(role) {
	140	+ if(filters.roles.indexOf(role) == -1) {
	141	+ filters.roles.push(role);
	142	+ }
	143	+ }
	144	+
	145	+ function removeRole(role) {
	146	+ filters.roles = filters.roles.filter(r => r !== role)
	147	+ }
	148	+
	149	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	150	+
	151	+ filterInputs.forEach(function(filterIpt) {
	152	+ filterIpt.addEventListener('click', function() {
	153	+ const role = this.getAttribute('data-role-filter');
	154	+ if(this.checked) {
	155	+ addRole(role);
	156	+ } else {
	157	+ removeRole(role);
	158	+ }
	159	+ runFilteredRequest();
	160	+ })
	161	+ });
	162	+
	163	+ function runFilteredRequest() {
	164	+ const urlParams = new URLSearchParams();
	165	+ const tmpFilters = filters;
	166	+ tmpFilters.roles = tmpFilters.roles.join("+");
	167	+ for(filter in tmpFilters) {
	168	+ urlParams.set(filter, tmpFilters[filter]);
	169	+ }
	170	+ console.log(urlParams);
	171	+ }
	172	+ // 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()
	188	+ handleXWikiSearch('')
31	31	}
32	32
33	33	});
34		- function handleXWikiSearch(space) {
	192	+ 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);
	208	+ if(callback) {
	209	+ callback(res).then(results => {
	210	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	211	+ })
	212	+ } else {
	213	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	214	+ }
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))
	219	+ function applyAdministratorFilter(results) {
	220	+ return new Promise((resolve, reject) => {
	221	+ //fetch("/rest/v1/collabs?roles=administrator")
	222	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	223	+ .then(res => res.json())
	224	+ .then(collabs => {
	225	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	226	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	227	+ resolve(filtered);
	228	+ })
	229	+
	230	+ })
73	73	}
74	74	});
75		-
76		-
77	77	</script>
	234	+-->
78	78	{{/html}}