diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js
new file mode 100644
index 000000000..71a173822
--- /dev/null
+++ b/app/soapbox/features/admin/user_index.js
@@ -0,0 +1,95 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import PropTypes from 'prop-types';
+import { debounce } from 'lodash';
+import { fetchUsers } from 'soapbox/actions/admin';
+import { FormattedMessage } from 'react-intl';
+import AccountContainer from 'soapbox/containers/account_container';
+import Column from 'soapbox/features/ui/components/column';
+import ScrollableList from 'soapbox/components/scrollable_list';
+import { Set as ImmutableSet, OrderedSet as ImmutableOrderedSet, is } from 'immutable';
+
+export default @connect()
+class UserIndex extends ImmutablePureComponent {
+
+ static propTypes = {
+ dispatch: PropTypes.func.isRequired,
+ };
+
+ state = {
+ isLoading: true,
+ filters: ImmutableSet(['local', 'active']),
+ accountIds: ImmutableOrderedSet(),
+ total: Infinity,
+ pageSize: 50,
+ page: 0,
+ }
+
+ clearState = () => {
+ this.setState({
+ isLoading: true,
+ page: 0,
+ });
+ }
+
+ fetchNextPage = () => {
+ const { filters, page, pageSize } = this.state;
+ const nextPage = page + 1;
+
+ this.props.dispatch(fetchUsers(filters, nextPage, pageSize))
+ .then(({ users, count }) => {
+ const newIds = users.map(user => user.id);
+
+ this.setState({
+ isLoading: false,
+ accountIds: this.state.accountIds.union(newIds),
+ total: count,
+ page: nextPage,
+ });
+ })
+ .catch(() => {});
+ }
+
+ componentDidMount() {
+ this.fetchNextPage();
+ }
+
+ componentDidUpdate(prevProps, prevState) {
+ const { filters, q } = this.state;
+
+ if (!is(filters, prevState.filters) || !is(q, prevState.q)) {
+ this.clearState();
+ this.fetchNextPage();
+ }
+ }
+
+ handleLoadMore = debounce(() => {
+ this.fetchNextPage();
+ }, 2000, { leading: true });
+
+ render() {
+ const { accountIds, isLoading } = this.state;
+ const hasMore = accountIds.count() < this.state.total;
+
+ const showLoading = isLoading && accountIds.isEmpty();
+
+ return (
+
+ }
+ >
+ {accountIds.map(id =>
+ ,
+ )}
+
+
+ );
+ }
+
+}
diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index a140cd0a7..fd522c07f 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -95,6 +95,7 @@ import {
ModerationLog,
CryptoDonate,
ScheduledStatuses,
+ UserIndex,
} from './util/async-components';
// Dummy import, to make sure that
ends up in the application bundle.
@@ -265,6 +266,7 @@ class SwitchingColumnsArea extends React.PureComponent {
+
@@ -428,7 +430,7 @@ class UI extends React.PureComponent {
if (isStaff(account)) {
this.props.dispatch(fetchReports({ state: 'open' }));
- this.props.dispatch(fetchUsers({ page: 1, filters: 'local,need_approval' }));
+ this.props.dispatch(fetchUsers(['local', 'need_approval']));
}
if (isAdmin(account)) {
diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js
index 9d1fcae1d..c1bb39301 100644
--- a/app/soapbox/features/ui/util/async-components.js
+++ b/app/soapbox/features/ui/util/async-components.js
@@ -241,3 +241,7 @@ export function CryptoDonate() {
export function ScheduledStatuses() {
return import(/* webpackChunkName: "features/scheduled_statuses" */'../../scheduled_statuses');
}
+
+export function UserIndex() {
+ return import(/* webpackChunkName: "features/admin/user_index" */'../../admin/user_index');
+}
diff --git a/app/soapbox/reducers/accounts.js b/app/soapbox/reducers/accounts.js
index 7bab5aad4..761356507 100644
--- a/app/soapbox/reducers/accounts.js
+++ b/app/soapbox/reducers/accounts.js
@@ -13,6 +13,7 @@ import {
} from 'immutable';
import { normalizePleromaUserFields } from 'soapbox/utils/pleroma';
import {
+ ADMIN_USERS_FETCH_SUCCESS,
ADMIN_USERS_TAG_REQUEST,
ADMIN_USERS_TAG_FAIL,
ADMIN_USERS_UNTAG_REQUEST,
@@ -22,7 +23,12 @@ import {
ADMIN_REMOVE_PERMISSION_GROUP_REQUEST,
ADMIN_REMOVE_PERMISSION_GROUP_FAIL,
} from 'soapbox/actions/admin';
-import { ADMIN_USERS_DELETE_REQUEST } from 'soapbox/actions/admin';
+import {
+ ADMIN_USERS_DELETE_REQUEST,
+ ADMIN_USERS_DELETE_FAIL,
+ ADMIN_USERS_DEACTIVATE_REQUEST,
+ ADMIN_USERS_DEACTIVATE_FAIL,
+} from 'soapbox/actions/admin';
const initialState = ImmutableMap();
@@ -79,17 +85,10 @@ const removeTags = (state, accountIds, tags) => {
});
};
-const nicknamesToIds = (state, nicknames) => {
- return nicknames.map(nickname => {
- return state.find(account => account.get('acct') === nickname, null, ImmutableMap()).get('id');
- });
-};
-
-const setDeactivated = (state, nicknames) => {
- const ids = nicknamesToIds(state, nicknames);
+const setActive = (state, accountIds, active) => {
return state.withMutations(state => {
- ids.forEach(id => {
- state.setIn([id, 'pleroma', 'is_active'], false);
+ accountIds.forEach(id => {
+ state.setIn([id, 'pleroma', 'is_active'], active);
});
});
};
@@ -121,6 +120,67 @@ const removePermission = (state, accountIds, permissionGroup) => {
});
};
+const buildAccount = adminUser => fromJS({
+ id: adminUser.get('id'),
+ username: adminUser.get('nickname').split('@')[0],
+ acct: adminUser.get('nickname'),
+ display_name: adminUser.get('display_name'),
+ display_name_html: adminUser.get('display_name'),
+ note: '',
+ url: adminUser.get('url'),
+ avatar: adminUser.get('avatar'),
+ avatar_static: adminUser.get('avatar'),
+ header: '',
+ header_static: '',
+ emojis: [],
+ fields: [],
+ pleroma: {
+ is_active: adminUser.get('is_active'),
+ is_confirmed: adminUser.get('is_confirmed'),
+ is_admin: adminUser.getIn(['roles', 'admin']),
+ is_moderator: adminUser.getIn(['roles', 'moderator']),
+ tags: adminUser.get('tags'),
+ },
+ source: {
+ pleroma: {
+ actor_type: adminUser.get('actor_type'),
+ },
+ },
+ should_refetch: true,
+});
+
+const mergeAdminUser = (account, adminUser) => {
+ return account.withMutations(account => {
+ account.set('display_name', adminUser.get('display_name'));
+ account.set('avatar', adminUser.get('avatar'));
+ account.set('avatar_static', adminUser.get('avatar'));
+ account.setIn(['pleroma', 'is_active'], adminUser.get('is_active'));
+ account.setIn(['pleroma', 'is_admin'], adminUser.getIn(['roles', 'admin']));
+ account.setIn(['pleroma', 'is_moderator'], adminUser.getIn(['roles', 'moderator']));
+ account.setIn(['pleroma', 'is_confirmed'], adminUser.get('is_confirmed'));
+ account.setIn(['pleroma', 'tags'], adminUser.get('tags'));
+ });
+};
+
+const importAdminUser = (state, adminUser) => {
+ const id = adminUser.get('id');
+ const account = state.get(id);
+
+ if (!account) {
+ return state.set(id, buildAccount(adminUser));
+ } else {
+ return state.set(id, mergeAdminUser(account, adminUser));
+ }
+};
+
+const importAdminUsers = (state, adminUsers) => {
+ return state.withMutations(state => {
+ fromJS(adminUsers).forEach(adminUser => {
+ importAdminUser(state, adminUser);
+ });
+ });
+};
+
export default function accounts(state = initialState, action) {
switch(action.type) {
case ACCOUNT_IMPORT:
@@ -149,7 +209,13 @@ export default function accounts(state = initialState, action) {
case ADMIN_ADD_PERMISSION_GROUP_FAIL:
return removePermission(state, action.accountIds, action.permissionGroup);
case ADMIN_USERS_DELETE_REQUEST:
- return setDeactivated(state, action.nicknames);
+ case ADMIN_USERS_DEACTIVATE_REQUEST:
+ return setActive(state, action.accountIds, false);
+ case ADMIN_USERS_DELETE_FAIL:
+ case ADMIN_USERS_DEACTIVATE_FAIL:
+ return setActive(state, action.accountIds, true);
+ case ADMIN_USERS_FETCH_SUCCESS:
+ return importAdminUsers(state, action.users);
default:
return state;
}
diff --git a/app/soapbox/reducers/admin.js b/app/soapbox/reducers/admin.js
index 960df70f6..f7cb33fb6 100644
--- a/app/soapbox/reducers/admin.js
+++ b/app/soapbox/reducers/admin.js
@@ -31,18 +31,21 @@ function importUsers(state, users) {
users.forEach(user => {
user = normalizePleromaUserFields(user);
if (!user.is_approved) {
- state.update('awaitingApproval', orderedSet => orderedSet.add(user.nickname));
+ state.update('awaitingApproval', orderedSet => orderedSet.add(user.id));
}
- state.setIn(['users', user.nickname], fromJS(user));
+ state.setIn(['users', user.id], ImmutableMap({
+ email: user.email,
+ registration_reason: user.registration_reason,
+ }));
});
});
}
-function deleteUsers(state, nicknames) {
+function deleteUsers(state, accountIds) {
return state.withMutations(state => {
- nicknames.forEach(nickname => {
- state.update('awaitingApproval', orderedSet => orderedSet.delete(nickname));
- state.deleteIn(['users', nickname]);
+ accountIds.forEach(id => {
+ state.update('awaitingApproval', orderedSet => orderedSet.delete(id));
+ state.deleteIn(['users', id]);
});
});
}
@@ -94,12 +97,12 @@ export default function admin(state = initialState, action) {
case ADMIN_REPORTS_PATCH_SUCCESS:
return handleReportDiffs(state, action.reports);
case ADMIN_USERS_FETCH_SUCCESS:
- return importUsers(state, action.data.users);
+ return importUsers(state, action.users);
case ADMIN_USERS_DELETE_REQUEST:
case ADMIN_USERS_DELETE_SUCCESS:
- return deleteUsers(state, action.nicknames);
+ return deleteUsers(state, action.accountIds);
case ADMIN_USERS_APPROVE_REQUEST:
- return state.update('awaitingApproval', set => set.subtract(action.nicknames));
+ return state.update('awaitingApproval', set => set.subtract(action.accountIds));
case ADMIN_USERS_APPROVE_SUCCESS:
return approveUsers(state, action.users);
default:
diff --git a/app/soapbox/selectors/index.js b/app/soapbox/selectors/index.js
index 0615db229..9b222921e 100644
--- a/app/soapbox/selectors/index.js
+++ b/app/soapbox/selectors/index.js
@@ -5,6 +5,7 @@ const getAccountBase = (state, id) => state.getIn(['accounts', id], null
const getAccountCounters = (state, id) => state.getIn(['accounts_counters', id], null);
const getAccountRelationship = (state, id) => state.getIn(['relationships', id], null);
const getAccountMoved = (state, id) => state.getIn(['accounts', state.getIn(['accounts', id, 'moved'])]);
+const getAccountAdminData = (state, id) => state.getIn(['admin', 'users', id]);
const getAccountPatron = (state, id) => {
const url = state.getIn(['accounts', id, 'url']);
return state.getIn(['patron', 'accounts', url]);
@@ -16,8 +17,9 @@ export const makeGetAccount = () => {
getAccountCounters,
getAccountRelationship,
getAccountMoved,
+ getAccountAdminData,
getAccountPatron,
- ], (base, counters, relationship, moved, patron) => {
+ ], (base, counters, relationship, moved, admin, patron) => {
if (base === null) {
return null;
}
@@ -26,6 +28,7 @@ export const makeGetAccount = () => {
map.set('relationship', relationship);
map.set('moved', moved);
map.set('patron', patron);
+ map.setIn(['pleroma', 'admin'], admin);
});
});
};