Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,61 @@
1	1	{{html clean="false"}}
	2	+<script type="module">
	3	+ import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
	4	+ class UnifiedSearch extends LitElement {
	5	+ static properties = {
	6	+ searchText: { type: String },
	7	+ favoritesFilter: { type: Boolean },
	8	+ administratorFilter: { type: Boolean },
	9	+ editorFilter: { type: Boolean },
	10	+ viewerFilter: { type: Boolean },
	11	+ publicFilter: { type: Boolean },
	12	+ privateFilter: { type: Boolean },
	13	+ }
	14	+ constructor() {
	15	+ super();
	16	+ this.searchText = "";
	17	+ this.favoritesFilter = false;
	18	+ this.administratorFilter = false;
	19	+ this.editorFilter = false;
	20	+ this.viewerFilter = false;
	21	+ this.publicFilter = false;
	22	+ this.privateFilter = false;
	23	+ }
	24	+ toggleBooleanFilter(filterName) {
	25	+ this[filterName] = !this[filterName];
	26	+ console.log(this.administratorFilter);
	27	+ }
	28	+ setSearchText(e) {
	29	+ this.searchText = e.target.value;
	30	+ }
	31	+ handleSearch() {
	32	+ // check if text changed
	33	+ console.log(this.searchText);
	34	+ }
	35	+ render() {
	36	+ return html`
	37	+<div>
	38	+ <div>
	39	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	40	+ <button @click="${this.handleSearch}">Search</button>
	41	+ </div>
	42	+ <div>
	43	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label>
	44	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label>
	45	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label>
	46	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label>
	47	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label>
	48	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label>
	49	+ </div>
	50	+</div>
	51	+`
	52	+ }
	53	+ }
	54	+ customElements.define('clb-unified-search', UnifiedSearch);
	55	+</script>
2	2
	57	+<clb-unified-search></clb-unified-search>
	58	+<!--
3	3	<select id="context-search-type">
4	4	<option value="all">All</option>
5	5	<option value="collabs">Collabs</option>
...	...	@@ -7,22 +7,62 @@
7	7	</select>
8	8	<input type="text" id="context-search-text" />
9	9	<button id="context-search-button" class="btn btn-primary">Search</button>
	66	+<div class="form-group">
	67	+ <label>
	68	+ <input type="checkbox" data-role-filter="administrator"> Administrator
	69	+ </label>
	70	+ <label>
	71	+ <input type="checkbox" data-role-filter="editor"> Editor
	72	+ </label>
	73	+</div>
10	10
	75	+
11	11	<pre id="context-search-response"></pre>
12	12	<script>
13		- /*
14		- async function fetchGlobalSearch(term) {
15		- const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
16		- const json = await res.json();
17		- return JSON.stringify(json, null, 2);
18		- }
19		- async function fetchCurrentCollabSearch(term) {
20		- const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
21		- const json = await res.json();
22		- return JSON.stringify(json, null, 2);
23		- }
24		- */
25	25	window.addEventListener('DOMContentLoaded', function() {
	79	+ const filters = {
	80	+ search: '',
	81	+ offset: 0,
	82	+ orderField: 'title',
	83	+ order: 'asc',
	84	+ favorite: false,
	85	+ roles: [] // to be joined as administrator+editor+viewer
	86	+ };
	87	+
	88	+ function addRole(role) {
	89	+ if(filters.roles.indexOf(role) == -1) {
	90	+ filters.roles.push(role);
	91	+ }
	92	+ }
	93	+
	94	+ function removeRole(role) {
	95	+ filters.roles = filters.roles.filter(r => r !== role)
	96	+ }
	97	+
	98	+ const filterInputs = document.querySelectorAll('input[data-role-filter]');
	99	+
	100	+ filterInputs.forEach(function(filterIpt) {
	101	+ filterIpt.addEventListener('click', function() {
	102	+ const role = this.getAttribute('data-role-filter');
	103	+ if(this.checked) {
	104	+ addRole(role);
	105	+ } else {
	106	+ removeRole(role);
	107	+ }
	108	+ runFilteredRequest();
	109	+ })
	110	+ });
	111	+
	112	+ function runFilteredRequest() {
	113	+ const urlParams = new URLSearchParams();
	114	+ const tmpFilters = filters;
	115	+ tmpFilters.roles = tmpFilters.roles.join("+");
	116	+ for(filter in tmpFilters) {
	117	+ urlParams.set(filter, tmpFilters[filter]);
	118	+ }
	119	+ console.log(urlParams);
	120	+ }
	121	+ // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
26	26	const contextSearchType = document.getElementById("context-search-type");
27	27	const contextSearchText = document.getElementById("context-search-text");
28	28	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -35,36 +35,54 @@
35	35	document.location.href = `/bin/view/Collabs/#search=${term}`;
36	36	break;
37	37	case 'current-collab':
38		- fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
39		- //handleXWikiSearch('bougaultx');
	134	+ handleXWikiSearch('bougaultx');
40	40	break
41	41	default:
42		- handleXWikiSearch()
43		- //fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
	137	+ handleXWikiSearch('')
44	44	}
45	45
46	46	});
47		- });
48		-
49		-function handleXWikiSearch(space) {
50		- require(['jquery'], function($) {
51		- console.log('ZZZZ');
52		- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
53		- const contextSearchButton = document.getElementById("context-search-button");
54		- const xwikiSpace = space ? `.${xwikiSpace}` : '';
55		- contextSearchButton.addEventListener('click', function() {
56		- $.post(solrServiceURL, {
57		- outputSyntax: 'plain',
58		- media: 'json',
59		- query: [
60		- 'q=*__INPUT__*',
61		- 'fq=type:DOCUMENT',
62		- `fq=space:Collabs${xWikiSpace}.*`
63		- ].join('\n'),
64		- input: $('#context-search-text').val()
65		- });
	141	+ function handleXWikiSearch(space, callback) {
	142	+ require(['jquery'], function($) {
	143	+ var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
	144	+ const contextSearchButton = document.getElementById("context-search-button");
	145	+ const xwikiSpace = space ? `.${space}` : '';
	146	+ contextSearchButton.addEventListener('click', function() {
	147	+ $.post(solrServiceURL, {
	148	+ outputSyntax: 'plain',
	149	+ media: 'json',
	150	+ query: [
	151	+ 'q="__INPUT__"~100',
	152	+ 'fq=type:DOCUMENT',
	153	+ `fq=space:Collabs${xwikiSpace}.*`
	154	+ ].join('\n'),
	155	+ input: $('#context-search-text').val()
	156	+ }).then(res => {
	157	+ if(callback) {
	158	+ callback(res).then(results => {
	159	+ contextSearchResponse.innerText = JSON.stringify(results, null, 2);
	160	+ })
	161	+ } else {
	162	+ contextSearchResponse.innerText = JSON.stringify(res, null, 2);
	163	+ }
	164	+ });
	165	+ });
66	66	});
67		- });
68		-}
	167	+ }
	168	+ function applyAdministratorFilter(results) {
	169	+ return new Promise((resolve, reject) => {
	170	+ //fetch("/rest/v1/collabs?roles=administrator")
	171	+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
	172	+ .then(res => res.json())
	173	+ .then(collabs => {
	174	+ const spaces = collabs.map(collab => `Collabs.${collab.name}`);
	175	+ const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	176	+ resolve(filtered);
	177	+ })
	178	+
	179	+ })
	180	+ }
	181	+});
69	69	</script>
	183	+-->
70	70	{{/html}}