Skip to content

Commit

Permalink
Merge pull request #8003 from opengovsg/release_v6.171.0
Browse files Browse the repository at this point in the history
build: release v6.171.0
  • Loading branch information
KenLSM authored Dec 17, 2024
2 parents b939444 + 089a155 commit 87a551c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 18 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ 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.171.0](https://github.com/opengovsg/FormSG/compare/v6.170.0...v6.171.0)

- feat(myinfo-children): enable myinfo child on storage admin create page [`#7988`](https://github.com/opengovsg/FormSG/pull/7988)
- build: merge release v6.170.0 to develop [`#8001`](https://github.com/opengovsg/FormSG/pull/8001)
- build: release v6.170.0 [`#7998`](https://github.com/opengovsg/FormSG/pull/7998)

#### [v6.170.0](https://github.com/opengovsg/FormSG/compare/v6.169.1...v6.170.0)

> 16 December 2024

- fix(sgid): add guard clause to ensure field is present before formatting [`#7997`](https://github.com/opengovsg/FormSG/pull/7997)
- fix(deps): bump aws-sdk from 2.1691.0 to 2.1692.0 [`#7951`](https://github.com/opengovsg/FormSG/pull/7951)
- fix(deps): bump libphonenumber-js from 1.11.15 to 1.11.16 in /shared [`#7974`](https://github.com/opengovsg/FormSG/pull/7974)
Expand All @@ -14,6 +22,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- build: merge release 6.169.0 to develop [`#7987`](https://github.com/opengovsg/FormSG/pull/7987)
- fix(i18n): replace title,desc missed earlier [`#7940`](https://github.com/opengovsg/FormSG/pull/7940)
- feat(i18n): replace hardcoded text in FeedbackBlock for i18n [`#7941`](https://github.com/opengovsg/FormSG/pull/7941)
- chore: bump version to v6.170.0 [`91bdef3`](https://github.com/opengovsg/FormSG/commit/91bdef34cd54b347c6ea9a1526b8811e8a6d2c1c)

#### [v6.169.1](https://github.com/opengovsg/FormSG/compare/v6.169.0...v6.169.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.170.0",
"version": "6.171.0",
"homepage": ".",
"type": "module",
"private": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,7 @@ export const MyInfoFieldPanel = ({ searchValue }: { searchValue: string }) => {
</Box>
)}
</Droppable>
{user?.betaFlags?.children &&
form?.responseMode === FormResponseMode.Email ? (
{user?.betaFlags?.children ? (
<Droppable isDropDisabled droppableId={CREATE_MYINFO_CHILDREN_DROP_ID}>
{(provided) => (
<Box ref={provided.innerRef} {...provided.droppableProps}>
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.170.0",
"version": "6.171.0",
"homepage": "https://form.gov.sg",
"authors": [
"FormSG <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/myinfo/myinfo.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ export const handleMyInfoChildHashResponse = (
// Validate each answer (child)
childAnswer.forEach((attrAnswer, subFieldIndex) => {
const key = getMyInfoChildHashKey(
field._id as string,
field._id,
subFields[subFieldIndex],
childIndex,
childName,
Expand Down
12 changes: 3 additions & 9 deletions src/app/modules/submission/submission.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ import {
MyInfoMissingLoginCookieError,
} from '../myinfo/myinfo.errors'
import { MyInfoKey } from '../myinfo/myinfo.types'
import { getMyInfoChildHashKey } from '../myinfo/myinfo.util'
import {
InvalidPaymentProductsError,
PaymentNotFoundError,
Expand Down Expand Up @@ -752,17 +751,12 @@ export const getAnswersForChild = (
return []
}
return response.answerArray.flatMap((arr, childIdx) => {
// First array element is always child name
const childName = arr[0]
return arr.map((answer, idx) => {
const subfield = subFields[idx]
return {
_id: getMyInfoChildHashKey(
response._id,
subFields[idx],
childIdx,
childName,
),
// Recreates the individual _id of the child field based on the parent field's _id and the subfield
// e.g., childrenbirthrecords.67585515e1ced6d790a91e14.childname.0
_id: `${MyInfoAttribute.ChildrenBirthRecords}.${response._id}.${subFields[idx]}.${childIdx}`,
fieldType: response.fieldType,
// qnChildIdx represents the index of the MyInfo field
// childIdx represents the index of the child in this MyInfo field
Expand Down

0 comments on commit 87a551c

Please sign in to comment.