Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,11 +1,9 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
	3	+ !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
4	4	-->
5	5	<script type="module">
6		-import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
7		-window.addEventListener('DOMContentLoaded', function() {
8		-
	6	+ import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
9	9	class UnifiedSearch extends LitElement {
10	10	/*
11	11	static properties = {
...	...	@@ -18,31 +18,14 @@
18	18	privateFilter: { type: Boolean },
19	19	}
20	20	*/
21		- static properties = {
22		- results: { type: Array }
23		- }
24		- static styles = css`
25		- .result {
26		- margin-top: 1em;
27		- }
28		- .light {
29		- color: var(--color-gray-500, #CCC);
30		- font-size: 14px;
31		- }
32		- a {
33		- color: var(--color-brand-primary, blue);
34		- }
35		- `;
36	36	constructor() {
37	37	super();
38	38	this.searchText = "";
39		- this.prevSearchText = "";
40	40	this.administrator = false;
41	41	this.editor = false;
42	42	this.viewer = false;
43	43	this.rolesFilter = [];
44		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
45		- this.results = [];
	26	+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
46	46	}
47	47	toggleRoleFilter(roleName) {
48	48	if(this.rolesFilter.indexOf(roleName) == -1) {
...	...	@@ -52,56 +52,16 @@
52	52	}
53	53	this[roleName] = !this[roleName];
54	54	this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55		- this.handleSearch();
56	56	}
57	57	setSearchText(e) {
58	58	this.searchText = e.target.value;
59	59	}
60	60	handleSearch() {
61		- if(this.searchText !== "") {
62		- if(this.searchText !== this.prevSearchText) {
63		- console.log(this.searchText, this.prevSearchText);
64		- this.prevSearchText = this.searchText;
65		- Promise.all([
66		- this.fetchWikiSearch(),
67		- this.fetchFilterSearch()
68		- ]).then(([wikiSearchResults, collabSearchResults]) => {
69		- console.log(wikiSearchResults, collabSearchResults);
70		- });
71		- } else if (this.searchText === this.prevSearchText) {
72		- console.log("Only apply filter on results");
73		- this.fetchFilterSearch().then(this.filterResults)
74		- }
75		- } else {
76		- console.log("no search text, should return filter search results if any");
77		- this.fetchFilterSearch().then(collabs => {
78		- console.log("Format and display collabs", collabs);
79		- })
80		- }
	41	+ console.log(this.searchText);
81	81	}
82		- hasActiveFilters() {
83		- // we only look at role filters for POC.
84		- return this.roles.length > 0;
	43	+ buildFilter() {
	44	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
85	85	}
86		- fetchWikiSearch() {
87		- // request should be built from component, not from "external" dependency. Leave it here like this for POC.
88		- return handleXWikiSearch(this.searchText);
89		- }
90		- fetchFilterSearch() {
91		- return new Promise((resolve) => {
92		- if(this.hasActiveFilters) {
93		- fetch(this.filterUrl).then(res => res.json()).then(resolve);
94		- } else {
95		- resolve(null);
96		- }
97		- });
98		- }
99		- filterResults = (filteredCollabs) => {
100		- console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
101		- }
102		- getLink(xwikiDocSpace) {
103		- return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
104		- }
105	105	render() {
106	106	return html`
107	107	<div>
...	...	@@ -114,43 +114,138 @@
114	114	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
115	115	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
116	116	</div>
117		- <div>
118		- ${this.results.map(result => html`
119		- <div class="result">
120		- <a href="${this.getLink(result.space)}">${result.title_}</a>
121		- <div>${result.doccontent_.substring(0, 150)}
122		- <div class="light">${result.space.replaceAll('.', ' / ')}</div>
123		- </div>
124		- `)}
125		- </div>
126	126	</div>
127	127	`
128	128	}
129	129	}
130	130	customElements.define('clb-unified-search', UnifiedSearch);
	63	+</script>
131	131
132		- function handleXWikiSearch(searchString) {
133		- return new Promise((resolve) => {
	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) {
134	134	require(['jquery'], function($) {
135		- const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
136		- //contextSearchButton.addEventListener('click', 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() {
137	137	$.post(solrServiceURL, {
138		- outputSyntax: 'plain',
139		- media: 'json',
140		- query: [
141		- 'q="__INPUT__"~100',
142		- 'fq=type:DOCUMENT',
143		- `fq=space:Collabs.*`
144		- ].join('\n'),
145		- input: searchString
146		- }).then(resolve);
147		- //});
148		- });
	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	+ });
149	149	});
150	150	}
	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	+ }
151	151	});
152	152	</script>
153		-
154		-<clb-unified-search></clb-unified-search>
155		-
	191	+-->
156	156	{{/html}}