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

rule_id --> rule_ids

This commit is contained in:
Alex Gleason 2022-05-02 14:47:58 -05:00
parent 83a0988daa
commit 86ecda84c5
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/soapbox/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx
View File

@ -28,6 +28,7 @@ describe('<ReportModal />', () => {
new: {
account_id: '1',
status_ids: ImmutableSet(['1']),
rule_ids: ImmutableSet(),
},
}),
statuses: ImmutableMap({

6
app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
View File

@ -84,7 +84,7 @@ const ReportModal = ({ onClose }: IReportModal) => {
const isBlocked = useAppSelector((state) => state.reports.getIn(['new', 'block']) as boolean);
const isSubmitting = useAppSelector((state) => state.reports.getIn(['new', 'isSubmitting']) as boolean);
const rules = useAppSelector((state) => state.rules.items);
const ruleId = useAppSelector((state) => state.reports.getIn(['new', 'rule_id']) as string);
const ruleIds = useAppSelector((state) => state.reports.getIn(['new', 'rule_ids']) as ImmutableSet<string>);
const selectedStatusIds = useAppSelector((state) => state.reports.getIn(['new', 'status_ids']) as ImmutableSet<string>);
const shouldRequireRule = rules.length > 0;
@ -152,8 +152,8 @@ const ReportModal = ({ onClose }: IReportModal) => {
return false;
}
return isSubmitting || (shouldRequireRule && !ruleId) || selectedStatusIds.size === 0;
}, [currentStep, isSubmitting, shouldRequireRule, ruleId, selectedStatusIds.size]);
return isSubmitting || (shouldRequireRule && ruleIds.isEmpty()) || selectedStatusIds.size === 0;
}, [currentStep, isSubmitting, shouldRequireRule, ruleIds, selectedStatusIds.size]);
const calculateProgress = useCallback(() => {
switch (currentStep) {

5
app/soapbox/features/ui/components/modals/report-modal/steps/reason-step.tsx
View File

@ -8,6 +8,7 @@ import { fetchRules } from 'soapbox/actions/rules';
import { FormGroup, Stack, Text, Textarea } from 'soapbox/components/ui';
import { useAppSelector } from 'soapbox/hooks';
import type { Set as ImmutableSet } from 'immutable';
import type { ReducerAccount } from 'soapbox/reducers/accounts';
const messages = defineMessages({
@ -32,7 +33,7 @@ const ReasonStep = (_props: IReasonStep) => {
const comment = useAppSelector((state) => state.reports.getIn(['new', 'comment']) as string);
const rules = useAppSelector((state) => state.rules.items);
const ruleId = useAppSelector((state) => state.reports.getIn(['new', 'rule_id']) as boolean);
const ruleIds = useAppSelector((state) => state.reports.getIn(['new', 'rule_ids']) as ImmutableSet<string>);
const shouldRequireRule = rules.length > 0;
const handleCommentChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
@ -87,7 +88,7 @@ const ReasonStep = (_props: IReasonStep) => {
ref={rulesListRef}
>
{rules.map((rule, idx) => {
const isSelected = String(ruleId) === String(rule.id);
const isSelected = ruleIds.includes(String(rule.id));
return (
<button

2
app/soapbox/reducers/__tests__/reports-test.js
View File

@ -12,7 +12,7 @@ describe('reports reducer', () => {
comment: '',
forward: false,
block: false,
rule_id: null,
rule_ids: ImmutableSet(),
}),
}));
});