moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staff-promotions-race-conditions' into 'develop' 

Staff promotions: fix race conditions

See merge request soapbox-pub/soapbox-fe!615
This commit is contained in:
Alex Gleason 2021-07-14 00:41:34 +00:00
parent c883613c67 4d35f16483
commit 263dc3ed2e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/soapbox/features/ui/components/profile_media_panel.js
View File

@ -35,12 +35,6 @@ class ProfileMediaPanel extends ImmutablePureComponent {
this.props.dispatch(expandAccountMediaTimeline(accountId)); this.props.dispatch(expandAccountMediaTimeline(accountId));
} }
componentDidUpdate() {
const { account } = this.props;
const accountId = account.get('id');
this.props.dispatch(expandAccountMediaTimeline(accountId));
}
render() { render() {
const { attachments, account } = this.props; const { attachments, account } = this.props;
const publicAttachments = attachments.filter(attachment => attachment.getIn(['status', 'visibility']) === 'public'); const publicAttachments = attachments.filter(attachment => attachment.getIn(['status', 'visibility']) === 'public');

8
app/soapbox/reducers/accounts.js
View File

@ -15,12 +15,16 @@ import { normalizePleromaUserFields } from 'soapbox/utils/pleroma';
import { import {
ADMIN_USERS_FETCH_SUCCESS, ADMIN_USERS_FETCH_SUCCESS,
ADMIN_USERS_TAG_REQUEST, ADMIN_USERS_TAG_REQUEST,
ADMIN_USERS_TAG_SUCCESS,
ADMIN_USERS_TAG_FAIL, ADMIN_USERS_TAG_FAIL,
ADMIN_USERS_UNTAG_REQUEST, ADMIN_USERS_UNTAG_REQUEST,
ADMIN_USERS_UNTAG_SUCCESS,
ADMIN_USERS_UNTAG_FAIL, ADMIN_USERS_UNTAG_FAIL,
ADMIN_ADD_PERMISSION_GROUP_REQUEST, ADMIN_ADD_PERMISSION_GROUP_REQUEST,
ADMIN_ADD_PERMISSION_GROUP_SUCCESS,
ADMIN_ADD_PERMISSION_GROUP_FAIL, ADMIN_ADD_PERMISSION_GROUP_FAIL,
ADMIN_REMOVE_PERMISSION_GROUP_REQUEST, ADMIN_REMOVE_PERMISSION_GROUP_REQUEST,
ADMIN_REMOVE_PERMISSION_GROUP_SUCCESS,
ADMIN_REMOVE_PERMISSION_GROUP_FAIL, ADMIN_REMOVE_PERMISSION_GROUP_FAIL,
} from 'soapbox/actions/admin'; } from 'soapbox/actions/admin';
import { import {
@ -197,15 +201,19 @@ export default function accounts(state = initialState, action) {
case STREAMING_CHAT_UPDATE: case STREAMING_CHAT_UPDATE:
return importAccountsFromChats(state, [action.chat]); return importAccountsFromChats(state, [action.chat]);
case ADMIN_USERS_TAG_REQUEST: case ADMIN_USERS_TAG_REQUEST:
case ADMIN_USERS_TAG_SUCCESS:
case ADMIN_USERS_UNTAG_FAIL: case ADMIN_USERS_UNTAG_FAIL:
return addTags(state, action.accountIds, action.tags); return addTags(state, action.accountIds, action.tags);
case ADMIN_USERS_UNTAG_REQUEST: case ADMIN_USERS_UNTAG_REQUEST:
case ADMIN_USERS_UNTAG_SUCCESS:
case ADMIN_USERS_TAG_FAIL: case ADMIN_USERS_TAG_FAIL:
return removeTags(state, action.accountIds, action.tags); return removeTags(state, action.accountIds, action.tags);
case ADMIN_ADD_PERMISSION_GROUP_REQUEST: case ADMIN_ADD_PERMISSION_GROUP_REQUEST:
case ADMIN_ADD_PERMISSION_GROUP_SUCCESS:
case ADMIN_REMOVE_PERMISSION_GROUP_FAIL: case ADMIN_REMOVE_PERMISSION_GROUP_FAIL:
return addPermission(state, action.accountIds, action.permissionGroup); return addPermission(state, action.accountIds, action.permissionGroup);
case ADMIN_REMOVE_PERMISSION_GROUP_REQUEST: case ADMIN_REMOVE_PERMISSION_GROUP_REQUEST:
case ADMIN_REMOVE_PERMISSION_GROUP_SUCCESS:
case ADMIN_ADD_PERMISSION_GROUP_FAIL: case ADMIN_ADD_PERMISSION_GROUP_FAIL:
return removePermission(state, action.accountIds, action.permissionGroup); return removePermission(state, action.accountIds, action.permissionGroup);
case ADMIN_USERS_DELETE_REQUEST: case ADMIN_USERS_DELETE_REQUEST: