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

fix: Inbox showing GBR when there’s a report with RBR #51643

Merged
merged 19 commits into from
Nov 12, 2024
Merged

fix: Inbox showing GBR when there’s a report with RBR #51643

Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
87f6644
fix: Inbox showing GBR when there’s a report with RBR
truph01 Oct 29, 2024
850f5ab
merge main
truph01 Oct 31, 2024
6d00a65
fix: optimize code
truph01 Oct 31, 2024
bba3e08
merge main
truph01 Nov 4, 2024
bbbe5aa
fix: refactor code
truph01 Nov 4, 2024
462c52f
fix: lint
truph01 Nov 4, 2024
c45ade8
merge main
truph01 Nov 5, 2024
f20b84f
fix: add test
truph01 Nov 5, 2024
a708691
fix: lint
truph01 Nov 5, 2024
85d684f
fix: unit test
truph01 Nov 5, 2024
0f9e3df
fix: lint
truph01 Nov 5, 2024
976c78f
fix: lint
truph01 Nov 5, 2024
e156dca
fix: add comment to test and create json file
truph01 Nov 7, 2024
e82e777
fix: prettier
truph01 Nov 7, 2024
8d0da00
fix: remove unused data in json
truph01 Nov 8, 2024
d42e264
fix: add 2nd test case
truph01 Nov 8, 2024
ef77bb9
fix: lint
truph01 Nov 8, 2024
bd9c7ac
fix: update comment
truph01 Nov 8, 2024
16b9d4e
fix: add detailed comments in test
truph01 Nov 12, 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
11 changes: 10 additions & 1 deletion src/libs/WorkspacesSettingsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,16 @@ const getBrickRoadForPolicy = (report: Report, altReportActions?: OnyxCollection
const oneTransactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions);
let doesReportContainErrors = Object.keys(reportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
Copy link
Contributor

Choose a reason for hiding this comment

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

add line break


if (oneTransactionThreadReportID) {
const parentReportActions = (altReportActions ?? allReportActions)?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`];
const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
const shouldDisplayViolations = ReportUtils.shouldDisplayTransactionThreadViolations(report, allTransactionViolations, parentReportAction);
const shouldDisplayReportViolations = ReportUtils.isReportOwner(report) && ReportUtils.hasReportViolations(report.reportID);
const hasViolations = shouldDisplayViolations || shouldDisplayReportViolations;
if (hasViolations && !doesReportContainErrors) {
doesReportContainErrors = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
}
Copy link
Contributor

@mkhutornyi mkhutornyi Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
const parentReportActions = (altReportActions ?? allReportActions)?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`];
const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
const shouldDisplayViolations = ReportUtils.shouldDisplayTransactionThreadViolations(report, allTransactionViolations, parentReportAction);
const shouldDisplayReportViolations = ReportUtils.isReportOwner(report) && ReportUtils.hasReportViolations(report.reportID);
const hasViolations = shouldDisplayViolations || shouldDisplayReportViolations;
if (hasViolations && !doesReportContainErrors) {
doesReportContainErrors = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
}
if (!doesReportContainErrors) {
const parentReportActions = (altReportActions ?? allReportActions)?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`];
const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
const shouldDisplayViolations = ReportUtils.shouldDisplayTransactionThreadViolations(report, allTransactionViolations, parentReportAction);
const shouldDisplayReportViolations = ReportUtils.isReportOwner(report) && ReportUtils.hasReportViolations(report.reportID);
const hasViolations = shouldDisplayViolations || shouldDisplayReportViolations;
if (hasViolations) {
doesReportContainErrors = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
}
}


if (oneTransactionThreadReportID && !doesReportContainErrors) {
const oneTransactionThreadReport = ReportUtils.getReport(oneTransactionThreadReportID);

if (
Expand Down
Loading