Skip to content

Commit

Permalink
Merge pull request #7752 from opengovsg/release-v6.150.1
Browse files Browse the repository at this point in the history
chore: bump version to v6.150.1
  • Loading branch information
kevin9foong authored Oct 7, 2024
2 parents fff5011 + f52a92e commit fee3556
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +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.150.1](/~https://github.com/opengovsg/FormSG/compare/v6.150.0...v6.150.1)

- fix: radio button saving others despite not selected [`#7751`](/~https://github.com/opengovsg/FormSG/pull/7751)
- build: release v6.150.0 [`#7741`](/~https://github.com/opengovsg/FormSG/pull/7741)

#### [v6.150.0](/~https://github.com/opengovsg/FormSG/compare/v6.149.3...v6.150.0)

> 2 October 2024

- fix: ordering of arguments for bounce service functions [`#7739`](/~https://github.com/opengovsg/FormSG/pull/7739)
- build: merge v6.149.3 to develop [`#7740`](/~https://github.com/opengovsg/FormSG/pull/7740)
- fix: logic active step padding (#7737) [`#7738`](/~https://github.com/opengovsg/FormSG/pull/7738)
- chore: remove container naming on docker-compose [`#7721`](/~https://github.com/opengovsg/FormSG/pull/7721)
- chore: allow empty coveralls to pass [`#7726`](/~https://github.com/opengovsg/FormSG/pull/7726)
- build: merge release v6.149.0 to develop [`#7727`](/~https://github.com/opengovsg/FormSG/pull/7727)
- fix(deps): bump @joi/date from 2.1.0 to 2.1.1 [`#7723`](/~https://github.com/opengovsg/FormSG/pull/7723)
- chore: bump version to v6.150.0 [`5c5a215`](/~https://github.com/opengovsg/FormSG/commit/5c5a215d23f1f4f6e707bbb9cb33fc44b8688f15)
- chore: bump version to 6.149.3 [`f427462`](/~https://github.com/opengovsg/FormSG/commit/f427462d3d7a6a24112063369416a7055e753ab1)

#### [v6.149.3](/~https://github.com/opengovsg/FormSG/compare/v6.149.2...v6.149.3)
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.150.0",
"version": "6.150.1",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down
18 changes: 12 additions & 6 deletions frontend/src/features/public-form/utils/createSubmission.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
FormFieldValue,
FormFieldValues,
} from '~templates/Field'
import { RADIO_OTHERS_INPUT_VALUE } from '~templates/Field/Radio/constants'

import { FieldIdToQuarantineKeyType } from '../PublicFormService'

Expand Down Expand Up @@ -364,12 +365,17 @@ const createResponsesV3 = (
const input = formInputs[ff._id] as
| FormFieldValue<typeof ff.fieldType>
| undefined
if (!input?.value && !input?.othersInput) break
returnedInputs[ff._id] = {
fieldType: ff.fieldType,
answer: input.othersInput
? { othersInput: input.othersInput }
: { value: input.value },
const isOthersSelected = input?.value === RADIO_OTHERS_INPUT_VALUE
if (!isOthersSelected && input?.value) {
returnedInputs[ff._id] = {
fieldType: ff.fieldType,
answer: { value: input.value },
}
} else if (isOthersSelected && input?.othersInput) {
returnedInputs[ff._id] = {
fieldType: ff.fieldType,
answer: { othersInput: input.othersInput },
}
}
break
}
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.150.0",
"version": "6.150.1",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <formsg@data.gov.sg>"
Expand Down

0 comments on commit fee3556

Please sign in to comment.