Changes for page Context Search

Summary

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

Details

Page properties

Content

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