Add list of muted user to UI and Getting Started (#1799)
Add the same UI that already exists for blocked users for muted ones and add it to the "Getting Started" menu.master
Patrick Figel
8 years ago
committed by
Eugen
parent
92cd207c50
commit
fe8dd58bc1
@ -0,0 +1,82 @@ |
||||
import api, { getLinks } from '../api' |
||||
import { fetchRelationships } from './accounts'; |
||||
|
||||
export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST'; |
||||
export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS'; |
||||
export const MUTES_FETCH_FAIL = 'MUTES_FETCH_FAIL'; |
||||
|
||||
export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST'; |
||||
export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS'; |
||||
export const MUTES_EXPAND_FAIL = 'MUTES_EXPAND_FAIL'; |
||||
|
||||
export function fetchMutes() { |
||||
return (dispatch, getState) => { |
||||
dispatch(fetchMutesRequest()); |
||||
|
||||
api(getState).get('/api/v1/mutes').then(response => { |
||||
const next = getLinks(response).refs.find(link => link.rel === 'next'); |
||||
dispatch(fetchMutesSuccess(response.data, next ? next.uri : null)); |
||||
dispatch(fetchRelationships(response.data.map(item => item.id))); |
||||
}).catch(error => dispatch(fetchMutesFail(error))); |
||||
}; |
||||
}; |
||||
|
||||
export function fetchMutesRequest() { |
||||
return { |
||||
type: MUTES_FETCH_REQUEST |
||||
}; |
||||
}; |
||||
|
||||
export function fetchMutesSuccess(accounts, next) { |
||||
return { |
||||
type: MUTES_FETCH_SUCCESS, |
||||
accounts, |
||||
next |
||||
}; |
||||
}; |
||||
|
||||
export function fetchMutesFail(error) { |
||||
return { |
||||
type: MUTES_FETCH_FAIL, |
||||
error |
||||
}; |
||||
}; |
||||
|
||||
export function expandMutes() { |
||||
return (dispatch, getState) => { |
||||
const url = getState().getIn(['user_lists', 'mutes', 'next']); |
||||
|
||||
if (url === null) { |
||||
return; |
||||
} |
||||
|
||||
dispatch(expandMutesRequest()); |
||||
|
||||
api(getState).get(url).then(response => { |
||||
const next = getLinks(response).refs.find(link => link.rel === 'next'); |
||||
dispatch(expandMutesSuccess(response.data, next ? next.uri : null)); |
||||
dispatch(fetchRelationships(response.data.map(item => item.id))); |
||||
}).catch(error => dispatch(expandMutesFail(error))); |
||||
}; |
||||
}; |
||||
|
||||
export function expandMutesRequest() { |
||||
return { |
||||
type: MUTES_EXPAND_REQUEST |
||||
}; |
||||
}; |
||||
|
||||
export function expandMutesSuccess(accounts, next) { |
||||
return { |
||||
type: MUTES_EXPAND_SUCCESS, |
||||
accounts, |
||||
next |
||||
}; |
||||
}; |
||||
|
||||
export function expandMutesFail(error) { |
||||
return { |
||||
type: MUTES_EXPAND_FAIL, |
||||
error |
||||
}; |
||||
}; |
||||
@ -0,0 +1,68 @@ |
||||
import { connect } from 'react-redux'; |
||||
import PureRenderMixin from 'react-addons-pure-render-mixin'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import LoadingIndicator from '../../components/loading_indicator'; |
||||
import { ScrollContainer } from 'react-router-scroll'; |
||||
import Column from '../ui/components/column'; |
||||
import ColumnBackButtonSlim from '../../components/column_back_button_slim'; |
||||
import AccountContainer from '../../containers/account_container'; |
||||
import { fetchMutes, expandMutes } from '../../actions/mutes'; |
||||
import { defineMessages, injectIntl } from 'react-intl'; |
||||
|
||||
const messages = defineMessages({ |
||||
heading: { id: 'column.mutes', defaultMessage: 'Muted users' } |
||||
}); |
||||
|
||||
const mapStateToProps = state => ({ |
||||
accountIds: state.getIn(['user_lists', 'mutes', 'items']) |
||||
}); |
||||
|
||||
const Mutes = React.createClass({ |
||||
propTypes: { |
||||
params: React.PropTypes.object.isRequired, |
||||
dispatch: React.PropTypes.func.isRequired, |
||||
accountIds: ImmutablePropTypes.list, |
||||
intl: React.PropTypes.object.isRequired |
||||
}, |
||||
|
||||
mixins: [PureRenderMixin], |
||||
|
||||
componentWillMount () { |
||||
this.props.dispatch(fetchMutes()); |
||||
}, |
||||
|
||||
handleScroll (e) { |
||||
const { scrollTop, scrollHeight, clientHeight } = e.target; |
||||
|
||||
if (scrollTop === scrollHeight - clientHeight) { |
||||
this.props.dispatch(expandMutes()); |
||||
} |
||||
}, |
||||
|
||||
render () { |
||||
const { intl, accountIds } = this.props; |
||||
|
||||
if (!accountIds) { |
||||
return ( |
||||
<Column> |
||||
<LoadingIndicator /> |
||||
</Column> |
||||
); |
||||
} |
||||
|
||||
return ( |
||||
<Column icon='users' heading={intl.formatMessage(messages.heading)}> |
||||
<ColumnBackButtonSlim /> |
||||
<ScrollContainer scrollKey='mutes'> |
||||
<div className='scrollable' onScroll={this.handleScroll}> |
||||
{accountIds.map(id => |
||||
<AccountContainer key={id} id={id} /> |
||||
)} |
||||
</div> |
||||
</ScrollContainer> |
||||
</Column> |
||||
); |
||||
} |
||||
}); |
||||
|
||||
export default connect(mapStateToProps)(injectIntl(Mutes)); |
||||
Loading…
Reference in new issue