Changes for page Context Search

Summary

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

Details

Page properties

Content

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