Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,5 @@
1		-
2		-{{html clean="false"}}<!--
	1	+{{html clean="false"}}
	2	+<!--
3	3	!!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4	4	!!! Many optimisations can be done !!!
5	5	-->
...	...	@@ -27,6 +27,19 @@
27	27	a {
28	28	color: var(--color-brand-primary, blue);
29	29	}
	30	+ .rawResults {
	31	+ width: 100%;
	32	+ display: flex;
	33	+ font-size: 12px;
	34	+ margin-top: 2em;
	35	+ }
	36	+ .rawResults > div {
	37	+ width: 100%;
	38	+ }
	39	+ .rawResults ul {
	40	+ list-style-type: none;
	41	+ padding: 0;
	42	+ }
30	30	`;
31	31	constructor() {
32	32	super();
...	...	@@ -39,8 +39,7 @@
39	39	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
40	40	this.results = [];
41	41	this.resultsCache = [];
42		- this.offset = 0;
43		- this.nb = 10;
	55	+ this.collabFiltersResults = [];
44	44	}
45	45	firstUpdated() {
46	46	this.renderRoot.getElementById('searchInput').focus();
...	...	@@ -58,32 +58,24 @@
58	58	setSearchText(e) {
59	59	this.searchText = e.target.value;
60	60	}
61		- setOffset(e) {
62		- this.offset = e.target.value;
63		- }
64		- setNb(e) {
65		- this.nb = e.target.value;
66		- }
67	67	handleSearch(textSearch) {
68	68	if(this.searchText !== "" || textSearch) {
69		- // if(this.searchText !== this.prevSearchText) {
	75	+ if(this.searchText !== this.prevSearchText) {
70	70	this.clearResults();
71	71	this.prevSearchText = this.searchText;
72	72	this.fetchWikiSearch().then(results => {
73		- console.log('results', results);
74		- //this.resultsCache = results;
	79	+ this.resultsCache = results;
75	75	if(this.hasActiveFilters()) {
76	76	this.fetchFilterSearch().then(this.filterResults);
77	77	} else {
78		- this.results = results ? results : [];
	83	+ this.results = results;
79	79	}
80	80	})
81		- /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	86	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
82	82	this.fetchFilterSearch().then(this.filterResults)
83	83	} else {
84	84	this.results = this.resultsCache;
85	85	}
86		- */
87	87	} else {
88	88	this.clearResults();
89	89	console.log("no search text, should return filter search results if any");
...	...	@@ -98,13 +98,17 @@
98	98	}
99	99	fetchWikiSearch() {
100	100	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
101		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	105	+ return handleXWikiSearch(this.searchText);
102	102	}
103	103	fetchFilterSearch() {
104	104	return new Promise((resolve) => {
105	105	if(this.hasActiveFilters()) {
106		- fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
	110	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	111	+ this.collabFiltersResults = res;
	112	+ resolve(res);
	113	+ });
107	107	} else {
	115	+ this.collabFiltersResults = res;
108	108	resolve([]);
109	109	}
110	110	});
...	...	@@ -116,6 +116,7 @@
116	116	clearResults() {
117	117	this.results = [];
118	118	this.resultsCache = [];
	127	+ this.collabFiltersResults = [];
119	119	}
120	120	getLink(xwikiDocSpace) {
121	121	return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
...	...	@@ -130,8 +130,6 @@
130	130	<div>
131	131	<div>
132	132	<input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
133		- <input @change="${this.setNb}"" type="text" value="${this.nb}" />
134		- <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
135	135	<button @click="${() => this.handleSearch(true)}">Search</button>
136	136	</div>
137	137	<div>
...	...	@@ -148,21 +148,30 @@
148	148	</div>
149	149	`)}
150	150	</div>
	158	+ <div class="rawResults">
	159	+ <div>
	160	+ <strong>XWiki Search Results</strong>
	161	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	162	+ </div>
	163	+ <div>
	164	+ <strong>Collab Search Results (Filters)</strong>
	165	+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
	166	+ </div>
	167	+ </div>
	168	+</div>
151	151	`
152	152	}
153	153	}
154	154	customElements.define('clb-unified-search', UnifiedSearch);
155	155
156		- function handleXWikiSearch(searchString, offset, nb) {
	174	+ function handleXWikiSearch(searchString) {
157	157	return new Promise((resolve) => {
158	158	require(['jquery'], function($) {
159	159	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
160	160	//contextSearchButton.addEventListener('click', function() {
161		- $.get(solrServiceURL, {
	179	+ $.post(solrServiceURL, {
162	162	outputSyntax: 'plain',
163	163	media: 'json',
164		- nb: nb,
165		- offset: offset,
166	166	query: [
167	167	'q="__INPUT__"~100',
168	168	'fq=type:DOCUMENT',
...	...	@@ -176,4 +176,5 @@
176	176	}
177	177	});
178	178	</script>
179		-<clb-unified-search></clb-unified-search>{{/html}}
	195	+<clb-unified-search></clb-unified-search>
	196	+{{/html}}