Changes for page Context Search

Summary

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

Details

Page properties

Content

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