fix(ojoi): Update form context (#16147)

* Using setvalues to update the form context so updateApplication mutation updates the application with correct values.

* Fixed import

libs/application/templates/official-journal-of-iceland/src/components/signatures/AddCommitteeMember.tsx

@@ -9,6 +9,7 @@ import {
 } from '../../lib/constants'
 import { getCommitteeAnswers, getEmptyMember } from '../../lib/utils'
 import set from 'lodash/set'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -20,6 +21,8 @@ export const AddCommitteeMember = ({ applicationId }: Props) => {
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onAddCommitteeMember = () => {
     const { signature, currentAnswers } = getCommitteeAnswers(
       structuredClone(application.answers),
@@ -37,6 +40,8 @@ export const AddCommitteeMember = ({ applicationId }: Props) => {
         withExtraMember,
       )
 
+      setValue(InputFields.signature.committee, withExtraMember)
+
       updateApplication(updatedAnswers)
     }
   }

libs/application/templates/official-journal-of-iceland/src/components/signatures/AddRegularMember.tsx

@@ -9,6 +9,7 @@ import {
 } from '../../lib/constants'
 import { getEmptyMember, getRegularAnswers } from '../../lib/utils'
 import set from 'lodash/set'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -21,6 +22,8 @@ export const AddRegularMember = ({ applicationId, signatureIndex }: Props) => {
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onAddMember = () => {
     const { signature, currentAnswers } = getRegularAnswers(
       structuredClone(application.answers),
@@ -47,6 +50,8 @@ export const AddRegularMember = ({ applicationId, signatureIndex }: Props) => {
           updatedRegularSignature,
         )
 
+        setValue(InputFields.signature.regular, updatedRegularSignature)
+
         updateApplication(updatedAnswers)
       }
     }

libs/application/templates/official-journal-of-iceland/src/components/signatures/AddRegularSignature.tsx

@@ -15,6 +15,7 @@ import {
   MAXIMUM_REGULAR_SIGNATURE_COUNT,
   ONE,
 } from '../../lib/constants'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -26,6 +27,8 @@ export const AddRegularSignature = ({ applicationId }: Props) => {
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onAddInstitution = () => {
     const { signature, currentAnswers } = getRegularAnswers(
       structuredClone(application.answers),
@@ -37,12 +40,16 @@ export const AddRegularSignature = ({ applicationId }: Props) => {
         DEFAULT_REGULAR_SIGNATURE_MEMBER_COUNT,
       )?.pop()
 
+      const updatedSignature = [...signature, newSignature]
+
       const updatedAnswers = set(
         currentAnswers,
         InputFields.signature.regular,
-        [...signature, newSignature],
+        updatedSignature,
       )
 
+      setValue(InputFields.signature.regular, updatedSignature)
+
       updateApplication(updatedAnswers)
     }
   }

libs/application/templates/official-journal-of-iceland/src/components/signatures/Chairman.tsx

@@ -13,6 +13,7 @@ import { SignatureMember } from './Member'
 import set from 'lodash/set'
 import * as styles from './Signatures.css'
 import * as z from 'zod'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -27,6 +28,8 @@ export const Chairman = ({ applicationId, member }: Props) => {
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const handleChairmanChange = (value: string, key: keyof MemberProperties) => {
     const { signature, currentAnswers } = getCommitteeAnswers(
       application.answers,
@@ -57,6 +60,8 @@ export const Chairman = ({ applicationId, member }: Props) => {
         updatedCommitteeSignature,
       )
 
+      setValue(InputFields.signature.committee, updatedCommitteeSignature)
+
       return updatedSignatures
     }
 

libs/application/templates/official-journal-of-iceland/src/components/signatures/CommitteeMember.tsx

@@ -14,6 +14,7 @@ import { memberItemSchema } from '../../lib/dataSchema'
 import { SignatureMember } from './Member'
 import * as z from 'zod'
 import { RemoveCommitteeMember } from './RemoveComitteeMember'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -33,6 +34,8 @@ export const CommitteeMember = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const handleMemberChange = (
     value: string,
     key: keyof MemberProperties,
@@ -77,6 +80,8 @@ export const CommitteeMember = ({
         updatedCommitteeSignature,
       )
 
+      setValue(InputFields.signature.committee, updatedCommitteeSignature)
+
       return updatedSignatures
     }
 

libs/application/templates/official-journal-of-iceland/src/components/signatures/Institution.tsx

@@ -27,6 +27,7 @@ import {
 import { z } from 'zod'
 import { signatureInstitutionSchema } from '../../lib/dataSchema'
 import { RemoveRegularSignature } from './RemoveRegularSignature'
+import { useFormContext } from 'react-hook-form'
 type Props = {
   applicationId: string
   type: SignatureType
@@ -49,6 +50,8 @@ export const InstitutionSignature = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const handleInstitutionChange = (
     value: string,
     key: SignatureInstitutionKeys,
@@ -88,6 +91,8 @@ export const InstitutionSignature = ({
         updatedRegularSignature,
       )
 
+      setValue(InputFields.signature[type], updatedRegularSignature)
+
       return updatedSignatures
     }
 
@@ -114,6 +119,8 @@ export const InstitutionSignature = ({
         },
       )
 
+      setValue(InputFields.signature[type], updatedCommitteeSignature)
+
       return updatedCommitteeSignature
     }
 

libs/application/templates/official-journal-of-iceland/src/components/signatures/RegularMember.tsx

@@ -15,6 +15,7 @@ import { memberItemSchema } from '../../lib/dataSchema'
 import { SignatureMember } from './Member'
 import * as z from 'zod'
 import { RemoveRegularMember } from './RemoveRegularMember'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -36,6 +37,8 @@ export const RegularMember = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const handleMemberChange = (
     value: string,
     key: keyof MemberProperties,
@@ -84,6 +87,8 @@ export const RegularMember = ({
         updatedRegularSignature,
       )
 
+      setValue(InputFields.signature.regular, updatedRegularSignature)
+
       return updatedSignatures
     }
 

libs/application/templates/official-journal-of-iceland/src/components/signatures/RemoveComitteeMember.tsx

@@ -5,6 +5,7 @@ import { MINIMUM_COMMITTEE_SIGNATURE_MEMBER_COUNT } from '../../lib/constants'
 import set from 'lodash/set'
 import * as styles from './Signatures.css'
 import { getCommitteeAnswers, isCommitteeSignature } from '../../lib/utils'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -19,6 +20,8 @@ export const RemoveCommitteeMember = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onRemoveMember = () => {
     const { currentAnswers, signature } = getCommitteeAnswers(
       application.answers,
@@ -36,6 +39,8 @@ export const RemoveCommitteeMember = ({
         updatedCommitteeSignature,
       )
 
+      setValue(InputFields.signature.committee, updatedCommitteeSignature)
+
       updateApplication(updatedAnswers)
     }
   }

libs/application/templates/official-journal-of-iceland/src/components/signatures/RemoveRegularMember.tsx

@@ -5,6 +5,7 @@ import { MINIMUM_REGULAR_SIGNATURE_MEMBER_COUNT } from '../../lib/constants'
 import set from 'lodash/set'
 import * as styles from './Signatures.css'
 import { getRegularAnswers } from '../../lib/utils'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -21,6 +22,8 @@ export const RemoveRegularMember = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onRemoveMember = () => {
     const { currentAnswers, signature } = getRegularAnswers(application.answers)
 
@@ -45,6 +48,8 @@ export const RemoveRegularMember = ({
           updatedRegularSignature,
         )
 
+        setValue(InputFields.signature.regular, updatedRegularSignature)
+
         updateApplication(updatedAnswers)
       }
     }

libs/application/templates/official-journal-of-iceland/src/components/signatures/RemoveRegularSignature.tsx

@@ -4,6 +4,7 @@ import { getValueViaPath } from '@island.is/application/core'
 import { InputFields } from '../../lib/types'
 import { isRegularSignature } from '../../lib/utils'
 import set from 'lodash/set'
+import { useFormContext } from 'react-hook-form'
 
 type Props = {
   applicationId: string
@@ -18,6 +19,8 @@ export const RemoveRegularSignature = ({
     applicationId,
   })
 
+  const { setValue } = useFormContext()
+
   const onRemove = () => {
     const currentAnswers = structuredClone(application.answers)
     const signature = getValueViaPath(
@@ -36,6 +39,8 @@ export const RemoveRegularSignature = ({
         updatedRegularSignature,
       )
 
+      setValue(InputFields.signature.regular, updatedRegularSignature)
+
       updateApplication(updatedSignatures)
     }
   }

libs/application/templates/official-journal-of-iceland/src/screens/RequirementsScreen.tsx

@@ -14,7 +14,7 @@ import {
   DEFAULT_COMMITTEE_SIGNATURE_MEMBER_COUNT,
   DEFAULT_REGULAR_SIGNATURE_COUNT,
   DEFAULT_REGULAR_SIGNATURE_MEMBER_COUNT,
-  OJOI_INPUT_HEIGHT as OJOI_INPUT_HEIGHT,
+  OJOI_INPUT_HEIGHT,
   SignatureTypes,
 } from '../lib/constants'
 import { useApplication } from '../hooks/useUpdateApplication'