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

Jump to bottom

Update archive feature #46934

Merged
merged 24 commits into from
Sep 17, 2024
Merged

Update archive feature #46934

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d3087b
update archive feature
cretadn22 Aug 7, 2024
8eccb7b
address lint error
cretadn22 Aug 7, 2024
11516db
update the latest main
cretadn22 Aug 9, 2024
cc7564e
apply the new update
cretadn22 Aug 13, 2024
adbe9fb
update latest main
cretadn22 Aug 22, 2024
bde5ae2
add type
cretadn22 Aug 22, 2024
c357161
disable naming convention
cretadn22 Aug 22, 2024
9d9ee77
remopve dupe
cretadn22 Sep 6, 2024
4f03f7f
merge main
cretadn22 Sep 6, 2024
5173d1f
update the newest main
cretadn22 Sep 12, 2024
8c660d1
add extra fix
cretadn22 Sep 12, 2024
1fef9df
fix test
cretadn22 Sep 12, 2024
b5a0fcd
fix test
cretadn22 Sep 12, 2024
eb1cccf
using private_isArchived directly
cretadn22 Sep 13, 2024
6ef653a
update
cretadn22 Sep 13, 2024
4686350
update
cretadn22 Sep 13, 2024
5b741a5
fix test
cretadn22 Sep 13, 2024
8ebc86d
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 2024
e7aadc2
Update src/libs/SidebarUtils.ts
cretadn22 Sep 17, 2024
85593ad
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 2024
efbad6f
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 2024
18ab3c1
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 2024
ae281b6
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 2024
96c5cd2
Update src/libs/OptionsListUtils.ts
cretadn22 Sep 17, 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
18 changes: 8 additions & 10 deletions src/libs/OptionsListUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,9 +595,8 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
// some types of actions are filtered out for lastReportAction, in some cases we need to check the actual last action
const lastOriginalReportAction = lastReportActions[reportID] ?? null;
let lastMessageTextFromReport = '';
const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);

if (ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
if (report?.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;
Expand Down Expand Up @@ -712,7 +711,6 @@ function createOption(
isIOUReportOwner: null,
iouReportAmount: 0,
isChatRoom: false,
isArchivedRoom: false,
shouldShowSubscript: false,
isPolicyExpenseChat: false,
isOwnPolicyExpenseChat: false,
Expand All @@ -730,11 +728,11 @@ function createOption(
let reportName;
result.participantsList = personalDetailList;
result.isOptimisticPersonalDetail = personalDetail?.isOptimisticPersonalDetail;
const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
if (report) {
result.isChatRoom = ReportUtils.isChatRoom(report);
result.isDefaultRoom = ReportUtils.isDefaultRoom(report);
result.isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
// eslint-disable-next-line @typescript-eslint/naming-convention
result.private_isArchived = report?.private_isArchived;
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
result.isExpenseReport = ReportUtils.isExpenseReport(report);
result.isInvoiceRoom = ReportUtils.isInvoiceRoom(report);
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
Expand Down Expand Up @@ -1588,7 +1586,7 @@ function orderOptions(options: ReportUtils.OptionData[], searchValue: string | u
if (preferChatroomsOverThreads && option.isThread) {
return 4;
}
if (!!option.isChatRoom || option.isArchivedRoom) {
if (!!option.isChatRoom || option?.private_isArchived) {
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
return 3;
}
if (!option.login) {
Expand Down Expand Up @@ -1833,7 +1831,7 @@ function getOptions(
// - All archived reports should remain at the bottom
const orderedReportOptions = lodashSortBy(filteredReportOptions, (option) => {
const report = option.item;
if (option.isArchivedRoom) {
if (option?.private_isArchived) {
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
return CONST.DATE.UNIX_EPOCH;
}

Expand Down Expand Up @@ -1942,10 +1940,10 @@ function getOptions(
}

const isCurrentUserOwnedPolicyExpenseChatThatCouldShow =
reportOption.isPolicyExpenseChat && reportOption.ownerAccountID === currentUserAccountID && includeOwnedWorkspaceChats && !reportOption.isArchivedRoom;
reportOption.isPolicyExpenseChat && reportOption.ownerAccountID === currentUserAccountID && includeOwnedWorkspaceChats && !reportOption?.private_isArchived;
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved

const shouldShowInvoiceRoom =
includeInvoiceRooms && ReportUtils.isInvoiceRoom(reportOption.item) && ReportUtils.isPolicyAdmin(reportOption.policyID ?? '', policies) && !reportOption.isArchivedRoom;
includeInvoiceRooms && ReportUtils.isInvoiceRoom(reportOption.item) && ReportUtils.isPolicyAdmin(reportOption.policyID ?? '', policies) && !reportOption?.private_isArchived;
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
// TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
// && PolicyUtils.canSendInvoiceFromWorkspace(reportOption.policyID);

Expand Down Expand Up @@ -2305,7 +2303,7 @@ function getHeaderMessageForNonUserList(hasSelectableOptions: boolean, searchVal
* Helper method to check whether an option can show tooltip or not
*/
function shouldOptionShowTooltip(option: ReportUtils.OptionData): boolean {
return (!option.isChatRoom || !!option.isThread) && !option.isArchivedRoom;
return (!option.isChatRoom || !!option.isThread) && !option?.private_isArchived;
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
1 change: 0 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ type OptionData = {
keyForList?: string;
searchText?: string;
isIOUReportOwner?: boolean | null;
isArchivedRoom?: boolean | null;
shouldShowSubscript?: boolean | null;
isPolicyExpenseChat?: boolean | null;
isMoneyRequestReport?: boolean | null;
Expand Down
13 changes: 6 additions & 7 deletions src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@ function getOptionData({
hasParentAccess: undefined,
isIOUReportOwner: null,
isChatRoom: false,
isArchivedRoom: false,
// eslint-disable-next-line @typescript-eslint/naming-convention
private_isArchived: undefined,
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
shouldShowSubscript: false,
isPolicyExpenseChat: false,
isMoneyRequestReport: false,
Expand All @@ -307,8 +308,8 @@ function getOptionData({
result.isTaskReport = ReportUtils.isTaskReport(report);
result.isInvoiceReport = ReportUtils.isInvoiceReport(report);
result.parentReportAction = parentReportAction;
const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
result.isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
// eslint-disable-next-line @typescript-eslint/naming-convention
result.private_isArchived = report?.private_isArchived;
result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
result.isExpenseRequest = ReportUtils.isExpenseRequest(report);
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
Expand Down Expand Up @@ -399,8 +400,7 @@ function getOptionData({

const isThreadMessage =
ReportUtils.isThread(report) && lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && lastAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage) && !result.isArchivedRoom) {
if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage) && !result?.private_isArchived) {
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
const lastActionName = lastAction?.actionName ?? report.lastActionType;

if (ReportActionsUtils.isRenamedAction(lastAction)) {
Expand Down Expand Up @@ -575,8 +575,7 @@ function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
return welcomeMessage;
}

const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
if (ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
if (report?.private_isArchived) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
} else if (ReportUtils.isDomainRoom(report)) {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/OptionsListUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,7 @@ describe('OptionsListUtils', () => {
const filteredOptions = OptionsListUtils.filterOptions(options, searchText);

expect(filteredOptions.recentReports.length).toBe(1);
expect(filteredOptions.recentReports[0].isArchivedRoom).toBe(true);
cretadn22 marked this conversation as resolved.
Show resolved Hide resolved
expect(!!filteredOptions.recentReports[0].private_isArchived).toBe(true);
});

it('should filter options by email if dot is skipped in the email', () => {
Expand Down
3 changes: 2 additions & 1 deletion tests/utils/collections/optionData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export default function createRandomOptionData(index: number): OptionData {
policyName: randWord(),
policyID: `policy_${index}`,
accountID: randNumber(),
isArchivedRoom: randBoolean(),
// eslint-disable-next-line @typescript-eslint/naming-convention
private_isArchived: new Date().toISOString(),
isPolicyExpenseChat: randBoolean(),
chatType: rand(Object.values(CONST.REPORT.CHAT_TYPE)),
hasOutstandingChildRequest: randBoolean(),
Expand Down
Loading