Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,9 @@ jobs:
node-version: 22
- name: Install dependencies
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Configure Datadog Test Visibility
uses: datadog/[email protected]
with:
languages: js
service-name: ${{ secrets.DD_SERVICE }}
api-key: ${{ secrets.DD_API_KEY }}
- name: Build
env:
NODE_OPTIONS: --max-old-space-size=4096 -r ${{ env.DD_TRACE_PACKAGE }}
NODE_OPTIONS: --max-old-space-size=4096
VITE_APP_FORMSG_SDK_MODE: 'test'
run: npm run build
- name: Cache build artifacts
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,27 @@ 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.270.0](https://github.com/opengovsg/FormSG/compare/v6.269.0...v6.270.0)

- feat: remove un-neeeded dd tracing and browser installation in the setup [`#8901`](https://github.com/opengovsg/FormSG/pull/8901)
- feat: remove signature beta label [`#8898`](https://github.com/opengovsg/FormSG/pull/8898)
- feat: enable save draft instrumentation basic again [`#8899`](https://github.com/opengovsg/FormSG/pull/8899)
- fix(copy): fixed copy for toast message on form open [`#8900`](https://github.com/opengovsg/FormSG/pull/8900)
- build: merge v6.269.0 back to develop [`#8897`](https://github.com/opengovsg/FormSG/pull/8897)
- build: release v6.269.0 [`#8896`](https://github.com/opengovsg/FormSG/pull/8896)

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

> 13 November 2025

- 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)
- chore: bump version to v6.269.0 [`1b1ca1b`](https://github.com/opengovsg/FormSG/commit/1b1ca1b4ef3d4aa2df857bbc01564ac796c5b8e2)

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

Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "form-frontend",
"version": "6.269.0",
"version": "6.270.0",
"homepage": ".",
"type": "module",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,6 @@ export const BasicFieldOption = forwardRef<BasicFieldOptionProps, 'button'>(
<Text noOfLines={1}>Use for approvals</Text>
</Badge>
) : null}
{/* TODO: FRM-2054 remove when signature field is out of beta */}
{fieldType === BasicField.Signature ? (
<Badge colorScheme="primary" variant="subtle" color="secondary.500">
Beta
</Badge>
) : null}
</FieldListOption>
)
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/admin-form/settings/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const useMutateFormSettings = () => {
const toastStatusPublicMessage =
newData.responseMode === FormResponseMode.Encrypt
? `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.`
: `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.`
: 'Your form is now open.'
const toastStatusClosedMessage = 'Your form is closed to new responses.'
const toastStatusMessage = isNowPublic
? toastStatusPublicMessage
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/features/public-form/PublicFormProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -876,8 +876,7 @@ export const PublicFormProvider = ({
'features.publicForm.components.saveDraft.toast.restoredOnlyUnchangedFields',
)
: t('features.publicForm.components.saveDraft.toast.restoredAllFields')
console.log({
message: restoreDraftMessage,
datadogLogs.logger.log(restoreDraftMessage, {
meta: {
action: 'restoreDraft',
formId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Stack } from '@chakra-ui/react'
import { datadogLogs } from '@datadog/browser-logs'
import { useGrowthBook } from '@growthbook/growthbook-react'

import { featureFlags } from '~shared/constants'
Expand Down Expand Up @@ -41,14 +42,16 @@ export const FloatingToolBar = (): JSX.Element | null => {
{isSaveDraftEnabled && enableFloatingSaveDraftButton && (
<FloatingSaveDraftButton
onSaveDraft={() => {
console.log({
message: 'User clicked save draft from floating toolbar',
meta: {
action: 'saveDraft',
variant: 'FloatingToolbar',
formId,
datadogLogs.logger.log(
'User clicked save draft from floating toolbar',
{
meta: {
action: 'saveDraft',
variant: 'FloatingToolbar',
formId,
},
},
})
)
onSaveDraft()
}}
draftLastSavedDateTimeString={draftLastSavedDateTimeString}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
Text,
useDisclosure,
} from '@chakra-ui/react'
import { datadogLogs } from '@datadog/browser-logs'
import { useGrowthBook } from '@growthbook/growthbook-react'

import { featureFlags } from '~shared/constants/feature-flags'
Expand Down Expand Up @@ -101,14 +102,16 @@ export const MiniHeader = ({
{isSaveDraftEnabled && enableFormHeaderSaveDraftButton && (
<FormHeaderSaveDraftButton
onSaveDraft={() => {
console.log({
message: 'User clicked save draft from form header',
meta: {
action: 'saveDraft',
variant: 'FormHeader',
formId,
datadogLogs.logger.log(
'User clicked save draft from form header',
{
meta: {
action: 'saveDraft',
variant: 'FormHeader',
formId,
},
},
})
)
onSaveDraft()
}}
draftLastSavedDateTimeString={draftLastSavedDateTimeString}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FormSG",
"description": "Form Manager for Government",
"version": "6.269.0",
"version": "6.270.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
Loading