| ... |
... |
@@ -5,11 +5,6 @@ |
| 5 |
5 |
<option value="collabs">Collabs</option> |
| 6 |
6 |
<option value="current-collab">Current Collab</option> |
| 7 |
7 |
</select> |
| 8 |
|
-<div class="form-group"> |
| 9 |
|
-<label> |
| 10 |
|
- <input type="checkbox" data-role-filter="administrator"> Administrator |
| 11 |
|
-</label> |
| 12 |
|
-</div> |
| 13 |
13 |
<input type="text" id="context-search-text" /> |
| 14 |
14 |
<button id="context-search-button" class="btn btn-primary">Search</button> |
| 15 |
15 |
|
| ... |
... |
@@ -16,41 +16,6 @@ |
| 16 |
16 |
<pre id="context-search-response"></pre> |
| 17 |
17 |
<script> |
| 18 |
18 |
window.addEventListener('DOMContentLoaded', function() { |
| 19 |
|
- const filters = { |
| 20 |
|
- search: '', |
| 21 |
|
- offset: 0, |
| 22 |
|
- orderField: 'title', |
| 23 |
|
- order: 'asc', |
| 24 |
|
- favorite: false, |
| 25 |
|
- roles: [] // to be joined as administrator+editor+viewer |
| 26 |
|
- }; |
| 27 |
|
- |
| 28 |
|
- function addRole(role) { |
| 29 |
|
- if(filters.roles.indexOf(role) == -1) { |
| 30 |
|
- filters.roles.push(role); |
| 31 |
|
- } |
| 32 |
|
- } |
| 33 |
|
- |
| 34 |
|
- function removeRole(role) { |
| 35 |
|
- filters.roles.filter(r => r !== 'administrator') |
| 36 |
|
- } |
| 37 |
|
- |
| 38 |
|
- const filterInputs = document.querySelectorAll('input[data-role-filter]'); |
| 39 |
|
- console.log(filterInputs); |
| 40 |
|
- filterInputs.forEach(function(filterIpt) { |
| 41 |
|
- console.log(filterIpt); |
| 42 |
|
- filterIpt.addEventListener('click', function() { |
| 43 |
|
- const role = this.getAttribute('data-role-filter'); |
| 44 |
|
- if(this.checked) { |
| 45 |
|
- addRole(role); |
| 46 |
|
- } else { |
| 47 |
|
- removeRole(role); |
| 48 |
|
- } |
| 49 |
|
- console.log(filters); |
| 50 |
|
- }) |
| 51 |
|
- }); |
| 52 |
|
- |
| 53 |
|
- // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator |
| 54 |
54 |
const contextSearchType = document.getElementById("context-search-type"); |
| 55 |
55 |
const contextSearchText = document.getElementById("context-search-text"); |
| 56 |
56 |
const contextSearchResponse = document.getElementById("context-search-response"); |
| ... |
... |
@@ -99,12 +99,18 @@ |
| 99 |
99 |
} |
| 100 |
100 |
function applyAdministratorFilter(results) { |
| 101 |
101 |
return new Promise((resolve, reject) => { |
| 102 |
|
- //fetch("/rest/v1/collabs?roles=administrator") |
| 103 |
|
- fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") |
|
62 |
+ fetch("/rest/v1/collabs?roles=administrator") |
| 104 |
104 |
.then(res => res.json()) |
| 105 |
105 |
.then(collabs => { |
| 106 |
106 |
const spaces = collabs.map(collab => `Collabs.${collab.name}`); |
| 107 |
|
- 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, space); |
|
69 |
+ return result.space.startsWith(space) |
|
70 |
+ }) |
|
71 |
+ console.log(r, result.space); |
|
72 |
+ return r |
|
73 |
+ }); |
| 108 |
108 |
resolve(filtered); |
| 109 |
109 |
}) |
| 110 |
110 |
|