Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -3,7 +3,7 @@
3	3	!!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
4	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';
	6	+import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
7	7	window.addEventListener('DOMContentLoaded', function() {
8	8
9	9	class UnifiedSearch extends LitElement {
...	...	@@ -18,18 +18,6 @@
18	18	privateFilter: { type: Boolean },
19	19	}
20	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-400, #CCC);
30		- font-size: 14px;
31		- }
32		- `;
33	33	constructor() {
34	34	super();
35	35	this.searchText = "";
...	...	@@ -38,7 +38,6 @@
38	38	this.viewer = false;
39	39	this.rolesFilter = [];
40	40	this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
41		- this.results = [];
42	42	}
43	43	toggleRoleFilter(roleName) {
44	44	if(this.rolesFilter.indexOf(roleName) == -1) {
...	...	@@ -54,14 +54,7 @@
54	54	}
55	55	handleSearch() {
56	56	console.log(this.searchText);
57		- if(this.searchText !== "") {
58		- this.fetchWikiSearch();
59		- }
60	60	}
61		- fetchWikiSearch() {
62		- // request should be built from component, not from "external" dependency. Leave it here like this for POC.
63		- handleXWikiSearch(this.searchText).then(results => this.results = results);
64		- }
65	65	buildFilter() {
66	66	//https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
67	67	}
...	...	@@ -77,15 +77,6 @@
77	77	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
78	78	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
79	79	</div>
80		- <div>
81		- ${this.results.map(result => html`
82		- <div class="result">
83		- <a href="#">${result.title_}</a>
84		- <div>${result.space}</div>
85		- <div>${result.doccontent_.substring(0, 150)}
86		- </div>
87		- `)}
88		- </div>
89	89	</div>
90	90	`
91	91	}
...	...	@@ -92,22 +92,30 @@
92	92	}
93	93	customElements.define('clb-unified-search', UnifiedSearch);
94	94
95		- function handleXWikiSearch(searchString) {
96		- return new Promise((resolve) => {
97		- require(['jquery'], function($) {
98		- const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
99		- //contextSearchButton.addEventListener('click', function() {
100		- $.post(solrServiceURL, {
101		- outputSyntax: 'plain',
102		- media: 'json',
103		- query: [
104		- 'q="__INPUT__"~100',
105		- 'fq=type:DOCUMENT',
106		- `fq=space:Collabs.*`
107		- ].join('\n'),
108		- input: searchString
109		- }).then(resolve);
110		- //});
	66	+ function handleXWikiSearch(space, callback) {
	67	+ require(['jquery'], function($) {
	68	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	69	+ const contextSearchButton = document.getElementById("context-search-button");
	70	+ const xwikiSpace = space ? `.${space}` : '';
	71	+ contextSearchButton.addEventListener('click', function() {
	72	+ $.post(solrServiceURL, {
	73	+ outputSyntax: 'plain',
	74	+ media: 'json',
	75	+ query: [
	76	+ 'q="__INPUT__"~100',
	77	+ 'fq=type:DOCUMENT',
	78	+ `fq=space:Collabs${xwikiSpace}.*`
	79	+ ].join('\n'),
	80	+ input: $('#context-search-text').val()
	81	+ }).then(res => {
	82	+ if(callback) {
	83	+ callback(res).then(results => {
	84	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	85	+ })
	86	+ } else {
	87	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	88	+ }
	89	+ });
111	111	});
112	112	});
113	113	}