Changes for page Context Search

Summary

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

Details

Page properties

Content

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