| ... |
... |
@@ -1,9 +1,9 @@ |
| 1 |
1 |
{{html clean="false"}} |
| 2 |
2 |
<!-- |
| 3 |
|
- !!! POC. Code would must be reviewed / optimized and packaged for use in production !!! |
|
3 |
+ !!! POC. Code must be reviewed / optimized and packaged for use in production !!! |
| 4 |
4 |
--> |
| 5 |
5 |
<script type="module"> |
| 6 |
|
-import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; |
|
6 |
+import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js'; |
| 7 |
7 |
window.addEventListener('DOMContentLoaded', function() { |
| 8 |
8 |
|
| 9 |
9 |
class UnifiedSearch extends LitElement { |
| ... |
... |
@@ -21,6 +21,18 @@ |
| 21 |
21 |
static properties = { |
| 22 |
22 |
results: { type: Array } |
| 23 |
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 |
+ `; |
| 24 |
24 |
constructor() { |
| 25 |
25 |
super(); |
| 26 |
26 |
this.searchText = ""; |
| ... |
... |
@@ -28,7 +28,7 @@ |
| 28 |
28 |
this.editor = false; |
| 29 |
29 |
this.viewer = false; |
| 30 |
30 |
this.rolesFilter = []; |
| 31 |
|
- this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`); |
|
43 |
+ this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`); |
| 32 |
32 |
this.results = []; |
| 33 |
33 |
} |
| 34 |
34 |
toggleRoleFilter(roleName) { |
| ... |
... |
@@ -39,6 +39,7 @@ |
| 39 |
39 |
} |
| 40 |
40 |
this[roleName] = !this[roleName]; |
| 41 |
41 |
this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+")); |
|
54 |
+ console.log(this.filterUrl.toString()); |
| 42 |
42 |
} |
| 43 |
43 |
setSearchText(e) { |
| 44 |
44 |
this.searchText = e.target.value; |
| ... |
... |
@@ -53,8 +53,10 @@ |
| 53 |
53 |
// request should be built from component, not from "external" dependency. Leave it here like this for POC. |
| 54 |
54 |
handleXWikiSearch(this.searchText).then(results => this.results = results); |
| 55 |
55 |
} |
| 56 |
|
- buildFilter() { |
| 57 |
|
- //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles= |
|
69 |
+ |
|
70 |
+ |
|
71 |
+ getLink(xwikiDocSpace) { |
|
72 |
+ return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`; |
| 58 |
58 |
} |
| 59 |
59 |
render() { |
| 60 |
60 |
return html` |
| ... |
... |
@@ -70,10 +70,10 @@ |
| 70 |
70 |
</div> |
| 71 |
71 |
<div> |
| 72 |
72 |
${this.results.map(result => html` |
| 73 |
|
- <div> |
| 74 |
|
- <a href="#">${result.title_}</a> |
| 75 |
|
- <div>${result.space}</div> |
|
88 |
+ <div class="result"> |
|
89 |
+ <a href="${this.getLink(result.space)}">${result.title_}</a> |
| 76 |
76 |
<div>${result.doccontent_.substring(0, 150)} |
|
91 |
+ <div class="light">${result.space.replaceAll('.', ' / ')}</div> |
| 77 |
77 |
</div> |
| 78 |
78 |
`)} |
| 79 |
79 |
</div> |
| ... |
... |
@@ -106,130 +106,5 @@ |
| 106 |
106 |
</script> |
| 107 |
107 |
|
| 108 |
108 |
<clb-unified-search></clb-unified-search> |
| 109 |
|
-<!-- |
| 110 |
|
-<select id="context-search-type"> |
| 111 |
|
- <option value="all">All</option> |
| 112 |
|
- <option value="collabs">Collabs</option> |
| 113 |
|
- <option value="current-collab">Current Collab</option> |
| 114 |
|
-</select> |
| 115 |
|
-<input type="text" id="context-search-text" /> |
| 116 |
|
-<button id="context-search-button" class="btn btn-primary">Search</button> |
| 117 |
|
-<div class="form-group"> |
| 118 |
|
- <label> |
| 119 |
|
- <input type="checkbox" data-role-filter="administrator"> Administrator |
| 120 |
|
- </label> |
| 121 |
|
- <label> |
| 122 |
|
- <input type="checkbox" data-role-filter="editor"> Editor |
| 123 |
|
- </label> |
| 124 |
|
-</div> |
| 125 |
125 |
|
| 126 |
|
- |
| 127 |
|
-<pre id="context-search-response"></pre> |
| 128 |
|
-<script> |
| 129 |
|
- window.addEventListener('DOMContentLoaded', function() { |
| 130 |
|
- const filters = { |
| 131 |
|
- search: '', |
| 132 |
|
- offset: 0, |
| 133 |
|
- orderField: 'title', |
| 134 |
|
- order: 'asc', |
| 135 |
|
- favorite: false, |
| 136 |
|
- roles: [] // to be joined as administrator+editor+viewer |
| 137 |
|
- }; |
| 138 |
|
- |
| 139 |
|
- function addRole(role) { |
| 140 |
|
- if(filters.roles.indexOf(role) == -1) { |
| 141 |
|
- filters.roles.push(role); |
| 142 |
|
- } |
| 143 |
|
- } |
| 144 |
|
- |
| 145 |
|
- function removeRole(role) { |
| 146 |
|
- filters.roles = filters.roles.filter(r => r !== role) |
| 147 |
|
- } |
| 148 |
|
- |
| 149 |
|
- const filterInputs = document.querySelectorAll('input[data-role-filter]'); |
| 150 |
|
- |
| 151 |
|
- filterInputs.forEach(function(filterIpt) { |
| 152 |
|
- filterIpt.addEventListener('click', function() { |
| 153 |
|
- const role = this.getAttribute('data-role-filter'); |
| 154 |
|
- if(this.checked) { |
| 155 |
|
- addRole(role); |
| 156 |
|
- } else { |
| 157 |
|
- removeRole(role); |
| 158 |
|
- } |
| 159 |
|
- runFilteredRequest(); |
| 160 |
|
- }) |
| 161 |
|
- }); |
| 162 |
|
- |
| 163 |
|
- function runFilteredRequest() { |
| 164 |
|
- const urlParams = new URLSearchParams(); |
| 165 |
|
- const tmpFilters = filters; |
| 166 |
|
- tmpFilters.roles = tmpFilters.roles.join("+"); |
| 167 |
|
- for(filter in tmpFilters) { |
| 168 |
|
- urlParams.set(filter, tmpFilters[filter]); |
| 169 |
|
- } |
| 170 |
|
- console.log(urlParams); |
| 171 |
|
- } |
| 172 |
|
- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator |
| 173 |
|
- const contextSearchType = document.getElementById("context-search-type"); |
| 174 |
|
- const contextSearchText = document.getElementById("context-search-text"); |
| 175 |
|
- const contextSearchResponse = document.getElementById("context-search-response"); |
| 176 |
|
- const contextSearchButton = document.getElementById("context-search-button"); |
| 177 |
|
- contextSearchButton.addEventListener('click', function() { |
| 178 |
|
- const context = contextSearchType.options[contextSearchType.selectedIndex].value; |
| 179 |
|
- const term = contextSearchText.value; |
| 180 |
|
- switch(context) { |
| 181 |
|
- case 'collabs': |
| 182 |
|
- document.location.href = `/bin/view/Collabs/#search=${term}`; |
| 183 |
|
- break; |
| 184 |
|
- case 'current-collab': |
| 185 |
|
- handleXWikiSearch('bougaultx'); |
| 186 |
|
- break |
| 187 |
|
- default: |
| 188 |
|
- handleXWikiSearch('') |
| 189 |
|
- } |
| 190 |
|
- |
| 191 |
|
- }); |
| 192 |
|
- function handleXWikiSearch(space, callback) { |
| 193 |
|
- require(['jquery'], function($) { |
| 194 |
|
- var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get'); |
| 195 |
|
- const contextSearchButton = document.getElementById("context-search-button"); |
| 196 |
|
- const xwikiSpace = space ? `.${space}` : ''; |
| 197 |
|
- contextSearchButton.addEventListener('click', function() { |
| 198 |
|
- $.post(solrServiceURL, { |
| 199 |
|
- outputSyntax: 'plain', |
| 200 |
|
- media: 'json', |
| 201 |
|
- query: [ |
| 202 |
|
- 'q="__INPUT__"~100', |
| 203 |
|
- 'fq=type:DOCUMENT', |
| 204 |
|
- `fq=space:Collabs${xwikiSpace}.*` |
| 205 |
|
- ].join('\n'), |
| 206 |
|
- input: $('#context-search-text').val() |
| 207 |
|
- }).then(res => { |
| 208 |
|
- if(callback) { |
| 209 |
|
- callback(res).then(results => { |
| 210 |
|
- contextSearchResponse.innerText = JSON.stringify(results, null, 2); |
| 211 |
|
- }) |
| 212 |
|
- } else { |
| 213 |
|
- contextSearchResponse.innerText = JSON.stringify(res, null, 2); |
| 214 |
|
- } |
| 215 |
|
- }); |
| 216 |
|
- }); |
| 217 |
|
- }); |
| 218 |
|
- } |
| 219 |
|
- function applyAdministratorFilter(results) { |
| 220 |
|
- return new Promise((resolve, reject) => { |
| 221 |
|
- //fetch("/rest/v1/collabs?roles=administrator") |
| 222 |
|
- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") |
| 223 |
|
- .then(res => res.json()) |
| 224 |
|
- .then(collabs => { |
| 225 |
|
- const spaces = collabs.map(collab => `Collabs.${collab.name}`); |
| 226 |
|
- const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space))); |
| 227 |
|
- resolve(filtered); |
| 228 |
|
- }) |
| 229 |
|
- |
| 230 |
|
- }) |
| 231 |
|
- } |
| 232 |
|
-}); |
| 233 |
|
-</script> |
| 234 |
|
---> |
| 235 |
235 |
{{/html}} |