Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,81 +1,161 @@
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>
	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	+ .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.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 = [];
	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	+ setSearchText(e) {
	58	+ this.searchText = e.target.value;
	59	+ }
	60	+ handleSearch() {
	61	+ if(this.searchText !== "") {
	62	+ if(this.searchText !== this.prevSearchText) {
	63	+ console.log(this.searchText, this.prevSearchText);
	64	+ this.prevSearchText = this.searchText;
	65	+ Promise.all([
	66	+ this.fetchWikiSearch(),
	67	+ this.fetchFilterSearch()
	68	+ ]).then(([wikiSearchResults, collabSearchResults]) => {
	69	+ this.results = wikiSearchResults;
	70	+ console.log(wikiSearchResults, collabSearchResults);
	71	+ });
	72	+ } else if (this.searchText === this.prevSearchText) {
	73	+ console.log("Only apply filter on results");
	74	+ this.fetchFilterSearch().then(this.filterResults)
	75	+ }
	76	+ } else {
	77	+ console.log("no search text, should return filter search results if any");
	78	+ this.fetchFilterSearch().then(collabs => {
	79	+ console.log("Format and display collabs", collabs);
	80	+ })
	81	+ }
	82	+ }
	83	+ hasActiveFilters() {
	84	+ // we only look at role filters for POC.
	85	+ console.log('rolesfilter', this.rolesFilter);
	86	+ return this.rolesFilter.length > 0;
	87	+ }
	88	+ fetchWikiSearch() {
	89	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	90	+ return handleXWikiSearch(this.searchText);
	91	+ }
	92	+ fetchFilterSearch() {
	93	+ return new Promise((resolve) => {
	94	+ if(this.hasActiveFilters) {
	95	+ fetch(this.filterUrl).then(res => res.json()).then(resolve);
	96	+ } else {
	97	+ resolve(null);
	98	+ }
	99	+ });
	100	+ }
	101	+ filterResults = (filteredCollabs) => {
	102	+ console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
	103	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	104	+ const filteredResults = this.results.filter(result => collabsSpace.some(space => result.startsWith(space)));
	105	+ console.log(filteredResults);
	106	+ }
	107	+ getLink(xwikiDocSpace) {
	108	+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
	109	+ }
	110	+ render() {
	111	+ return html`
8	8	<div>
9		-<label>
10		- <input type="checkbox" id="administratorFilter"> Administrator
11		-</label>
12		-<input type="text" id="context-search-text" />
13		-<button id="context-search-button" class="btn btn-primary">Search</button>
	113	+ <div>
	114	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	115	+ <button @click="${this.handleSearch}">Search</button>
	116	+ </div>
	117	+ <div>
	118	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
	119	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
	120	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	121	+ </div>
	122	+ <div>
	123	+ ${this.results.map(result => html`
	124	+ <div class="result">
	125	+ <a href="${this.getLink(result.space)}">${result.title_}</a>
	126	+ <div>${result.doccontent_.substring(0, 150)}
	127	+ <div class="light">${result.space.replaceAll('.', ' / ')}</div>
	128	+ </div>
	129	+ `)}
	130	+ </div>
	131	+</div>
	132	+`
	133	+ }
	134	+ }
	135	+ customElements.define('clb-unified-search', UnifiedSearch);
14	14
15		-<pre id="context-search-response"></pre>
16		-<script>
17		- window.addEventListener('DOMContentLoaded', function() {
18		- const contextSearchType = document.getElementById("context-search-type");
19		- const contextSearchText = document.getElementById("context-search-text");
20		- const contextSearchResponse = document.getElementById("context-search-response");
21		- const contextSearchButton = document.getElementById("context-search-button");
22		- contextSearchButton.addEventListener('click', function() {
23		- const context = contextSearchType.options[contextSearchType.selectedIndex].value;
24		- const term = contextSearchText.value;
25		- switch(context) {
26		- case 'collabs':
27		- document.location.href = `/bin/view/Collabs/#search=${term}`;
28		- break;
29		- case 'current-collab':
30		- handleXWikiSearch('bougaultx');
31		- break
32		- default:
33		- handleXWikiSearch('', applyAdministratorFilter)
34		- }
35		-
36		- });
37		- function handleXWikiSearch(space, callback) {
	137	+ function handleXWikiSearch(searchString) {
	138	+ return new Promise((resolve) => {
38	38	require(['jquery'], function($) {
39		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
40		- const contextSearchButton = document.getElementById("context-search-button");
41		- const xwikiSpace = space ? `.${space}` : '';
42		- contextSearchButton.addEventListener('click', function() {
	140	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	141	+ //contextSearchButton.addEventListener('click', function() {
43	43	$.post(solrServiceURL, {
44		- outputSyntax: 'plain',
45		- media: 'json',
46		- query: [
47		- 'q="__INPUT__"~100',
48		- 'fq=type:DOCUMENT',
49		- `fq=space:Collabs${xwikiSpace}.*`
50		- ].join('\n'),
51		- input: $('#context-search-text').val()
52		- }).then(res => {
53		- if(callback) {
54		- callback(res).then(results => {
55		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
56		- })
57		- } else {
58		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
59		- }
60		- });
61		- });
	143	+ outputSyntax: 'plain',
	144	+ media: 'json',
	145	+ query: [
	146	+ 'q="__INPUT__"~100',
	147	+ 'fq=type:DOCUMENT',
	148	+ `fq=space:Collabs.*`
	149	+ ].join('\n'),
	150	+ input: searchString
	151	+ }).then(resolve);
	152	+ //});
	153	+ });
62	62	});
63	63	}
64		- function applyAdministratorFilter(results) {
65		- return new Promise((resolve, reject) => {
66		- //fetch("/rest/v1/collabs?roles=administrator")
67		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
68		- .then(res => res.json())
69		- .then(collabs => {
70		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
71		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
72		- resolve(filtered);
73		- })
74		-
75		- })
76		- }
77	77	});
	157	+</script>
78	78
	159	+<clb-unified-search></clb-unified-search>
79	79
80		-</script>
81	81	{{/html}}