Changes for page Context Search

Summary

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

Details

Page properties

Content

...	...	@@ -1,191 +1,192 @@
1	1	{{html clean="false"}}
2	2	<!--
3		- !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4		- !!! Many optimisations can be done !!!
	3	+ !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
5	5	-->
6	6	<script type="module">
7		-import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
8		-window.addEventListener('DOMContentLoaded', function() {
9		-
	6	+ import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
10	10	class UnifiedSearch extends LitElement {
	8	+ /*
11	11	static properties = {
12		- results: { type: Array },
13		- resultsCache: { type: Array },
14		- collabFiltersResults: { type: Array}
	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 },
15	15	}
16		- static styles = css`
17		- :host > div {
18		- padding-bottom: 4em;
19		- }
20		- .result {
21		- margin-top: 1em;
22		- }
23		- .light {
24		- color: var(--color-gray-500, #CCC);
25		- font-size: 14px;
26		- }
27		- a {
28		- color: var(--color-brand-primary, blue);
29		- }
30		- .rawResults {
31		- width: 100%;
32		- display: flex;
33		- font-size: 12px;
34		- margin-top: 2em;
35		- }
36		- .rawResults ul {
37		- list-style-type: none;
38		- padding: 0;
39		- }
40		- `;
	18	+ */
41	41	constructor() {
42	42	super();
43	43	this.searchText = "";
44		- this.prevSearchText = "";
45		- this.administrator = false;
46		- this.editor = false;
47		- this.viewer = false;
48		- this.rolesFilter = [];
49		- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
50		- this.results = [];
51		- this.resultsCache = [];
52		- this.collabFiltersResults = [];
	22	+ this.favoritesFilter = false;
	23	+ this.administratorFilter = false;
	24	+ this.editorFilter = false;
	25	+ this.viewerFilter = false;
	26	+ this.publicFilter = false;
	27	+ this.privateFilter = false;
53	53	}
54		- firstUpdated() {
55		- this.renderRoot.getElementById('searchInput').focus();
	29	+ toggleBooleanFilter(filterName) {
	30	+ this[filterName] = !this[filterName];
	31	+ console.log(this.administratorFilter);
56	56	}
57		- toggleRoleFilter(roleName) {
58		- if(this.rolesFilter.indexOf(roleName) === -1) {
59		- this.rolesFilter.push(roleName);
60		- } else {
61		- this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
62		- }
63		- this[roleName] = !this[roleName];
64		- this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
65		- this.handleSearch();
66		- }
67	67	setSearchText(e) {
68	68	this.searchText = e.target.value;
69	69	}
70		- handleSearch(textSearch) {
71		- if(this.searchText !== "" || textSearch) {
72		- if(this.searchText !== this.prevSearchText) {
73		- this.clearResults();
74		- this.prevSearchText = this.searchText;
75		- this.fetchWikiSearch().then(results => {
76		- this.resultsCache = results;
77		- if(this.hasActiveFilters()) {
78		- this.fetchFilterSearch().then(this.filterResults);
79		- } else {
80		- this.results = results;
81		- }
82		- })
83		- } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
84		- this.fetchFilterSearch().then(this.filterResults)
85		- } else {
86		- this.results = this.resultsCache;
87		- }
88		- } else {
89		- this.clearResults();
90		- console.log("no search text, should return filter search results if any");
91		- this.fetchFilterSearch().then(collabs => {
92		- console.log("Format and display collabs", collabs);
93		- })
94		- }
	36	+ handleSearch() {
	37	+ // check if text changed
	38	+ console.log(this.searchText);
95	95	}
96		- hasActiveFilters() {
97		- // we only look at role filters for POC.
98		- return this.rolesFilter.length > 0;
	40	+ buildFilter() {
	41	+ //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
99	99	}
100		- fetchWikiSearch() {
101		- // request should be built from component, not from "external" dependency. Leave it here like this for POC.
102		- return handleXWikiSearch(this.searchText);
103		- }
104		- fetchFilterSearch() {
105		- return new Promise((resolve) => {
106		- if(this.hasActiveFilters()) {
107		- fetch(this.filterUrl).then(res => res.json()).then((res) => {
108		- this.collabFiltersResults = res;
109		- resolve(res);
110		- });
111		- } else {
112		- resolve([]);
113		- }
114		- });
115		- }
116		- filterResults = (filteredCollabs) => {
117		- const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
118		- this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
119		- }
120		- clearResults() {
121		- this.results = [];
122		- this.resultsCache = [];
123		- }
124		- getLink(xwikiDocSpace) {
125		- return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
126		- }
127		- handleKeyPress(e) {
128		- if (e.keyCode === 13) {
129		- this.handleSearch(true);
130		- }
131		- }
132	132	render() {
133	133	return html`
134	134	<div>
135	135	<div>
136		- <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
137		- <button @click="${() => this.handleSearch(true)}">Search</button>
	47	+ <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
	48	+ <button @click="${this.handleSearch}">Search</button>
138	138	</div>
139	139	<div>
140		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
141		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
142		- <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
	51	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label>
	52	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label>
	53	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label>
	54	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label>
	55	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label>
	56	+ <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label>
143	143	</div>
144		- <div>
145		- ${this.results.map(result => html`
146		- <div class="result">
147		- <a href="${this.getLink(result.space)}">${result.title_}</a>
148		- <div>${result.doccontent_.substring(0, 150)}
149		- <div class="light">${result.space.replaceAll('.', ' / ')}</div>
150		- </div>
151		- `)}
152		- </div>
153		- <div class="rawResults">
154		- <div>
155		- <strong>XWiki Search Results</strong>
156		- <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
157		- </div>
158		- <div>
159		- <strong>Collab Search Results (Filters)</strong>
160		- <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
161		- </div>
162		- </div>
163	163	</div>
164	164	`
165	165	}
166	166	}
167	167	customElements.define('clb-unified-search', UnifiedSearch);
	63	+</script>
168	168
169		- function handleXWikiSearch(searchString) {
170		- 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) {
171	171	require(['jquery'], function($) {
172		- const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
173		- //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() {
174	174	$.post(solrServiceURL, {
175		- outputSyntax: 'plain',
176		- media: 'json',
177		- query: [
178		- 'q="__INPUT__"~100',
179		- 'fq=type:DOCUMENT',
180		- `fq=space:Collabs.*`
181		- ].join('\n'),
182		- input: searchString
183		- }).then(resolve);
184		- //});
185		- });
	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	+ });
186	186	});
187	187	}
	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	+ }
188	188	});
189	189	</script>
190		-<clb-unified-search></clb-unified-search>
	191	+-->
191	191	{{/html}}