build: release v6.109.0

CHANGELOG.md

@@ -4,11 +4,32 @@ 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.109.0](https://github.com/opengovsg/FormSG/compare/v6.109.0...v6.109.0)
+
+- revert: "chore(dev): add virus scanner npm install to root install command" [`#7082`](https://github.com/opengovsg/FormSG/pull/7082)
+
+#### [v6.109.0](https://github.com/opengovsg/FormSG/compare/v6.108.0...v6.109.0)
+
+> 14 February 2024
+
+- chore: add payments by product backend validation [`#7077`](https://github.com/opengovsg/FormSG/pull/7077)
+- chore: upgrade mongodb server core to 9.1.6 [`#7052`](https://github.com/opengovsg/FormSG/pull/7052)
+- feat(mrf): workflow builder [`#7072`](https://github.com/opengovsg/FormSG/pull/7072)
+- chore(dev): add virus scanner npm install to root install command [`#7069`](https://github.com/opengovsg/FormSG/pull/7069)
+- feat: update payments thank you page header [`#7020`](https://github.com/opengovsg/FormSG/pull/7020)
+- feat: encryption boundary shift in preview mode [`#7071`](https://github.com/opengovsg/FormSG/pull/7071)
+- build: merge release v6.108.0 into develop [`#7068`](https://github.com/opengovsg/FormSG/pull/7068)
+- build: release v6.108.0 [`#7067`](https://github.com/opengovsg/FormSG/pull/7067)
+- chore: bump version to v6.109.0 [`60b2cff`](https://github.com/opengovsg/FormSG/commit/60b2cff1a23fbbca938c2d9eba9110849c624565)
+
 #### [v6.108.0](https://github.com/opengovsg/FormSG/compare/v6.107.0...v6.108.0)
 
+> 6 February 2024
+
 - feat(payment): webhook with charge information [`#7058`](https://github.com/opengovsg/FormSG/pull/7058)
 - build: merge release v6.107.0 into develop [`#7064`](https://github.com/opengovsg/FormSG/pull/7064)
 - build: release v6.107.0 [`#7063`](https://github.com/opengovsg/FormSG/pull/7063)
+- chore: bump version to v6.108.0 [`6fb5f4b`](https://github.com/opengovsg/FormSG/commit/6fb5f4bab18df0897dd589d28107fbae8ac15c6b)
 
 #### [v6.107.0](https://github.com/opengovsg/FormSG/compare/v6.106.0...v6.107.0)
 
@@ -175,14 +196,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)
@@ -198,7 +218,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)
 
@@ -230,25 +250,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
@@ -285,22 +297,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.108.0",
+  "version": "6.109.0",
   "homepage": ".",
   "private": true,
   "dependencies": {

frontend/src/assets/icons/MultiParty.tsx

@@ -1,17 +1,11 @@
 export const MultiParty = (
   props: React.SVGProps<SVGSVGElement>,
 ): JSX.Element => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width={40}
-    height={40}
-    fill="none"
-    {...props}
-  >
+  <svg viewBox="0 0 40 40" fill="none" height="1em" width="1em" {...props}>
     <path
-      fill="#445072"
-      stroke="#445072"
-      strokeWidth={0.35}
+      fill="currentColor"
+      stroke="currentColor"
+      strokeWidth={0.5}
       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/components/InlineMessage/InlineMessage.tsx

@@ -1,4 +1,10 @@
-import { Flex, FlexProps, Icon, useMultiStyleConfig } from '@chakra-ui/react'
+import {
+  As,
+  Flex,
+  FlexProps,
+  Icon,
+  useMultiStyleConfig,
+} from '@chakra-ui/react'
 
 import { BxsErrorCircle, BxsInfoCircle } from '~/assets/icons'
 import { InlineMessageVariant } from '~/theme/components/InlineMessage'
@@ -9,12 +15,14 @@ import { MarkdownText } from '~components/MarkdownText'
 export interface InlineMessageProps extends FlexProps {
   variant?: InlineMessageVariant
   useMarkdown?: boolean
+  icon?: As
 }
 
 export const InlineMessage = ({
   variant = 'info',
   children,
   useMarkdown = false,
+  icon,
   ...flexProps
 }: InlineMessageProps): JSX.Element => {
   const styles = useMultiStyleConfig('InlineMessage', { variant })
@@ -24,7 +32,7 @@ export const InlineMessage = ({
   return (
     <Flex sx={styles.messagebox} {...flexProps}>
       <Icon
-        as={variant !== 'error' ? BxsInfoCircle : BxsErrorCircle}
+        as={icon || (variant !== 'error' ? BxsInfoCircle : BxsErrorCircle)}
         __css={styles.icon}
         aria-label={`${variant !== 'error' ? 'Info' : 'Error'} message icon`}
       />

frontend/src/constants/links.ts

@@ -13,6 +13,7 @@ export const GUIDE_WEBHOOKS = 'https://go.gov.sg/formsg-guide-webhooks'
 export const GUIDE_EMAIL_MODE = 'https://go.gov.sg/formsg-guide-email-mode'
 export const GUIDE_STORAGE_MODE = 'https://go.gov.sg/formsg-guide-storage-mode'
 export const GUIDE_FORM_LOGIC = 'https://go.gov.sg/formsg-guide-logic'
+export const GUIDE_FORM_MRF = 'https://go.gov.sg/formsg-guide-mrf'
 export const GUIDE_SPCP_ESRVCID =
   'https://go.gov.sg/formsg-guide-singpass-myinfo'
 export const GUIDE_ENABLE_SPCP =

frontend/src/features/admin-form/common/AdminViewFormService.ts

@@ -18,13 +18,9 @@ import {
 } from '~services/ApiService'
 
 import { augmentWithMyInfoDisplayValue } from '~features/myinfo/utils'
-import {
-  SubmitEmailFormArgs,
-  SubmitStorageFormArgs,
-} from '~features/public-form/PublicFormService'
+import { SubmitEmailFormArgs } from '~features/public-form/PublicFormService'
 import {
   createClearSubmissionFormData,
-  createEncryptedSubmissionData,
   filterHiddenInputs,
 } from '~features/public-form/utils'
 
@@ -181,26 +177,15 @@ export const submitEmailModeFormPreview = async ({
  * Submit a storage mode form in preview mode
  */
 export const submitStorageModeFormPreview = async ({
-  formFields,
-  formLogics,
-  formInputs,
   formId,
-  publicKey,
-}: SubmitStorageFormArgs) => {
-  const filteredInputs = filterHiddenInputs({
-    formFields,
-    formInputs,
-    formLogics,
-  })
-  const submissionContent = await createEncryptedSubmissionData({
-    formFields,
-    formInputs: filteredInputs,
-    publicKey,
-  })
+}: {
+  formId: string
+}) => {
+  const emptyFormData = {}
 
   return ApiService.post<SubmissionResponseDto>(
-    `${ADMIN_FORM_ENDPOINT}/${formId}/preview/submissions/encrypt`,
-    submissionContent,
+    `${ADMIN_FORM_ENDPOINT}/${formId}/preview/submissions/storage`,
+    emptyFormData,
   ).then(({ data }) => data)
 }
 
@@ -242,28 +227,17 @@ export const submitEmailModeFormPreviewWithFetch = async ({
  * TODO(#5826): Fallback using Fetch. Remove once network error is resolved
  */
 export const submitStorageModeFormPreviewWithFetch = async ({
-  formFields,
-  formLogics,
-  formInputs,
   formId,
-  publicKey,
-}: SubmitStorageFormArgs): Promise<SubmissionResponseDto> => {
-  const filteredInputs = filterHiddenInputs({
-    formFields,
-    formInputs,
-    formLogics,
-  })
-  const submissionContent = await createEncryptedSubmissionData({
-    formFields,
-    formInputs: filteredInputs,
-    publicKey,
-  })
+}: {
+  formId: string
+}): Promise<SubmissionResponseDto> => {
+  const emptyFormData = {}
 
   const response = await fetch(
-    `${API_BASE_URL}${ADMIN_FORM_ENDPOINT}/${formId}/preview/submissions/encrypt`,
+    `${API_BASE_URL}${ADMIN_FORM_ENDPOINT}/${formId}/preview/submissions/storage`,
     {
       method: 'POST',
-      body: JSON.stringify(submissionContent),
+      body: JSON.stringify(emptyFormData),
       headers: {
         'Content-Type': 'application/json',
         Accept: 'application/json',

frontend/src/features/admin-form/common/components/PreviewFormBanner/PreviewFormBanner.tsx

@@ -188,8 +188,19 @@ export const PreviewFormBanner = ({
             </Text>
           ) : (
             <Text {...textProps}>
-              You will not be able to make a test payment in Form Preview mode.
-              Open your form to make a test payment.
+              You will not be able to make a test payment, or view submitted
+              answers or attachments in Form Preview mode. Open your form to
+              make a test payment or form submission.
+            </Text>
+          )}
+        </Flex>
+      )}
+      {!isPaymentEnabled && (
+        <Flex backgroundColor="neutral.900">
+          {!(secretEnv === 'production') && (
+            <Text {...textProps}>
+              You will not be able to view submitted answers or attachments in
+              Form Preview mode. Open your form to test a form submission.
             </Text>
           )}
         </Flex>

frontend/src/features/admin-form/common/mutations.ts

@@ -469,7 +469,7 @@ export const usePreviewFormMutations = (formId: string) => {
 
   const submitStorageModeFormMutation = useMutation(
     (args: Omit<SubmitStorageFormArgs, 'formId'>) => {
-      return submitStorageModeFormPreview({ ...args, formId })
+      return submitStorageModeFormPreview({ formId })
     },
   )
 
@@ -482,7 +482,7 @@ export const usePreviewFormMutations = (formId: string) => {
 
   const submitStorageModeFormFetchMutation = useMutation(
     (args: Omit<SubmitStorageFormArgs, 'formId'>) => {
-      return submitStorageModeFormPreviewWithFetch({ ...args, formId })
+      return submitStorageModeFormPreviewWithFetch({ formId })
     },
   )
 

frontend/src/features/admin-form/create/common/CreatePageContent/CreatePageContent.tsx

@@ -6,6 +6,7 @@ import {
 import { BuilderAndDesignTab } from '../../builder-and-design/BuilderAndDesignTab'
 import { EndPageTab } from '../../end-page/EndPageTab'
 import { CreatePageLogicTab } from '../../logic/CreatePageLogicTab'
+import { CreatePageWorkflowTab } from '../../workflow/CreatePageWorkflowTab'
 
 export const CreatePageContent = (): JSX.Element => {
   const { activeTab } = useCreatePageSidebar()
@@ -14,6 +15,8 @@ export const CreatePageContent = (): JSX.Element => {
       return <CreatePageLogicTab />
     case DrawerTabs.EndPage:
       return <EndPageTab />
+    case DrawerTabs.Workflow:
+      return <CreatePageWorkflowTab />
     default:
       // builder or design
       return <BuilderAndDesignTab />