Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,69 +1,5 @@
1	1	{{html clean="false"}}
2		-<!--
3		- !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
4		--->
5		-<script type="module">
6		- import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
7		- class UnifiedSearch extends LitElement {
8		- /*
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 },
17		- }
18		- */
19		- constructor() {
20		- super();
21		- this.searchText = "";
22		- this.administrator = false;
23		- this.editor = false;
24		- this.viewer = false;
25		- this.rolesFilter = [];
26		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
27		- }
28		- toggleRoleFilter(roleName) {
29		- if(this.rolesFilter.indexOf(roleName) == -1) {
30		- this.rolesFilter.push(roleName);
31		- } else {
32		- this.rolesFilter.filter(role => role !== roleName);
33		- }
34		- this[roleName] = !this[roleName];
35		- this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
36		- }
37		- setSearchText(e) {
38		- this.searchText = e.target.value;
39		- }
40		- handleSearch() {
41		- console.log(this.searchText);
42		- }
43		- buildFilter() {
44		- //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
45		- }
46		- render() {
47		- return html`
48		-<div>
49		- <div>
50		- <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
51		- <button @click="${this.handleSearch}">Search</button>
52		- </div>
53		- <div>
54		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
55		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
56		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
57		- </div>
58		-</div>
59		-`
60		- }
61		- }
62		- customElements.define('clb-unified-search', UnifiedSearch);
63		-</script>
64	64
65		-<clb-unified-search></clb-unified-search>
66		-<!--
67	67	<select id="context-search-type">
68	68	<option value="all">All</option>
69	69	<option value="collabs">Collabs</option>
...	...	@@ -71,62 +71,10 @@
71	71	</select>
72	72	<input type="text" id="context-search-text" />
73	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	82
83		-
84	84	<pre id="context-search-response"></pre>
85	85	<script>
86	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	130	const contextSearchType = document.getElementById("context-search-type");
131	131	const contextSearchText = document.getElementById("context-search-text");
132	132	const contextSearchResponse = document.getElementById("context-search-response");
...	...	@@ -142,7 +142,7 @@
142	142	handleXWikiSearch('bougaultx');
143	143	break
144	144	default:
145		- handleXWikiSearch('')
	29	+ handleXWikiSearch('', applyAdministratorFilter)
146	146	}
147	147
148	148	});
...	...	@@ -175,12 +175,18 @@
175	175	}
176	176	function applyAdministratorFilter(results) {
177	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")
	62	+ fetch("/rest/v1/collabs?roles=administrator")
180	180	.then(res => res.json())
181	181	.then(collabs => {
182	182	const spaces = collabs.map(collab => `Collabs.${collab.name}`);
183		- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
	66	+ const filtered = results.filter(result => {
	67	+ const r = spaces.some(space => {
	68	+ console.log(result.space.startsWith(space), result.space, space);
	69	+ return result.space.startsWith(space)
	70	+ })
	71	+ console.log(r);
	72	+ return r
	73	+ });
184	184	resolve(filtered);
185	185	})
186	186
...	...	@@ -187,6 +187,7 @@
187	187	})
188	188	}
189	189	});
	80	+
	81	+
190	190	</script>
191		--->
192	192	{{/html}}