Skip to content

Commit f0242fb

Browse files
authored
Merge pull request #8902 from opengovsg/release_v6.270.0
build: release v6.270.0
2 parents 3a02ab3 + f2df60b commit f0242fb

File tree

11 files changed

+41
-38
lines changed

11 files changed

+41
-38
lines changed

.github/workflows/playwright.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,9 @@ jobs:
3333
node-version: 22
3434
- name: Install dependencies
3535
run: npm ci
36-
- name: Install Playwright Browsers
37-
run: npx playwright install --with-deps
38-
- name: Configure Datadog Test Visibility
39-
uses: datadog/[email protected]
40-
with:
41-
languages: js
42-
service-name: ${{ secrets.DD_SERVICE }}
43-
api-key: ${{ secrets.DD_API_KEY }}
4436
- name: Build
4537
env:
46-
NODE_OPTIONS: --max-old-space-size=4096 -r ${{ env.DD_TRACE_PACKAGE }}
38+
NODE_OPTIONS: --max-old-space-size=4096
4739
VITE_APP_FORMSG_SDK_MODE: 'test'
4840
run: npm run build
4941
- name: Cache build artifacts

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,27 @@ 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.270.0](https://github.com/opengovsg/FormSG/compare/v6.269.0...v6.270.0)
8+
9+
- feat: remove un-neeeded dd tracing and browser installation in the setup [`#8901`](https://github.com/opengovsg/FormSG/pull/8901)
10+
- feat: remove signature beta label [`#8898`](https://github.com/opengovsg/FormSG/pull/8898)
11+
- feat: enable save draft instrumentation basic again [`#8899`](https://github.com/opengovsg/FormSG/pull/8899)
12+
- fix(copy): fixed copy for toast message on form open [`#8900`](https://github.com/opengovsg/FormSG/pull/8900)
13+
- build: merge v6.269.0 back to develop [`#8897`](https://github.com/opengovsg/FormSG/pull/8897)
14+
- build: release v6.269.0 [`#8896`](https://github.com/opengovsg/FormSG/pull/8896)
15+
716
#### [v6.269.0](https://github.com/opengovsg/FormSG/compare/v6.268.1...v6.269.0)
817

18+
> 13 November 2025
19+
920
- build: merge v6.268.1 back to develop [`#8895`](https://github.com/opengovsg/FormSG/pull/8895)
1021
- build: release v6.268.1 [`#8891`](https://github.com/opengovsg/FormSG/pull/8891)
1122
- fix(copy): update Webhooks text to have more clarity entire payload is sent [`#8880`](https://github.com/opengovsg/FormSG/pull/8880)
1223
- feat: enable save draft instrumentation basic [`#8893`](https://github.com/opengovsg/FormSG/pull/8893)
1324
- docs(readme): remove button for beanstalk [`#8878`](https://github.com/opengovsg/FormSG/pull/8878)
1425
- build: merge v6.628.0 back to develop [`#8876`](https://github.com/opengovsg/FormSG/pull/8876)
1526
- fix(deps): bump libphonenumber-js from 1.12.25 to 1.12.26 in /shared [`#8871`](https://github.com/opengovsg/FormSG/pull/8871)
27+
- chore: bump version to v6.269.0 [`1b1ca1b`](https://github.com/opengovsg/FormSG/commit/1b1ca1b4ef3d4aa2df857bbc01564ac796c5b8e2)
1628

1729
#### [v6.268.1](https://github.com/opengovsg/FormSG/compare/v6.268.0...v6.268.1)
1830

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.269.0",
3+
"version": "6.270.0",
44
"homepage": ".",
55
"type": "module",
66
"private": true,

frontend/src/features/admin-form/create/builder-and-design/BuilderAndDesignDrawer/FieldListDrawer/FieldListOption.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,6 @@ export const BasicFieldOption = forwardRef<BasicFieldOptionProps, 'button'>(
184184
<Text noOfLines={1}>Use for approvals</Text>
185185
</Badge>
186186
) : null}
187-
{/* TODO: FRM-2054 remove when signature field is out of beta */}
188-
{fieldType === BasicField.Signature ? (
189-
<Badge colorScheme="primary" variant="subtle" color="secondary.500">
190-
Beta
191-
</Badge>
192-
) : null}
193187
</FieldListOption>
194188
)
195189
},

frontend/src/features/admin-form/settings/mutations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export const useMutateFormSettings = () => {
131131
const toastStatusPublicMessage =
132132
newData.responseMode === FormResponseMode.Encrypt
133133
? `Your form is now open.\n\nStore your secret key in a safe place. If you lose your secret key, all your responses will be lost permanently.`
134-
: `Your form is now open.\n\nIf you expect a large number of responses, [AutoArchive your mailbox](${GUIDE_PREVENT_EMAIL_BOUNCE}) to avoid losing any of them.`
134+
: 'Your form is now open.'
135135
const toastStatusClosedMessage = 'Your form is closed to new responses.'
136136
const toastStatusMessage = isNowPublic
137137
? toastStatusPublicMessage

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,8 +876,7 @@ export const PublicFormProvider = ({
876876
'features.publicForm.components.saveDraft.toast.restoredOnlyUnchangedFields',
877877
)
878878
: t('features.publicForm.components.saveDraft.toast.restoredAllFields')
879-
console.log({
880-
message: restoreDraftMessage,
879+
datadogLogs.logger.log(restoreDraftMessage, {
881880
meta: {
882881
action: 'restoreDraft',
883882
formId,

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Stack } from '@chakra-ui/react'
2+
import { datadogLogs } from '@datadog/browser-logs'
23
import { useGrowthBook } from '@growthbook/growthbook-react'
34

45
import { featureFlags } from '~shared/constants'
@@ -41,14 +42,16 @@ export const FloatingToolBar = (): JSX.Element | null => {
4142
{isSaveDraftEnabled && enableFloatingSaveDraftButton && (
4243
<FloatingSaveDraftButton
4344
onSaveDraft={() => {
44-
console.log({
45-
message: 'User clicked save draft from floating toolbar',
46-
meta: {
47-
action: 'saveDraft',
48-
variant: 'FloatingToolbar',
49-
formId,
45+
datadogLogs.logger.log(
46+
'User clicked save draft from floating toolbar',
47+
{
48+
meta: {
49+
action: 'saveDraft',
50+
variant: 'FloatingToolbar',
51+
formId,
52+
},
5053
},
51-
})
54+
)
5255
onSaveDraft()
5356
}}
5457
draftLastSavedDateTimeString={draftLastSavedDateTimeString}

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
Text,
1111
useDisclosure,
1212
} from '@chakra-ui/react'
13+
import { datadogLogs } from '@datadog/browser-logs'
1314
import { useGrowthBook } from '@growthbook/growthbook-react'
1415

1516
import { featureFlags } from '~shared/constants/feature-flags'
@@ -101,14 +102,16 @@ export const MiniHeader = ({
101102
{isSaveDraftEnabled && enableFormHeaderSaveDraftButton && (
102103
<FormHeaderSaveDraftButton
103104
onSaveDraft={() => {
104-
console.log({
105-
message: 'User clicked save draft from form header',
106-
meta: {
107-
action: 'saveDraft',
108-
variant: 'FormHeader',
109-
formId,
105+
datadogLogs.logger.log(
106+
'User clicked save draft from form header',
107+
{
108+
meta: {
109+
action: 'saveDraft',
110+
variant: 'FormHeader',
111+
formId,
112+
},
110113
},
111-
})
114+
)
112115
onSaveDraft()
113116
}}
114117
draftLastSavedDateTimeString={draftLastSavedDateTimeString}

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.

0 commit comments

Comments
 (0)