Changes for page Context Search

Summary

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

Details

Page properties

Content

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