Feature/pdct 1754 render af metadata in family form

src/components/forms/FamilyForm.tsx

@@ -40,11 +40,15 @@ import { ApiError } from '../feedback/ApiError'
 import { IDocument } from '@/interfaces/Document'
 import { IEvent } from '@/interfaces/Event'
 import { IError } from '@/interfaces/Auth'
-import { IChakraSelect, IConfigCorpora, TTaxonomy } from '@/interfaces'
+import {
+  IChakraSelect,
+  ICollection,
+  IConfigCorpora,
+  TTaxonomy,
+} from '@/interfaces'
 import {
   getMetadataHandler,
-  IFamilyFormIntlAgreements,
-  IFamilyFormLawsAndPolicies,
+  TFamilyFormSubmit,
 } from './metadata-handlers/familyForm'
 
 export interface IFamilyFormBase {
@@ -56,16 +60,16 @@ export interface IFamilyFormBase {
   collections?: IChakraSelect[]
 }
 
-export type TFamilyFormSubmit =
-  | IFamilyFormLawsAndPolicies
-  | IFamilyFormIntlAgreements
-
 type TChildEntity = 'event' | 'document'
 
 type TProps = {
   family?: TFamily
 }
 
+const getCollection = (collectionId: string, collections: ICollection[]) => {
+  return collections.find((collection) => collection.import_id === collectionId)
+}
+
 export const FamilyForm = ({ family: loadedFamily }: TProps) => {
   const [isLeavingModalOpen, setIsLeavingModalOpen] = useState(false)
   const [isFormSubmitting, setIsFormSubmitting] = useState(false)
@@ -234,22 +238,15 @@ export const FamilyForm = ({ family: loadedFamily }: TProps) => {
       await handleFormSubmission(data)
     } catch (error) {
       console.log('onSubmitErrorHandler', error)
+      setFormError(error as IError)
+      toast({
+        title: 'Form submission error',
+        description: (error as IError).message,
+        status: 'error',
+      })
     }
   }
 
-  // object type is workaround for SubmitErrorHandler<FieldErrors> throwing a tsc error.
-  const onSubmitErrorHandler = (error: object) => {
-    console.log('onSubmitErrorHandler', error)
-
-    // Handle any submission errors
-    setFormError(error as IError)
-    toast({
-      title: 'Form submission error',
-      description: (error as IError).message,
-      status: 'error',
-    })
-  }
-
   useEffect(() => {
     if (loadedFamily) {
       setFamilyDocuments(loadedFamily.documents || [])
@@ -273,13 +270,21 @@ export const FamilyForm = ({ family: loadedFamily }: TProps) => {
             }
           : undefined,
         category: isMCFCorpus ? 'MCF' : loadedFamily.category,
-        collections: loadedFamily.collections?.map((collection) => ({
-          value: collection,
-          label: collection,
-        })),
+        collections: loadedFamily.collections
+          ?.map((collectionId) => {
+            const collection = getCollection(collectionId, collections)
+            if (!collection) return null
+            return {
+              value: collection.import_id,
+              label: collection.title,
+            }
+          })
+          .filter(
+            (collection): collection is IChakraSelect => collection !== null,
+          ),
       })
     }
-  }, [config, loadedFamily, reset, isMCFCorpus])
+  }, [config, loadedFamily, reset, isMCFCorpus, collections])
 
   const onAddNewEntityClick = (entityType: TChildEntity) => {
     setEditingEntity(entityType)
@@ -413,7 +418,7 @@ export const FamilyForm = ({ family: loadedFamily }: TProps) => {
       )}
 
       {canLoadForm && (
-        <form onSubmit={handleSubmit(onSubmit, onSubmitErrorHandler)}>
+        <form onSubmit={handleSubmit(onSubmit)}>
           <VStack gap='4' mb={12} mt={4} align={'stretch'}>
             {formError && <ApiError error={formError} />}
 

src/components/forms/metadata-handlers/familyForm.ts

@@ -1,8 +1,7 @@
+import { IFamilyFormBase } from '@/components/forms/FamilyForm'
 import {
-  IFamilyFormBase,
-  TFamilyFormSubmit,
-} from '@/components/forms/FamilyForm'
-import {
+  IAFProjectsFamilyFormPost,
+  IAFProjectsMetadata,
   IFamilyFormPostBase,
   IInternationalAgreementsMetadata,
   ILawsAndPoliciesMetadata,
@@ -39,6 +38,22 @@ export interface IFamilyFormLawsAndPolicies extends IFamilyFormBase {
   framework?: IChakraSelect[]
   instrument?: IChakraSelect[]
 }
+export interface IFamilyFormAFProjects extends IFamilyFormBase {
+  // AF Projects
+  region?: IChakraSelect[]
+  sector?: IChakraSelect[]
+  implementing_agency?: IChakraSelect[]
+  status?: IChakraSelect
+  project_id?: string
+  project_url?: string
+  project_value_co_financing?: string
+  project_value_fund_spend?: string
+}
+
+export type TFamilyFormSubmit =
+  | IFamilyFormLawsAndPolicies
+  | IFamilyFormIntlAgreements
+  | IFamilyFormAFProjects
 
 // Mapping of corpus types to their specific metadata handlers
 export const corpusMetadataHandlers: Record<
@@ -80,6 +95,31 @@ export const corpusMetadataHandlers: Record<
         metadata,
       }) as ILawsAndPoliciesFamilyFormPost,
   },
+  AF: {
+    extractMetadata: (formData: TFamilyFormSubmit) => {
+      const afData = formData as IFamilyFormAFProjects
+      return {
+        region: afData.region?.map((region) => region.value) || [],
+        sector: afData.sector?.map((sector) => sector.value) || [],
+        implementing_agency:
+          afData.implementing_agency?.map((agency) => agency.value) || [],
+        status: afData.status ? [afData.status?.value] : [],
+        project_id: afData.project_id ? [afData.project_id] : [],
+        project_url: afData.project_url ? [afData.project_url] : [],
+        project_value_co_financing: afData.project_value_co_financing
+          ? [afData.project_value_co_financing]
+          : [0],
+        project_value_fund_spend: afData.project_value_fund_spend
+          ? [afData.project_value_fund_spend]
+          : [0],
+      } as IAFProjectsMetadata
+    },
+    createSubmissionData: (baseData, metadata) =>
+      ({
+        ...baseData,
+        metadata,
+      }) as IAFProjectsFamilyFormPost,
+  },
   // Add other corpus types here with their specific metadata extraction logic
 }
 

src/interfaces/Family.ts

@@ -15,9 +15,21 @@ export interface ILawsAndPoliciesMetadata extends IMetadata {
   instrument: string[]
 }
 
+export interface IAFProjectsMetadata extends IMetadata {
+  region: string[]
+  sector: string[]
+  implementing_agency: string[]
+  status: string[]
+  project_id: string[]
+  project_url: string[]
+  project_value_co_financing: string[]
+  project_value_fund_spend: string[]
+}
+
 export type TFamilyMetadata =
   | IInternationalAgreementsMetadata
   | ILawsAndPoliciesMetadata
+  | IAFProjectsMetadata
 
 // Read DTOs.
 interface IFamilyBase {
@@ -69,7 +81,11 @@ export interface IInternationalAgreementsFamilyFormPost
   extends IFamilyFormPostBase {
   metadata: IInternationalAgreementsMetadata
 }
+export interface IAFProjectsFamilyFormPost extends IFamilyFormPostBase {
+  metadata: IAFProjectsMetadata
+}
 
 export type TFamilyFormPost =
   | ILawsAndPoliciesFamilyFormPost
   | IInternationalAgreementsFamilyFormPost
+  | IAFProjectsFamilyFormPost

src/interfaces/Metadata.ts

@@ -68,6 +68,28 @@ export const CORPUS_METADATA_CONFIG: CorpusMetadataConfig = {
       'instrument',
     ],
   },
+  AF: {
+    renderFields: {
+      region: { type: FieldType.MULTI_SELECT },
+      sector: { type: FieldType.MULTI_SELECT },
+      implementing_agency: { type: FieldType.MULTI_SELECT },
+      status: { type: FieldType.SINGLE_SELECT },
+      project_id: { type: FieldType.TEXT },
+      project_url: { type: FieldType.TEXT },
+      project_value_co_financing: { type: FieldType.NUMBER },
+      project_value_fund_spend: { type: FieldType.NUMBER },
+    },
+    validationFields: [
+      'project_id',
+      'project_url',
+      'region',
+      'sector',
+      'status',
+      'implementing_agency',
+      'project_value_co_financing',
+      'project_value_fund_spend',
+    ],
+  },
   default: {
     renderFields: {},
     validationFields: [],