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

align lastMessageText formatting with backend by trimming leading and trailing spaces #18822

Merged
merged 2 commits into from
May 16, 2023
Merged

align lastMessageText formatting with backend by trimming leading and trailing spaces #18822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20cbe50
align lastMessageText formatting with backend
honnamkuan May 12, 2023
aa8d418
apply prettier formatting
honnamkuan May 12, 2023
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
2 changes: 1 addition & 1 deletion src/libs/ReportActionsUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function getLastVisibleMessageText(reportID, actionsToMerge = {}) {
const htmlText = lodashGet(lastVisibleAction, 'message[0].html', '');
const parser = new ExpensiMark();
const messageText = parser.htmlToText(htmlText);
return String(messageText).replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
return String(messageText).replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here we are not reusing ReportUtils.formatReportLastMessage because currently ReportUtils is importing ReportActionsUtils. We cannot import ReportUtils functions into ReportActionsUtils, otherwise there will be a cyclic dependency between the two utility libraries.

This was the decision from a separate PR https://github.com/Expensify/App/pull/14779/files#r1098049449

Copy link
Member

Choose a reason for hiding this comment

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

thanks, that's helpful!

}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,12 @@ function canShowReportRecipientLocalTime(personalDetails, report) {
}

/**
* Trim the last message text to a fixed limit.
* Html decode, shorten last message text to fixed length and trim spaces.
* @param {String} lastMessageText
* @returns {String}
*/
function formatReportLastMessageText(lastMessageText) {
return String(lastMessageText).replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
return Str.htmlDecode(String(lastMessageText)).replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a note for future reference, we should never decode a plain text. A plain text is a raw text and not html, there is nothing to decode here.

For historic reasons we used to decode those due to another bug in Expensify-Common. We fixed that bug here #17658.

}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/libs/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function addActions(reportID, text = '', file) {

const optimisticReport = {
lastVisibleActionCreated: currentTime,
lastMessageText: Str.htmlDecode(lastCommentText),
lastMessageText: lastCommentText,
lastActorEmail: currentUserEmail,
lastReadTime: currentTime,
};
Expand Down Expand Up @@ -979,7 +979,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
const reportComment = parser.htmlToText(htmlForNewComment);
const lastMessageText = ReportUtils.formatReportLastMessageText(reportComment);
const optimisticReport = {
lastMessageText: Str.htmlDecode(lastMessageText),
lastMessageText,
};
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
Expand Down