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

Keep chats with draft comments in the LHN #781

Merged
merged 12 commits into from
Dec 1, 2020
Merged

Keep chats with draft comments in the LHN #781

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
46e7f62
Keep chats with draft comments in the LHN
Gonals Nov 10, 2020
9f21436
merge master
Gonals Nov 13, 2020
b8784fb
show icon
Gonals Nov 20, 2020
6fb89fe
merge master and cleanup
Gonals Nov 20, 2020
5e463dc
Merge branch 'master' into alberto-draftsPinned
Gonals Nov 23, 2020
f0b3531
cleanup style
Gonals Nov 23, 2020
996600d
Merge branch 'master' into alberto-draftsPinned
Gonals Nov 24, 2020
ee45cb4
split line
Gonals Nov 24, 2020
34f5d48
remove extra space
Gonals Nov 24, 2020
4859ab6
add comment
Gonals Nov 26, 2020
398b5eb
Merge branch 'master' into alberto-draftsPinned
Gonals Nov 27, 2020
974e2e3
Do not add second text line if we don't have it
Gonals Nov 27, 2020
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
14 changes: 7 additions & 7 deletions src/pages/home/sidebar/SidebarLinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ const propTypes = {
})),

// List of draft comments. We don't know the shape, since the keys include the report numbers

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

// eslint-disable-next-line react/forbid-prop-types
comments: PropTypes.object,
comments: PropTypes.objectOf(PropTypes.string),

isChatSwitcherActive: PropTypes.bool,

Expand All @@ -55,6 +54,7 @@ const defaultProps = {
personalDetails: {},
};


const SidebarLinks = (props) => {
const {onLinkClick} = props;
const reportIDInUrl = parseInt(props.match.params.reportID, 10);
Expand All @@ -65,11 +65,13 @@ const SidebarLinks = (props) => {
'desc',
'asc'
]);
const hasComment = reportID => get(props.comments, `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, '').length > 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

This is still having a lint warning for the line length. I have a few suggestions:

  1. Make it into a multi-line function like this:
function hasComment(reportID) {
    const reportComments = get(props.comments, `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, '');
    return reportComments.length > 1;
}
  1. Define it outside the component and pass both reportID and props.comments as arguments

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! Fixed


// Filter the reports so that the only reports shown are pinned, unread, have draft
// comments (but are not the open one), and the one matching the URL
// eslint-disable-next-line max-len
const reportsToDisplay = _.filter(sortedReports, report => (report.isPinned || (report.unreadActionCount > 0) || report.reportID === reportIDInUrl || (report.reportID !== reportIDInUrl && get(props.comments, `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${report.reportID}`, '').length > 0)));
const reportsToDisplay = _.filter(sortedReports, report => (report.isPinned || (report.unreadActionCount > 0)
|| report.reportID === reportIDInUrl
|| (report.reportID !== reportIDInUrl && hasComment(report.reportID))));

// Update styles to hide the report links if they should not be visible
const sidebarLinksStyle = !props.isChatSwitcherActive
Expand Down Expand Up @@ -110,9 +112,7 @@ const SidebarLinks = (props) => {
login: participantDetails ? participantDetails.login : '',
reportID: report.reportID,
isUnread: report.unreadActionCount > 0,

// eslint-disable-next-line max-len
hasDraftComment: report.reportID !== reportIDInUrl && get(props.comments, `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${report.reportID}`, '').length > 0
hasDraftComment: report.reportID !== reportIDInUrl && hasComment(report.reportID)
}}
onSelectRow={onLinkClick}
optionIsFocused={report.reportID === reportIDInUrl}
Expand Down