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

Recalculate new marker indicator if current one is deleted #15144

Merged
merged 3 commits into from
Feb 15, 2023
Merged

Recalculate new marker indicator if current one is deleted #15144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75bbf42
Recalculate new marker indicator if current one is deleted
s77rt Feb 14, 2023
c17ac21
Update src/pages/home/report/ReportActionsView.js
s77rt Feb 15, 2023
b8b29e4
Cleaned the conditions logic
s77rt Feb 15, 2023
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
9 changes: 5 additions & 4 deletions src/pages/home/report/ReportActionsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,11 @@ class ReportActionsView extends React.Component {
this.openReportIfNecessary();
}

// If the report is unread, we want to check if the number of actions has decreased. If so, then it seems that one of them was deleted. In this case, if the deleted action was the
// one marking the unread point, we need to recalculate which action should be the unread marker.
if (ReportUtils.isUnread(this.props.report) && ReportActionsUtils.filterReportActionsForDisplay(prevProps.reportActions).length > this.sortedAndFilteredReportActions.length) {
this.setState({newMarkerReportActionID: ReportUtils.getNewMarkerReportActionID(this.props.report, this.sortedAndFilteredReportActions)});
// If the report action marking the unread point is deleted we need to recalculate which action should be the unread marker
if (this.state.newMarkerReportActionID && _.isEmpty(lodashGet(this.props.reportActions[this.state.newMarkerReportActionID], 'message[0].html'))) {
s77rt marked this conversation as resolved.
Show resolved Hide resolved
this.setState({
newMarkerReportActionID: ReportUtils.getNewMarkerReportActionID(this.props.report, this.sortedAndFilteredReportActions),
});
}

// When the user navigates to the LHN the ReportActionsView doesn't unmount and just remains hidden.
Expand Down