Merge pull request #7006 from opengovsg/release_v6.99.0

build: release v6.99.0

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,22 +182,21 @@ 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)
 - chore(dockerfile): update mocktwilio to start asap [`#6862`](https://github.com/opengovsg/FormSG/pull/6862)
 - 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)
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.98.0",
+  "version": "6.99.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
@@ -41,10 +41,11 @@
     "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",
+    "polyfill-object.fromentries": "^1.0.1",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.0",
     "react-csv": "^2.2.2",

frontend/src/assets/icons/MultiParty.tsx

@@ -1,22 +1,18 @@
 export const MultiParty = (
   props: React.SVGProps<SVGSVGElement>,
-): JSX.Element => {
-  return (
-    <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
-    >
-      <g id="CustomIcon/multi-party">
-        <path
-          id="Vector"
-          d="M12.2423 6.0591L11.3133 6.92592L11.235 6.99903L11.3133 7.07215L11.8016 7.52777L11.8699 7.59142L11.9381 7.52777L13.8863 5.70999L13.9646 5.63689L13.8863 5.56378L11.9381 3.74524L11.8699 3.68155L11.8016 3.74522L11.3133 4.20084L11.235 4.27393L11.3133 4.34705L12.2425 5.21466H9.3491C9.13957 3.34961 7.55728 1.9 5.63632 1.9C3.57281 1.9 1.9 3.57281 1.9 5.63632C1.9 7.69983 3.57281 9.37263 5.63632 9.37263C7.5569 9.37263 9.13894 7.92361 9.34897 6.0591H12.2423ZM6.05892 11.7573L6.92574 12.6863L6.99886 12.7646L7.07197 12.6863L7.52759 12.198L7.59125 12.1297L7.52759 12.0615L5.70982 10.1134L5.63672 10.035L5.5636 10.1133L3.74506 12.0615L3.68137 12.1297L3.74504 12.198L4.20066 12.6863L4.27375 12.7646L4.34687 12.6863L5.21448 11.7571V14.6507C3.34952 14.8603 1.9 16.4425 1.9 18.3634C1.9 20.4269 3.57281 22.0997 5.63632 22.0997C7.69983 22.0997 9.37263 20.4269 9.37263 18.3634C9.37263 16.4428 7.92351 14.8607 6.05892 14.6508V11.7573ZM17.9408 9.34899V12.2425L17.074 11.3135L17.0009 11.2351L16.9278 11.3135L16.4722 11.8018L16.4085 11.87L16.4722 11.9382L18.2899 13.8864L18.363 13.9647L18.4361 13.8864L20.2547 11.9382L20.3184 11.87L20.2547 11.8018L19.7991 11.3135L19.726 11.2351L19.6529 11.3134L18.7853 12.2426V9.34908C20.6502 9.13947 22.0997 7.55722 22.0997 5.63632C22.0997 3.57281 20.4269 1.9 18.3634 1.9C16.2999 1.9 14.6271 3.57281 14.6271 5.63632C14.6271 7.55696 16.0762 9.13904 17.9408 9.34899ZM7.98844 5.63632C7.98844 6.93536 6.93536 7.98844 5.63632 7.98844C4.33728 7.98844 3.2842 6.93536 3.2842 5.63632C3.2842 4.33728 4.33728 3.2842 5.63632 3.2842C6.93536 3.2842 7.98844 4.33728 7.98844 5.63632ZM5.63632 16.0113C6.93536 16.0113 7.98844 17.0644 7.98844 18.3634C7.98844 19.6625 6.93536 20.7155 5.63632 20.7155C4.33728 20.7155 3.2842 19.6625 3.2842 18.3634C3.2842 17.0644 4.33728 16.0113 5.63632 16.0113ZM18.3634 7.98844C17.0644 7.98844 16.0113 6.93536 16.0113 5.63632C16.0113 4.33728 17.0644 3.2842 18.3634 3.2842C19.6625 3.2842 20.7155 4.33728 20.7155 5.63632C20.7155 6.93536 19.6625 7.98844 18.3634 7.98844ZM20.584 18.3158C20.584 19.5686 19.5684 20.5842 18.3156 20.5842C17.0628 20.5842 16.0472 19.5686 16.0472 18.3158C16.0472 17.063 17.0628 16.0474 18.3156 16.0474C19.5684 16.0474 20.584 17.063 20.584 18.3158ZM18.3156 22.1C20.4055 22.1 22.0997 20.4058 22.0997 18.3158C22.0997 16.2259 20.4055 14.5317 18.3156 14.5317C16.2256 14.5317 14.5314 16.2259 14.5314 18.3158C14.5314 20.4058 16.2256 22.1 18.3156 22.1Z"
-          stroke="#445072"
-          strokeWidth="0.2"
-        />
-      </g>
-    </svg>
-  )
-}
+): JSX.Element => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={40}
+    height={40}
+    fill="none"
+    {...props}
+  >
+    <path
+      fill="#445072"
+      stroke="#445072"
+      strokeWidth={0.35}
+      d="m20.383 10.107-1.533 1.43-.137.128.137.128.814.76.12.11.119-.11 3.247-3.03.137-.128-.137-.128-3.247-3.03-.12-.112-.12.111-.813.76-.137.127.137.128 1.533 1.432H15.59a6.236 6.236 0 1 0 0 1.424h4.794Zm-10.276 9.51 1.43 1.533.128.137.128-.137.76-.814.11-.12-.11-.119-3.03-3.247-.128-.137-.128.137-3.031 3.247-.112.12.112.119.76.814.127.137.128-.137 1.432-1.534v4.794a6.236 6.236 0 1 0 1.424 0v-4.793Zm19.786-4.028v4.794l-1.43-1.533-.128-.137-.128.137-.76.814-.11.12.11.119 3.03 3.247.128.137.128-.137 3.031-3.247.111-.12-.11-.119-.76-.814-.128-.137-.128.137-1.432 1.533V15.59a6.237 6.237 0 1 0-1.424 0ZM13.306 9.394a3.912 3.912 0 1 1-7.824 0 3.912 3.912 0 0 1 7.824 0Zm-3.912 17.3a3.912 3.912 0 1 1 0 7.824 3.912 3.912 0 0 1 0-7.824Zm21.212-13.388a3.912 3.912 0 1 1 0-7.824 3.912 3.912 0 0 1 0 7.824Zm3.692 17.22a3.772 3.772 0 1 1-7.544 0 3.772 3.772 0 0 1 7.544 0Zm-3.772 6.316a6.315 6.315 0 1 0 0-12.63 6.315 6.315 0 0 0 0 12.63Z"
+    />
+  </svg>
+)

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'
 

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' }}
     >
-      <Text as="span" textStyle="subhead-1">
+      <Text as="span" textStyle="subhead-1" whiteSpace="nowrap">
         {label}:
       </Text>
       <Skeleton isLoaded={!isLoading && !isError}>{value}</Skeleton>

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 (
-    <FormProvider {...formMethods}>
-      <FormControl isInvalid={!isEmpty(errors)}>
-        <FormLabel
-          isRequired
-          useMarkdownForDescription
-          description={`Add at least **2 recipients** to prevent loss of response. Learn more on [how to guard against email bounces](${GUIDE_PREVENT_EMAIL_BOUNCE}).`}
-        >
-          Emails where responses will be sent
-        </FormLabel>
-        <AdminEmailRecipientsInput onSubmit={handleSubmitEmails} />
-        <FormErrorMessage>{get(errors, 'emails.message')}</FormErrorMessage>
-      </FormControl>
-    </FormProvider>
+    <>
+      <CheckpointAdvertisingInfobox />
+      <FormProvider {...formMethods}>
+        <FormControl isInvalid={!isEmpty(errors)}>
+          <FormLabel
+            isRequired
+            useMarkdownForDescription
+            description={`Add at least **2 recipients** to prevent loss of response. Learn more on [how to guard against email bounces](${GUIDE_PREVENT_EMAIL_BOUNCE}).`}
+          >
+            Emails where responses will be sent
+          </FormLabel>
+          <AdminEmailRecipientsInput onSubmit={handleSubmitEmails} />
+          <FormErrorMessage>{get(errors, 'emails.message')}</FormErrorMessage>
+        </FormControl>
+      </FormProvider>
+    </>
+  )
+}
+
+const CheckpointAdvertisingInfobox = () => {
+  const mdComponents = useMdComponents()
+
+  return (
+    <Flex bg="primary.100" p="1rem">
+      <Icon as={BiBulb} color="primary.500" fontSize="1.5rem" mr="0.5rem" />
+      <MarkdownText
+        components={mdComponents}
+      >{`Require routing and approval? [Try using Checkpoint to set up an approval workflow](${OGP_CHECKPOINT})`}</MarkdownText>
+    </Flex>
   )
 }
 

frontend/src/features/workspace/components/CreateFormModal/CreateFormModalContent/FormResponseOptions.tsx

@@ -70,6 +70,7 @@ export const FormResponseOptions = forwardRef<
         <Tile.Subtitle>Receive responses in your inbox</Tile.Subtitle>
         <OptionDescription
           listItems={[
+            'Supported by Checkpoint, an approval workflow tool',
             'Attachments: up to 7MB per form',
             'Up to Restricted and Sensitive (High) data',
           ]}

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'

frontend/src/polyfills.ts

@@ -0,0 +1,4 @@
+/**
+ * Polyfills the Object.fromEntries
+ */
+import 'polyfill-object.fromentries'