From 2426d28cef5d7d488d9d2d63853397aefa217003 Mon Sep 17 00:00:00 2001 From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:50:57 +0800 Subject: [PATCH 1/3] chore: bump version to v6.158.0 --- CHANGELOG.md | 10 ++++++++-- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f49064008d..ba944168ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ 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.157.0](https://github.com/opengovsg/FormSG/compare/v6.157.0...v6.157.0) +#### [v6.158.0](https://github.com/opengovsg/FormSG/compare/v6.157.0...v6.158.0) + +- build: merge release v6.157.0 to develop [`#7846`](https://github.com/opengovsg/FormSG/pull/7846) +- fix: change email summary response row to represent table row instead of cell [`#7836`](https://github.com/opengovsg/FormSG/pull/7836) +- fix(deps): bump jose from 4.15.5 to 5.9.6 [`#7800`](https://github.com/opengovsg/FormSG/pull/7800) +- fix: set table field required false to cols instead of whole field [`#7839`](https://github.com/opengovsg/FormSG/pull/7839) +- build: release v6.157.0 [`#7837`](https://github.com/opengovsg/FormSG/pull/7837) #### [v6.157.0](https://github.com/opengovsg/FormSG/compare/v6.156.0...v6.157.0) @@ -16,7 +22,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - chore(deps-dev): bump @types/lodash from 4.17.12 to 4.17.13 in /shared [`#7832`](https://github.com/opengovsg/FormSG/pull/7832) - chore: update test snapshot [`#7831`](https://github.com/opengovsg/FormSG/pull/7831) - build: release v6.156.0 [`#7828`](https://github.com/opengovsg/FormSG/pull/7828) -- chore: bump version to v6.157.0 [`07f0867`](https://github.com/opengovsg/FormSG/commit/07f0867d4ec34fef38b19fc12aa45ba0d6712910) +- chore: bump version to v6.157.0 [`1dc8b83`](https://github.com/opengovsg/FormSG/commit/1dc8b83e8767aa862fc978d72cfd9f033f0e3648) #### [v6.156.0](https://github.com/opengovsg/FormSG/compare/v6.155.0...v6.156.0) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8e7a5e734e..4ab31d9a3f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "form-frontend", - "version": "6.157.0", + "version": "6.158.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "form-frontend", - "version": "6.157.0", + "version": "6.158.0", "hasInstallScript": true, "dependencies": { "@chakra-ui/react": "^2.8.2", diff --git a/frontend/package.json b/frontend/package.json index 91a195fd4c..36287d7724 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "form-frontend", - "version": "6.157.0", + "version": "6.158.0", "homepage": ".", "type": "module", "private": true, diff --git a/package-lock.json b/package-lock.json index f75f894dc8..20697d57e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "FormSG", - "version": "6.157.0", + "version": "6.158.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "FormSG", - "version": "6.157.0", + "version": "6.158.0", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudwatch-logs": "^3.536.0", diff --git a/package.json b/package.json index 86b142a76b..f260c94079 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "6.157.0", + "version": "6.158.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG " From 35ee4a9784d84cd62e7409e55cc99a4a7610cc0f Mon Sep 17 00:00:00 2001 From: Ken Lee Shu Ming Date: Tue, 5 Nov 2024 15:53:27 +0800 Subject: [PATCH 2/3] fix: add debounce to break infinite call loop (#7848) --- .../ChildrenCompound/ChildrenCompoundField.tsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx index 2c0de2ab3b..28eb38d79e 100644 --- a/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx +++ b/frontend/src/templates/Field/ChildrenCompound/ChildrenCompoundField.tsx @@ -21,7 +21,7 @@ import { VisuallyHidden, VStack, } from '@chakra-ui/react' -import { get } from 'lodash' +import { debounce, get } from 'lodash' import simplur from 'simplur' import { DATE_DISPLAY_FORMAT } from '~shared/constants/dates' @@ -439,13 +439,15 @@ const ChildrenBody = ({ items={ MYINFO_ATTRIBUTE_MAP[subField].fieldOptions as string[] } - onChange={(option) => - // This is bad practice but we have no choice because our - // custom Select doesn't forward the event. - // FIXME: Fix types - // @ts-expect-error type inference issue - setValue(fieldPath, option, { shouldValidate: true }) - } + onChange={debounce( + (option) => + // This is bad practice but we have no choice because our + // custom Select doesn't forward the event. + // FIXME: Fix types + setValue(fieldPath, option, { shouldValidate: true }), + 200, + { leading: true }, + )} /> {childrenSubFieldError?.message} From 1a9c868d4c2e3b15229a331c5e1e64cf48b58de2 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 5 Nov 2024 15:57:35 +0800 Subject: [PATCH 3/3] build: release 6.158.1 --- CHANGELOG.md | 8 ++++++++ frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba944168ef..ceec244088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,21 @@ 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.158.1](https://github.com/opengovsg/FormSG/compare/v6.158.0...v6.158.1) + +- fix: add debounce to break infinite call loop [`#7848`](https://github.com/opengovsg/FormSG/pull/7848) +- build: release v6.158.0 [`#7847`](https://github.com/opengovsg/FormSG/pull/7847) + #### [v6.158.0](https://github.com/opengovsg/FormSG/compare/v6.157.0...v6.158.0) +> 5 November 2024 + - build: merge release v6.157.0 to develop [`#7846`](https://github.com/opengovsg/FormSG/pull/7846) - fix: change email summary response row to represent table row instead of cell [`#7836`](https://github.com/opengovsg/FormSG/pull/7836) - fix(deps): bump jose from 4.15.5 to 5.9.6 [`#7800`](https://github.com/opengovsg/FormSG/pull/7800) - fix: set table field required false to cols instead of whole field [`#7839`](https://github.com/opengovsg/FormSG/pull/7839) - build: release v6.157.0 [`#7837`](https://github.com/opengovsg/FormSG/pull/7837) +- chore: bump version to v6.158.0 [`2426d28`](https://github.com/opengovsg/FormSG/commit/2426d28cef5d7d488d9d2d63853397aefa217003) #### [v6.157.0](https://github.com/opengovsg/FormSG/compare/v6.156.0...v6.157.0) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4ab31d9a3f..dbdee57bf6 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "form-frontend", - "version": "6.158.0", + "version": "6.158.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "form-frontend", - "version": "6.158.0", + "version": "6.158.1", "hasInstallScript": true, "dependencies": { "@chakra-ui/react": "^2.8.2", diff --git a/frontend/package.json b/frontend/package.json index 36287d7724..c41d186b08 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "form-frontend", - "version": "6.158.0", + "version": "6.158.1", "homepage": ".", "type": "module", "private": true, diff --git a/package-lock.json b/package-lock.json index 20697d57e5..a5ae34a81d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "FormSG", - "version": "6.158.0", + "version": "6.158.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "FormSG", - "version": "6.158.0", + "version": "6.158.1", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudwatch-logs": "^3.536.0", diff --git a/package.json b/package.json index f260c94079..a458053205 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "6.158.0", + "version": "6.158.1", "homepage": "https://form.gov.sg", "authors": [ "FormSG "