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,35 +58,25 @@
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		- console.log(textSearch);
69	69	if(this.searchText !== "" || textSearch) {
70		- // if(this.searchText !== this.prevSearchText) {
	75	+ if(this.searchText !== this.prevSearchText) {
71	71	this.clearResults();
72	72	this.prevSearchText = this.searchText;
73	73	this.fetchWikiSearch().then(results => {
74		- console.log('results', results);
75		- //this.resultsCache = results;
	79	+ this.resultsCache = results;
76	76	if(this.hasActiveFilters()) {
77	77	this.fetchFilterSearch().then(this.filterResults);
78	78	} else {
79		- this.results = results ? results : [];
	83	+ this.results = results;
80	80	}
81	81	})
82		- /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	86	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
83	83	this.fetchFilterSearch().then(this.filterResults)
84	84	} else {
85	85	this.results = this.resultsCache;
86	86	}
87		- */
88	88	} else {
89		- this.results = [];
90	90	this.clearResults();
91	91	console.log("no search text, should return filter search results if any");
92	92	this.fetchFilterSearch().then(collabs => {
...	...	@@ -100,12 +100,15 @@
100	100	}
101	101	fetchWikiSearch() {
102	102	// request should be built from component, not from "external" dependency. Leave it here like this for POC.
103		- return handleXWikiSearch(this.searchText, this.offset, this.nb);
	105	+ return handleXWikiSearch(this.searchText);
104	104	}
105	105	fetchFilterSearch() {
106	106	return new Promise((resolve) => {
107	107	if(this.hasActiveFilters()) {
108		- 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	+ });
109	109	} else {
110	110	resolve([]);
111	111	}
...	...	@@ -132,8 +132,6 @@
132	132	<div>
133	133	<div>
134	134	<input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
135		- <input @change="${this.setNb}"" type="text" value="${this.nb}" />
136		- <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
137	137	<button @click="${() => this.handleSearch(true)}">Search</button>
138	138	</div>
139	139	<div>
...	...	@@ -150,21 +150,30 @@
150	150	</div>
151	151	`)}
152	152	</div>
	156	+ <div class="rawResults">
	157	+ <div>
	158	+ <strong>XWiki Search Results</strong>
	159	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	160	+ </div>
	161	+ <div>
	162	+ <strong>Collab Search Results (Filters)</strong>
	163	+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
	164	+ </div>
	165	+ </div>
	166	+</div>
153	153	`
154	154	}
155	155	}
156	156	customElements.define('clb-unified-search', UnifiedSearch);
157	157
158		- function handleXWikiSearch(searchString, offset, nb) {
	172	+ function handleXWikiSearch(searchString) {
159	159	return new Promise((resolve) => {
160	160	require(['jquery'], function($) {
161	161	const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
162	162	//contextSearchButton.addEventListener('click', function() {
163		- $.get(solrServiceURL, {
	177	+ $.post(solrServiceURL, {
164	164	outputSyntax: 'plain',
165	165	media: 'json',
166		- nb: nb,
167		- offset: offset,
168	168	query: [
169	169	'q="__INPUT__"~100',
170	170	'fq=type:DOCUMENT',
...	...	@@ -178,4 +178,5 @@
178	178	}
179	179	});
180	180	</script>
181		-<clb-unified-search></clb-unified-search>{{/html}}
	193	+<clb-unified-search></clb-unified-search>
	194	+{{/html}}