Skip to content
Snippets Groups Projects

Hin 904

Merged Mihail Hagiu requested to merge HIN-904 into develop
3 unresolved threads
12 files
+ 373
31
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -12,6 +12,7 @@ import {
@@ -12,6 +12,7 @@ import {
marginHelper,
marginHelper,
ContextualBox,
ContextualBox,
ReviewersTable,
ReviewersTable,
 
PublonsTable,
ReviewerReport,
ReviewerReport,
InviteReviewers,
InviteReviewers,
ReviewerBreakdown,
ReviewerBreakdown,
@@ -24,10 +25,14 @@ const ReviewerDetails = ({
@@ -24,10 +25,14 @@ const ReviewerDetails = ({
reports,
reports,
fragment,
fragment,
invitations,
invitations,
 
publonReviewers,
 
isFetching,
previewFile,
previewFile,
downloadFile,
downloadFile,
 
fetchingError,
canInviteReviewers,
canInviteReviewers,
onInviteReviewer,
onInviteReviewer,
 
onInvitePublonReviewer,
onResendReviewerInvite,
onResendReviewerInvite,
onRevokeReviewerInvite,
onRevokeReviewerInvite,
canViewReviewersDetails,
canViewReviewersDetails,
@@ -52,12 +57,19 @@ const ReviewerDetails = ({
@@ -52,12 +57,19 @@ const ReviewerDetails = ({
>
>
<H4>Reviewer Details</H4>
<H4>Reviewer Details</H4>
</TabButton>
</TabButton>
<TabButton
<TabButton
ml={1}
ml={1}
mr={1}
mr={1}
onClick={() => changeTab(1)}
onClick={() => changeTab(1)}
selected={selectedTab === 1}
selected={selectedTab === 1}
 
>
 
<H4>Reviewer Suggestions</H4>
 
</TabButton>
 
<TabButton
 
ml={1}
 
mr={1}
 
onClick={() => changeTab(2)}
 
selected={selectedTab === 2}
>
>
<H4>Reviewer Reports</H4>
<H4>Reviewer Reports</H4>
<Tag mr={1}>{reports.length}</Tag>
<Tag mr={1}>{reports.length}</Tag>
@@ -80,6 +92,14 @@ const ReviewerDetails = ({
@@ -80,6 +92,14 @@ const ReviewerDetails = ({
</Fragment>
</Fragment>
)}
)}
{selectedTab === 1 && (
{selectedTab === 1 && (
 
<PublonsTable
 
onInvite={onInvitePublonReviewer}
 
publonsError={fetchingError}
 
publonsFetching={isFetching}
    • You don't need the publonsFetching prop. You already wrapped your PublonsTable with withFetching and now the caller is responsible with setting the correct fetching state and that will get passed down to your component.

Please register or sign in to reply
 
reviewers={publonReviewers}
 
/>
 
)}
 
{selectedTab === 2 && (
<Fragment>
<Fragment>
{reports.length === 0 && (
{reports.length === 0 && (
<Text align="center">No reports submitted yet.</Text>
<Text align="center">No reports submitted yet.</Text>
@@ -107,14 +127,22 @@ const ReviewerDetails = ({
@@ -107,14 +127,22 @@ const ReviewerDetails = ({
export default compose(
export default compose(
withFilePreview,
withFilePreview,
withFileDownload,
withFileDownload,
withProps(({ invitations = [], reviewerReports = [], currentUser }) => ({
withProps(
token: get(currentUser, 'token', ''),
({
invitations: invitations.map(i => ({
invitations = [],
...i,
publonReviewers = [],
review: reviewerReports.find(r => r.userId === i.userId),
reviewerReports = [],
})),
currentUser,
reports: reviewerReports.filter(r => r.submittedOn),
}) => ({
})),
token: get(currentUser, 'token', ''),
 
publonReviewers,
 
invitations: invitations.map(i => ({
 
...i,
 
review: reviewerReports.find(r => r.userId === i.userId),
 
})),
 
reports: reviewerReports.filter(r => r.submittedOn),
 
}),
 
),
withProps(({ currentUser }) => ({
withProps(({ currentUser }) => ({
canInviteReviewers: get(currentUser, 'permissions.canInviteReviewers'),
canInviteReviewers: get(currentUser, 'permissions.canInviteReviewers'),
canViewReviewersDetails: get(
canViewReviewersDetails: get(