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.

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

Don't use report for isArchived check #52805

Merged
merged 50 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
85753dd
Don't use report for isArchived check
srikarparsi Nov 20, 2024
0c31b92
update optional
srikarparsi Nov 20, 2024
d1bd791
ReportUtils fix
srikarparsi Nov 20, 2024
139c91d
parentReportNameValuePairs fix
srikarparsi Nov 20, 2024
bd7aa22
child report name value pairs
srikarparsi Nov 20, 2024
37e4804
fix tests
srikarparsi Nov 21, 2024
ecd47fa
type collection
srikarparsi Nov 22, 2024
2d7af61
optimistic and failure for deletePolicy
srikarparsi Nov 23, 2024
32c275b
small fixes
srikarparsi Nov 26, 2024
36ae672
Merge branch 'main' into srikar-dontUseReportInArchived
srikarparsi Dec 9, 2024
5d71aee
fix errors
srikarparsi Dec 9, 2024
8c93e83
unsafe
srikarparsi Dec 9, 2024
cea8821
merge main
srikarparsi Dec 16, 2024
22f1ebd
fix ts errors
srikarparsi Dec 16, 2024
764dd81
typecheck again
srikarparsi Dec 16, 2024
e0d6894
try optionData
srikarparsi Dec 16, 2024
92616dd
more private_isArchived fixes
srikarparsi Dec 16, 2024
c8140e0
remove private_isArchived from report type
srikarparsi Dec 16, 2024
85ec285
fix lint
srikarparsi Dec 16, 2024
a1c089c
add parantheses for lint
srikarparsi Dec 16, 2024
5b43c6f
option data changes
srikarparsi Dec 16, 2024
e30dd02
add deps
srikarparsi Dec 16, 2024
a9f7912
fix perf tests
srikarparsi Dec 16, 2024
340c0ca
listen for changes
srikarparsi Dec 23, 2024
3fbe302
Merge branch 'main' into srikar-dontUseReportInArchived
srikarparsi Dec 23, 2024
521abb1
merge main
srikarparsi Dec 26, 2024
783e8bc
merge
srikarparsi Dec 26, 2024
dfa7dd7
lint and typecheck
srikarparsi Dec 26, 2024
f257065
Merge branch 'main' into srikar-dontUseReportInArchived
srikarparsi Dec 27, 2024
06eb9c7
merge main
srikarparsi Dec 31, 2024
46ed7a8
typecheck
srikarparsi Dec 31, 2024
68b1c89
Merge branch 'main' into srikar-dontUseReportInArchived
srikarparsi Jan 9, 2025
e681f3a
partial SidebarOrder test fix
srikarparsi Jan 9, 2025
5be276c
ReportUtils tests
srikarparsi Jan 9, 2025
31e774a
More fixes to ReportUtilsTest
srikarparsi Jan 9, 2025
7fb76b5
use afterEach
srikarparsi Jan 9, 2025
b3f1726
Merge branch 'main' into srikar-dontUseReportInArchived
srikarparsi Jan 13, 2025
24cdd83
fix SidebarTest.js
srikarparsi Jan 13, 2025
4282eb9
fix jest tests
srikarparsi Jan 13, 2025
16b2bd8
merge conflicts
srikarparsi Jan 14, 2025
d141983
some lint, prettier and test fix
srikarparsi Jan 15, 2025
4753a3e
type errors
srikarparsi Jan 15, 2025
e6d33cf
merge conflicts
srikarparsi Jan 17, 2025
637dce7
fix error
srikarparsi Jan 17, 2025
788026c
fix conflicts
srikarparsi Jan 22, 2025
b1dd134
conflicts again
srikarparsi Jan 22, 2025
fbc51db
fix errors
srikarparsi Jan 22, 2025
4c129cc
more conflicts
srikarparsi Jan 22, 2025
2225354
conflicts
srikarparsi Jan 23, 2025
21f14cc
fix policy test
srikarparsi Jan 23, 2025
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
4 changes: 3 additions & 1 deletion src/libs/OptionsListUtils.ts
Original file line number Diff line number Diff line change
@@ -490,7 +490,9 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
const lastOriginalReportAction = lastReportActions[reportID] ?? null;
let lastMessageTextFromReport = '';

if (report?.private_isArchived) {
const reportNameValuePairs = ReportUtils.getReportNameValuePairs(reportID);

if (reportNameValuePairs?.private_isArchived) {
const archiveReason =
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
(ReportActionUtils.isClosedAction(lastOriginalReportAction) && ReportActionUtils.getOriginalMessage(lastOriginalReportAction)?.reason) || CONST.REPORT.ARCHIVE_REASON.DEFAULT;
4 changes: 3 additions & 1 deletion src/libs/SidebarUtils.ts
Original file line number Diff line number Diff line change
@@ -348,13 +348,15 @@ function getOptionData({
const participantPersonalDetailList = Object.values(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails));
const personalDetail = participantPersonalDetailList.at(0) ?? ({} as PersonalDetails);

const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report.reportID);

result.isThread = ReportUtils.isChatThread(report);
result.isChatRoom = ReportUtils.isChatRoom(report);
result.isTaskReport = ReportUtils.isTaskReport(report);
result.isInvoiceReport = ReportUtils.isInvoiceReport(report);
result.parentReportAction = parentReportAction;
// eslint-disable-next-line @typescript-eslint/naming-convention
result.private_isArchived = report?.private_isArchived;
result.private_isArchived = reportNameValuePairs?.private_isArchived;
result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
result.isExpenseRequest = ReportUtils.isExpenseRequest(report);
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);