| ... |
... |
@@ -59,18 +59,20 @@ |
| 59 |
59 |
} |
| 60 |
60 |
function applyAdministratorFilter(results) { |
| 61 |
61 |
return new Promise((resolve, reject) => { |
| 62 |
|
- fetch("/rest/v1/collabs?roles=administrator") |
|
62 |
+ //fetch("/rest/v1/collabs?roles=administrator") |
|
63 |
+ fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator") |
| 63 |
63 |
.then(res => res.json()) |
| 64 |
64 |
.then(collabs => { |
| 65 |
65 |
const spaces = collabs.map(collab => `Collabs.${collab.name}`); |
| 66 |
66 |
const filtered = results.filter(result => { |
| 67 |
|
- return collabs.some(name => { |
| 68 |
|
- console.log(result.space, name); |
| 69 |
|
- return result.space.startsWith(name) |
|
68 |
+ const r = spaces.some(space => { |
|
69 |
+ console.log(result.space, space); |
|
70 |
+ return result.space.startsWith(space) |
| 70 |
70 |
}) |
|
72 |
+ |
|
73 |
+ return r |
| 71 |
71 |
}); |
| 72 |
|
- console.log(filtered, spaces, results); |
| 73 |
|
- resolve(results); |
|
75 |
+ resolve(filtered); |
| 74 |
74 |
}) |
| 75 |
75 |
|
| 76 |
76 |
}) |