Shizanit/synapse-admin
1
0
Fork 0
mirror of https://github.com/UA-Fediland/synapse-admin.git synced 2024-11-25 15:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #22 from rkfg/bugfix

Browse source 
Fix pagination and use deactivated users switch
This commit is contained in:
Manuel Stahl 2020-03-26 14:24:21 +01:00 committed by GitHub
commit 7eeb60539f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/synapse/dataProvider.js
View file

@ -25,8 +25,8 @@ const resourceMap = {
deactivated: !!u.deactivated, deactivated: !!u.deactivated,
}), }),
data: "users", data: "users",
total: (json, perPage) => { total: (json, from, perPage) => {
return parseInt(json.next_token, 10) + perPage; return json.next_token ? parseInt(json.next_token, 10) + perPage : from + json.users.length;
}, },
}, },
rooms: { rooms: {
@ -55,13 +55,15 @@ function filterNullValues(key, value) {
const dataProvider = { const dataProvider = {
getList: (resource, params) => { getList: (resource, params) => {
console.log("getList " + resource); console.log("getList " + resource);
const { user_id, guests } = params.filter; const { user_id, guests, deactivated } = params.filter;
const { page, perPage } = params.pagination; const { page, perPage } = params.pagination;
const from = (page - 1) * perPage;
const query = { const query = {
from: (page - 1) * perPage, from: from,
limit: perPage, limit: perPage,
user_id: user_id, user_id: user_id,
guests: guests, guests: guests,
deactivated: deactivated,
}; };
const homeserver = localStorage.getItem("base_url"); const homeserver = localStorage.getItem("base_url");
if (!homeserver || !(resource in resourceMap)) return Promise.reject(); if (!homeserver || !(resource in resourceMap)) return Promise.reject();
@ -73,7 +75,7 @@ const dataProvider = {
return jsonClient(url).then(({ json }) => ({ return jsonClient(url).then(({ json }) => ({
data: json[res.data].map(res.map), data: json[res.data].map(res.map),
total: res.total(json, perPage), total: res.total(json, from, perPage),
})); }));
}, },