consolidated fe and aligned be - failing on submission still

__tests__/unit/backend/helpers/generate-form-data.ts

@@ -275,9 +275,12 @@ export const generateNewSingleAnswerResponse = (
   customParams?: Partial<ProcessedSingleAnswerResponse>,
 ): ProcessedSingleAnswerResponse => {
   if (
-    [BasicField.Attachment, BasicField.Table, BasicField.Checkbox].includes(
-      fieldType,
-    )
+    [
+      BasicField.Attachment,
+      BasicField.Table,
+      BasicField.Checkbox,
+      BasicField.Address,
+    ].includes(fieldType)
   ) {
     throw new Error(
       'Call the custom response generator functions for attachment, table and checkbox.',

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignContent/FieldRow/FieldRowContainer.tsx

@@ -23,7 +23,7 @@ import { useToast } from '~hooks/useToast'
 import IconButton from '~components/IconButton'
 import Tooltip from '~components/Tooltip'
 import {
-  AddressField,
+  AddressCompoundField,
   AttachmentField,
   CheckboxField,
   ChildrenCompoundField,
@@ -514,6 +514,6 @@ const FieldRow = ({ field, ...rest }: FieldRowProps) => {
     case BasicField.Children:
       return <ChildrenCompoundField schema={field} {...rest} />
     case BasicField.Address:
-      return <AddressField schema={field} {...rest} />
+      return <AddressCompoundField schema={field} {...rest} />
   }
 }

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.stories.tsx

@@ -1,14 +1,14 @@
 import { Meta, StoryFn } from '@storybook/react'
 
-import { AddressFieldBase, BasicField } from '~shared/types'
+import { AddressCompoundFieldBase, BasicField } from '~shared/types'
 
 import { createFormBuilderMocks } from '~/mocks/msw/handlers/admin-form'
 
 import { EditFieldDrawerDecorator, StoryRouter } from '~utils/storybook'
 
 import { EditAddress, EditAddressProps } from './EditAddress'
 
-const DEFAULT_ADDRESS_FIELD: AddressFieldBase = {
+const DEFAULT_ADDRESS_FIELD: AddressCompoundFieldBase = {
   title: 'Local address',
   description: '',
   required: true,
@@ -38,7 +38,7 @@ export default {
 } as Meta<EditAddressProps>
 
 interface StoryArgs {
-  field: AddressFieldBase
+  field: AddressCompoundFieldBase
 }
 
 const Template: StoryFn<StoryArgs> = ({ field }) => {

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditAddress/EditAddress.tsx

@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { FormControl } from '@chakra-ui/react'
 import { extend, pick } from 'lodash'
 
-import { AddressFieldBase } from '~shared/types/field'
+import { AddressCompoundFieldBase } from '~shared/types/field'
 
 import { createBaseValidationRules } from '~utils/fieldValidation'
 import FormErrorMessage from '~components/FormControl/FormErrorMessage'
@@ -17,10 +17,10 @@ import { FormFieldDrawerActions } from '../common/FormFieldDrawerActions'
 import { EditFieldProps } from '../common/types'
 import { useEditFieldForm } from '../common/useEditFieldForm'
 
-export type EditAddressProps = EditFieldProps<AddressFieldBase>
+export type EditAddressProps = EditFieldProps<AddressCompoundFieldBase>
 
 type EditAddressInputs = Pick<
-  AddressFieldBase,
+  AddressCompoundFieldBase,
   'title' | 'description' | 'required'
 >
 
@@ -37,7 +37,7 @@ export const EditAddress = ({ field }: EditAddressProps): JSX.Element => {
     isLoading,
     handleCancel,
     setValue,
-  } = useEditFieldForm<EditAddressInputs, AddressFieldBase>({
+  } = useEditFieldForm<EditAddressInputs, AddressCompoundFieldBase>({
     field,
     transform: {
       input: (inputField) =>

frontend/src/features/public-form/components/FormFields/FieldFactory.tsx

@@ -4,7 +4,7 @@ import { BasicField } from '~shared/types/field'
 import { FormColorTheme, FormResponseMode } from '~shared/types/form'
 
 import {
-  AddressField,
+  AddressCompoundField,
   AttachmentField,
   CheckboxField,
   ChildrenCompoundField,
@@ -121,7 +121,7 @@ export const FieldFactory = memo(
       case BasicField.Table:
         return <TableField schema={field} {...rest} />
       case BasicField.Address:
-        return <AddressField schema={field} {...rest} />
+        return <AddressCompoundField schema={field} {...rest} />
       case BasicField.Children:
         return (
           <ChildrenCompoundField

frontend/src/features/public-form/utils/createSubmission.ts

@@ -163,6 +163,7 @@ export const createClearSubmissionWithVirusScanningFormData = (
       return response
     },
   )
+
   const attachments = getAttachmentsMap(formFields, formInputs)
 
   // Convert content to FormData object.
@@ -248,6 +249,9 @@ const createResponsesArray = (
     .map((ff) => transformInputsToOutputs(ff, formInputs[ff._id]))
     .filter((output): output is FieldResponse => output !== null)
 
+  const v = validateResponses(transformedResponses)
+  console.log('testing')
+  console.log(v)
   return validateResponses(transformedResponses)
 }
 
@@ -288,14 +292,7 @@ const createResponsesV3 = (
         if (!input) break
         returnedInputs[ff._id] = {
           fieldType: ff.fieldType,
-          answer: {
-            postalCode: input.postalCode,
-            blockNumber: input.blockNumber,
-            streetName: input.streetName,
-            buildingName: input.buildingName,
-            levelNumber: input.levelNumber,
-            unitNumber: input.unitNumber,
-          },
+          answer: input,
         } as FieldResponseV3
         break
       }

frontend/src/features/public-form/utils/inputTransformation.ts

@@ -1,9 +1,10 @@
+import { Address } from 'cluster'
 import { format, parse } from 'date-fns'
 import { times } from 'lodash'
 
 import { DATE_PARSE_FORMAT } from '~shared/constants/dates'
 import {
-  AddressFieldResponseV3,
+  AddressCompoundFieldResponseV3,
   AttachmentFieldResponseV3,
   CheckboxFieldResponsesV3,
   ChildrenCompoundFieldResponsesV3,
@@ -13,7 +14,11 @@ import {
   VerifiableFieldResponseV3,
   YesNoFieldResponseV3,
 } from '~shared/types'
-import { BasicField, FormFieldDto } from '~shared/types/field'
+import {
+  AddressAttributes,
+  BasicField,
+  FormFieldDto,
+} from '~shared/types/field'
 import {
   AddressResponse,
   AttachmentResponse,
@@ -31,8 +36,8 @@ import { CHECKBOX_OTHERS_INPUT_VALUE } from '~templates/Field/Checkbox/constants
 import { RADIO_OTHERS_INPUT_VALUE } from '~templates/Field/Radio/constants'
 import { createTableRow } from '~templates/Field/Table/utils/createRow'
 import {
-  AddressFieldSchema,
-  AddressFieldValues,
+  AddressCompoundFieldSchema,
+  AddressCompoundFieldValues,
   AttachmentFieldSchema,
   BaseFieldOutput,
   CheckboxFieldSchema,
@@ -222,14 +227,32 @@ const transformToChildOutput = (
 }
 
 const transformToAddressOutput = (
-  schema: AddressFieldSchema,
-  input?: AddressFieldValues | AddressFieldResponseV3,
+  schema: AddressCompoundFieldSchema,
+  input?: AddressCompoundFieldValues | AddressCompoundFieldResponseV3,
 ): AddressResponse => {
-  let answer = ''
-  if (input?.postalCode !== undefined) answer = input.postalCode // TODO: do for all input fields, just using postalCode to test now
+  // let answerArray: AddressAttributes
+  const answerArray: string[][] = []
+  // if (input !== undefined) {
+  //   answerArray = input.addressSubFields
+  // } else {
+  //   answerArray = {
+  //     postalCode: '',
+  //     blockNumber: '',
+  //     streetName: '',
+  //     buildingName: '',
+  //     levelNumber: '',
+  //     unitNumber: '',
+  //   }
+  // }
+  if (input !== undefined) {
+    Object.entries(input.addressSubFields).map(([key, value]) =>
+      answerArray.push([`${key}: ${value}`]),
+    )
+  }
+
   return {
     ...pickBaseOutputFromSchema(schema),
-    answer,
+    answerArray,
   }
 }
 

frontend/src/services/ApiService.ts

@@ -109,6 +109,7 @@ export const processFetchResponse = async (response: Response) => {
       throw new Error(`Non-2XX response: ${response.status}`)
     } else {
       const data = await response.json()
+      // console.log(data)
       return data
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any