Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,125 +1,125 @@
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		-<input type="text" id="context-search-text" />
9		-<button id="context-search-button" class="btn btn-primary">Search</button>
10		-<div class="form-group">
11		- <label>
12		- <input type="checkbox" data-role-filter="administrator"> Administrator
13		- </label>
14		- <label>
15		- <input type="checkbox" data-role-filter="editor"> Editor
16		- </label>
17		-</div>
18		-
19		-
20		-<pre id="context-search-response"></pre>
21		-<script>
22		- window.addEventListener('DOMContentLoaded', function() {
23		- const filters = {
24		- search: '',
25		- offset: 0,
26		- orderField: 'title',
27		- order: 'asc',
28		- favorite: false,
29		- roles: [] // to be joined as administrator+editor+viewer
30		- };
31		-
32		- function addRole(role) {
33		- if(filters.roles.indexOf(role) == -1) {
34		- 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;
35	35	}
	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=true&roles=`);
	44	+ this.results = [];
36	36	}
37		-
38		- function removeRole(role) {
39		- filters.roles = filters.roles.filter(r => r !== role)
	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	+ console.log(this.filterUrl.toString());
40	40	}
	56	+ setSearchText(e) {
	57	+ this.searchText = e.target.value;
	58	+ }
	59	+ handleSearch() {
	60	+ console.log(this.searchText);
	61	+ if(this.searchText !== "") {
	62	+ this.fetchWikiSearch();
	63	+ }
	64	+ }
	65	+ fetchWikiSearch() {
	66	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	67	+ handleXWikiSearch(this.searchText).then(results => this.results = results);
	68	+ }
41	41
42		- const filterInputs = document.querySelectorAll('input[data-role-filter]');
43	43
44		- filterInputs.forEach(function(filterIpt) {
45		- filterIpt.addEventListener('click', function() {
46		- const role = this.getAttribute('data-role-filter');
47		- if(this.checked) {
48		- addRole(role);
49		- } else {
50		- removeRole(role);
51		- }
52		- runFilteredRequest();
53		- })
54		- });
55		-
56		- function runFilteredRequest() {
57		- for(filter in filters) {
58		- console.log(filter);
59		- }
	71	+ getLink(xwikiDocSpace) {
	72	+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
60	60	}
61		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
62		- const contextSearchType = document.getElementById("context-search-type");
63		- const contextSearchText = document.getElementById("context-search-text");
64		- const contextSearchResponse = document.getElementById("context-search-response");
65		- const contextSearchButton = document.getElementById("context-search-button");
66		- contextSearchButton.addEventListener('click', function() {
67		- const context = contextSearchType.options[contextSearchType.selectedIndex].value;
68		- const term = contextSearchText.value;
69		- switch(context) {
70		- case 'collabs':
71		- document.location.href = `/bin/view/Collabs/#search=${term}`;
72		- break;
73		- case 'current-collab':
74		- handleXWikiSearch('bougaultx');
75		- break
76		- default:
77		- handleXWikiSearch('')
78		- }
	74	+ render() {
	75	+ return html`
	76	+<div>
	77	+ <div>
	78	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	79	+ <button @click="${this.handleSearch}">Search</button>
	80	+ </div>
	81	+ <div>
	82	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
	83	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
	84	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	85	+ </div>
	86	+ <div>
	87	+ ${this.results.map(result => html`
	88	+ <div class="result">
	89	+ <a href="${this.getLink(result.space)}">${result.title_}</a>
	90	+ <div>${result.doccontent_.substring(0, 150)}
	91	+ <div class="light">${result.space.replaceAll('.', ' / ')}</div>
	92	+ </div>
	93	+ `)}
	94	+ </div>
	95	+</div>
	96	+`
	97	+ }
	98	+ }
	99	+ customElements.define('clb-unified-search', UnifiedSearch);
79	79
80		- });
81		- function handleXWikiSearch(space, callback) {
	101	+ function handleXWikiSearch(searchString) {
	102	+ return new Promise((resolve) => {
82	82	require(['jquery'], function($) {
83		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
84		- const contextSearchButton = document.getElementById("context-search-button");
85		- const xwikiSpace = space ? `.${space}` : '';
86		- contextSearchButton.addEventListener('click', function() {
	104	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	105	+ //contextSearchButton.addEventListener('click', function() {
87	87	$.post(solrServiceURL, {
88		- outputSyntax: 'plain',
89		- media: 'json',
90		- query: [
91		- 'q="__INPUT__"~100',
92		- 'fq=type:DOCUMENT',
93		- `fq=space:Collabs${xwikiSpace}.*`
94		- ].join('\n'),
95		- input: $('#context-search-text').val()
96		- }).then(res => {
97		- if(callback) {
98		- callback(res).then(results => {
99		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
100		- })
101		- } else {
102		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
103		- }
104		- });
105		- });
	107	+ outputSyntax: 'plain',
	108	+ media: 'json',
	109	+ query: [
	110	+ 'q="__INPUT__"~100',
	111	+ 'fq=type:DOCUMENT',
	112	+ `fq=space:Collabs.*`
	113	+ ].join('\n'),
	114	+ input: searchString
	115	+ }).then(resolve);
	116	+ //});
	117	+ });
106	106	});
107	107	}
108		- function applyAdministratorFilter(results) {
109		- return new Promise((resolve, reject) => {
110		- //fetch("/rest/v1/collabs?roles=administrator")
111		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
112		- .then(res => res.json())
113		- .then(collabs => {
114		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
115		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
116		- resolve(filtered);
117		- })
118		-
119		- })
120		- }
121	121	});
	121	+</script>
122	122
	123	+<clb-unified-search></clb-unified-search>
123	123
124		-</script>
125	125	{{/html}}