-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Show tasks in LHN #18931
Merged
Merged
Show tasks in LHN #18931
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
362e25a
update isThread check and include task reports in LHN
thienlnam ebc31d6
Merge branch 'main' into jack-showTasksLHN
thienlnam 7361d4d
Merge branch 'main' into jack-showTasksLHN
thienlnam 66b2840
Merge branch 'main' into jack-showTasksLHN
thienlnam 55ef422
Merge branch 'main' into jack-showTasksLHN
thienlnam c56255c
remove from share in and add to search
thienlnam b084181
prevent crashes
thienlnam 10bdf44
Merge branch 'main' into jack-showTasksLHN
thienlnam c48f52e
remove task handling
thienlnam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -161,7 +161,8 @@ function getOrderedReportIDs(reportIDFromRoute) { | |
return; | ||
} | ||
|
||
if (ReportUtils.isTaskReport(report)) { | ||
if (ReportUtils.isTaskReport(report) && report.stateNum !== CONST.REPORT.STATE.OPEN && report.statusNum !== CONST.REPORT.STATUS.OPEN) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Completed Tasks should not be moved to archived reports as a user can still message on the thread. This created #23883 issue. |
||
archivedReports.push(report); | ||
return; | ||
} | ||
|
||
|
@@ -303,10 +304,8 @@ function getOptionData(reportID) { | |
}); | ||
} | ||
|
||
if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread) && !result.isArchivedRoom) { | ||
if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport) && !result.isArchivedRoom) { | ||
result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet'); | ||
} else if (result.isTaskReport) { | ||
result.alternateText = Localize.translate(preferredLocale, 'newTaskPage.task'); | ||
} else { | ||
if (!lastMessageText) { | ||
// Here we get the beginning of chat history message and append the display name for each user, adding pronouns if there are any. | ||
|
@@ -349,7 +348,6 @@ function getOptionData(reportID) { | |
result.icons = ReportUtils.getIcons(result.isTaskReport ? parentReport : report, personalDetails, policies, ReportUtils.getAvatar(personalDetail.avatar, personalDetail.login)); | ||
result.searchText = OptionsListUtils.getSearchText(report, reportName, participantPersonalDetailList, result.isChatRoom || result.isPolicyExpenseChat); | ||
result.displayNamesWithTooltips = displayNamesWithTooltips; | ||
|
||
return result; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, this PR caused a bug - Task name is not appearing in search page