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