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