bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'improve-reporting' into 'develop'

Browse source 
ReportModal fixes

See merge request soapbox-pub/soapbox-fe!1297
This commit is contained in:
Alex Gleason 2022-05-02 20:11:11 +00:00
commit 6fc7418096
7 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/actions/reports.js
View file

Binary file not shown.

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

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

2
app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
View file

@ -32,7 +32,7 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => {
const statusIds = useAppSelector((state) => OrderedSet(state.timelines.getIn([`account:${account.id}:with_replies`, 'items'])).union(state.reports.getIn(['new', 'status_ids']) as Iterable<unknown>) as OrderedSet<string>); const statusIds = useAppSelector((state) => OrderedSet(state.timelines.getIn([`account:${account.id}:with_replies`, 'items'])).union(state.reports.getIn(['new', 'status_ids']) as Iterable<unknown>) as OrderedSet<string>);
const isBlocked = useAppSelector((state) => state.reports.getIn(['new', 'block']) as boolean); const isBlocked = useAppSelector((state) => state.reports.getIn(['new', 'block']) as boolean);
const isForward = useAppSelector((state) => state.reports.getIn(['reports', 'forward']) as boolean); const isForward = useAppSelector((state) => state.reports.getIn(['new', 'forward']) as boolean);
const canForward = isRemote(account as any) && features.federating; const canForward = isRemote(account as any) && features.federating;
const isSubmitting = useAppSelector((state) => state.reports.getIn(['new', 'isSubmitting']) as boolean); const isSubmitting = useAppSelector((state) => state.reports.getIn(['new', 'isSubmitting']) as boolean);

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

BIN
app/soapbox/reducers/__tests__/reports-test.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/reports.js
View file

Binary file not shown.