New Thread Report Empty State, Header, LHN, OpenReport, Buttons for DEV #18522
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
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 |
|---|---|---|
|
|
@@ -427,12 +427,42 @@ function isPolicyExpenseChatAdmin(report, policies) { | |
| return policyRole === CONST.POLICY.ROLE.ADMIN; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if report has a parent and is therefore a Thread. | ||
| * | ||
| * @param {Object} report | ||
| * @returns {Boolean} | ||
| */ | ||
| function isThread(report) { | ||
| return Boolean(report && report.parentReportID && report.parentReportActionID); | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if reportAction has a child. | ||
| * | ||
| * @param {Object} reportAction | ||
| * @returns {Boolean} | ||
| */ | ||
| function isThreadParent(reportAction) { | ||
| return reportAction && reportAction.childReportID && reportAction.childReportID !== 0; | ||
| } | ||
|
|
||
| /** | ||
| * Get either the policyName or domainName the chat is tied to | ||
| * @param {Object} report | ||
| * @returns {String} | ||
| */ | ||
| function getChatRoomSubtitle(report) { | ||
| if (isThread(report)) { | ||
| if (!getChatType(report)) { | ||
| return ''; | ||
| } | ||
|
|
||
| // If thread is not from a DM or group chat, the subtitle will follow the pattern 'Workspace Name • #roomName' | ||
| const workspaceName = getPolicyName(report); | ||
| const roomName = isChatRoom(report) ? lodashGet(report, 'displayName') : ''; | ||
| return [workspaceName, roomName].join(' • '); | ||
| } | ||
| if (!isDefaultRoom(report) && !isUserCreatedPolicyRoom(report) && !isPolicyExpenseChat(report)) { | ||
| return ''; | ||
| } | ||
|
|
@@ -719,6 +749,27 @@ function getIcons(report, personalDetails, defaultIcon = null) { | |
| result.source = Expensicons.DeletedRoomAvatar; | ||
| return [result]; | ||
| } | ||
| if (isThread(report)) { | ||
| const parentReport = lodashGet(allReports, [`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`]); | ||
| const parentReportAction = ReportActionsUtils.getParentReportAction(report); | ||
|
|
||
grgia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (!parentReport) { | ||
stitesExpensify marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| result.source = Expensicons.ActiveRoomAvatar; | ||
| return [result]; | ||
| } | ||
|
|
||
| if (getChatType(parentReport)) { | ||
| result.source = getWorkspaceAvatar(parentReport); | ||
| result.type = CONST.ICON_TYPE_WORKSPACE; | ||
| result.name = getPolicyName(parentReport); | ||
| return [result]; | ||
| } | ||
|
|
||
| const actorEmail = lodashGet(parentReportAction, 'actorEmail', ''); | ||
| result.source = getAvatar(lodashGet(personalDetails, [actorEmail, 'avatar']), actorEmail); | ||
| result.name = actorEmail; | ||
| return [result]; | ||
| } | ||
| if (isDomainRoom(report)) { | ||
| result.source = Expensicons.DomainRoomAvatar; | ||
| return [result]; | ||
|
|
@@ -935,6 +986,11 @@ function getMoneyRequestReportName(report) { | |
| */ | ||
| function getReportName(report) { | ||
| let formattedName; | ||
| if (isThread(report)) { | ||
| const parentReportAction = ReportActionsUtils.getParentReportAction(report); | ||
| const parentReportActionMessage = lodashGet(parentReportAction, ['message', 0, 'text'], '').replace(/(\r\n|\n|\r)/gm, ' '); | ||
| return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage'); | ||
|
There was a problem hiding this comment. When the action is an Attachment, the title of the report will be |
||
| } | ||
| if (isChatRoom(report) || isTaskReport(report)) { | ||
| formattedName = report.reportName; | ||
| } | ||
|
|
@@ -1295,6 +1351,8 @@ function buildOptimisticIOUReportAction(type, amount, currency, comment, partici | |
| * @param {String} oldPolicyName | ||
| * @param {String} visibility | ||
| * @param {String} notificationPreference | ||
| * @param {String} parentReportActionID | ||
| * @param {String} parentReportID | ||
| * @returns {Object} | ||
| */ | ||
| function buildOptimisticChatReport( | ||
|
|
@@ -1307,6 +1365,8 @@ function buildOptimisticChatReport( | |
| oldPolicyName = '', | ||
| visibility = undefined, | ||
| notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, | ||
| parentReportActionID, | ||
| parentReportID, | ||
| ) { | ||
| const currentTime = DateUtils.getDBTime(); | ||
| return { | ||
|
|
@@ -1323,6 +1383,8 @@ function buildOptimisticChatReport( | |
| notificationPreference, | ||
| oldPolicyName, | ||
| ownerEmail: ownerEmail || CONST.REPORT.OWNER_EMAIL_FAKE, | ||
| parentReportActionID, | ||
| parentReportID, | ||
| participants: participantList, | ||
| policyID, | ||
| reportID: generateReportID(), | ||
|
|
@@ -1628,7 +1690,7 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr | |
| // Exclude reports that have no data because there wouldn't be anything to show in the option item. | ||
| // This can happen if data is currently loading from the server or a report is in various stages of being created. | ||
| // This can also happen for anyone accessing a public room or archived room for which they don't have access to the underlying policy. | ||
| if (!report || !report.reportID || (_.isEmpty(report.participants) && !isThread(report) && !isPublicRoom(report) && !isArchivedRoom(report) && !isMoneyRequestReport(report))) { | ||
| return false; | ||
| } | ||
|
|
||
|
|
@@ -1678,15 +1740,15 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr | |
| } | ||
|
|
||
| /** | ||
| * Attempts to find a report in onyx with the provided list of participants. Does not include threads | ||
| * @param {Array} newParticipantList | ||
| * @returns {Array|undefined} | ||
| */ | ||
| function getChatByParticipants(newParticipantList) { | ||
| newParticipantList.sort(); | ||
| return _.find(allReports, (report) => { | ||
| // If the report has been deleted, or there are no participants (like an empty #admins room) then skip it | ||
| if (!report || !report.participants || isThread(report)) { | ||
| return false; | ||
| } | ||
|
|
||
|
|
@@ -2005,6 +2067,8 @@ export { | |
| canRequestMoney, | ||
| getWhisperDisplayNames, | ||
| getWorkspaceAvatar, | ||
| isThread, | ||
| isThreadParent, | ||
| shouldReportShowSubscript, | ||
| isSettled, | ||
| }; | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
Is it intentional to show workspace name and room name in thread?
As there's no way to see last thread message in LHN, the issue was reported here - #19447.
This only works in DM chat as subtitle not exist.
So I'd like to confirm if it's fine to use
optionItem.alternateTexthere no matter thread or not.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.
@grgia bump ^
Here's design doc:
LHN:
Header: