Merge pull request #265 from City-of-Helsinki/UHF-10025

UHF-10025: Contact form bugfixes
City-of-Helsinki · May 7, 2024 · ab4d4cd · ab4d4cd
2 parents 0687db8 + 1d969ac
commit ab4d4cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/pages/api/feedback.js b/pages/api/feedback.js
@@ -37,16 +37,15 @@ export default async function handler(request, response) {
         message,
         page,
         name,
-        feedback_email,
-        subject = 'Palautetta sivustolta: <otsikko puuttuu>',
+        uuid,
       } = request?.body
       const form_response = await axios.post(POST_URL, {
         sender_email,
         message,
         page,
-        subject,
+        subject: `Palautetta sivustolta: ${page}`,
         name,
-        feedback_email,
+        uuid,
         webform_id: WEBFORM_ID,
       })
       if (form_response?.status !== 200) {

diff --git a/src/components/feedback/FeedbackForm.jsx b/src/components/feedback/FeedbackForm.jsx
@@ -5,7 +5,7 @@ import { useForm } from 'react-hook-form'
 import InfoBlock from '@/components/feedback/InfoBlock'
 import { isSSR } from '@/hooks/useIsomorphicLayoutEffect'
 import axios from 'axios'
-import { feedbackEmailAtom } from '@/src/store'
+import {nodeIdAtom} from '@/src/store'
 import { useAtomValue } from 'jotai/utils'
 
 // eslint-disable-next-line react/display-name
@@ -15,7 +15,7 @@ const FeedbackForm = forwardRef(({ onCancel }, ref) => {
   // Consider using async atom and useAtom hook instead if this becomes a real issue.
 
   const { t } = useTranslation('common')
-  const feedbackEmail = useAtomValue(feedbackEmailAtom)
+  const nodeId = useAtomValue(nodeIdAtom)
   const urlWithoutHash =
     isSSR() === false ? window.location.href.split('#').shift() : ''
   const {
@@ -27,7 +27,7 @@ const FeedbackForm = forwardRef(({ onCancel }, ref) => {
   } = useForm()
 
   const onSubmit = async (data) =>
-    axios.post('/api/feedback', { ...data, feedback_email: feedbackEmail })
+    axios.post('/api/feedback', { ...data, uuid: nodeId })
 
   const onError = (errors, e) => {
     console.error({ errors, e })
@@ -82,11 +82,6 @@ const FeedbackForm = forwardRef(({ onCancel }, ref) => {
 
           <form onSubmit={handleSubmit(onSubmit, onError)}>
             <input type="hidden" {...register('page')} value={urlWithoutHash} />
-            <input
-              type="hidden"
-              {...register('subject')}
-              value={`Palautetta sivusta: ${urlWithoutHash}`}
-            />
             <div className="mb-2">
               <label
                 htmlFor="ifu-feedback-name"

diff --git a/src/store.js b/src/store.js
@@ -151,10 +151,6 @@ export const themeMenuAtom = atom((get) => get(pageAtom).themeMenu)
 
 export const nodeAtom = selectAtom(pageAtom, (page) => page?.node)
 export const nodeIdAtom = selectAtom(pageAtom, (page) => page?.node?.id)
-export const feedbackEmailAtom = selectAtom(
-  pageAtom,
-  (page) => page?.node?.field_feedback_email
-)
 
 /** Cookie consent atom */
 export const cookieConsentAtom = atomWithStorage(