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

Merge branch 'polls-unauthorized-modal' into 'develop' 

Check if unauthorized when toggling poll options

See merge request soapbox-pub/soapbox-fe!828
This commit is contained in:
Alex Gleason 2021-11-03 18:15:57 +00:00
parent 9140e1daf0 92ee89936e
commit 8634db39a5
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/soapbox/components/poll.js
View File

@ -33,6 +33,7 @@ class Poll extends ImmutablePureComponent {
dispatch: PropTypes.func, dispatch: PropTypes.func,
disabled: PropTypes.bool, disabled: PropTypes.bool,
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
onOpenUnauthorizedModal: PropTypes.func.isRequired,
}; };
state = { state = {
@ -40,18 +41,22 @@ class Poll extends ImmutablePureComponent {
}; };
_toggleOption = value => { _toggleOption = value => {
if (this.props.poll.get('multiple')) { if (this.props.me) {
const tmp = { ...this.state.selected }; if (this.props.poll.get('multiple')) {
if (tmp[value]) { const tmp = { ...this.state.selected };
delete tmp[value]; if (tmp[value]) {
delete tmp[value];
} else {
tmp[value] = true;
}
this.setState({ selected: tmp });
} else { } else {
const tmp = {};
tmp[value] = true; tmp[value] = true;
this.setState({ selected: tmp });
} }
this.setState({ selected: tmp });
} else { } else {
const tmp = {}; this.props.onOpenUnauthorizedModal();
tmp[value] = true;
this.setState({ selected: tmp });
} }
} }

9
app/soapbox/containers/poll_container.js
View File

@ -1,4 +1,5 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { openModal } from 'soapbox/actions/modal';
import Poll from 'soapbox/components/poll'; import Poll from 'soapbox/components/poll';
const mapStateToProps = (state, { pollId }) => ({ const mapStateToProps = (state, { pollId }) => ({
@ -6,4 +7,10 @@ const mapStateToProps = (state, { pollId }) => ({
me: state.get('me'), me: state.get('me'),
}); });
export default connect(mapStateToProps)(Poll); const mapDispatchToProps = (dispatch) => ({
onOpenUnauthorizedModal() {
dispatch(openModal('UNAUTHORIZED'));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(Poll);