From b8fb318c0670d5834539ecd2221696bfe87f6f32 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 2 May 2022 14:36:18 -0500 Subject: [PATCH 1/4] ReportModal: fix report forwarding --- .../components/modals/report-modal/steps/other-actions-step.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index b1439807ca..1724c6a977 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -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) as OrderedSet); 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 isSubmitting = useAppSelector((state) => state.reports.getIn(['new', 'isSubmitting']) as boolean); From 9cbe98f131659717a7f31fe49113486e3d6a59e5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 2 May 2022 14:39:08 -0500 Subject: [PATCH 2/4] Reports: submit rule_ids to API --- app/soapbox/actions/reports.js | Bin 2444 -> 2510 bytes app/soapbox/reducers/reports.js | Bin 2447 -> 2486 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/reports.js b/app/soapbox/actions/reports.js index 9a23b51f447a6214f2e2daa9aeee6ea4ef61ed71..69f9006dedff88b557123093eac33040f3500115 100644 GIT binary patch delta 26 ecmeAXJ}10EhmEDEG$(cP8&+*FW3wzn+#|d}hi!8nTLLox9gG9* diff --git a/app/soapbox/reducers/reports.js b/app/soapbox/reducers/reports.js index 74ba75dd2362e2515b6df360a86e449f8b0125ac..4103e4bf59600d742be5bf0d6d734775de1411e7 100644 GIT binary patch delta 73 zcmeAd-X^?3f@$($M$yemOd_nx#po?cODPHKE+il#M}f Date: Mon, 2 May 2022 14:40:34 -0500 Subject: [PATCH 3/4] submitReport(): don't call getState() a million times --- app/soapbox/actions/reports.js | Bin 2510 -> 2476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/reports.js b/app/soapbox/actions/reports.js index 69f9006dedff88b557123093eac33040f3500115..8e8e45595e8555b36ae5293175bd207558290957 100644 GIT binary patch delta 146 zcmX>nyheCK8mpoL5G3d46_+SfD-@*`diso5H4yF1Gm!+b<>nWu!AT delta 182 zcmZ1@d`@^n8tddPRyW!7)RN$m#FA7EO+6sfGfyL0y(qOHzo?{GT}NT^eO65ZD#Y2; X38?U8Qz4+DflV2|ip`tYelY<6_qIJq From 86ecda84c5b12556535bfd063875229d5870e06f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 2 May 2022 14:47:58 -0500 Subject: [PATCH 4/4] rule_id --> rule_ids --- .../__tests__/report-modal.test.tsx | 1 + .../modals/report-modal/report-modal.tsx | 6 +++--- .../modals/report-modal/steps/reason-step.tsx | 5 +++-- app/soapbox/reducers/__tests__/reports-test.js | Bin 484 -> 495 bytes 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/soapbox/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx b/app/soapbox/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx index f50732146b..28c36e58fb 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx @@ -28,6 +28,7 @@ describe('', () => { new: { account_id: '1', status_ids: ImmutableSet(['1']), + rule_ids: ImmutableSet(), }, }), statuses: ImmutableMap({ diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index f2891c07dd..5845afbb88 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx @@ -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); const selectedStatusIds = useAppSelector((state) => state.reports.getIn(['new', 'status_ids']) as ImmutableSet); 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) { diff --git a/app/soapbox/features/ui/components/modals/report-modal/steps/reason-step.tsx b/app/soapbox/features/ui/components/modals/report-modal/steps/reason-step.tsx index fa0ba43258..1badbe94fd 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/steps/reason-step.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/steps/reason-step.tsx @@ -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); const shouldRequireRule = rules.length > 0; const handleCommentChange = (event: React.ChangeEvent) => { @@ -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 (