Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,173 +1,191 @@
1	1	{{html clean="false"}}
	2	+<!--
	3	+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	4	+ !!! Many optimisations can be done !!!
	5	+-->
2	2	<script type="module">
3		- import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
	7	+import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
	8	+window.addEventListener('DOMContentLoaded', function() {
	9	+
4	4	class UnifiedSearch extends LitElement {
5	5	static properties = {
6		- searchText: { type: String },
7		- favoritesFilter: { type: Boolean },
8		- administratorFilter: { type: Boolean },
9		- editorFilter: { type: Boolean },
10		- viewerFilter: { type: Boolean },
11		- publicFilter: { type: Boolean },
12		- privateFilter: { type: Boolean },
	12	+ results: { type: Array },
	13	+ resultsCache: { type: Array },
	14	+ collabFiltersResults: { type: Array}
13	13	}
	16	+ static styles = css`
	17	+ :host > div {
	18	+ padding-bottom: 4em;
	19	+ }
	20	+ .result {
	21	+ margin-top: 1em;
	22	+ }
	23	+ .light {
	24	+ color: var(--color-gray-500, #CCC);
	25	+ font-size: 14px;
	26	+ }
	27	+ a {
	28	+ color: var(--color-brand-primary, blue);
	29	+ }
	30	+ .rawResults {
	31	+ width: 100%;
	32	+ display: flex;
	33	+ font-size: 12px;
	34	+ margin-top: 2em;
	35	+ }
	36	+ .rawResults ul {
	37	+ list-style-type: none;
	38	+ padding: 0;
	39	+ }
	40	+ `;
14	14	constructor() {
15	15	super();
16	16	this.searchText = "";
17		- this.favoritesFilter = false;
18		- this.administratorFilter = false;
19		- this.editorFilter = false;
20		- this.viewerFilter = false;
21		- this.publicFilter = false;
22		- this.privateFilter = false;
	44	+ this.prevSearchText = "";
	45	+ this.administrator = false;
	46	+ this.editor = false;
	47	+ this.viewer = false;
	48	+ this.rolesFilter = [];
	49	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
	50	+ this.results = [];
	51	+ this.resultsCache = [];
	52	+ this.collabFiltersResults = [];
23	23	}
	54	+ firstUpdated() {
	55	+ this.renderRoot.getElementById('searchInput').focus();
	56	+ }
	57	+ toggleRoleFilter(roleName) {
	58	+ if(this.rolesFilter.indexOf(roleName) === -1) {
	59	+ this.rolesFilter.push(roleName);
	60	+ } else {
	61	+ this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
	62	+ }
	63	+ this[roleName] = !this[roleName];
	64	+ this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
	65	+ this.handleSearch();
	66	+ }
24	24	setSearchText(e) {
25	25	this.searchText = e.target.value;
26	26	}
27		- handleSearch() {
28		- console.log(this.searchText);
	70	+ handleSearch(textSearch) {
	71	+ if(this.searchText !== "" || textSearch) {
	72	+ if(this.searchText !== this.prevSearchText) {
	73	+ this.clearResults();
	74	+ this.prevSearchText = this.searchText;
	75	+ this.fetchWikiSearch().then(results => {
	76	+ this.resultsCache = results;
	77	+ if(this.hasActiveFilters()) {
	78	+ this.fetchFilterSearch().then(this.filterResults);
	79	+ } else {
	80	+ this.results = results;
	81	+ }
	82	+ })
	83	+ } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
	84	+ this.fetchFilterSearch().then(this.filterResults)
	85	+ } else {
	86	+ this.results = this.resultsCache;
	87	+ }
	88	+ } else {
	89	+ this.clearResults();
	90	+ console.log("no search text, should return filter search results if any");
	91	+ this.fetchFilterSearch().then(collabs => {
	92	+ console.log("Format and display collabs", collabs);
	93	+ })
	94	+ }
29	29	}
	96	+ hasActiveFilters() {
	97	+ // we only look at role filters for POC.
	98	+ return this.rolesFilter.length > 0;
	99	+ }
	100	+ fetchWikiSearch() {
	101	+ // request should be built from component, not from "external" dependency. Leave it here like this for POC.
	102	+ return handleXWikiSearch(this.searchText);
	103	+ }
	104	+ fetchFilterSearch() {
	105	+ return new Promise((resolve) => {
	106	+ if(this.hasActiveFilters()) {
	107	+ fetch(this.filterUrl).then(res => res.json()).then((res) => {
	108	+ this.collabFiltersResults = res;
	109	+ resolve(res);
	110	+ });
	111	+ } else {
	112	+ resolve([]);
	113	+ }
	114	+ });
	115	+ }
	116	+ filterResults = (filteredCollabs) => {
	117	+ const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
	118	+ this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
	119	+ }
	120	+ clearResults() {
	121	+ this.results = [];
	122	+ this.resultsCache = [];
	123	+ }
	124	+ getLink(xwikiDocSpace) {
	125	+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
	126	+ }
	127	+ handleKeyPress(e) {
	128	+ if (e.keyCode === 13) {
	129	+ this.handleSearch(true);
	130	+ }
	131	+ }
30	30	render() {
31	31	return html`
32	32	<div>
33	33	<div>
34		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
35		- <button @click="${this.handleSearch}">Search</button>
	136	+ <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
	137	+ <button @click="${() => this.handleSearch(true)}">Search</button>
36	36	</div>
37		- <label><input type="checkbox" @change="${(e) => { this.administratorFilter = e.target.checked }}" .checked="${this.administratorFilter}"/> Administrator</label>
	139	+ <div>
	140	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
	141	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
	142	+ <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	143	+ </div>
	144	+ <div>
	145	+ ${this.results.map(result => html`
	146	+ <div class="result">
	147	+ <a href="${this.getLink(result.space)}">${result.title_}</a>
	148	+ <div>${result.doccontent_.substring(0, 150)}
	149	+ <div class="light">${result.space.replaceAll('.', ' / ')}</div>
	150	+ </div>
	151	+ `)}
	152	+ </div>
	153	+ <div class="rawResults">
	154	+ <div>
	155	+ <strong>XWiki Search Results</strong>
	156	+ <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
	157	+ </div>
	158	+ <div>
	159	+ <strong>Collab Search Results (Filters)</strong>
	160	+ <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
	161	+ </div>
	162	+ </div>
38	38	</div>
39	39	`
40	40	}
41	41	}
42	42	customElements.define('clb-unified-search', UnifiedSearch);
43		-</script>
44	44
45		-<clb-unified-search></clb-unified-search>
46		-
47		-<select id="context-search-type">
48		- <option value="all">All</option>
49		- <option value="collabs">Collabs</option>
50		- <option value="current-collab">Current Collab</option>
51		-</select>
52		-<input type="text" id="context-search-text" />
53		-<button id="context-search-button" class="btn btn-primary">Search</button>
54		-<div class="form-group">
55		- <label>
56		- <input type="checkbox" data-role-filter="administrator"> Administrator
57		- </label>
58		- <label>
59		- <input type="checkbox" data-role-filter="editor"> Editor
60		- </label>
61		-</div>
62		-
63		-
64		-<pre id="context-search-response"></pre>
65		-<script>
66		- window.addEventListener('DOMContentLoaded', function() {
67		- const filters = {
68		- search: '',
69		- offset: 0,
70		- orderField: 'title',
71		- order: 'asc',
72		- favorite: false,
73		- roles: [] // to be joined as administrator+editor+viewer
74		- };
75		-
76		- function addRole(role) {
77		- if(filters.roles.indexOf(role) == -1) {
78		- filters.roles.push(role);
79		- }
80		- }
81		-
82		- function removeRole(role) {
83		- filters.roles = filters.roles.filter(r => r !== role)
84		- }
85		-
86		- const filterInputs = document.querySelectorAll('input[data-role-filter]');
87		-
88		- filterInputs.forEach(function(filterIpt) {
89		- filterIpt.addEventListener('click', function() {
90		- const role = this.getAttribute('data-role-filter');
91		- if(this.checked) {
92		- addRole(role);
93		- } else {
94		- removeRole(role);
95		- }
96		- runFilteredRequest();
97		- })
98		- });
99		-
100		- function runFilteredRequest() {
101		- const urlParams = new URLSearchParams();
102		- const tmpFilters = filters;
103		- tmpFilters.roles = tmpFilters.roles.join("+");
104		- for(filter in tmpFilters) {
105		- urlParams.set(filter, tmpFilters[filter]);
106		- }
107		- console.log(urlParams);
108		- }
109		- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
110		- const contextSearchType = document.getElementById("context-search-type");
111		- const contextSearchText = document.getElementById("context-search-text");
112		- const contextSearchResponse = document.getElementById("context-search-response");
113		- const contextSearchButton = document.getElementById("context-search-button");
114		- contextSearchButton.addEventListener('click', function() {
115		- const context = contextSearchType.options[contextSearchType.selectedIndex].value;
116		- const term = contextSearchText.value;
117		- switch(context) {
118		- case 'collabs':
119		- document.location.href = `/bin/view/Collabs/#search=${term}`;
120		- break;
121		- case 'current-collab':
122		- handleXWikiSearch('bougaultx');
123		- break
124		- default:
125		- handleXWikiSearch('')
126		- }
127		-
128		- });
129		- function handleXWikiSearch(space, callback) {
	169	+ function handleXWikiSearch(searchString) {
	170	+ return new Promise((resolve) => {
130	130	require(['jquery'], function($) {
131		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
132		- const contextSearchButton = document.getElementById("context-search-button");
133		- const xwikiSpace = space ? `.${space}` : '';
134		- contextSearchButton.addEventListener('click', function() {
	172	+ const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	173	+ //contextSearchButton.addEventListener('click', function() {
135	135	$.post(solrServiceURL, {
136		- outputSyntax: 'plain',
137		- media: 'json',
138		- query: [
139		- 'q="__INPUT__"~100',
140		- 'fq=type:DOCUMENT',
141		- `fq=space:Collabs${xwikiSpace}.*`
142		- ].join('\n'),
143		- input: $('#context-search-text').val()
144		- }).then(res => {
145		- if(callback) {
146		- callback(res).then(results => {
147		- contextSearchResponse.innerText = JSON.stringify(results, null, 2);
148		- })
149		- } else {
150		- contextSearchResponse.innerText = JSON.stringify(res, null, 2);
151		- }
152		- });
153		- });
	175	+ outputSyntax: 'plain',
	176	+ media: 'json',
	177	+ query: [
	178	+ 'q="__INPUT__"~100',
	179	+ 'fq=type:DOCUMENT',
	180	+ `fq=space:Collabs.*`
	181	+ ].join('\n'),
	182	+ input: searchString
	183	+ }).then(resolve);
	184	+ //});
	185	+ });
154	154	});
155	155	}
156		- function applyAdministratorFilter(results) {
157		- return new Promise((resolve, reject) => {
158		- //fetch("/rest/v1/collabs?roles=administrator")
159		- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
160		- .then(res => res.json())
161		- .then(collabs => {
162		- const spaces = collabs.map(collab => `Collabs.${collab.name}`);
163		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
164		- resolve(filtered);
165		- })
166		-
167		- })
168		- }
169	169	});
170		-
171		-
172	172	</script>
	190	+<clb-unified-search></clb-unified-search>
173	173	{{/html}}