Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reinstate fix get all ancestors in a thread #43518

Merged
merged 18 commits into from
Aug 6, 2024
Merged

Reinstate fix get all ancestors in a thread #43518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
35d8dc1
Add hideThreadReplies prop to ReportActionItem. Change ancestor.repor…
kmbcook Jun 11, 2024
54c1b67
Revert "Merge pull request #43201 from Expensify/revert-42554-fix/iss…
kmbcook Jun 11, 2024
a401c7c
hideThreadReplies is optional
kmbcook Jun 12, 2024
af7b65b
Fix lint error
kmbcook Jun 12, 2024
9c2148b
Resolve conflicts in ThreadDivider to finishing merging main
kmbcook Jun 17, 2024
0b6188f
Merge main and resolve conflicts
kmbcook Jun 25, 2024
d846f68
Resolve another conflict due to merging main
kmbcook Jun 25, 2024
381c32a
Merge main and fix confict
kmbcook Jul 1, 2024
a3a34f7
Merge main
kmbcook Jul 5, 2024
e223a58
Merge main
kmbcook Jul 8, 2024
8c649f7
Merge branch 'main' into fix/issue-41519-get-all-ancestors
kmbcook Jul 14, 2024
60f01c1
Merge branch 'main' into fix/issue-41519-get-all-ancestors
kmbcook Jul 15, 2024
8ec355f
Show trip details view instead of report action item, when thread anc…
kmbcook Jul 15, 2024
cdf0560
After npm run prettier
kmbcook Jul 15, 2024
2984e6d
Merge main
kmbcook Jul 19, 2024
3a5faf1
Merge branch 'main' into fix/issue-41519-get-all-ancestors
kmbcook Jul 26, 2024
41624fa
Merge branch 'main' into fix/issue-41519-get-all-ancestors
kmbcook Jul 29, 2024
daacbd0
Resolve conflicts and merge main
kmbcook Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6897,14 +6897,12 @@ function getAllAncestorReportActions(report: Report | null | undefined): Ancesto
let parentReportID = report.parentReportID;
Copy link
Contributor

@allgandalf allgandalf Nov 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With these changes the reportID contains the reportID of the report where the action belongs to, if we create a thread from report A, the reportID will be report A instead of B. So, isThreadFirstChat will always be false.

This caused the Join Thread to shows up for thread first chat. This resulted in #50262

let parentReportActionID = report.parentReportActionID;

// Store the child of parent report
let currentReport = report;

while (parentReportID) {
const parentReport = getReportOrDraftReport(parentReportID);
const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '-1');

if (
!parentReport ||
!parentReportAction ||
(ReportActionsUtils.isTransactionThread(parentReportAction) && !ReportActionsUtils.isSentMoneyReportAction(parentReportAction)) ||
ReportActionsUtils.isReportPreviewAction(parentReportAction)
Expand All @@ -6914,20 +6912,13 @@ function getAllAncestorReportActions(report: Report | null | undefined): Ancesto

const isParentReportActionUnread = ReportActionsUtils.isCurrentActionUnread(parentReport, parentReportAction);
allAncestors.push({
report: currentReport,
report: parentReport,
reportAction: parentReportAction,
shouldDisplayNewMarker: isParentReportActionUnread,
});

if (!parentReport) {
break;
}

parentReportID = parentReport?.parentReportID;
parentReportActionID = parentReport?.parentReportActionID;
if (!isEmptyObject(parentReport)) {
currentReport = parentReport;
}
}

return allAncestors.reverse();
Expand Down
19 changes: 4 additions & 15 deletions src/pages/home/report/ReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import RenameAction from '@components/ReportActionItem/RenameAction';
import ReportPreview from '@components/ReportActionItem/ReportPreview';
import TaskAction from '@components/ReportActionItem/TaskAction';
import TaskPreview from '@components/ReportActionItem/TaskPreview';
import TripDetailsView from '@components/ReportActionItem/TripDetailsView';
import TripRoomPreview from '@components/ReportActionItem/TripRoomPreview';
import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
import Text from '@components/Text';
Expand Down Expand Up @@ -154,6 +153,8 @@ type ReportActionItemProps = {
/** IF the thread divider line will be used */
shouldUseThreadDividerLine?: boolean;

hideThreadReplies?: boolean;

/** Whether context menu should be displayed */
shouldDisplayContextMenu?: boolean;
} & ReportActionItemOnyxProps;
Expand All @@ -177,6 +178,7 @@ function ReportActionItem({
isFirstVisibleReportAction = false,
shouldUseThreadDividerLine = false,
linkedTransactionRouteError,
hideThreadReplies = false,
shouldDisplayContextMenu = true,
parentReportActionForTransactionThread,
}: ReportActionItemProps) {
Expand Down Expand Up @@ -719,7 +721,7 @@ function ReportActionItem({
}
const numberOfThreadReplies = action.childVisibleActionCount ?? 0;

const shouldDisplayThreadReplies = ReportUtils.shouldDisplayThreadReplies(action, report.reportID);
const shouldDisplayThreadReplies = !hideThreadReplies && ReportUtils.shouldDisplayThreadReplies(action, report.reportID);
const oldestFourAccountIDs =
action.childOldestFourAccountIDs
?.split(',')
Expand Down Expand Up @@ -811,19 +813,6 @@ function ReportActionItem({
return <ReportActionItemGrouped wrapperStyle={isWhisper ? styles.pt1 : {}}>{content}</ReportActionItemGrouped>;
};

if (action.actionName === CONST.REPORT.ACTIONS.TYPE.TRIPPREVIEW) {
if (ReportUtils.isTripRoom(report)) {
return (
<OfflineWithFeedback pendingAction={action.pendingAction}>
<TripDetailsView
tripRoomReportID={report.reportID}
shouldShowHorizontalRule={false}
/>
</OfflineWithFeedback>
);
}
}

if (action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) {
const transactionID = ReportActionsUtils.isMoneyRequestAction(parentReportActionForTransactionThread)
? ReportActionsUtils.getOriginalMessage(parentReportActionForTransactionThread)?.IOUTransactionID
Expand Down
65 changes: 38 additions & 27 deletions src/pages/home/report/ReportActionItemParentAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, {useEffect, useRef, useState} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import TripDetailsView from '@components/ReportActionItem/TripDetailsView';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -113,35 +114,45 @@ function ReportActionItemParentAction({
>
<ThreadDivider
ancestor={ancestor}
isLinkDisabled={!ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.parentReportID ?? '-1'])}
isLinkDisabled={!ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.reportID ?? '-1'])}
/>
<ReportActionItem
onPress={
ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.parentReportID ?? '-1'])
? () => {
const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '-1');
// Pop the thread report screen before navigating to the chat report.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1'));
if (isVisibleAction && !isOffline) {
// Pop the chat report screen before navigating to the linked report action.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1', ancestor.reportAction.reportActionID));
{ReportActionsUtils.isTripPreview(ancestor?.reportAction) ? (
<OfflineWithFeedback pendingAction={ancestor.reportAction.pendingAction}>
<TripDetailsView
tripRoomReportID={ReportActionsUtils.getOriginalMessage(ancestor.reportAction)?.linkedReportID ?? '-1'}
shouldShowHorizontalRule={false}
/>
</OfflineWithFeedback>
) : (
<ReportActionItem
onPress={
ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.parentReportID ?? '-1'])
? () => {
const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '-1');
// Pop the thread report screen before navigating to the chat report.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1'));
if (isVisibleAction && !isOffline) {
// Pop the chat report screen before navigating to the linked report action.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1', ancestor.reportAction.reportActionID));
}
Timing.start(CONST.TIMING.SWITCH_REPORT);
}
Timing.start(CONST.TIMING.SWITCH_REPORT);
}
: undefined
}
parentReportAction={parentReportAction}
report={ancestor.report}
reportActions={reportActions}
transactionThreadReport={transactionThreadReport}
action={ancestor.reportAction}
displayAsGroup={false}
isMostRecentIOUReportAction={false}
shouldDisplayNewMarker={ancestor.shouldDisplayNewMarker}
index={index}
isFirstVisibleReportAction={isFirstVisibleReportAction}
shouldUseThreadDividerLine={shouldUseThreadDividerLine}
/>
: undefined
}
parentReportAction={parentReportAction}
report={ancestor.report}
reportActions={reportActions}
transactionThreadReport={transactionThreadReport}
action={ancestor.reportAction}
displayAsGroup={false}
isMostRecentIOUReportAction={false}
shouldDisplayNewMarker={ancestor.shouldDisplayNewMarker}
index={index}
isFirstVisibleReportAction={isFirstVisibleReportAction}
shouldUseThreadDividerLine={shouldUseThreadDividerLine}
hideThreadReplies
/>
)}
</OfflineWithFeedback>
))}
{shouldDisplayReplyDivider && <RepliesDivider shouldHideThreadDividerLine={shouldHideThreadDividerLine} />}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home/report/ThreadDivider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ function ThreadDivider({ancestor, isLinkDisabled = false}: ThreadDividerProps) {
Timing.start(CONST.TIMING.SWITCH_REPORT);
const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '-1');
// Pop the thread report screen before navigating to the chat report.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1'));
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.reportID ?? '-1'));
if (isVisibleAction && !isOffline) {
// Pop the chat report screen before navigating to the linked report action.
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1', ancestor.reportAction.reportActionID));
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.reportID ?? '-1', ancestor.reportAction.reportActionID));
}
}}
accessibilityLabel={translate('threads.thread')}
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,10 +856,10 @@ describe('ReportUtils', () => {

it('should return correctly all ancestors of a thread report', () => {
const resultAncestors = [
{report: reports[1], reportAction: reportActions[0], shouldDisplayNewMarker: false},
{report: reports[2], reportAction: reportActions[1], shouldDisplayNewMarker: false},
{report: reports[3], reportAction: reportActions[2], shouldDisplayNewMarker: false},
{report: reports[4], reportAction: reportActions[3], shouldDisplayNewMarker: false},
{report: reports[0], reportAction: reportActions[0], shouldDisplayNewMarker: false},
{report: reports[1], reportAction: reportActions[1], shouldDisplayNewMarker: false},
{report: reports[2], reportAction: reportActions[2], shouldDisplayNewMarker: false},
{report: reports[3], reportAction: reportActions[3], shouldDisplayNewMarker: false},
];

expect(ReportUtils.getAllAncestorReportActions(reports[4])).toEqual(resultAncestors);
Expand Down
Loading