Changes for page Context Search

Summary

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

Details

Page properties

Content

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