Merge pull request #8896 from opengovsg/release_v6.269.0

build: release v6.269.0

Author: kevin9foong

CHANGELOG.md

@@ -4,10 +4,23 @@ 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.269.0](https://github.com/opengovsg/FormSG/compare/v6.268.1...v6.269.0)
+
+- build: merge v6.268.1 back to develop  [`#8895`](https://github.com/opengovsg/FormSG/pull/8895)
+- build: release v6.268.1 [`#8891`](https://github.com/opengovsg/FormSG/pull/8891)
+- fix(copy): update Webhooks text to have more clarity entire payload is sent [`#8880`](https://github.com/opengovsg/FormSG/pull/8880)
+- feat: enable save draft instrumentation basic [`#8893`](https://github.com/opengovsg/FormSG/pull/8893)
+- docs(readme): remove button for beanstalk [`#8878`](https://github.com/opengovsg/FormSG/pull/8878)
+- build: merge v6.628.0 back to develop [`#8876`](https://github.com/opengovsg/FormSG/pull/8876)
+- fix(deps): bump libphonenumber-js from 1.12.25 to 1.12.26 in /shared [`#8871`](https://github.com/opengovsg/FormSG/pull/8871)
+
 #### [v6.268.1](https://github.com/opengovsg/FormSG/compare/v6.268.0...v6.268.1)
 
+> 13 November 2025
+
 - build: release v6.268.0 [`#8875`](https://github.com/opengovsg/FormSG/pull/8875)
 - fix: changes from feat/add-hotfix-script [`d845902`](https://github.com/opengovsg/FormSG/commit/d845902902e162314761c0c0c266360a93616c35)
+- chore: bump version to v6.268.1 [`6817482`](https://github.com/opengovsg/FormSG/commit/6817482b353f63137759f33d399db5fd061efb3d)
 
 #### [v6.268.0](https://github.com/opengovsg/FormSG/compare/v6.267.0...v6.268.0)
 
@@ -302,7 +315,6 @@ 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)
@@ -311,10 +323,11 @@ 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 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d)
+- chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68)
 
 #### [v6.240.0](https://github.com/opengovsg/FormSG/compare/v6.239.0...v6.240.0)
 
@@ -1140,8 +1153,6 @@ 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)
@@ -1150,13 +1161,15 @@ 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 [`affeb5f`](https://github.com/opengovsg/FormSG/commit/affeb5f3ed0c9add243c763ebf02905f35e91bca)
+- chore: bump version to v6.179.0 [`9ace3f2`](https://github.com/opengovsg/FormSG/commit/9ace3f23a41f089356ba43013a71d5e996748777)
 
 #### [v6.178.2](https://github.com/opengovsg/FormSG/compare/v6.178.1...v6.178.2)
 
@@ -1227,44 +1240,40 @@ 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 [`22b1122`](https://github.com/opengovsg/FormSG/commit/22b1122e8e15dbb8ca4c69c1d6c026a865d3b67c)
+- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
 
 #### [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 [`1cb7772`](https://github.com/opengovsg/FormSG/commit/1cb7772374249830091d1fb3278a035957d23bcb)
+- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
 
 #### [v6.172.0](https://github.com/opengovsg/FormSG/compare/v6.171.0...v6.172.0)
 

README.md

@@ -5,7 +5,6 @@
 ---
 
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
-[![Build Status](https://github.com/opengovsg/FormSG/actions/workflows/deploy-eb.yml/badge.svg)](https://github.com/opengovsg/FormSG/actions/workflows/deploy-eb.yml)
 [![Coverage Status](https://coveralls.io/repos/github/opengovsg/FormSG/badge.svg?branch=develop)](https://coveralls.io/github/opengovsg/FormSG?branch=develop)
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-opengovsg%2FFormSG-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/opengovsg/FormSG)
 
@@ -14,6 +13,7 @@
 For comprehensive self-hosting guides, configuration references, and deployment instructions, visit our **[FormSG Self-Hosting Guide](https://ogp-international.gitbook.io/ogp-international-hub/self-hosting/formsg)**.
 
 The GitBook documentation is actively maintained and provides:
+
 - Deployment guides for AWS and other platforms
 - Configuration reference for all environment variables
 - Component customization guides
@@ -23,7 +23,7 @@ The GitBook documentation is actively maintained and provides:
 ## Table of Contents
 
 - [Contributing](#contributing)
-    - [IMPORTANT NOTE TO ALL CONTRIBUTORS](#important-note-to-all-contributors)
+  - [IMPORTANT NOTE TO ALL CONTRIBUTORS](#important-note-to-all-contributors)
 - [Features](#features)
 - [Local Development (Docker)](#local-development-docker)
   - [Prerequisites](#prerequisites)
@@ -104,30 +104,32 @@ npm run build:frontend
 
 Run the following shell commands to build the Docker image. The first time will usually take 10 or so minutes. These commands runs the backend services specified under [docker-compose.yml](docker-compose.yml) and the React frontend on the native host.
 
-This command runs: 
+This command runs:
+
 - backend server
 - frontend server
-- emulated serverless ClamAV (legacy) virus scanner function 
-- emulated serverless GuardDuty virus scanner function 
-- emulated serverless pdf generation function  
+- emulated serverless ClamAV (legacy) virus scanner function
+- emulated serverless GuardDuty virus scanner function
+- emulated serverless pdf generation function
 
 ```bash
 npm run dev
 ```
 
-Alternatively, you can run required components independently - which is what the main dev team usually does: 
+Alternatively, you can run required components independently - which is what the main dev team usually does:
+
 ```bash
-# Frontend server 
+# Frontend server
 npm run dev:frontend (frontend react server, compulsory)
 
-# Backend server 
-docker compose up 
+# Backend server
+docker compose up
 
-# PDF generation function (only needed if you're using features requiring PDF generation, eg, payment invoice/auto-reply PDF) 
-npm run dev:pdf-gen 
+# PDF generation function (only needed if you're using features requiring PDF generation, eg, payment invoice/auto-reply PDF)
+npm run dev:pdf-gen
 
 # Virus scanners - run both (only needed if you're uploading attachments)
-npm run dev:virus-scanner 
+npm run dev:virus-scanner
 
 npm run dev:virus-scanner-guardduty
 ```

frontend/package-lock.json

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

frontend/package.json

@@ -876,11 +876,19 @@ export const PublicFormProvider = ({
             'features.publicForm.components.saveDraft.toast.restoredOnlyUnchangedFields',
           )
         : t('features.publicForm.components.saveDraft.toast.restoredAllFields')
+      console.log({
+        message: restoreDraftMessage,
+        meta: {
+          action: 'restoreDraft',
+          formId,
+          hasChangedDraftFields,
+        },
+      })
       toast({
         description: restoreDraftMessage,
       })
     },
-    [t, toast],
+    [t, toast, formId],
   )
   const hasUnrestorableFields = Boolean(changedFieldIds?.length > 0)
 

frontend/src/features/public-form/PublicFormProvider.tsx

@@ -40,7 +40,17 @@ export const FloatingToolBar = (): JSX.Element | null => {
       <FloatingIssueFeedbackButton isPreview={isPreview} formId={formId} />
       {isSaveDraftEnabled && enableFloatingSaveDraftButton && (
         <FloatingSaveDraftButton
-          onSaveDraft={onSaveDraft}
+          onSaveDraft={() => {
+            console.log({
+              message: 'User clicked save draft from floating toolbar',
+              meta: {
+                action: 'saveDraft',
+                variant: 'FloatingToolbar',
+                formId,
+              },
+            })
+            onSaveDraft()
+          }}
           draftLastSavedDateTimeString={draftLastSavedDateTimeString}
         />
       )}

frontend/src/features/public-form/components/FloatingToolBar/FloatingToolbar.tsx

@@ -46,8 +46,12 @@ export const MiniHeader = ({
   isOpen,
   isTemplate,
 }: MiniHeaderProps): JSX.Element => {
-  const { isSaveDraftEnabled, onSaveDraft, draftLastSavedDateTimeString } =
-    usePublicFormContext()
+  const {
+    isSaveDraftEnabled,
+    onSaveDraft,
+    draftLastSavedDateTimeString,
+    formId,
+  } = usePublicFormContext()
 
   const isTest = import.meta.env.STORYBOOK_NODE_ENV === 'test'
   const gb = useGrowthBook()
@@ -96,7 +100,17 @@ export const MiniHeader = ({
             </Flex>
             {isSaveDraftEnabled && enableFormHeaderSaveDraftButton && (
               <FormHeaderSaveDraftButton
-                onSaveDraft={onSaveDraft}
+                onSaveDraft={() => {
+                  console.log({
+                    message: 'User clicked save draft from form header',
+                    meta: {
+                      action: 'saveDraft',
+                      variant: 'FormHeader',
+                      formId,
+                    },
+                  })
+                  onSaveDraft()
+                }}
                 draftLastSavedDateTimeString={draftLastSavedDateTimeString}
               />
             )}

frontend/src/features/public-form/components/FormStartPage/FormHeader.tsx

@@ -3,7 +3,7 @@ export const enSG = {
   input: {
     label: 'Endpoint URL',
     description:
-      'FormSG will POST encrypted form responses in real-time to the HTTPS endpoint specified here. Ensure that your external system can support the classification and sensitivity.',
+      'FormSG will POST the entire encrypted form response in real-time to the HTTPS endpoint specified. Ensure that the external system can support the classification and sensitivity.',
   },
   retry: {
     label: 'Enable retries',

frontend/src/i18n/locales/features/admin-form/settings/webhooks/en-sg.ts

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