Merge pull request #8832 from opengovsg/release_v6.262.0

kevin9foong · web-flow · commit 2098f316323d · 2025-10-21T15:31:31.000+08:00
build: release v6.262.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v6.262.0](https://github.com/opengovsg/FormSG/compare/v6.261.0...v6.262.0)
+
+- feat: submission email redact [`#8825`](https://github.com/opengovsg/FormSG/pull/8825)
+- build: merge release v6.261.0 to develop [`#8830`](https://github.com/opengovsg/FormSG/pull/8830)
+- build: release v6.261.0 [`#8829`](https://github.com/opengovsg/FormSG/pull/8829)
+
 #### [v6.261.0](https://github.com/opengovsg/FormSG/compare/v6.260.0...v6.261.0)
 
+> 21 October 2025
+
 - feat: update save draft toast and admin toggle copy [`#8828`](https://github.com/opengovsg/FormSG/pull/8828)
 - build: merge release v6.260.0 to develop  [`#8824`](https://github.com/opengovsg/FormSG/pull/8824)
 - build: release v6.260.0 [`#8823`](https://github.com/opengovsg/FormSG/pull/8823)
+- chore: bump version to v6.261.0 [`faa03ef`](https://github.com/opengovsg/FormSG/commit/faa03ef0a3b90e74daec06be0343e0f22c322ca4)
 
 #### [v6.260.0](https://github.com/opengovsg/FormSG/compare/v6.259.0...v6.260.0)
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.261.0",
+  "version": "6.262.0",
   "homepage": ".",
   "type": "module",
   "private": true,
diff --git a/frontend/src/features/public-form/PublicFormContext.tsx b/frontend/src/features/public-form/PublicFormContext.tsx
@@ -8,7 +8,7 @@ import {
 } from 'react'
 import { UseQueryResult } from 'react-query'
 
-import { FormFieldDto, MultirespondentSubmissionDto } from '~shared/types'
+import { FormFieldDto, PublicMultirespondentSubmissionDto } from '~shared/types'
 import { PublicFormViewDto } from '~shared/types/form'
 
 import { FormFieldValues } from '~templates/Field'
@@ -85,7 +85,7 @@ export interface PublicFormContextProps
   setHasSingleSubmissionValidationError?: Dispatch<SetStateAction<boolean>>
   hasRespondentNotWhitelistedError: boolean
 
-  encryptedPreviousSubmission?: MultirespondentSubmissionDto
+  encryptedPreviousSubmission?: PublicMultirespondentSubmissionDto
   previousSubmission?: ReturnType<typeof decryptSubmission>
   previousAttachments?: Record<string, ArrayBuffer>
   setPreviousSubmission?: (
diff --git a/frontend/src/features/public-form/PublicFormPage.stories.tsx b/frontend/src/features/public-form/PublicFormPage.stories.tsx
@@ -1620,7 +1620,6 @@ WithMultiRespondentFormStep1TableFieldAdditionalRows.parameters = {
               _id: 'step-0',
               edit: ['table-field-for-test-id'],
               workflow_type: WorkflowType.Static,
-              emails: [],
             },
           ],
           form_fields: [TABLE_FIELD_ADDITIONAL_ROWS_FIELD],
diff --git a/frontend/src/features/public-form/PublicFormPageMrfSubsequentSteps.stories.tsx b/frontend/src/features/public-form/PublicFormPageMrfSubsequentSteps.stories.tsx
@@ -81,13 +81,11 @@ WithMultiRespondentFormStep2NonEditableTableFieldAdditionalRows.parameters = {
             _id: 'step-0',
             edit: ['table-field-for-test-id'],
             workflow_type: WorkflowType.Static,
-            emails: [],
           },
           {
             _id: 'step-1',
             edit: [],
             workflow_type: WorkflowType.Static,
-            emails: [],
           },
         ],
         form_fields: [TABLE_FIELD_ADDITIONAL_ROWS_FIELD],
@@ -118,13 +116,11 @@ WithMultiRespondentFormStep2EditableTableFieldLessThanMinimumRows.parameters = {
             _id: 'step-0',
             edit: ['table-field-for-test-id'],
             workflow_type: WorkflowType.Static,
-            emails: [],
           },
           {
             _id: 'step-1',
             edit: ['table-field-for-test-id'],
             workflow_type: WorkflowType.Static,
-            emails: [],
           },
         ],
         form_fields: [TABLE_FIELD_ADDITIONAL_ROWS_FIELD],
@@ -191,13 +187,11 @@ WithMultiRespondentFormStep2NonEditableTableFieldAdditionalRowsWithSaveDraft.par
               _id: 'step-0',
               edit: ['table-field-for-test-id'],
               workflow_type: WorkflowType.Static,
-              emails: [],
             },
             {
               _id: 'step-1',
               edit: [],
               workflow_type: WorkflowType.Static,
-              emails: [],
             },
           ],
           form_fields: [TABLE_FIELD_ADDITIONAL_ROWS_FIELD],
@@ -286,13 +280,11 @@ WithMultiRespondentFormStep2EditableTableFieldAdditionalRowsWithSaveDraft.parame
               _id: 'step-0',
               edit: ['table-field-for-test-id'],
               workflow_type: WorkflowType.Static,
-              emails: [],
             },
             {
               _id: 'step-1',
               edit: ['table-field-for-test-id'],
               workflow_type: WorkflowType.Static,
-              emails: [],
             },
           ],
           form_fields: [TABLE_FIELD_ADDITIONAL_ROWS_FIELD],
diff --git a/frontend/src/features/public-form/PublicFormService.ts b/frontend/src/features/public-form/PublicFormService.ts
@@ -25,7 +25,7 @@ import {
   PublicFormViewDto,
 } from '~shared/types/form/form'
 import {
-  MultirespondentSubmissionDto,
+  PublicMultirespondentSubmissionDto,
   ResponseMetadata,
   SubmissionResponseDto,
 } from '~shared/types/submission'
@@ -46,7 +46,7 @@ import {
 } from './utils/createSubmission'
 import { convertEncryptedAttachmentToFileContent } from './utils/decryptSubmission'
 import { filterHiddenInputs } from './utils/filterHiddenInputs'
-import { MultirespondentSubmissionDtoWithAttachments } from './types'
+import { PublicMultirespondentSubmissionDtoWithAttachments } from './types'
 
 export const PUBLIC_FORMS_ENDPOINT = '/forms'
 
@@ -122,11 +122,11 @@ export const getMultirespondentSubmissionById = async ({
 }: {
   formId: string
   submissionId: string
-}): Promise<MultirespondentSubmissionDtoWithAttachments> => {
-  return ApiService.get<MultirespondentSubmissionDto>(
+}): Promise<PublicMultirespondentSubmissionDtoWithAttachments> => {
+  return ApiService.get<PublicMultirespondentSubmissionDto>(
     `${PUBLIC_FORMS_ENDPOINT}/${formId}/submissions/${submissionId}`,
   ).then(async ({ data }) => {
-    const encryptedAttachments: MultirespondentSubmissionDtoWithAttachments['encryptedAttachments'] =
+    const encryptedAttachments: PublicMultirespondentSubmissionDtoWithAttachments['encryptedAttachments'] =
       {}
     const downloadTasks = Object.keys(data.attachmentMetadata).map(
       async (id) => {
diff --git a/frontend/src/features/public-form/components/FormFields/FormFields.tsx b/frontend/src/features/public-form/components/FormFields/FormFields.tsx
@@ -10,8 +10,8 @@ import { FormFieldDto } from '~shared/types/field'
 import {
   FormColorTheme,
   FormResponseMode,
-  FormWorkflowStepDto,
   LogicDto,
+  StrippedFormWorkflowStepDto,
 } from '~shared/types/form'
 
 import InlineMessage from '~components/InlineMessage'
@@ -32,7 +32,7 @@ export interface FormFieldsProps {
   previousAttachments?: Record<string, ArrayBuffer>
   formFields: FormFieldDto[]
   formLogics: LogicDto[]
-  workflowStep?: FormWorkflowStepDto
+  workflowStep?: StrippedFormWorkflowStepDto
   colorTheme: FormColorTheme
   onSubmit: SubmitHandler<FormFieldValues> | undefined
 }
diff --git a/frontend/src/features/public-form/components/FormFields/VisibleFormFields.tsx b/frontend/src/features/public-form/components/FormFields/VisibleFormFields.tsx
@@ -3,8 +3,8 @@ import { Control, useWatch } from 'react-hook-form'
 
 import {
   FormColorTheme,
-  FormWorkflowStepDto,
   LogicDto,
+  StrippedFormWorkflowStepDto,
 } from '~shared/types/form'
 
 import { FormFieldValues } from '~templates/Field'
@@ -24,7 +24,7 @@ interface VisibleFormFieldsProps {
   control: Control<FormFieldValues>
   formFields: FormFieldWithQuestionNo[]
   formLogics: LogicDto[]
-  workflowStep?: FormWorkflowStepDto
+  workflowStep?: StrippedFormWorkflowStepDto
   colorTheme: FormColorTheme
   fieldPrefillMap: PrefillMap
 }
diff --git a/frontend/src/features/public-form/queries.ts b/frontend/src/features/public-form/queries.ts
@@ -11,7 +11,7 @@ import {
   getMultirespondentSubmissionById,
   getPublicFormView,
 } from './PublicFormService'
-import { MultirespondentSubmissionDtoWithAttachments } from './types'
+import { PublicMultirespondentSubmissionDtoWithAttachments } from './types'
 
 export const publicFormKeys = {
   // All keys map to either an array or function returning an array for
@@ -46,7 +46,10 @@ export const useEncryptedSubmission = (
   submissionId?: string,
   /** Extra override to determine whether query is enabled */
   enabled = true,
-): UseQueryResult<MultirespondentSubmissionDtoWithAttachments, ApiError> => {
+): UseQueryResult<
+  PublicMultirespondentSubmissionDtoWithAttachments,
+  ApiError
+> => {
   return useQuery(
     publicFormKeys.submission(formId, submissionId),
     () =>
diff --git a/frontend/src/features/public-form/types.ts b/frontend/src/features/public-form/types.ts
@@ -1,8 +1,8 @@
 import { EncryptedFileContent } from '@opengovsg/formsg-sdk/dist/types'
 
-import { MultirespondentSubmissionDto } from '~shared/types'
+import { PublicMultirespondentSubmissionDto } from '~shared/types'
 
-export type MultirespondentSubmissionDtoWithAttachments =
-  MultirespondentSubmissionDto & {
+export type PublicMultirespondentSubmissionDtoWithAttachments =
+  PublicMultirespondentSubmissionDto & {
     encryptedAttachments: Record<string, EncryptedFileContent>
   }
diff --git a/frontend/src/features/public-form/utils/decryptSubmission.ts b/frontend/src/features/public-form/utils/decryptSubmission.ts
@@ -4,7 +4,10 @@ import {
 } from '@opengovsg/formsg-sdk/dist/types'
 import { decode as decodeBase64 } from '@stablelib/base64'
 
-import { FieldResponsesV3, MultirespondentSubmissionDto } from '~shared/types'
+import {
+  FieldResponsesV3,
+  PublicMultirespondentSubmissionDto,
+} from '~shared/types'
 
 import formsgSdk from '~utils/formSdk'
 
@@ -19,10 +22,13 @@ export const decryptSubmission = ({
   submission,
   secretKey,
 }: {
-  submission?: MultirespondentSubmissionDto
+  submission?: PublicMultirespondentSubmissionDto
   secretKey?: string
 }):
-  | (Omit<MultirespondentSubmissionDto, 'encryptedContent' | 'version'> & {
+  | (Omit<
+      PublicMultirespondentSubmissionDto,
+      'encryptedContent' | 'version'
+    > & {
       responses: FieldResponsesV3
       submissionSecretKey: string
     })
diff --git a/frontend/src/mocks/msw/handlers/public-form.ts b/frontend/src/mocks/msw/handlers/public-form.ts
@@ -7,9 +7,9 @@ import {
   LogicConditionState,
   LogicIfValue,
   LogicType,
-  MultirespondentSubmissionDto,
   PaymentChannel,
   PreventSubmitLogicDto,
+  PublicMultirespondentSubmissionDto,
   ShowFieldLogicDto,
 } from '~shared/types'
 import { FormId, PublicFormViewDto } from '~shared/types/form/form'
@@ -584,12 +584,12 @@ export const getEncryptedSubmissionResponse = ({
   overrides,
 }: {
   delay?: number | 'infinite'
-  overrides?: PartialDeep<MultirespondentSubmissionDto>
+  overrides?: PartialDeep<PublicMultirespondentSubmissionDto>
 } = {}) => {
   return http.get<
     { formId: string; submissionId: string },
     never,
-    MultirespondentSubmissionDto
+    PublicMultirespondentSubmissionDto
   >('/api/v3/forms/:formId/submissions/:submissionId', async ({ params }) => {
     const {
       formId = '61540ece3d4a6e50ac0cc6ff',
@@ -617,7 +617,7 @@ export const getEncryptedSubmissionResponse = ({
           return [...srcValue, ...objValue]
         }
       },
-    ) as MultirespondentSubmissionDto
+    ) as PublicMultirespondentSubmissionDto
 
     await MswDelay(delay)
     return HttpResponse.json(response)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.261.0",
+  "version": "6.262.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"
diff --git a/shared/types/form/form.ts b/shared/types/form/form.ts
@@ -284,6 +284,7 @@ export type AdminFormDto =
 
 type PublicFormBase = {
   admin: PublicUserDto
+  form_fields: StrippedFormFieldDto[]
 }
 
 export type PublicStorageFormDto = Merge<
@@ -316,10 +317,12 @@ export type PublicMultirespondentFormDto = Merge<
   PublicFormBase
 >
 
-export type StrippedPublicMultirespondentFormDto =
-  PublicMultirespondentFormDto & {
-    workflow: StrippedFormWorkflowDto
-  }
+export type StrippedPublicMultirespondentFormDto = Omit<
+  PublicMultirespondentFormDto,
+  'workflow'
+> & {
+  workflow: StrippedFormWorkflowDto
+}
 
 /**
  * Used for public form view to redact sensitive information.
@@ -332,12 +335,10 @@ export type StrippedFormFieldDto<T extends FormFieldDto = FormFieldDto> =
     ? Except<T, 'optionsToRecipientsMap'>
     : T
 
-export type PublicFormDto = Merge<
+export type PublicFormDto =
   | PublicStorageFormDto
   | PublicEmailFormDto
-  | StrippedPublicMultirespondentFormDto,
-  { form_fields: StrippedFormFieldDto[] }
->
+  | StrippedPublicMultirespondentFormDto
 
 export type EmailFormSettings = Pick<
   EmailFormDto,
diff --git a/shared/types/submission.ts b/shared/types/submission.ts
@@ -3,7 +3,7 @@ import { z } from 'zod'
 
 import { ErrorDto } from './core'
 import { FormFieldDto, MyInfoAttribute, PaymentFieldsDto } from './field'
-import { FormAuthType } from './form/form'
+import { FormAuthType, StrippedFormFieldDto } from './form/form'
 import { DateString } from './generic'
 import { EmailResponse, FieldResponse, MobileResponse } from './response'
 import { PaymentStatus } from './payment'
@@ -202,6 +202,14 @@ export type MultirespondentSubmissionDto = SubmissionDtoBase & {
   mrfMeta: SubmissionMrfMetadata
 }
 
+export type PublicMultirespondentSubmissionDto = Omit<
+  MultirespondentSubmissionDto,
+  'workflow' | 'form_fields'
+> & {
+  form_fields: StrippedFormFieldDto[]
+  workflow: StrippedFormWorkflowDto
+}
+
 export type SubmissionDto =
   | StorageModeSubmissionDto
   | MultirespondentSubmissionDto
diff --git a/src/app/modules/submission/multirespondent-submission/__tests__/multirespondent-submission.controller.spec.ts b/src/app/modules/submission/multirespondent-submission/__tests__/multirespondent-submission.controller.spec.ts
diff --git a/src/app/modules/submission/multirespondent-submission/__tests__/multirespondent-submission.utils.spec.ts b/src/app/modules/submission/multirespondent-submission/__tests__/multirespondent-submission.utils.spec.ts
diff --git a/src/app/modules/submission/multirespondent-submission/multirespondent-submission.controller.ts b/src/app/modules/submission/multirespondent-submission/multirespondent-submission.controller.ts
diff --git a/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts b/src/app/modules/submission/multirespondent-submission/multirespondent-submission.utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "form-frontend",`
`3`		`- "version": "6.261.0",`
	`3`	`+ "version": "6.262.0",`
`4`	`4`	`"homepage": ".",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"private": true,`