From 41c40e5aff58832b9086aca5c79aa152a1018223 Mon Sep 17 00:00:00 2001 From: wanlingt <56983748+wanlingt@users.noreply.github.com> Date: Thu, 4 Jan 2024 17:03:44 +0800 Subject: [PATCH 1/6] fix: add polyfill for Object.FromEntries (#6996) --- frontend/package-lock.json | 11 +++++++++++ frontend/package.json | 1 + .../components/FormFields/FormFieldsContainer.tsx | 2 ++ 3 files changed, 14 insertions(+) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index ad8a7f1be4..616762a5d6 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -50,6 +50,7 @@ "lodash": "^4.17.21", "lottie-web": "^5.9.4", "p-queue": "^7.2.0", + "polyfill-object.fromentries": "^1.0.1", "react": "^17.0.2", "react-beautiful-dnd": "^13.1.0", "react-csv": "^2.2.2", @@ -36308,6 +36309,11 @@ "node": ">=10" } }, + "node_modules/polyfill-object.fromentries": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/polyfill-object.fromentries/-/polyfill-object.fromentries-1.0.1.tgz", + "integrity": "sha512-zlEL/n2S73hX7BQXIPapzirQw4yM/VC7slrcOyfbsH0ZyUQ/lLh4NF9wshSJ354v0F3KDMC8FCxeTQ7UUPpu9g==" + }, "node_modules/popmotion": { "version": "11.0.3", "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz", @@ -75866,6 +75872,11 @@ "@babel/runtime": "^7.17.8" } }, + "polyfill-object.fromentries": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/polyfill-object.fromentries/-/polyfill-object.fromentries-1.0.1.tgz", + "integrity": "sha512-zlEL/n2S73hX7BQXIPapzirQw4yM/VC7slrcOyfbsH0ZyUQ/lLh4NF9wshSJ354v0F3KDMC8FCxeTQ7UUPpu9g==" + }, "popmotion": { "version": "11.0.3", "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index 44d4aa98fa..bd664f155c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -45,6 +45,7 @@ "lodash": "^4.17.21", "lottie-web": "^5.9.4", "p-queue": "^7.2.0", + "polyfill-object.fromentries": "^1.0.1", "react": "^17.0.2", "react-beautiful-dnd": "^13.1.0", "react-csv": "^2.2.2", diff --git a/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx b/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx index 6bedebeb48..15c0b819f3 100644 --- a/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx +++ b/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx @@ -1,3 +1,5 @@ +import 'polyfill-object.fromentries' + import { useMemo, useState } from 'react' import { useSearchParams } from 'react-router-dom' import { Box } from '@chakra-ui/react' From dbfd6b91c2fd0d1aa182f36ad7f9bf14c5480614 Mon Sep 17 00:00:00 2001 From: wanlingt <56983748+wanlingt@users.noreply.github.com> Date: Thu, 4 Jan 2024 18:10:16 +0800 Subject: [PATCH 2/6] fix: move polyfills to separate file (#6998) * fix: move polyfills to separate file * fix: remove check for Object.fromEntries --- .../public-form/components/FormFields/FormFieldsContainer.tsx | 2 -- frontend/src/index.tsx | 1 + frontend/src/polyfills.ts | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 frontend/src/polyfills.ts diff --git a/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx b/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx index 15c0b819f3..6bedebeb48 100644 --- a/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx +++ b/frontend/src/features/public-form/components/FormFields/FormFieldsContainer.tsx @@ -1,5 +1,3 @@ -import 'polyfill-object.fromentries' - import { useMemo, useState } from 'react' import { useSearchParams } from 'react-router-dom' import { Box } from '@chakra-ui/react' diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index adfa0c45f7..bb4d15f0b0 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,6 +1,7 @@ import 'inter-ui/inter.css' import 'focus-visible/dist/focus-visible.min.js' import './i18n/i18n' +import './polyfills' import * as React from 'react' import ReactDOM from 'react-dom' diff --git a/frontend/src/polyfills.ts b/frontend/src/polyfills.ts new file mode 100644 index 0000000000..2edceeb922 --- /dev/null +++ b/frontend/src/polyfills.ts @@ -0,0 +1,4 @@ +/** + * Polyfills the Object.fromEntries + */ +import 'polyfill-object.fromentries' From a34e951b26d5bdca07b6f120cb183eee7e8721ab Mon Sep 17 00:00:00 2001 From: Justyn Oh Date: Fri, 5 Jan 2024 18:48:07 +0800 Subject: [PATCH 3/6] fix(mrf): loading checkbox response, ui fixes (#6997) * fix(mrf): loading checkbox response, ui fixes * fix: add name parameter back for a11y --- frontend/src/assets/icons/MultiParty.tsx | 36 +++-- .../IndividualResponsePage.tsx | 2 +- .../Field/Checkbox/CheckboxField.tsx | 132 ++++++++++-------- 3 files changed, 90 insertions(+), 80 deletions(-) diff --git a/frontend/src/assets/icons/MultiParty.tsx b/frontend/src/assets/icons/MultiParty.tsx index ad5c075345..dcc99ae003 100644 --- a/frontend/src/assets/icons/MultiParty.tsx +++ b/frontend/src/assets/icons/MultiParty.tsx @@ -1,22 +1,18 @@ export const MultiParty = ( props: React.SVGProps, -): JSX.Element => { - return ( - - - - - - ) -} +): JSX.Element => ( + + + +) diff --git a/frontend/src/features/admin-form/responses/IndividualResponsePage/IndividualResponsePage.tsx b/frontend/src/features/admin-form/responses/IndividualResponsePage/IndividualResponsePage.tsx index 87e60270a4..8b082dec9a 100644 --- a/frontend/src/features/admin-form/responses/IndividualResponsePage/IndividualResponsePage.tsx +++ b/frontend/src/features/admin-form/responses/IndividualResponsePage/IndividualResponsePage.tsx @@ -66,7 +66,7 @@ const StackRow = ({ spacing={{ base: '0', md: '0.5rem' }} direction={{ base: 'column', md: 'row' }} > - + {label}: {value} diff --git a/frontend/src/templates/Field/Checkbox/CheckboxField.tsx b/frontend/src/templates/Field/Checkbox/CheckboxField.tsx index 234c4962d3..e101392b20 100644 --- a/frontend/src/templates/Field/Checkbox/CheckboxField.tsx +++ b/frontend/src/templates/Field/Checkbox/CheckboxField.tsx @@ -1,11 +1,12 @@ import { forwardRef, useMemo } from 'react' +import { Controller, get, useFormContext, useFormState } from 'react-hook-form' import { - get, - useFormContext, - UseFormRegisterReturn, - useFormState, -} from 'react-hook-form' -import { Box, FormControl, useMultiStyleConfig } from '@chakra-ui/react' + Box, + CheckboxGroup as ChakraCheckboxGroup, + CheckboxGroupProps as ChakraCheckboxGroupProps, + FormControl, + useMultiStyleConfig, +} from '@chakra-ui/react' import { FormColorTheme } from '~shared/types' @@ -58,7 +59,7 @@ export const CheckboxField = ({ [disableRequiredValidation, schema], ) - const { register, getValues } = useFormContext() + const { register, getValues, control } = useFormContext() const { isValid, isSubmitting, errors } = useFormState({ name: schema._id, }) @@ -79,66 +80,79 @@ export const CheckboxField = ({ }), [checkboxInputName, getValues], ) - return ( - {schema.fieldOptions.map((o, idx) => ( - - {o} - - ))} - {schema.fieldOptions.length === 1 ? ( - // React-hook-form quirk where the value will not be set in an array if there is only a single checkbox option. - // This is a workaround to set the value in an array by registering a hidden checkbox with the same id. - // See https://github.com/react-hook-form/react-hook-form/issues/7834#issuecomment-1040735711. - - ) : null} - {schema.othersRadioButton ? ( - - - - - - {get(errors, `${othersInputName}.message`)} - - - - ) : null} + ( + + {schema.fieldOptions.map((o, idx) => ( + + {o} + + ))} + {schema.fieldOptions.length === 1 ? ( + // React-hook-form quirk where the value will not be set in an array if there is only a single checkbox option. + // This is a workaround to set the value in an array by registering a hidden checkbox with the same id. + // See https://github.com/react-hook-form/react-hook-form/issues/7834#issuecomment-1040735711. + + ) : null} + {schema.othersRadioButton ? ( + + + + + + {get(errors, `${othersInputName}.message`)} + + + + ) : null} + + )} + /> ) } -interface OtherCheckboxFieldProps - extends UseFormRegisterReturn, - Omit { +interface CheckboxGroupProps extends Omit { + value: false | string[] +} +const CheckboxGroup = ({ children, value, ...props }: CheckboxGroupProps) => ( + + {children} + +) + +interface OtherCheckboxFieldProps extends CheckboxProps { value: string } const OtherCheckboxField = forwardRef< From e852fe49cf10c2f95c07a82b7cea0b55dbcfc330 Mon Sep 17 00:00:00 2001 From: Ken Lee Shu Ming Date: Mon, 8 Jan 2024 14:11:22 +0800 Subject: [PATCH 4/6] chore(deps): update libphonenumber-js package (#6904) chore: update libphonenum package --- frontend/package-lock.json | 14 +++++++------- frontend/package.json | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- shared/package-lock.json | 2 +- shared/package.json | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 616762a5d6..aa3945a905 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -46,7 +46,7 @@ "inter-ui": "^3.19.3", "intl-messageformat": "^9.13.0", "jszip": "^3.10.0", - "libphonenumber-js": "^1.9.44", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "lottie-web": "^5.9.4", "p-queue": "^7.2.0", @@ -32131,9 +32131,9 @@ } }, "node_modules/libphonenumber-js": { - "version": "1.9.44", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz", - "integrity": "sha512-zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g==" + "version": "1.10.49", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz", + "integrity": "sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==" }, "node_modules/lie": { "version": "3.3.0", @@ -72759,9 +72759,9 @@ } }, "libphonenumber-js": { - "version": "1.9.44", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz", - "integrity": "sha512-zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g==" + "version": "1.10.49", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz", + "integrity": "sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==" }, "lie": { "version": "3.3.0", diff --git a/frontend/package.json b/frontend/package.json index bd664f155c..0dfcd387c7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,7 +41,7 @@ "inter-ui": "^3.19.3", "intl-messageformat": "^9.13.0", "jszip": "^3.10.0", - "libphonenumber-js": "^1.9.44", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "lottie-web": "^5.9.4", "p-queue": "^7.2.0", diff --git a/package-lock.json b/package-lock.json index c2a0c9b94f..67a194bea6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,7 +72,7 @@ "jszip": "^3.10.1", "jwk-to-pem": "^2.0.5", "jwt-decode": "^3.1.2", - "libphonenumber-js": "^1.10.24", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "moment-timezone": "0.5.41", "mongodb-memory-server-core": "^6.9.6", @@ -21188,9 +21188,9 @@ } }, "node_modules/libphonenumber-js": { - "version": "1.10.24", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.24.tgz", - "integrity": "sha512-3Dk8f5AmrcWqg+oHhmm9hwSTqpWHBdSqsHmjCJGroULFubi0+x7JEIGmRZCuL3TI8Tx39xaKqfnhsDQ4ALa/Nw==" + "version": "1.10.49", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz", + "integrity": "sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==" }, "node_modules/lie": { "version": "3.1.1", @@ -46795,9 +46795,9 @@ "dev": true }, "libphonenumber-js": { - "version": "1.10.24", - "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.24.tgz", - "integrity": "sha512-3Dk8f5AmrcWqg+oHhmm9hwSTqpWHBdSqsHmjCJGroULFubi0+x7JEIGmRZCuL3TI8Tx39xaKqfnhsDQ4ALa/Nw==" + "version": "1.10.49", + "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz", + "integrity": "sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==" }, "lie": { "version": "3.1.1", diff --git a/package.json b/package.json index e17f23c425..906dca8cbe 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "jszip": "^3.10.1", "jwk-to-pem": "^2.0.5", "jwt-decode": "^3.1.2", - "libphonenumber-js": "^1.10.24", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "moment-timezone": "0.5.41", "mongodb-memory-server-core": "^6.9.6", diff --git a/shared/package-lock.json b/shared/package-lock.json index 0d00f91d7b..4ee80328dc 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -11,7 +11,7 @@ "date-fns": "^2.26.0", "json-stringify-safe": "^5.0.1", "jszip": "^3.7.1", - "libphonenumber-js": "^1.9.43", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "type-fest": "^4.1.0", "validator": "^13.7.0", diff --git a/shared/package.json b/shared/package.json index 4135e734fe..424702dc03 100644 --- a/shared/package.json +++ b/shared/package.json @@ -6,7 +6,7 @@ "date-fns": "^2.26.0", "json-stringify-safe": "^5.0.1", "jszip": "^3.7.1", - "libphonenumber-js": "^1.9.43", + "libphonenumber-js": "^1.10.48", "lodash": "^4.17.21", "type-fest": "^4.1.0", "validator": "^13.7.0", From 4d2cd06b2e19636dd4773a1803a32f20436be797 Mon Sep 17 00:00:00 2001 From: Justyn Oh Date: Mon, 8 Jan 2024 15:10:40 +0800 Subject: [PATCH 5/6] chore: add advertising for Checkpoint (#7005) --- frontend/src/constants/links.ts | 1 + .../settings/components/EmailFormSection.tsx | 49 +++++++++++++------ .../FormResponseOptions.tsx | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/frontend/src/constants/links.ts b/frontend/src/constants/links.ts index 2b2ae89b31..ba05b3ed6a 100644 --- a/frontend/src/constants/links.ts +++ b/frontend/src/constants/links.ts @@ -77,6 +77,7 @@ export const LANDING_PAGE_EXAMPLE_FORMS = [ export const OGP_ALL_PRODUCTS = 'https://www.open.gov.sg/products/overview' export const OGP_POSTMAN = 'https://postman.gov.sg' +export const OGP_CHECKPOINT = 'https://checkpoint.gov.sg' export const OGP_FORMSG_COLLATE = 'https://collate.form.gov.sg' export const OGP_SGID = 'https://go.gov.sg/sgid-formsg' diff --git a/frontend/src/features/admin-form/settings/components/EmailFormSection.tsx b/frontend/src/features/admin-form/settings/components/EmailFormSection.tsx index af944d4387..1e3e62ec4c 100644 --- a/frontend/src/features/admin-form/settings/components/EmailFormSection.tsx +++ b/frontend/src/features/admin-form/settings/components/EmailFormSection.tsx @@ -5,14 +5,17 @@ import { useForm, useFormContext, } from 'react-hook-form' -import { FormControl } from '@chakra-ui/react' +import { BiBulb } from 'react-icons/bi' +import { Flex, FormControl, Icon } from '@chakra-ui/react' import { get, isEmpty, isEqual } from 'lodash' import isEmail from 'validator/lib/isEmail' -import { GUIDE_PREVENT_EMAIL_BOUNCE } from '~constants/links' +import { GUIDE_PREVENT_EMAIL_BOUNCE, OGP_CHECKPOINT } from '~constants/links' +import { useMdComponents } from '~hooks/useMdComponents' import { ADMIN_EMAIL_VALIDATION_RULES } from '~utils/formValidation' import FormErrorMessage from '~components/FormControl/FormErrorMessage' import FormLabel from '~components/FormControl/FormLabel' +import { MarkdownText } from '~components/MarkdownText' import { TagInput } from '~components/TagInput' import { useMutateFormSettings } from '../mutations' @@ -48,19 +51,35 @@ export const EmailFormSection = ({ useEffect(() => reset({ emails: initialEmails }), [initialEmails, reset]) return ( - - - - Emails where responses will be sent - - - {get(errors, 'emails.message')} - - + <> + + + + + Emails where responses will be sent + + + {get(errors, 'emails.message')} + + + + ) +} + +const CheckpointAdvertisingInfobox = () => { + const mdComponents = useMdComponents() + + return ( + + + {`Require routing and approval? [Try using Checkpoint to set up an approval workflow](${OGP_CHECKPOINT})`} + ) } diff --git a/frontend/src/features/workspace/components/CreateFormModal/CreateFormModalContent/FormResponseOptions.tsx b/frontend/src/features/workspace/components/CreateFormModal/CreateFormModalContent/FormResponseOptions.tsx index eb2541728d..f2ca731298 100644 --- a/frontend/src/features/workspace/components/CreateFormModal/CreateFormModalContent/FormResponseOptions.tsx +++ b/frontend/src/features/workspace/components/CreateFormModal/CreateFormModalContent/FormResponseOptions.tsx @@ -70,6 +70,7 @@ export const FormResponseOptions = forwardRef< Receive responses in your inbox Date: Mon, 8 Jan 2024 15:20:59 +0800 Subject: [PATCH 6/6] chore: bump version to v6.99.0 --- CHANGELOG.md | 37 +++++++++++++++++++------------------ frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3ee3679f2..7670302280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ 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.99.0](https://github.com/opengovsg/FormSG/compare/v6.98.0...v6.99.0) + +- chore: add advertising for Checkpoint [`#7005`](https://github.com/opengovsg/FormSG/pull/7005) +- chore(deps): update libphonenumber-js package [`#6904`](https://github.com/opengovsg/FormSG/pull/6904) +- fix(mrf): loading checkbox response, ui fixes [`#6997`](https://github.com/opengovsg/FormSG/pull/6997) +- fix: move polyfills to separate file [`#6998`](https://github.com/opengovsg/FormSG/pull/6998) +- fix: add polyfill for Object.FromEntries [`#6996`](https://github.com/opengovsg/FormSG/pull/6996) +- build: merge release v6.98.0 into develop [`#6995`](https://github.com/opengovsg/FormSG/pull/6995) +- build: release v6.98.0 [`#6994`](https://github.com/opengovsg/FormSG/pull/6994) +- chore: bump version to v6.98.0 [`614d3a1`](https://github.com/opengovsg/FormSG/commit/614d3a1af0640525a9b0b66116230d1113431c2f) + #### [v6.98.0](https://github.com/opengovsg/FormSG/compare/v6.97.0...v6.98.0) > 3 January 2024 @@ -14,7 +25,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - build: merge release v6.97.0 into develop [`#6990`](https://github.com/opengovsg/FormSG/pull/6990) - fix: formendpage missing context provider [`#6989`](https://github.com/opengovsg/FormSG/pull/6989) - build: release v6.97.0 [`#6988`](https://github.com/opengovsg/FormSG/pull/6988) -- chore: bump version to v6.98.0 [`85c5335`](https://github.com/opengovsg/FormSG/commit/85c53351552b2af6d237ff582ed36252265299e6) +- chore: bump version to v6.98.0 [`1b380ac`](https://github.com/opengovsg/FormSG/commit/1b380acb8d96c2d768e38da6e56a4e692dc366a2) #### [v6.97.0](https://github.com/opengovsg/FormSG/compare/v6.96.0...v6.97.0) @@ -70,14 +81,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix(deps): bump type-fest from 4.8.2 to 4.8.3 in /shared [`#6943`](https://github.com/opengovsg/FormSG/pull/6943) - build: merge release v6.92.0 into develop [`#6934`](https://github.com/opengovsg/FormSG/pull/6934) - build: release v6.92.0 [`#6932`](https://github.com/opengovsg/FormSG/pull/6932) -- feat: set secret key input to password type on activation modal [`#6933`](https://github.com/opengovsg/FormSG/pull/6933) -- chore: bump version to v6.92.0 [`28a8b9c`](https://github.com/opengovsg/FormSG/commit/28a8b9ca95f456c0f2c95d22813bf6d2ae1509ed) - chore: bump version to v6.93.0 [`f7e9dcf`](https://github.com/opengovsg/FormSG/commit/f7e9dcf49f5104815f11ecad6c48d6e71a1e1bf8) #### [v6.92.0](https://github.com/opengovsg/FormSG/compare/v6.91.1...v6.92.0) > 28 November 2023 +- feat: set secret key input to password type on activation modal [`#6933`](https://github.com/opengovsg/FormSG/pull/6933) - fix: add myinfo errors to error map for storage-mode submissions [`#6931`](https://github.com/opengovsg/FormSG/pull/6931) - feat(FE): set secret key input to password type [`#6930`](https://github.com/opengovsg/FormSG/pull/6930) - feat: add prefills for variable payments [`#6899`](https://github.com/opengovsg/FormSG/pull/6899) @@ -93,7 +103,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: omit isVisible property from webhook response [`#6907`](https://github.com/opengovsg/FormSG/pull/6907) - feat: charts [`#6790`](https://github.com/opengovsg/FormSG/pull/6790) - build: merge release 6.90.0 to develop [`#6914`](https://github.com/opengovsg/FormSG/pull/6914) -- chore: bump version to v6.92.0 [`72fac02`](https://github.com/opengovsg/FormSG/commit/72fac021a92df588be577c25690b49e96796387d) +- chore: bump version to v6.92.0 [`28a8b9c`](https://github.com/opengovsg/FormSG/commit/28a8b9ca95f456c0f2c95d22813bf6d2ae1509ed) #### [v6.91.1](https://github.com/opengovsg/FormSG/compare/v6.91.0...v6.91.1) @@ -125,25 +135,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - build: merge release v6.89.1 into develop [`#6905`](https://github.com/opengovsg/FormSG/pull/6905) - chore: bump version to v6.90.0 [`c03692e`](https://github.com/opengovsg/FormSG/commit/c03692e3d9aa64afa8007dffecfd9871542f4759) -#### [v6.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.1...v6.89.2) +#### [v6.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.0...v6.89.2) > 17 November 2023 - fix: hotfix v6.89.1 for proper error handling in encrypt-submission middleware [`#6903`](https://github.com/opengovsg/FormSG/pull/6903) +- build: release v6.89.0 [`#6898`](https://github.com/opengovsg/FormSG/pull/6898) +- fix: remove myinfo child from storage mode [`#6901`](https://github.com/opengovsg/FormSG/pull/6901) - chore: revert commit 6869 [`efab3cf`](https://github.com/opengovsg/FormSG/commit/efab3cf844113573d758b1b2c57147d5d0656a28) - chore: bump version to 6.89.2 [`1f4e9f7`](https://github.com/opengovsg/FormSG/commit/1f4e9f70cd33ac2f015fb902de5243a4227e4981) - fix: remove error block [`fb415fc`](https://github.com/opengovsg/FormSG/commit/fb415fcd7189a90056557c242ed98f1dc10e757e) -#### [v6.89.1](https://github.com/opengovsg/FormSG/compare/v6.89.0...v6.89.1) - -> 16 November 2023 - -- build: release v6.89.0 [`#6898`](https://github.com/opengovsg/FormSG/pull/6898) -- fix: remove myinfo child from storage mode [`#6901`](https://github.com/opengovsg/FormSG/pull/6901) -- chore: bump version to 6.89.1 [`253dd25`](https://github.com/opengovsg/FormSG/commit/253dd2596844d28e5dc3caae298fc775fb1a3f75) -- fix: add error handling [`d6c4985`](https://github.com/opengovsg/FormSG/commit/d6c4985aa8e35dd2278af9b70d00d4e86a48bde1) -- fix: remove email mode from myinfo limit message [`5a45c98`](https://github.com/opengovsg/FormSG/commit/5a45c980dbe3fc8c15eacb3ff1827f3003fcbfc4) - #### [v6.89.0](https://github.com/opengovsg/FormSG/compare/v6.88.0...v6.89.0) > 15 November 2023 @@ -180,14 +182,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: add case for SGID MyInfo when field value is missing [`#6874`](https://github.com/opengovsg/FormSG/pull/6874) - build: merge release v6.86.0 into develop [`#6873`](https://github.com/opengovsg/FormSG/pull/6873) - build: release v6.86.0 [`#6866`](https://github.com/opengovsg/FormSG/pull/6866) -- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867) -- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a) - chore: bump version to v6.87.0 [`5054803`](https://github.com/opengovsg/FormSG/commit/50548038804b03f30ce6d23b4d43b7a8cf7d9620) #### [v6.86.0](https://github.com/opengovsg/FormSG/compare/v6.85.1...v6.86.0) > 6 November 2023 +- chore: use non-testing branch for font-wqy-zenhei [`#6867`](https://github.com/opengovsg/FormSG/pull/6867) - chore: update credits and terms of use [`#6865`](https://github.com/opengovsg/FormSG/pull/6865) - fix: add cloudflareinsights as allowable csp [`#6864`](https://github.com/opengovsg/FormSG/pull/6864) - feat: optimise submission query [`#6863`](https://github.com/opengovsg/FormSG/pull/6863) @@ -195,7 +196,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - fix: only render delete button if owner [`#6837`](https://github.com/opengovsg/FormSG/pull/6837) - build: merge release v6.85.1 into develop [`#6861`](https://github.com/opengovsg/FormSG/pull/6861) - fix: hotfix v6.85.1 to prevent creation of SGID_MyInfo storage mode forms [`#6860`](https://github.com/opengovsg/FormSG/pull/6860) -- chore: bump version to v6.86.0 [`1c827cd`](https://github.com/opengovsg/FormSG/commit/1c827cd11844649ca303bb5dc9987db5367637c9) +- chore: bump version to v6.86.0 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a) #### [v6.85.1](https://github.com/opengovsg/FormSG/compare/v6.85.0...v6.85.1) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index aa3945a905..837297eed9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "form-frontend", - "version": "6.98.0", + "version": "6.99.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "form-frontend", - "version": "6.98.0", + "version": "6.99.0", "hasInstallScript": true, "dependencies": { "@chakra-ui/react": "^1.8.6", diff --git a/frontend/package.json b/frontend/package.json index 0dfcd387c7..872b96dde2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "form-frontend", - "version": "6.98.0", + "version": "6.99.0", "homepage": ".", "private": true, "dependencies": { diff --git a/package-lock.json b/package-lock.json index 67a194bea6..03f1dbf3b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "FormSG", - "version": "6.98.0", + "version": "6.99.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "FormSG", - "version": "6.98.0", + "version": "6.99.0", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudwatch-logs": "^3.347.1", diff --git a/package.json b/package.json index 906dca8cbe..21b9db64c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "6.98.0", + "version": "6.99.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG "