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