From 12d872d843a32cc2a7ab9570923cd6f530014559 Mon Sep 17 00:00:00 2001 From: scottheng96 <44297674+scottheng96@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:18:39 +0800 Subject: [PATCH 1/3] fix: fixed cursor appearance for inactive logic block (#7917) * fixed cursor appearance for inactive logic block * changed cursor to auto behaviour --- .../LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx | 2 +- .../WorkflowContent/InactiveStepBlock/InactiveStepBlock.tsx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx b/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx index e97f1ab6b1..c042f426b8 100644 --- a/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx +++ b/frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx @@ -96,7 +96,7 @@ export const InactiveLogicBlock = ({ bg="white" border="1px solid" borderColor="neutral.300" - cursor={isPreventEdit ? 'not-allowed' : 'pointer'} + cursor={isPreventEdit ? 'not-allowed' : 'auto'} aria-disabled={isPreventEdit} > From e6b6f3726e2db36f0a9351acd779970efef458c9 Mon Sep 17 00:00:00 2001 From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:56:53 +0800 Subject: [PATCH 2/3] feat(approvals-ga): p1 changes (#7918) * fix: update report copy * fix: use own tooltip component * fix: change toast for report * feat: update mrf email notif copy --- frontend/src/components/Toggle/Toggle.tsx | 4 ++-- .../components/FormIssueNotificationToggle.tsx | 2 +- .../settings/components/MrfFormEmailSection.tsx | 12 ++++-------- .../src/features/admin-form/settings/mutations.ts | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/Toggle/Toggle.tsx b/frontend/src/components/Toggle/Toggle.tsx index 46b8e93c04..c7c2984a0d 100644 --- a/frontend/src/components/Toggle/Toggle.tsx +++ b/frontend/src/components/Toggle/Toggle.tsx @@ -5,8 +5,6 @@ import { Flex, forwardRef, Icon, - Tooltip, - TooltipProps, useMultiStyleConfig, } from '@chakra-ui/react' @@ -14,6 +12,8 @@ import { TOGGLE_THEME_KEY } from '~/theme/components/Toggle' import { BxsHelpCircle } from '~assets/icons/BxsHelpCircle' import { BxsInfoCircle } from '~assets/icons/BxsInfoCircle' +import Tooltip from '~components/Tooltip' +import { TooltipProps } from '~components/Tooltip/Tooltip' import FormLabel from '../FormControl/FormLabel' diff --git a/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx b/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx index 2ba9e21dd0..08c96687f9 100644 --- a/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx +++ b/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx @@ -26,7 +26,7 @@ export const FormIssueNotificationToggle = (): JSX.Element => { handleToggleIssueNotification()} /> diff --git a/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx b/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx index f6f14cf8e3..08ee76cf05 100644 --- a/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx +++ b/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx @@ -143,16 +143,12 @@ const MrfEmailNotificationsForm = ({ return (
- - Workflow outcome notifications - - Send an email to inform selected respondents when the form and/or - workflow is complete. + Select who to notify when the form and/or workflow is complete: - Notify respondent in Step 1 + Respondent in Step 1 - Notify other respondents in your workflow + Other respondents in your workflow - Notify other parties + Others { onSuccess: (newData) => { handleSuccess({ newData, - toastDescription: `Email notifications for reports are now ${ + toastDescription: `Email notifications for issues reported are now ${ newData.hasIssueNotification ? 'enabled' : 'disabled' } on your form.`, }) From 9cf94dc221b374648a41d6e291ac8e1190484c72 Mon Sep 17 00:00:00 2001 From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:01:11 +0800 Subject: [PATCH 3/3] chore: bump version to v6.164.0 --- CHANGELOG.md | 11 ++++++++++- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 666f262677..781a900370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +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.164.0](https://github.com/opengovsg/FormSG/compare/v6.163.0...v6.164.0) + +- feat(approvals-ga): p1 changes [`#7918`](https://github.com/opengovsg/FormSG/pull/7918) +- build: merge release v6.163.0 to develop [`#7916`](https://github.com/opengovsg/FormSG/pull/7916) +- fix: fixed cursor appearance for inactive logic block [`#7917`](https://github.com/opengovsg/FormSG/pull/7917) +- build: release v6.163.0 [`#7914`](https://github.com/opengovsg/FormSG/pull/7914) + #### [v6.163.0](https://github.com/opengovsg/FormSG/compare/v6.162.0...v6.163.0) +> 19 November 2024 + - chore: update package-lock [`#7907`](https://github.com/opengovsg/FormSG/pull/7907) - fix(deps): bump nodemailer and @types/nodemailer [`#7891`](https://github.com/opengovsg/FormSG/pull/7891) - chore(deps-dev): bump lint-staged from 15.2.7 to 15.2.10 [`#7899`](https://github.com/opengovsg/FormSG/pull/7899) @@ -20,9 +29,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - chore: remove jest-axios-mock, jest-localstorage-mock [`#7893`](https://github.com/opengovsg/FormSG/pull/7893) - fix(mail): failure to render mail [`#7890`](https://github.com/opengovsg/FormSG/pull/7890) - fix: replace trash icon in MRF steps [`#7885`](https://github.com/opengovsg/FormSG/pull/7885) +- chore: bump version to v6.163.0 [`7fa5e57`](https://github.com/opengovsg/FormSG/commit/7fa5e57727d21b2e99bab86200493b6e4e585215) - chore: bump version to v6.162.0 [`c1b4ecf`](https://github.com/opengovsg/FormSG/commit/c1b4ecf2c9840c5be8af44e791145bb43b1447d0) - update trash icon to pencil icon, remove delete functionality in InactiveStepBlock [`ae4db1d`](https://github.com/opengovsg/FormSG/commit/ae4db1d772781b6733deba75eae8442bcd4e33df) -- removed edit function on entire step box [`7394d00`](https://github.com/opengovsg/FormSG/commit/7394d007a3fa8a92bbf8f2e04f584b57351a35ab) #### [v6.162.0](https://github.com/opengovsg/FormSG/compare/v6.161.0...v6.162.0) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e9a59eded5..396ed9b30c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "form-frontend", - "version": "6.163.0", + "version": "6.164.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "form-frontend", - "version": "6.163.0", + "version": "6.164.0", "hasInstallScript": true, "dependencies": { "@chakra-ui/react": "^2.8.2", diff --git a/frontend/package.json b/frontend/package.json index 19604110bf..014aa9b64d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "form-frontend", - "version": "6.163.0", + "version": "6.164.0", "homepage": ".", "type": "module", "private": true, diff --git a/package-lock.json b/package-lock.json index 99a50aa9ec..cdce0cebc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "FormSG", - "version": "6.163.0", + "version": "6.164.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "FormSG", - "version": "6.163.0", + "version": "6.164.0", "hasInstallScript": true, "dependencies": { "@aws-sdk/client-cloudwatch-logs": "^3.536.0", diff --git a/package.json b/package.json index 0582a33f3e..9543cd9af4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "FormSG", "description": "Form Manager for Government", - "version": "6.163.0", + "version": "6.164.0", "homepage": "https://form.gov.sg", "authors": [ "FormSG "