Merge pull request #8812 from opengovsg/release_v6.257.0

build: release v6.257.0

Author: kevin9foong

CHANGELOG.md

@@ -4,15 +4,24 @@ 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.257.0](https://github.com/opengovsg/FormSG/compare/v6.256.0...v6.257.0)
+
+- feat: duplicate form workflow and override emails [`#8799`](https://github.com/opengovsg/FormSG/pull/8799)
+- build: merge release v6.256.0 to develop [`#8808`](https://github.com/opengovsg/FormSG/pull/8808)
+- build: release v6.256.0 [`#8807`](https://github.com/opengovsg/FormSG/pull/8807)
+
 #### [v6.256.0](https://github.com/opengovsg/FormSG/compare/v6.255.0...v6.256.0)
 
+> 9 October 2025
+
 - fix: revert signatures v1.4 [`#8805`](https://github.com/opengovsg/FormSG/pull/8805)
 - fix: add missing response id and time submitted in local generated pdf [`#8798`](https://github.com/opengovsg/FormSG/pull/8798)
 - build: merge release v6.255.0 to develop [`#8797`](https://github.com/opengovsg/FormSG/pull/8797)
 - fix(deps): bump tar-fs from 3.0.10 to 3.1.1 [`#8757`](https://github.com/opengovsg/FormSG/pull/8757)
 - fix(deps): bump moment-timezone from 0.5.41 to 0.6.0 [`#8708`](https://github.com/opengovsg/FormSG/pull/8708)
 - fix(deps): bump libphonenumber-js from 1.12.18 to 1.12.23 in /shared [`#8763`](https://github.com/opengovsg/FormSG/pull/8763)
 - build: release v6.255.0 [`#8796`](https://github.com/opengovsg/FormSG/pull/8796)
+- chore: bump version to v6.256.0 [`2ea61e8`](https://github.com/opengovsg/FormSG/commit/2ea61e84e36d5fead7ef8b443ef4a08d58ca9b03)
 
 #### [v6.255.0](https://github.com/opengovsg/FormSG/compare/v6.254.0...v6.255.0)
 
@@ -165,6 +174,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build(deps): bump next from 15.3.4 to 15.5.2 in /react-email-preview [`#8660`](https://github.com/opengovsg/FormSG/pull/8660)
 - fix(deps): bump next from 15.3.4 to 15.5.2 [`#8661`](https://github.com/opengovsg/FormSG/pull/8661)
 - build(deps-dev): bump vite from 5.4.19 to 5.4.20 in /frontend [`#8686`](https://github.com/opengovsg/FormSG/pull/8686)
+- fix: home number fields are added to the draft despite not being modified  [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
 - Revert "feat: save draft v1.0 (#8091)" [`ef00908`](https://github.com/opengovsg/FormSG/commit/ef00908c4fa711b8022f06a59595d13ec24d2963)
 - Revert "fix: home number fields are added to the draft despite not being modified  (#8704)" [`8ceffce`](https://github.com/opengovsg/FormSG/commit/8ceffce1e0485fa4623cb941dd1042f73bedd5f6)
 - chore: bump version to v6.242.0 [`49cfc58`](https://github.com/opengovsg/FormSG/commit/49cfc582734a9110861ec37aa14932753639e334)
@@ -173,11 +183,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 16 September 2025
 
-- fix: home number fields are added to the draft despite not being modified  [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
 - feat: save draft v1.0 [`#8091`](https://github.com/opengovsg/FormSG/pull/8091)
 - build: merge release v6.240.0 to develop [`#8695`](https://github.com/opengovsg/FormSG/pull/8695)
 - build: release v6.240.0 [`#8693`](https://github.com/opengovsg/FormSG/pull/8693)
-- chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68)
+- chore: bump version to v6.241.0 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d)
 
 #### [v6.240.0](https://github.com/opengovsg/FormSG/compare/v6.239.0...v6.240.0)
 
@@ -1003,6 +1012,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - build: merge release v6.178.2 to develop [`#8111`](https://github.com/opengovsg/FormSG/pull/8111)
 - build: release v6.178.2 [`#8110`](https://github.com/opengovsg/FormSG/pull/8110)
 - fix: also match amount paid [`#8109`](https://github.com/opengovsg/FormSG/pull/8109)
+- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
+- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
 - chore: bump version to v6.179.0 [`1247426`](https://github.com/opengovsg/FormSG/commit/1247426080ba2254a33c8efb3deb51c6cd9f7e9e)
 - chore: bump version to v6.178.2 [`618bdff`](https://github.com/opengovsg/FormSG/commit/618bdffa52a73fca82c53283ee7868390af42c91)
 - chore: bump version to v6.180.0 [`13b3fc4`](https://github.com/opengovsg/FormSG/commit/13b3fc4c696810eb1c58a54edf4d583894022b52)
@@ -1011,15 +1022,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 13 February 2025
 
-- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
-- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
 - feat: address field [`#7966`](https://github.com/opengovsg/FormSG/pull/7966)
 - feat(mrf-admin-view): hawkeye v1.0 [`#7965`](https://github.com/opengovsg/FormSG/pull/7965)
 - fix(deps): bump zod from 3.24.1 to 3.24.2 in /shared [`#8101`](https://github.com/opengovsg/FormSG/pull/8101)
 - fix: failing test for new joi validation [`#8098`](https://github.com/opengovsg/FormSG/pull/8098)
 - build: release v6.178.1 to develop [`#8096`](https://github.com/opengovsg/FormSG/pull/8096)
 - build: merge release v6.178.0 to develop [`#8093`](https://github.com/opengovsg/FormSG/pull/8093)
-- chore: bump version to v6.179.0 [`9ace3f2`](https://github.com/opengovsg/FormSG/commit/9ace3f23a41f089356ba43013a71d5e996748777)
+- chore: bump version to v6.179.0 [`affeb5f`](https://github.com/opengovsg/FormSG/commit/affeb5f3ed0c9add243c763ebf02905f35e91bca)
 
 #### [v6.178.2](https://github.com/opengovsg/FormSG/compare/v6.178.1...v6.178.2)
 
@@ -1090,40 +1099,44 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - * fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared (#8021) [`#8039`](https://github.com/opengovsg/FormSG/pull/8039)
 - fix(deps): bump zod from 3.23.8 to 3.24.1 in /shared [`#7996`](https://github.com/opengovsg/FormSG/pull/7996)
 - fix(deps): bump type-fest from 4.30.2 to 4.32.0 in /shared [`#8037`](https://github.com/opengovsg/FormSG/pull/8037)
+- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
+- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
+- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
+- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
+- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
+- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
 - chore: bump version to v6.175.0 [`d31bb97`](https://github.com/opengovsg/FormSG/commit/d31bb9717625d365d6798a51d8235b5acdab706c)
 
 #### [v6.174.0](https://github.com/opengovsg/FormSG/compare/v6.173.1...v6.174.0)
 
 > 13 January 2025
 
-- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
-- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
-- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
 - fix: only show fixed translations for supported forms [`#8038`](https://github.com/opengovsg/FormSG/pull/8038)
 - feat(iframe): add frame messaging for paysg [`#7979`](https://github.com/opengovsg/FormSG/pull/7979)
 - chore: mongoose, nanoid packages update [`#8000`](https://github.com/opengovsg/FormSG/pull/8000)
 - build: merge release v6.173.0 to develop [`#8034`](https://github.com/opengovsg/FormSG/pull/8034)
 - fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared [`#8021`](https://github.com/opengovsg/FormSG/pull/8021)
-- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
+- chore: bump version to v6.174.0 [`22b1122`](https://github.com/opengovsg/FormSG/commit/22b1122e8e15dbb8ca4c69c1d6c026a865d3b67c)
 
 #### [v6.173.1](https://github.com/opengovsg/FormSG/compare/v6.173.0...v6.173.1)
 
 > 13 January 2025
 
 - fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
 - * fix(deps): bump fp-ts from 2.16.8 to 2.16.9 (#8017) [`#8027`](https://github.com/opengovsg/FormSG/pull/8027)
+- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
 - chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
+- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
 
 #### [v6.173.0](https://github.com/opengovsg/FormSG/compare/v6.172.0...v6.173.0)
 
 > 7 January 2025
 
-- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
 - feat: multi lang feature [`#8022`](https://github.com/opengovsg/FormSG/pull/8022)
 - fix(deps): bump fp-ts from 2.16.8 to 2.16.9 [`#8017`](https://github.com/opengovsg/FormSG/pull/8017)
 - build: merge release v6.172.0 to develop [`#8016`](https://github.com/opengovsg/FormSG/pull/8016)
 - build: release v6.172.0 [`#8015`](https://github.com/opengovsg/FormSG/pull/8015)
-- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
+- chore: bump version to v6.173.0 [`1cb7772`](https://github.com/opengovsg/FormSG/commit/1cb7772374249830091d1fb3278a035957d23bcb)
 
 #### [v6.172.0](https://github.com/opengovsg/FormSG/compare/v6.171.0...v6.172.0)
 

frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.256.0",
+  "version": "6.257.0",
   "homepage": ".",
   "type": "module",
   "private": true,

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.256.0",
+  "version": "6.257.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"

package-lock.json

@@ -395,6 +395,7 @@ export type DuplicateFormOverwriteDto = {
   | {
       responseMode: FormResponseMode.Multirespondent
       publicKey: string
+      workflow?: FormWorkflowDto
     }
 )
 

package.json

@@ -2830,6 +2830,118 @@ describe('Form Model', () => {
         )
 
         expect(duplicatedForm).not.toHaveProperty('whitelistedSubmitterIds')
+        expect(duplicatedForm.workflow).toBeUndefined()
+      })
+
+      describe('for multirespondent form', () => {
+        const MOCK_EMAIL_FIELD = {
+          _id: new ObjectId().toString(),
+          fieldType: BasicField.Email,
+        }
+        const MOCK_DROPDOWN_FIELD = {
+          _id: new ObjectId().toString(),
+          fieldType: BasicField.Dropdown,
+          optionsToRecipientsMap: {
+            'Option 1': ['[email protected]'],
+          },
+        }
+        const MOCK_YES_NO_FIELD = {
+          _id: new ObjectId().toString(),
+          fieldType: BasicField.YesNo,
+        }
+        const MOCK_FORM_FIELDS = [
+          MOCK_EMAIL_FIELD,
+          MOCK_DROPDOWN_FIELD,
+          MOCK_YES_NO_FIELD,
+        ]
+        const MOCK_WORKFLOW = [
+          {
+            _id: new ObjectId().toString(),
+            workflow_type: WorkflowType.Static,
+            emails: ['[email protected]'],
+            edit: [MOCK_EMAIL_FIELD._id],
+          },
+          {
+            _id: new ObjectId().toString(),
+            workflow_type: WorkflowType.Dynamic,
+            field: new ObjectId().toString(),
+            edit: [MOCK_DROPDOWN_FIELD._id],
+          },
+          {
+            _id: new ObjectId().toString(),
+            workflow_type: WorkflowType.Conditional,
+            conditional_field: new ObjectId().toString(),
+            edit: [MOCK_YES_NO_FIELD._id],
+          },
+        ]
+
+        it('should duplicate all required fields, including workflow', () => {
+          const MOCK_ALL_OVERRIDE_PARAMS = {
+            admin: 'duplicated admin',
+            title: 'duplicated mrf form title',
+            responseMode: FormResponseMode.Multirespondent,
+            publicKey: 'duplicated public key',
+          }
+          const MOCK_ALL_FORM_PARAMS = {
+            title: 'Test Form',
+            admin: MOCK_ADMIN_OBJ_ID,
+            isSubmitterIdCollectionEnabled: true,
+            isSingleSubmission: true,
+            isSaveDraftEnabled: true,
+            inactiveMessage: 'inactive_test',
+            responseMode: FormResponseMode.Multirespondent,
+            submissionLimit: 1000,
+            publicKey: 'initial public key',
+            workflow: MOCK_WORKFLOW,
+            form_fields: MOCK_FORM_FIELDS,
+          }
+
+          const sourceForm = new MultirespondentForm(MOCK_ALL_FORM_PARAMS)
+          const duplicatedForm = sourceForm.getDuplicateParams(
+            MOCK_ALL_OVERRIDE_PARAMS,
+          )
+
+          // Assert overriden fields
+          expect(duplicatedForm.title).toEqual(MOCK_ALL_OVERRIDE_PARAMS.title)
+          expect(duplicatedForm.admin).toEqual(MOCK_ALL_OVERRIDE_PARAMS.admin)
+          expect(duplicatedForm.responseMode).toEqual(
+            MOCK_ALL_OVERRIDE_PARAMS.responseMode,
+          )
+          expect(duplicatedForm.publicKey).toEqual(
+            MOCK_ALL_OVERRIDE_PARAMS.publicKey,
+          )
+
+          // Assert unoverriden fields
+          // Assert workflow is duplicated
+          const duplicatedWorkflow = JSON.parse(
+            JSON.stringify(duplicatedForm.workflow),
+          )
+          expect(duplicatedWorkflow).toEqual(MOCK_ALL_FORM_PARAMS.workflow)
+
+          const duplicatedFormFieldIds = JSON.parse(
+            JSON.stringify(duplicatedForm.form_fields),
+          ).map((field: FormFieldDto) => field._id)
+          const expectedFormFieldIds = MOCK_ALL_FORM_PARAMS.form_fields.map(
+            (field) => field._id,
+          )
+          expect(duplicatedFormFieldIds).toEqual(expectedFormFieldIds)
+
+          expect(duplicatedForm.submissionLimit).toEqual(
+            MOCK_ALL_FORM_PARAMS.submissionLimit,
+          )
+          expect(duplicatedForm.isSubmitterIdCollectionEnabled).toEqual(
+            MOCK_ALL_FORM_PARAMS.isSubmitterIdCollectionEnabled,
+          )
+          expect(duplicatedForm.isSingleSubmission).toEqual(
+            MOCK_ALL_FORM_PARAMS.isSingleSubmission,
+          )
+          expect(duplicatedForm.isSaveDraftEnabled).toEqual(
+            MOCK_ALL_FORM_PARAMS.isSaveDraftEnabled,
+          )
+          expect(duplicatedForm.inactiveMessage).toEqual(
+            MOCK_ALL_FORM_PARAMS.inactiveMessage,
+          )
+        })
       })
     })
 

shared/types/form/form.ts

@@ -122,6 +122,20 @@ import { isPositiveInteger } from './utils'
 
 export const FORM_SCHEMA_ID = 'Form'
 
+const FORM_SCHEMA_COMMON_DUPLICATE_PARAMS = [
+  'form_fields',
+  'form_logics',
+  'startPage',
+  'endPage',
+  'authType',
+  'isSaveDraftEnabled',
+  'isSubmitterIdCollectionEnabled',
+  'isSingleSubmission',
+  'inactiveMessage',
+  'responseMode',
+  'submissionLimit',
+] as const
+
 const formSchemaOptions: SchemaOptions<IFormSchema> = {
   id: false,
   toJSON: {
@@ -444,6 +458,16 @@ const MultirespondentFormSchema = new Schema<IMultirespondentFormSchema>({
   },
 })
 
+MultirespondentFormSchema.methods.getDuplicateParams = function (
+  overrideProps: OverrideProps,
+) {
+  const newForm = pick(this, [
+    ...FORM_SCHEMA_COMMON_DUPLICATE_PARAMS,
+    'workflow',
+  ]) as PickDuplicateForm
+  return { ...newForm, ...overrideProps }
+}
+
 const MultirespondentFormWorkflowPath = MultirespondentFormSchema.path(
   'workflow',
 ) as Schema.Types.DocumentArray
@@ -923,19 +947,10 @@ const compileFormModel = (db: Mongoose): IFormModel => {
   FormSchema.methods.getDuplicateParams = function (
     overrideProps: OverrideProps,
   ) {
-    const newForm = pick(this, [
-      'form_fields',
-      'form_logics',
-      'startPage',
-      'endPage',
-      'authType',
-      'isSaveDraftEnabled',
-      'isSubmitterIdCollectionEnabled',
-      'isSingleSubmission',
-      'inactiveMessage',
-      'responseMode',
-      'submissionLimit',
-    ]) as PickDuplicateForm
+    const newForm = pick(
+      this,
+      FORM_SCHEMA_COMMON_DUPLICATE_PARAMS,
+    ) as PickDuplicateForm
     return { ...newForm, ...overrideProps }
   }