Changes for page Context Search

Summary

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

Details

Page properties

Content

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