Activity feed: financial types + redesigned cards #981
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,121 +1,154 @@ | ||
| 'use client'; | ||
|
|
||
| import { FC, useState } from 'react'; | ||
| import { useRouter } from 'next/navigation'; | ||
| import { ArrowRight } from 'lucide-react'; | ||
| import { Avatar } from '@/components/ui/Avatar'; | ||
| import { Button } from '@/components/ui/Button'; | ||
| import { CommentReadOnly } from '@/components/Comment/CommentReadOnly'; | ||
| import { FeedItemActions } from '@/components/Feed/FeedItemActions'; | ||
| import { ContributeToFundraiseModal } from '@/components/modals/ContributeToFundraiseModal'; | ||
| import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext'; | ||
| import { useExchangeRate } from '@/contexts/ExchangeRateContext'; | ||
| import { useShareModalContext } from '@/contexts/ShareContext'; | ||
| import { ActivityCardHeader } from './ActivityCardHeader'; | ||
| import { WorkPreviewCard } from './WorkPreviewCard'; | ||
| import { getActivityHeaderMessage, getCommentPreview } from './lib/feedEntryAdapters'; | ||
| import { getActivityWorkContext, getWorkCardPresentation } from './lib/activityWorkContext'; | ||
| import type { FeedEntry } from '@/types/feed'; | ||
|
|
||
| interface ActivityCardFullProps { | ||
| entry: FeedEntry; | ||
| } | ||
|
|
||
| export const ActivityCardFull: FC<ActivityCardFullProps> = ({ entry }) => { | ||
| const work = getActivityWorkContext(entry); | ||
| const router = useRouter(); | ||
| const { showUSD } = useCurrencyPreference(); | ||
| const { exchangeRate } = useExchangeRate(); | ||
| const { showShareModal } = useShareModalContext(); | ||
| const [isContributeModalOpen, setIsContributeModalOpen] = useState(false); | ||
|
|
||
| if (!work) return null; | ||
|
|
||
| const message = getActivityHeaderMessage(entry); | ||
| const commentPreview = getCommentPreview(entry); | ||
| const presentation = getWorkCardPresentation(entry, work, { | ||
| showUSD, | ||
| exchangeRate, | ||
| isReview: commentPreview?.isReview, | ||
| }); | ||
|
|
||
| const showComment = presentation.showComment && !!commentPreview; | ||
| const voteCount = entry.metrics?.adjustedScore ?? entry.metrics?.votes ?? 0; | ||
| const isReviewOfProposal = !!commentPreview?.isReview && work.documentType === 'preregistration'; | ||
| const feedContentType = work.documentType === 'paper' ? 'PAPER' : 'POST'; | ||
|
|
||
| const handleFundClick = () => { | ||
| setIsContributeModalOpen(true); | ||
| }; | ||
|
|
||
| const handleContributeSuccess = () => { | ||
| setIsContributeModalOpen(false); | ||
| showShareModal({ | ||
| url: window.location.href, | ||
| docTitle: work.title, | ||
| action: 'USER_FUNDED_PROPOSAL', | ||
| }); | ||
| router.refresh(); | ||
| }; | ||
|
|
||
| const action = (() => { | ||
| const cta = presentation.cta; | ||
| if (!cta) return undefined; | ||
|
|
||
| return ( | ||
| <Button | ||
| variant="dark" | ||
| size="sm" | ||
| onClick={cta.kind === 'fund-modal' ? handleFundClick : () => router.push(cta.href)} | ||
| className="rounded-md gap-1" | ||
| > | ||
| {cta.label} | ||
| <ArrowRight size={14} aria-hidden /> | ||
| </Button> | ||
| ); | ||
| })(); | ||
|
|
||
| return ( | ||
| <article className="py-4 border-b border-gray-100 last:border-b-0"> | ||
| <div className="flex gap-2.5"> | ||
| <div className="flex w-8 flex-shrink-0 flex-col items-center"> | ||
| <div className="pt-0.5"> | ||
| <Avatar | ||
| src={message.actor.profileImage} | ||
| alt={message.actor.fullName || 'User'} | ||
| size={32} | ||
| authorId={message.actor.id} | ||
| /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="min-w-0 flex-1"> | ||
| <ActivityCardHeader entry={entry} /> | ||
|
|
||
| {showComment && commentPreview && ( | ||
| <div className="mt-2"> | ||
| <CommentReadOnly | ||
| content={commentPreview.content} | ||
| contentFormat={commentPreview.format} | ||
| maxLength={250} | ||
| showReadMoreButton | ||
| showLinkPreviews={false} | ||
| className="text-sm" | ||
| /> | ||
| </div> | ||
| )} | ||
|
|
||
| <div className="mt-5 -ml-[42px] tablet:!ml-0"> | ||
| <WorkPreviewCard | ||
| title={work.title} | ||
| href={work.href} | ||
| imageSrc={work.imageUrl} | ||
| showPlaceholder | ||
| authors={isReviewOfProposal ? [] : presentation.authors} | ||
| organization={presentation.organization} | ||
| institution={presentation.institution} | ||
| score={presentation.score} | ||
| stats={presentation.stats} | ||
| progress={presentation.progress} | ||
| actions={ | ||
| <FeedItemActions | ||
| metrics={{ votes: voteCount, adjustedScore: voteCount }} | ||
| feedContentType={feedContentType} | ||
| votableEntityId={work.id} | ||
| relatedDocumentId={work.id.toString()} | ||
| relatedDocumentContentType={work.documentType} | ||
| relatedDocumentUnifiedDocumentId={work.unifiedDocumentId?.toString()} | ||
| userVote={entry.userVote} | ||
| href={work.href} | ||
| hideCommentButton | ||
| hideReportButton | ||
| variant="inline" | ||
| leadingUtilityActions | ||
| rightSideActionButton={action} | ||
| className="gap-1" | ||
| /> | ||
| } | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| {work.fundraise && ( | ||
| <ContributeToFundraiseModal | ||
| isOpen={isContributeModalOpen} | ||
| onClose={() => setIsContributeModalOpen(false)} | ||
| onContributeSuccess={handleContributeSuccess} | ||
| fundraise={work.fundraise} | ||
| proposalTitle={work.title} | ||
| /> | ||
| )} | ||
| </article> | ||
| ); | ||
| }; | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| 'use client'; | ||
|
|
||
| import { FC } from 'react'; | ||
| import { ActivityHeaderActionText } from './ActivityHeaderActionText'; | ||
| import { BountyAmount } from './BountyAmount'; | ||
| import { ContributionAmount } from './ContributionAmount'; | ||
| import { FeedEntryIcon } from './FeedEntryIcon'; | ||
| import { GrantFundingAmount } from './GrantFundingAmount'; | ||
| import { ReviewScoreStars } from './ReviewScoreStars'; | ||
| import { | ||
| getActionIcon, | ||
| getActivityHeaderMessage, | ||
| getContribution, | ||
| getGrantAmount, | ||
| getReviewEarning, | ||
| getReviewScore, | ||
| } from './lib/feedEntryAdapters'; | ||
| import { getActivityBounty } from './lib/activityWorkContext'; | ||
| import { formatTimeAgo } from '@/utils/date'; | ||
| import { Tooltip } from '@/components/ui/Tooltip'; | ||
| import type { FeedEntry } from '@/types/feed'; | ||
|
|
||
| interface ActivityCardHeaderProps { | ||
| entry: FeedEntry; | ||
| } | ||
|
|
||
| export const ActivityCardHeader: FC<ActivityCardHeaderProps> = ({ entry }) => { | ||
| const message = getActivityHeaderMessage(entry); | ||
| const actionIcon = getActionIcon(entry); | ||
| const reviewScore = getReviewScore(entry); | ||
| const reviewEarning = getReviewEarning(entry); | ||
| const grantAmount = getGrantAmount(entry); | ||
| const contribution = getContribution(entry); | ||
| const bounty = entry.activityContext === 'bounty_opened' ? getActivityBounty(entry) : undefined; | ||
|
|
||
| const hasAmount = Boolean( | ||
| grantAmount || contribution || reviewEarning || bounty || reviewScore != null | ||
| ); | ||
|
|
||
| return ( | ||
| <div className="mb-2.5 flex items-start justify-between gap-2 pt-1 text-sm"> | ||
| <div className="min-w-0 flex-1 leading-6"> | ||
| <ActivityHeaderActionText message={message} /> | ||
| {grantAmount && ( | ||
| <> | ||
| {' '} | ||
| <GrantFundingAmount amount={grantAmount} className="align-middle" /> | ||
| </> | ||
| )} | ||
| {contribution && ( | ||
| <> | ||
| {' '} | ||
| <ContributionAmount | ||
| contribution={contribution} | ||
| showSign={!message.isEarning} | ||
| className="align-middle" | ||
| /> | ||
| </> | ||
| )} | ||
| {reviewEarning && ( | ||
| <> | ||
| {' '} | ||
| <ContributionAmount | ||
| contribution={reviewEarning} | ||
| showSign={false} | ||
| className="align-middle" | ||
| /> | ||
| </> | ||
| )} | ||
| {bounty && ( | ||
| <> | ||
| {' '} | ||
| <BountyAmount bounty={bounty} className="align-middle" /> | ||
| </> | ||
| )} | ||
| {reviewScore != null && reviewScore > 0 && ( | ||
| <> | ||
| {' '} | ||
| <ReviewScoreStars score={reviewScore} size="sm" className="align-middle" /> | ||
| </> | ||
| )} | ||
| <FeedEntryIcon name={hasAmount ? null : actionIcon} /> | ||
| </div> | ||
|
|
||
| <Tooltip | ||
| content={new Date(entry.timestamp).toLocaleString()} | ||
| wrapperClassName="flex-shrink-0" | ||
| > | ||
| <span className="text-xs leading-6 text-gray-400 cursor-default whitespace-nowrap"> | ||
| {formatTimeAgo(entry.timestamp)} | ||
| </span> | ||
| </Tooltip> | ||
| </div> | ||
| ); | ||
| }; |
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.
When the activity payload is a top-level document event (for example
PAPERorRESEARCHHUBPOSTfor a published paper/grant/proposal) and does not includerelated_work, this early return drops the row entirely even thoughtransformFeedEntrystill builds the document fromcontent_object. The previous activity card fell back to the entry content viagetEntryMeta, so these entries remained visible; please add a fallback work context from the entry content instead of requiringentry.relatedWork.Useful? React with 👍 / 👎.