Changes for page Context Search

Summary

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

Details

Page properties

Content

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