Skip to content

Commit

Permalink
[Glitch] Fix empty “Server rules violation” report option
Browse files Browse the repository at this point in the history
Port eed5a4b to glitch-soc

Signed-off-by: Claire <[email protected]>
  • Loading branch information
ClearlyClaire authored and single-right-quote committed May 5, 2022
1 parent 0a2149a commit 80b75f8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
18 changes: 15 additions & 3 deletions app/javascript/flavours/glitch/features/report/category.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Button from 'flavours/glitch/components/button';
import Option from './components/option';
Expand All @@ -17,11 +19,17 @@ const messages = defineMessages({
account: { id: 'report.category.title_account', defaultMessage: 'profile' },
});

export default @injectIntl
const mapStateToProps = state => ({
rules: state.get('rules'),
});

export default @connect(mapStateToProps)
@injectIntl
class Category extends React.PureComponent {

static propTypes = {
onNextStep: PropTypes.func.isRequired,
rules: ImmutablePropTypes.list,
category: PropTypes.string,
onChangeCategory: PropTypes.func.isRequired,
startedFrom: PropTypes.oneOf(['status', 'account']),
Expand Down Expand Up @@ -53,13 +61,17 @@ class Category extends React.PureComponent {
};

render () {
const { category, startedFrom, intl } = this.props;
const { category, startedFrom, rules, intl } = this.props;

const options = [
const options = rules.size > 0 ? [
'dislike',
'spam',
'violation',
'other',
] : [
'dislike',
'spam',
'other',
];

return (
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/flavours/glitch/features/ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { uploadCompose, resetCompose, changeComposeSpoilerness } from 'flavours/
import { expandHomeTimeline } from 'flavours/glitch/actions/timelines';
import { expandNotifications, notificationsSetVisibility } from 'flavours/glitch/actions/notifications';
import { fetchFilters } from 'flavours/glitch/actions/filters';
import { fetchRules } from 'flavours/glitch/actions/rules';
import { clearHeight } from 'flavours/glitch/actions/height_cache';
import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
import { WrappedSwitch, WrappedRoute } from 'flavours/glitch/util/react_router_helpers';
Expand Down Expand Up @@ -402,6 +403,7 @@ class UI extends React.Component {
this.props.dispatch(expandHomeTimeline());
this.props.dispatch(expandNotifications());
setTimeout(() => this.props.dispatch(fetchFilters()), 500);
setTimeout(() => this.props.dispatch(fetchRules()), 3000);
}

componentDidMount () {
Expand Down

0 comments on commit 80b75f8

Please sign in to comment.