Skip to content

Commit c60a7be

Browse files
authored
Merge pull request #8807 from opengovsg/release_v6.256.0
build: release v6.256.0
2 parents 2b3343d + 2ea61e8 commit c60a7be

26 files changed

+192
-920
lines changed

CHANGELOG.md

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [v6.256.0](https://github.com/opengovsg/FormSG/compare/v6.255.0...v6.256.0)
8+
9+
- fix: revert signatures v1.4 [`#8805`](https://github.com/opengovsg/FormSG/pull/8805)
10+
- fix: add missing response id and time submitted in local generated pdf [`#8798`](https://github.com/opengovsg/FormSG/pull/8798)
11+
- build: merge release v6.255.0 to develop [`#8797`](https://github.com/opengovsg/FormSG/pull/8797)
12+
- fix(deps): bump tar-fs from 3.0.10 to 3.1.1 [`#8757`](https://github.com/opengovsg/FormSG/pull/8757)
13+
- fix(deps): bump moment-timezone from 0.5.41 to 0.6.0 [`#8708`](https://github.com/opengovsg/FormSG/pull/8708)
14+
- fix(deps): bump libphonenumber-js from 1.12.18 to 1.12.23 in /shared [`#8763`](https://github.com/opengovsg/FormSG/pull/8763)
15+
- build: release v6.255.0 [`#8796`](https://github.com/opengovsg/FormSG/pull/8796)
16+
717
#### [v6.255.0](https://github.com/opengovsg/FormSG/compare/v6.254.0...v6.255.0)
818

19+
> 7 October 2025
20+
921
- feat: signatures v1.4 (webhooks) [`#8782`](https://github.com/opengovsg/FormSG/pull/8782)
1022
- fix: hide empty tooltip for main save draft button [`#8794`](https://github.com/opengovsg/FormSG/pull/8794)
1123
- build: merge release v6.254.0 to develop [`#8792`](https://github.com/opengovsg/FormSG/pull/8792)
1224
- fix: ignore url line in printable response [`#8793`](https://github.com/opengovsg/FormSG/pull/8793)
1325
- build: release v6.254.0 [`#8791`](https://github.com/opengovsg/FormSG/pull/8791)
26+
- chore: bump version to v6.255.0 [`01c6450`](https://github.com/opengovsg/FormSG/commit/01c64505bc9937bf606b10ca1150b0e279d0c79e)
1427

1528
#### [v6.254.0](https://github.com/opengovsg/FormSG/compare/v6.253.0...v6.254.0)
1629

@@ -152,7 +165,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
152165
- build(deps): bump next from 15.3.4 to 15.5.2 in /react-email-preview [`#8660`](https://github.com/opengovsg/FormSG/pull/8660)
153166
- fix(deps): bump next from 15.3.4 to 15.5.2 [`#8661`](https://github.com/opengovsg/FormSG/pull/8661)
154167
- build(deps-dev): bump vite from 5.4.19 to 5.4.20 in /frontend [`#8686`](https://github.com/opengovsg/FormSG/pull/8686)
155-
- fix: home number fields are added to the draft despite not being modified [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
156168
- Revert "feat: save draft v1.0 (#8091)" [`ef00908`](https://github.com/opengovsg/FormSG/commit/ef00908c4fa711b8022f06a59595d13ec24d2963)
157169
- Revert "fix: home number fields are added to the draft despite not being modified (#8704)" [`8ceffce`](https://github.com/opengovsg/FormSG/commit/8ceffce1e0485fa4623cb941dd1042f73bedd5f6)
158170
- chore: bump version to v6.242.0 [`49cfc58`](https://github.com/opengovsg/FormSG/commit/49cfc582734a9110861ec37aa14932753639e334)
@@ -161,10 +173,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
161173

162174
> 16 September 2025
163175

176+
- fix: home number fields are added to the draft despite not being modified [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
164177
- feat: save draft v1.0 [`#8091`](https://github.com/opengovsg/FormSG/pull/8091)
165178
- build: merge release v6.240.0 to develop [`#8695`](https://github.com/opengovsg/FormSG/pull/8695)
166179
- build: release v6.240.0 [`#8693`](https://github.com/opengovsg/FormSG/pull/8693)
167-
- chore: bump version to v6.241.0 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d)
180+
- chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68)
168181

169182
#### [v6.240.0](https://github.com/opengovsg/FormSG/compare/v6.239.0...v6.240.0)
170183

@@ -990,8 +1003,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
9901003
- build: merge release v6.178.2 to develop [`#8111`](https://github.com/opengovsg/FormSG/pull/8111)
9911004
- build: release v6.178.2 [`#8110`](https://github.com/opengovsg/FormSG/pull/8110)
9921005
- fix: also match amount paid [`#8109`](https://github.com/opengovsg/FormSG/pull/8109)
993-
- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
994-
- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
9951006
- chore: bump version to v6.179.0 [`1247426`](https://github.com/opengovsg/FormSG/commit/1247426080ba2254a33c8efb3deb51c6cd9f7e9e)
9961007
- chore: bump version to v6.178.2 [`618bdff`](https://github.com/opengovsg/FormSG/commit/618bdffa52a73fca82c53283ee7868390af42c91)
9971008
- chore: bump version to v6.180.0 [`13b3fc4`](https://github.com/opengovsg/FormSG/commit/13b3fc4c696810eb1c58a54edf4d583894022b52)
@@ -1000,13 +1011,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
10001011

10011012
> 13 February 2025
10021013

1014+
- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
1015+
- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
10031016
- feat: address field [`#7966`](https://github.com/opengovsg/FormSG/pull/7966)
10041017
- feat(mrf-admin-view): hawkeye v1.0 [`#7965`](https://github.com/opengovsg/FormSG/pull/7965)
10051018
- fix(deps): bump zod from 3.24.1 to 3.24.2 in /shared [`#8101`](https://github.com/opengovsg/FormSG/pull/8101)
10061019
- fix: failing test for new joi validation [`#8098`](https://github.com/opengovsg/FormSG/pull/8098)
10071020
- build: release v6.178.1 to develop [`#8096`](https://github.com/opengovsg/FormSG/pull/8096)
10081021
- build: merge release v6.178.0 to develop [`#8093`](https://github.com/opengovsg/FormSG/pull/8093)
1009-
- chore: bump version to v6.179.0 [`affeb5f`](https://github.com/opengovsg/FormSG/commit/affeb5f3ed0c9add243c763ebf02905f35e91bca)
1022+
- chore: bump version to v6.179.0 [`9ace3f2`](https://github.com/opengovsg/FormSG/commit/9ace3f23a41f089356ba43013a71d5e996748777)
10101023

10111024
#### [v6.178.2](https://github.com/opengovsg/FormSG/compare/v6.178.1...v6.178.2)
10121025

@@ -1077,44 +1090,40 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
10771090
- * fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared (#8021) [`#8039`](https://github.com/opengovsg/FormSG/pull/8039)
10781091
- fix(deps): bump zod from 3.23.8 to 3.24.1 in /shared [`#7996`](https://github.com/opengovsg/FormSG/pull/7996)
10791092
- fix(deps): bump type-fest from 4.30.2 to 4.32.0 in /shared [`#8037`](https://github.com/opengovsg/FormSG/pull/8037)
1080-
- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
1081-
- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
1082-
- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
1083-
- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
1084-
- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
1085-
- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
10861093
- chore: bump version to v6.175.0 [`d31bb97`](https://github.com/opengovsg/FormSG/commit/d31bb9717625d365d6798a51d8235b5acdab706c)
10871094

10881095
#### [v6.174.0](https://github.com/opengovsg/FormSG/compare/v6.173.1...v6.174.0)
10891096

10901097
> 13 January 2025
10911098

1099+
- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
1100+
- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
1101+
- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
10921102
- fix: only show fixed translations for supported forms [`#8038`](https://github.com/opengovsg/FormSG/pull/8038)
10931103
- feat(iframe): add frame messaging for paysg [`#7979`](https://github.com/opengovsg/FormSG/pull/7979)
10941104
- chore: mongoose, nanoid packages update [`#8000`](https://github.com/opengovsg/FormSG/pull/8000)
10951105
- build: merge release v6.173.0 to develop [`#8034`](https://github.com/opengovsg/FormSG/pull/8034)
10961106
- fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared [`#8021`](https://github.com/opengovsg/FormSG/pull/8021)
1097-
- chore: bump version to v6.174.0 [`22b1122`](https://github.com/opengovsg/FormSG/commit/22b1122e8e15dbb8ca4c69c1d6c026a865d3b67c)
1107+
- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
10981108

10991109
#### [v6.173.1](https://github.com/opengovsg/FormSG/compare/v6.173.0...v6.173.1)
11001110

11011111
> 13 January 2025
11021112

11031113
- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
11041114
- * fix(deps): bump fp-ts from 2.16.8 to 2.16.9 (#8017) [`#8027`](https://github.com/opengovsg/FormSG/pull/8027)
1105-
- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
11061115
- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
1107-
- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
11081116

11091117
#### [v6.173.0](https://github.com/opengovsg/FormSG/compare/v6.172.0...v6.173.0)
11101118

11111119
> 7 January 2025
11121120

1121+
- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
11131122
- feat: multi lang feature [`#8022`](https://github.com/opengovsg/FormSG/pull/8022)
11141123
- fix(deps): bump fp-ts from 2.16.8 to 2.16.9 [`#8017`](https://github.com/opengovsg/FormSG/pull/8017)
11151124
- build: merge release v6.172.0 to develop [`#8016`](https://github.com/opengovsg/FormSG/pull/8016)
11161125
- build: release v6.172.0 [`#8015`](https://github.com/opengovsg/FormSG/pull/8015)
1117-
- chore: bump version to v6.173.0 [`1cb7772`](https://github.com/opengovsg/FormSG/commit/1cb7772374249830091d1fb3278a035957d23bcb)
1126+
- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
11181127

11191128
#### [v6.172.0](https://github.com/opengovsg/FormSG/compare/v6.171.0...v6.172.0)
11201129

frontend/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "form-frontend",
3-
"version": "6.255.0",
3+
"version": "6.256.0",
44
"homepage": ".",
55
"type": "module",
66
"private": true,

frontend/src/features/admin-form/responses/IndividualResponsePage/PrintableResponse.stories.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,13 @@ Default.args = {
145145
formTitle: 'Default Form Submission',
146146
formId: '61540ece3d4a6e50ac0cc6ff',
147147
decryptedResponses: mockResponses,
148+
responseId: '68e4a1b6aa7e70297d82e8e2',
149+
submissionTime: 'Mon, 6 Oct 2025, 02:00:31 PM',
148150
}
149151

150152
export const MinimalForm = Template.bind({})
151153
MinimalForm.args = {
154+
...Default.args,
152155
formTitle: 'Minimal Form Submission',
153156
formId: '61540ece3d4a6e50ac0cc6ff',
154157
decryptedResponses: [
@@ -169,6 +172,7 @@ MinimalForm.args = {
169172

170173
export const LongFormTitle = Template.bind({})
171174
LongFormTitle.args = {
175+
...Default.args,
172176
formTitle:
173177
'Comprehensive Employee Onboarding and Information Collection Form for New Hires',
174178
formId: '61540ece3d4a6e50ac0cc6ff',
@@ -177,13 +181,15 @@ LongFormTitle.args = {
177181

178182
export const EmptyResponses = Template.bind({})
179183
EmptyResponses.args = {
184+
...Default.args,
180185
formTitle: 'Empty Form',
181186
formId: '61540ece3d4a6e50ac0cc6ff',
182187
decryptedResponses: [],
183188
}
184189

185190
export const OnlySections = Template.bind({})
186191
OnlySections.args = {
192+
...Default.args,
187193
formTitle: 'Form with Headings Only',
188194
formId: '61540ece3d4a6e50ac0cc6ff',
189195
decryptedResponses: [
@@ -204,6 +210,7 @@ OnlySections.args = {
204210

205211
export const TableHeavyForm = Template.bind({})
206212
TableHeavyForm.args = {
213+
...Default.args,
207214
formTitle: 'Table Heavy Form',
208215
formId: '61540ece3d4a6e50ac0cc6ff',
209216
decryptedResponses: [
@@ -234,6 +241,7 @@ TableHeavyForm.args = {
234241

235242
export const LongTextForm = Template.bind({})
236243
LongTextForm.args = {
244+
...Default.args,
237245
formTitle: 'Feedback Form',
238246
formId: '61540ece3d4a6e50ac0cc6ff',
239247
decryptedResponses: [
@@ -256,6 +264,7 @@ LongTextForm.args = {
256264

257265
export const OptionalSignature = Template.bind({})
258266
OptionalSignature.args = {
267+
...Default.args,
259268
formTitle: 'Optional signature with and without answer',
260269
formId: '61540ece3d4a6e50ac0cc6ff',
261270
decryptedResponses: [

frontend/src/features/admin-form/responses/IndividualResponsePage/PrintableResponse.tsx

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,21 @@ const TableSingleColItem = ({ children }: { children: React.ReactNode }) => (
6060
</td>
6161
)
6262

63+
const StandardPrintableRow = ({
64+
question,
65+
answer,
66+
}: {
67+
question: string
68+
answer: string
69+
}) => {
70+
return (
71+
<TableRow>
72+
<TableSingleColItem>{question}</TableSingleColItem>
73+
<TableSingleColItem>{answer}</TableSingleColItem>
74+
</TableRow>
75+
)
76+
}
77+
6378
const PrintableDecryptedRow = ({
6479
row,
6580
}: {
@@ -81,22 +96,21 @@ const PrintableDecryptedRow = ({
8196
row.answerArray as string[],
8297
).join(', ')
8398
return (
84-
<TableRow>
85-
<TableSingleColItem>{row.question}</TableSingleColItem>
86-
<TableSingleColItem>{transformedAddress}</TableSingleColItem>
87-
</TableRow>
99+
<StandardPrintableRow
100+
question={row.question}
101+
answer={transformedAddress}
102+
/>
88103
)
89104
}
90105
case BasicField.Table:
91106
return (
92107
<>
93108
{row.answerArray?.map((ans, idx) => (
94-
<TableRow key={idx}>
95-
<TableSingleColItem>{row.question}</TableSingleColItem>
96-
<TableSingleColItem>
97-
{Array.isArray(ans) ? ans.join(', ') : ans}
98-
</TableSingleColItem>
99-
</TableRow>
109+
<StandardPrintableRow
110+
question={row.question}
111+
answer={Array.isArray(ans) ? ans.join(', ') : ans}
112+
key={idx}
113+
/>
100114
))}
101115
</>
102116
)
@@ -111,20 +125,39 @@ const PrintableDecryptedRow = ({
111125
)
112126
default:
113127
return (
114-
<TableRow>
115-
<TableSingleColItem>{row.question}</TableSingleColItem>
116-
<TableSingleColItem>
117-
{row.answer || row.answerArray?.join(', ') || ''}
118-
</TableSingleColItem>
119-
</TableRow>
128+
<StandardPrintableRow
129+
question={row.question}
130+
answer={row.answer || row.answerArray?.join(', ') || ''}
131+
/>
120132
)
121133
}
122134
}
123135

136+
const getDefaultRows = ({
137+
responseId,
138+
submissionTime,
139+
}: {
140+
responseId: string
141+
submissionTime: string
142+
}) => [
143+
{
144+
question: 'Response ID',
145+
answer: responseId,
146+
},
147+
{
148+
question: 'Time Submitted',
149+
answer: submissionTime,
150+
},
151+
]
152+
124153
const PrintableResponseRows = ({
125154
decryptedResponses,
155+
responseId,
156+
submissionTime,
126157
}: {
127158
decryptedResponses: AugmentedDecryptedResponse[]
159+
responseId: string
160+
submissionTime: string
128161
}) => {
129162
return (
130163
<table
@@ -133,6 +166,13 @@ const PrintableResponseRows = ({
133166
}}
134167
>
135168
<tbody>
169+
{getDefaultRows({ responseId, submissionTime }).map((r, idx) => (
170+
<StandardPrintableRow
171+
question={r.question}
172+
answer={r.answer}
173+
key={idx}
174+
/>
175+
))}
136176
{decryptedResponses.map((r, idx) => (
137177
<PrintableDecryptedRow row={r} key={idx} />
138178
))}
@@ -145,10 +185,14 @@ export const PrintableResponse = ({
145185
formTitle,
146186
formId,
147187
decryptedResponses,
188+
responseId,
189+
submissionTime,
148190
}: {
149191
formTitle: string
150192
formId: string
151193
decryptedResponses: AugmentedDecryptedResponse[]
194+
responseId: string
195+
submissionTime: string
152196
}) => {
153197
return (
154198
<Box py="16px" fontFamily="sans-serif">
@@ -172,7 +216,11 @@ export const PrintableResponse = ({
172216
</Text>
173217
</Box>
174218
<Box mx="5%" my="30px">
175-
<PrintableResponseRows decryptedResponses={decryptedResponses} />
219+
<PrintableResponseRows
220+
decryptedResponses={decryptedResponses}
221+
responseId={responseId}
222+
submissionTime={submissionTime}
223+
/>
176224
</Box>
177225
</Box>
178226
)
@@ -189,6 +237,8 @@ const PrintableResponseContainer = forwardRef<HTMLDivElement>((_, ref) => {
189237
formTitle={form.title}
190238
formId={form._id}
191239
decryptedResponses={data?.responses}
240+
responseId={data.refNo}
241+
submissionTime={data.submissionTime}
192242
/>
193243
</Box>
194244
)

0 commit comments

Comments
 (0)