Add award RFPs

app/proposal/[id]/[slug]/layout.tsx

@@ -119,7 +119,9 @@ export default async function ProposalSlugLayout({ params, children }: Props) {
         >
           <ProposalByline work={work} metadata={metadata} />
           <Suspense>{children}</Suspense>
-          {metadata.fundraising && <ProposalActionBar fundraise={metadata.fundraising} />}
+          {metadata.fundraising && (
+            <ProposalActionBar fundraise={metadata.fundraising} linkedGrant={work.linkedGrant} />
+          )}
         </PageLayout>
       </FundPanelProvider>
     </WorkTabProvider>

components/AIMode/document/PublishDialog.tsx

@@ -9,6 +9,8 @@ import { NonprofitConfirmModal, NonprofitSearchSection } from '@/components/Nonp
 import { usePublishingController } from '@/components/Notebook/PublishingForm';
 import { FUNDRAISE_DURATION_HELP } from '@/components/Notebook/PublishingForm/components/EndDateSection';
 import { GRANT_APPLICATION_VISIBILITY_HELP } from '@/components/Notebook/PublishingForm/components/GrantApplicationVisibilitySection';
+import { isAwardMechanism } from '@/components/Funding/lib/fundingMechanism';
+import { GrantFundingMechanismSection } from '@/components/Notebook/PublishingForm/components/GrantFundingMechanismSection';
 import {
   useIsLockedPrivate,
   useShowPrivateWarning,
@@ -70,7 +72,8 @@ export function PublishDialog({ title, onRename }: PublishDialogProps) {
 
   const publish = () => {
     if (!canPublish) return;
-    if (isNewProposal && selectedNonprofit) setConfirmingNonprofit(true);
+    const isAwardApplication = isAwardMechanism(watch('selectedGrant')?.fundingMechanism);
+    if (isNewProposal && selectedNonprofit && !isAwardApplication) setConfirmingNonprofit(true);
     else void confirmPublish(title);
   };
 
@@ -143,6 +146,7 @@ export function PublishDialog({ title, onRename }: PublishDialogProps) {
                     <PublishDetails readiness={readiness} title={title} onRename={onRename} />
 
                     {isNewProposal && <ProposalSettings />}
+                    {isRfp && <GrantFundingMechanismSection className="px-0 py-0" />}
                     {isRfp && !isUpdate && <RfpSettings />}
 
                     {showGuidelines && (
@@ -316,14 +320,16 @@ function ChoiceBox({
 
 /**
  * A new proposal's settings: who can see it, how long it stays open, and a
- * nonprofit to receive the funds. Two rules come with the first, and the
+ * nonprofit to receive the funds. An award has no nonprofit: the funder pays
+ * for results. Two rules come with the first, and the
  * first of them holds back the dialog's Publish: a private proposal needs an
  * RFP, and an RFP that only takes private proposals makes the proposal private.
  */
 function ProposalSettings() {
   const { watch, setValue } = useFormContext<PublishingFormData>();
   const isPublic = watch('isPublic');
   const days = watch('fundraiseEndDays') ?? DEFAULT_FUNDRAISE_END_DAYS;
+  const isAwardApplication = isAwardMechanism(watch('selectedGrant')?.fundingMechanism);
   const isLockedPrivate = useIsLockedPrivate();
   const privateNeedsRfp = useShowPrivateWarning();
   // The RFP may have been chosen since the form loaded, which is the only
@@ -361,7 +367,7 @@ function ProposalSettings() {
         />
       </SettingSection>
 
-      <FundsRecipient />
+      {!isAwardApplication && <FundsRecipient />}
     </>
   );
 }

components/AIMode/document/masthead/mastheadWidgets.ts

@@ -7,6 +7,7 @@ import {
   Users,
   type LucideIcon,
 } from 'lucide-react';
+import { isAwardMechanism } from '@/components/Funding/lib/fundingMechanism';
 import type { PublishingFieldKey } from '@/components/Notebook/PublishingForm/completion';
 import type {
   ArticleType,
@@ -83,6 +84,8 @@ const FUNDING_GOAL: MastheadWidgetConfig = {
   hint: 'How much you are raising for this work. It cannot be changed once the fundraise is open.',
   // A fundraise that is open keeps the goal it opened with.
   lockedWhen: (values) => Boolean(values.workId),
+  // An award application has no goal. The server opens its escrow at 0.
+  hiddenWhen: (values) => isAwardMechanism(values.selectedGrant?.fundingMechanism),
 };
 
 const APPLYING_TO: MastheadWidgetConfig = {

components/AIMode/useAIModeChat.ts

@@ -21,6 +21,7 @@ import { useUser } from '@/contexts/UserContext';
 import { useAgentChatList, type UseAgentChatListResult } from '@/hooks/useAgentChat';
 import { useChatSession, type ChatSession } from '@/hooks/useChatSession';
 import { getChatTransport } from '@/services/chatTransport';
+import { GrantService } from '@/services/grant.service';
 import type { AgentChat, ChatNoteRef } from '@/types/agentChat';
 import type { SelectedGrantDetails } from '@/types/grant';
 import type { Note } from '@/types/note';
@@ -118,6 +119,25 @@ export function useAIModeChat(): AIModeChatState {
   const intent = urlIntent ?? rememberedIntent;
   const [selectedGrant, setSelectedGrant] = useState<SelectedGrantDetails | null>(null);
 
+  // An RFP page's Apply leads here with the RFP named (`?rfp=<id>`): it starts
+  // out picked, as if chosen on this screen, and can still be changed. The
+  // RFP is read signed in, so a visitor who logs in here gets it then.
+  const { user, isLoading: userLoading } = useUser();
+  const signedInUserId = user?.id ?? null;
+  const urlGrantId = target.kind === 'new' ? (target.grantId ?? null) : null;
+  useEffect(() => {
+    if (urlGrantId == null || signedInUserId == null) return;
+    let cancelled = false;
+    GrantService.getSelectedGrant(urlGrantId)
+      .then((grant) => {
+        if (!cancelled) setSelectedGrant(grant);
+      })
+      .catch((error) => console.error('Error loading the RFP to apply to:', error));
+    return () => {
+      cancelled = true;
+    };
+  }, [urlGrantId, signedInUserId]);
+
   // ---- the first message of a new draft ----
   // It creates the document, then a chat on it, then goes out there. A note
   // created by an attempt whose chat then failed is kept here, so a retry
@@ -307,7 +327,6 @@ export function useAIModeChat(): AIModeChatState {
   // ---- a signed-out visitor ----
   // What would start a draft asks them to log in, and keeps what they typed
   // (or the suggestion they picked) in the box for when they are back.
-  const { user, isLoading: userLoading } = useUser();
   const { showAuthModal } = useAuthModalContext();
   const signedOut = user == null && !userLoading;
   const { setDraft } = session;

components/AIMode/workspaceUrl.ts

@@ -6,11 +6,13 @@ export const WORKSPACE_PATH = '/workspace';
  * `note=<id>` opens a document, with `chat` naming the chat on it: an id, or
  * `new` for a chat not yet started; absent, its most recent chat.
  * `new=rfp|proposal` is the screen that starts a new draft for one side of
- * the money. Anything else is that screen too.
+ * the money, with `rfp=<grant id>` naming the RFP a new proposal answers.
+ * Anything else is that screen too.
  */
 const CHAT_PARAM = 'chat';
 const NOTE_PARAM = 'note';
 const NEW_PARAM = 'new';
+const RFP_PARAM = 'rfp';
 const NEW_CHAT = 'new';
 
 /**
@@ -29,16 +31,24 @@ export type WorkspaceTarget =
       readonly kind: 'new';
       /** What the door it was opened through will draft: an RFP or a proposal. */
       readonly intent?: FundingIntent;
+      /** The RFP a new proposal answers, picked before the workspace opened. */
+      readonly grantId?: string;
     }
   | {
       readonly kind: 'document';
       readonly noteId: number;
       readonly chat: DocumentChat;
     };
 
-/** The screen that starts a new draft, for one side of the money or the one last used. */
-export const newDraftTarget = (intent?: FundingIntent): WorkspaceTarget =>
-  intent ? { kind: 'new', intent } : { kind: 'new' };
+/**
+ * The screen that starts a new draft, for one side of the money or the one
+ * last used, and for a proposal, optionally the RFP it answers.
+ */
+export const newDraftTarget = (intent?: FundingIntent, grantId?: string): WorkspaceTarget => ({
+  kind: 'new',
+  ...(intent ? { intent } : {}),
+  ...(grantId ? { grantId } : {}),
+});
 
 /** A document, on its most recent chat unless another is named. */
 export const documentTarget = (noteId: number, chat: DocumentChat = 'latest'): WorkspaceTarget => ({
@@ -60,7 +70,13 @@ function parseId(raw: string | null): number | null {
 
 export function readWorkspaceTarget(params: Params): WorkspaceTarget {
   const noteId = parseId(params.get(NOTE_PARAM));
-  if (noteId == null) return newDraftTarget(INTENT_BY_PARAM[params.get(NEW_PARAM) ?? '']);
+  if (noteId == null) {
+    const grantId = parseId(params.get(RFP_PARAM));
+    return newDraftTarget(
+      INTENT_BY_PARAM[params.get(NEW_PARAM) ?? ''],
+      grantId == null ? undefined : String(grantId)
+    );
+  }
   const chat = params.get(CHAT_PARAM);
   return documentTarget(noteId, chat === NEW_CHAT ? 'new' : (parseId(chat) ?? 'latest'));
 }
@@ -70,8 +86,9 @@ export function workspaceHref(target: WorkspaceTarget): string {
   if (target.kind === 'document') {
     params.set(NOTE_PARAM, String(target.noteId));
     if (target.chat !== 'latest') params.set(CHAT_PARAM, String(target.chat));
-  } else if (target.intent) {
-    params.set(NEW_PARAM, PARAM_BY_INTENT[target.intent]);
+  } else {
+    if (target.intent) params.set(NEW_PARAM, PARAM_BY_INTENT[target.intent]);
+    if (target.grantId) params.set(RFP_PARAM, target.grantId);
   }
   const query = params.toString();
   return query ? `${WORKSPACE_PATH}?${query}` : WORKSPACE_PATH;

components/Activity/lib/activityDisplay.utils.ts

@@ -1,3 +1,4 @@
+import { isAwardMechanism } from '@/components/Funding/lib/fundingMechanism';
 import { buildWorkUrl } from '@/utils/url';
 import { isFoundationUser } from '@/components/Bounty/lib/bountyUtil';
 import type { CurrencyAmount } from '@/utils/currency';
@@ -148,8 +149,11 @@
   }
 
   if (entry.contentType === 'USDFUNDRAISECONTRIBUTION' || entry.contentType === 'PURCHASE') {
-    return isFundingPoolContribution(entry)
-      ? { actor, verb: 'contributed', suffix: ' to the funding pool' }
+    if (isFundingPoolContribution(entry)) {
+      return { actor, verb: 'contributed', suffix: ' to the funding pool' };
+    }
+    return isAwardMechanism(entry.relatedWork?.fundingMechanism)
+      ? { actor, verb: 'awarded this proposal with' }
       : { actor, verb: 'funded this proposal with' };
   }
 
@@ -570,10 +574,14 @@
     return { label: 'Contributed to a bounty' };
   }
   if (entry.contentType === 'USDFUNDRAISECONTRIBUTION' || entry.contentType === 'PURCHASE') {
+    const awardedProposal =
+      !isFundingPoolContribution(entry) && isAwardMechanism(entry.relatedWork?.fundingMechanism);
     return {
       label: isFundingPoolContribution(entry)
         ? 'Added to an RFP’s funding pool'
-        : 'Funded a proposal',
+        : awardedProposal
+          ? 'Awarded a proposal'
+          : 'Funded a proposal',
       value: contributionValue(getContribution(entry)),
     };
   }
@@ -582,7 +590,14 @@
     return { label: 'Opened an RFP', value: amount ? { kind: 'grant', amount } : undefined };
   }
   if (entry.contentType === 'PREREGISTRATION') {
-    return { label: 'Submitted a proposal for funding' };
+    const mechanism =
+      entry.relatedWork?.fundingMechanism ??
+      (entry.associatedGrants?.some((grant) => isAwardMechanism(grant.fundingMechanism))
+        ? 'AWARD'
+        : undefined);
+    if (mechanism === 'AWARD') return { label: 'Submitted a proposal for an award' };
+    if (mechanism === 'FUNDING') return { label: 'Submitted a proposal for funding' };
+    return { label: 'Submitted a proposal' };
   }
   if (entry.contentType === 'PAPER') {
     return { label: 'Published a preprint' };

components/Activity/lib/activityWork.utils.ts

@@ -12,6 +12,7 @@
 } from './activityDisplay.utils';
 import { formatCurrency } from '@/utils/currency';
 import { toOptionalNumber } from '@/utils/number';
+import { awardRaisedLabel, isAwardMechanism } from '@/components/Funding/lib/fundingMechanism';
 import { getGrantBadgeAmount, type FundingPool } from '@/types/grant';
 import type {
   ActivityAction,
@@ -151,6 +152,21 @@
   });
 }
 
+export function getAwardCardStat(
+  fundraise: { status?: string; amountRaised?: { usd?: number; rsc?: number } },
+  showUSD: boolean,
+  exchangeRate: number
+): WorkCardStat | null {
+  const label = awardRaisedLabel(fundraise);
+  if (!label) return null;
+  const raised = (showUSD ? fundraise.amountRaised?.usd : fundraise.amountRaised?.rsc) ?? 0;
+  return {
+    label,
+    value: formatAmount(raised, showUSD, exchangeRate, true),
+    accent: true,
+  };
+}
+
 function resolveReviewScore(entry: FeedEntry): number | null {
   const entryScore = entry.metrics?.reviewScore;
   return entryScore && entryScore > 0 ? entryScore : null;
@@ -206,15 +222,43 @@
   };
 }
 
+/** The entry is a proposal to an award RFP: the funder awards it, so it asks for nothing. */
+export function isAwardFeedEntry(entry: FeedEntry): boolean {
+  if (isAwardMechanism(entry.relatedWork?.fundingMechanism)) return true;
+  return entry.associatedGrants?.some((grant) => isAwardMechanism(grant.fundingMechanism)) ?? false;
+}
+
+function isAwardFundraise(
+  fundraise: NonNullable<ActivityWork['fundraise']>,
+  entry?: FeedEntry
+): boolean {
+  if (entry != null && isAwardFeedEntry(entry)) return true;
+  const goalUsd = fundraise.goalAmount?.usd;
+  const goalRsc = fundraise.goalAmount?.rsc;
+  if (goalUsd == null && goalRsc == null) return false;
+  return (goalUsd ?? 0) <= 0 && (goalRsc ?? 0) <= 0;
+}
+
 function presentFundraise(
   base: WorkCardPresentation,
   fundraise: NonNullable<ActivityWork['fundraise']>,
   showUSD: boolean,
-  exchangeRate: number
+  exchangeRate: number,
+  entry: FeedEntry
 ): WorkCardPresentation {
   const goalUsd = fundraise.goalAmount?.usd ?? 0;
   const goalRsc = fundraise.goalAmount?.rsc ?? 0;
   const raisedUsd = fundraise.amountRaised?.usd ?? 0;
+
+  if (isAwardFundraise(fundraise, entry)) {
+    const stat = getAwardCardStat(fundraise, showUSD, exchangeRate);
+    return {
+      ...base,
+      stats: stat ? [stat] : base.stats,
+      progress: undefined,
+    };
+  }
+
   const goalAmount = showUSD ? goalUsd : goalRsc;
 
   return {
@@ -307,7 +351,7 @@
   const base = buildBasePresentation(entry, work, slot, { isReview });
 
   if (slot === 'fundraise' && work.fundraise) {
-    return presentFundraise(base, work.fundraise, showUSD, exchangeRate);
+    return presentFundraise(base, work.fundraise, showUSD, exchangeRate, entry);
   }
   if (slot === 'grant' && work.grant) {
     return presentGrant(base, work.grant, showUSD, exchangeRate);
@@ -385,7 +429,7 @@
   return Math.min(1, (work.fundraise.amountRaised?.usd ?? 0) / goal);
 }
 
 function getSlotStat(
   slot: ActivityBodySlot,
   work: ActivityWork,
   showUSD: boolean,
@@ -393,6 +437,10 @@
 ): WorkCoverStat | null {
   if (slot === 'fundraise' && work.fundraise) {
     const { goalAmount } = work.fundraise;
+    if (isAwardFundraise(work.fundraise)) {
+      const stat = getAwardCardStat(work.fundraise, showUSD, exchangeRate);
+      return stat ? { label: stat.label, value: stat.value } : null;
+    }
     const goal = (showUSD ? goalAmount?.usd : goalAmount?.rsc) ?? 0;
     return goal > 0
       ? { label: 'Raising', value: formatAmount(goal, showUSD, exchangeRate, true) }
@@ -538,7 +586,7 @@
       : link('View RFP');
   }
 
-  if (openFundraise) {
+  if (openFundraise && !isAwardFundraise(openFundraise, entry)) {
     return {
       kind: 'fund-proposal',
       label: 'Fund proposal',

components/Feed/FeedItemFundingBadges.tsx

@@ -14,6 +14,8 @@ interface FeedItemFundingBadgesProps {
   href: string;
   isNonprofit?: boolean;
   fundraiseStatus?: FundraiseStatus;
+  /** Replaces "Funded" on a completed fundraise. Award RFPs say "Awarded". */
+  completedLabel?: string;
   variant?: 'default' | 'overlay';
 }
 
@@ -26,6 +28,7 @@ export const FeedItemFundingBadges: FC<FeedItemFundingBadgesProps> = ({
   href,
   isNonprofit,
   fundraiseStatus,
+  completedLabel = 'Funded',
   variant = 'default',
 }) => {
   const hasReviewScore = reviewScore !== undefined && reviewScore > 0;
@@ -66,7 +69,7 @@ export const FeedItemFundingBadges: FC<FeedItemFundingBadgesProps> = ({
           }`}
         >
           <CheckCircle size={12} className="text-white" />
-          Funded
+          {completedLabel}
         </span>
       ) : (
         isNonprofit && (