feat: api integration for CANFundingInfoCard (#3182)

* feat: api integration for CANFundingInfoCard * fix: correct funding_received --------- Co-authored-by: maiyerlee <[email protected]>
HHS · Dec 6, 2024 · 1328a7b · 1328a7b
1 parent f9f4b6e
commit 1328a7b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/backend/ops_api/ops/schemas/cans.py b/backend/ops_api/ops/schemas/cans.py
@@ -118,7 +118,7 @@ class CreateUpdateFundingDetailsSchema(Schema):
 class FundingDetailsSchema(Schema):
     active_period = fields.Integer(allow_none=True)
     funding_method = fields.String(allow_none=True)
-    funding_frequency = fields.String(allow_none=True)
+    funding_received = fields.String(allow_none=True)
     funding_type = fields.String(allow_none=True)
     allotment = fields.String(allow_none=True)
     allowance = fields.String(allow_none=True)

diff --git a/frontend/src/components/CANs/CANFundingInfoCard/CANFundingInfoCard.jsx b/frontend/src/components/CANs/CANFundingInfoCard/CANFundingInfoCard.jsx
@@ -78,12 +78,10 @@ const CANFundingInfoCard = ({ funding, fiscalYear }) => {
                 </div>
                 <div className="grid-col">
                     <dl>
-                        {/* TODO: ask where this comes from */}
                         <TermTag
-                            term="Funding Received*"
-                            description="Coming Soon"
+                            term="Funding Received"
+                            description={funding.funding_received ?? NO_DATA}
                         />
-                        {/* TODO: ask where this comes from */}
                         <TermTag
                             term="Funding Source"
                             description={funding.funding_source ?? NO_DATA}
@@ -93,8 +91,8 @@ const CANFundingInfoCard = ({ funding, fiscalYear }) => {
                 <div className="grid-col">
                     <dl>
                         <TermTag
-                            term="Funding Method*"
-                            description="Coming Soon"
+                            term="Funding Method"
+                            description={funding.funding_method ?? NO_DATA}
                         />
                         <TermTag
                             term="Partner"
@@ -104,10 +102,9 @@ const CANFundingInfoCard = ({ funding, fiscalYear }) => {
                 </div>
                 <div className="grid-col">
                     <dl>
-                        {/* TODO: ask where this comes from */}
                         <TermTag
-                            term="Funding Type*"
-                            description="Coming Soon"
+                            term="Funding Type"
+                            description={funding.funding_type ?? NO_DATA}
                         />
                         <TermTag
                             term="Method of Transfer"

diff --git a/frontend/src/components/CANs/CANTypes.d.ts b/frontend/src/components/CANs/CANTypes.d.ts
@@ -75,6 +75,9 @@ export type FundingDetails = {
     fund_code: string;
     funding_partner?: string;
     funding_source?: "OPRE" | "ACF" | "HHS";
+    funding_method?: "Direct" | "Reimbursable";
+    funding_received?: "Quarterly" | "FY Start";
+    funding_type?: "Discretionary" | "Mandatory";
     id: number;
     method_of_transfer?: keyof typeof CAN_TRANSFER;
     obligate_by?: number;