Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,116 +1,141 @@
1	1	{{html clean="false"}}
	2	+<!--
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	4	+-->
	5	+<script type="module">
	6	+import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
	7	+window.addEventListener('DOMContentLoaded', function() {
2	2
3		-<select id="context-search-type">
4		- <option value="all">All</option>
5		- <option value="collabs">Collabs</option>
6		- <option value="current-collab">Current Collab</option>
7		-</select>
8		-<div>
9		-<label>
10		- <input type="checkbox" data-role-filter="administrator"> Administrator
11		-</label>
12		-<input type="text" id="context-search-text" />
13		-<button id="context-search-button" class="btn btn-primary">Search</button>
14		-
15		-<pre id="context-search-response"></pre>
16		-<script>
17		- window.addEventListener('DOMContentLoaded', function() {
18		- const filters = {
19		- search: '',
20		- offset: 0,
21		- orderField: 'title',
22		- order: 'asc',
23		- favorite: false,
24		- roles: [] // to be joined as administrator+editor+viewer
25		- };
26		-
27		- function addRole(role) {
28		- if(filters.roles.indexOf(role) == -1) {
29		- filters.roles.push(role);
	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	+ static styles = css`
	25	+ .result {
	26	+ margin-top: 1em;
30	30	}
	28	+ .light {
	29	+ color: var(--color-gray-500, #CCC);
	30	+ font-size: 14px;
	31	+ }
	32	+ a {
	33	+ color: var(--color-brand-primary, blue);
	34	+ }
	35	+ `;
	36	+ constructor() {
	37	+ super();
	38	+ this.searchText = "";
	39	+ this.administrator = false;
	40	+ this.editor = false;
	41	+ this.viewer = false;
	42	+ this.rolesFilter = [];
	43	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
	44	+ this.results = [];
31	31	}
32		-
33		- function removeRole(role) {
34		- filters.roles.filter(r => r !== 'administrator')
	46	+ toggleRoleFilter(roleName) {
	47	+ if(this.rolesFilter.indexOf(roleName) == -1) {
	48	+ this.rolesFilter.push(roleName);
	49	+ } else {
	50	+ this.rolesFilter.filter(role => role !== roleName);
	51	+ }
	52	+ this[roleName] = !this[roleName];
	53	+ this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	54	+ // if search text then apply filter
	55	+ // else return filters result
35	35	}
36		-
37		- const filterInputs = document.querySelector('input[data-role-filter]');
38		- console.log(filterInputs);
39		- filterInputs.forEach(function(filterIpt) {
40		- console.log(filterIpt);
41		- filter.addEventListener('click', function() {
42		- const role = this.getAttribute('data-role-filter');
43		- if(this.checked) {
44		- addRole(role);
	57	+ setSearchText(e) {
	58	+ this.searchText = e.target.value;
	59	+ }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "") {
	62	+ Promise.all([
	63	+ this.fetchWikiSearch(),
	64	+ this.fetchFilterSearch()
	65	+ ])
	66	+ } else {
	67	+ console.log("no search text, should return filter search results if any");
	68	+ }
	69	+ }
	70	+ hasActiveFilters() {
	71	+ // we only look at role filters for POC.
	72	+ return this.roles.length > 0;
	73	+ }
	74	+ fetchWikiSearch() {
	75	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	76	+ return handleXWikiSearch(this.searchText);
	77	+ }
	78	+ fetchFilterSearch() {
	79	+ return new Promise((resolve) => {
	80	+ if(hasActiveFilters) {
	81	+ fetch(this.filterUrl).then(console.log);
45	45	} else {
46		- removeRole(role);
	83	+ resolve(null);
47	47	}
48		- console.log(filters);
49		- })
50		- });
	85	+ });
	86	+ }
	87	+ getLink(xwikiDocSpace) {
	88	+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
	89	+ }
	90	+ render() {
	91	+ return html`
	92	+<div>
	93	+ <div>
	94	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	95	+ <button @click="${this.handleSearch}">Search</button>
	96	+ </div>
	97	+ <div>
	98	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
	99	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
	100	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	101	+ </div>
	102	+ <div>
	103	+ ${this.results.map(result => html`
	104	+ <div class="result">
	105	+ <a href="${this.getLink(result.space)}">${result.title_}</a>
	106	+ <div>${result.doccontent_.substring(0, 150)}
	107	+ <div class="light">${result.space.replaceAll('.', ' / ')}</div>
	108	+ </div>
	109	+ `)}
	110	+ </div>
	111	+</div>
	112	+`
	113	+ }
	114	+ }
	115	+ customElements.define('clb-unified-search', UnifiedSearch);
51	51
52		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
53		- const contextSearchType = document.getElementById("context-search-type");
54		- const contextSearchText = document.getElementById("context-search-text");
55		- const contextSearchResponse = document.getElementById("context-search-response");
56		- const contextSearchButton = document.getElementById("context-search-button");
57		- contextSearchButton.addEventListener('click', function() {
58		- const context = contextSearchType.options[contextSearchType.selectedIndex].value;
59		- const term = contextSearchText.value;
60		- switch(context) {
61		- case 'collabs':
62		- document.location.href = `/bin/view/Collabs/#search=${term}`;
63		- break;
64		- case 'current-collab':
65		- handleXWikiSearch('bougaultx');
66		- break
67		- default:
68		- handleXWikiSearch('', applyAdministratorFilter)
69		- }
70		-
71		- });
72		- function handleXWikiSearch(space, callback) {
	117	+ function handleXWikiSearch(searchString) {
	118	+ return new Promise((resolve) => {
73	73	require(['jquery'], function($) {
74		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
75		- const contextSearchButton = document.getElementById("context-search-button");
76		- const xwikiSpace = space ? `.${space}` : '';
77		- contextSearchButton.addEventListener('click', function() {
	120	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	121	+ //contextSearchButton.addEventListener('click', function() {
78	78	$.post(solrServiceURL, {
79		- outputSyntax: 'plain',
80		- media: 'json',
81		- query: [
82		- 'q="__INPUT__"~100',
83		- 'fq=type:DOCUMENT',
84		- `fq=space:Collabs${xwikiSpace}.*`
85		- ].join('\n'),
86		- input: $('#context-search-text').val()
87		- }).then(res => {
88		- if(callback) {
89		- callback(res).then(results => {
90		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
91		- })
92		- } else {
93		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
94		- }
95		- });
96		- });
	123	+ outputSyntax: 'plain',
	124	+ media: 'json',
	125	+ query: [
	126	+ 'q="__INPUT__"~100',
	127	+ 'fq=type:DOCUMENT',
	128	+ `fq=space:Collabs.*`
	129	+ ].join('\n'),
	130	+ input: searchString
	131	+ }).then(resolve);
	132	+ //});
	133	+ });
97	97	});
98	98	}
99		- function applyAdministratorFilter(results) {
100		- return new Promise((resolve, reject) => {
101		- //fetch("/rest/v1/collabs?roles=administrator")
102		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
103		- .then(res => res.json())
104		- .then(collabs => {
105		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
106		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
107		- resolve(filtered);
108		- })
109		-
110		- })
111		- }
112	112	});
	137	+</script>
113	113
	139	+<clb-unified-search></clb-unified-search>
114	114
115		-</script>
116	116	{{/html}}