opengovsg · wanlingt · Jan 3, 2024 · Jan 2, 2024 · Jan 2, 2024 · Jan 3, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,27 @@ 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.98.0](https://github.com/opengovsg/FormSG/compare/v6.97.0...v6.98.0)
+
+> 3 January 2024
+
+- fix(mrf): individual response page [`#6992`](https://github.com/opengovsg/FormSG/pull/6992)
+- feat(mrf): add static workflow routing [`#6968`](https://github.com/opengovsg/FormSG/pull/6968)
+- fix(deps): [Snyk] Security upgrade axios from 1.6.2 to 1.6.3 [`#6983`](https://github.com/opengovsg/FormSG/pull/6983)
+- 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)
+
 #### [v6.97.0](https://github.com/opengovsg/FormSG/compare/v6.96.0...v6.97.0)
 
+> 2 January 2024
+
 - fix(mrf): form duplication with MRF [`#6985`](https://github.com/opengovsg/FormSG/pull/6985)
 - fix: payments thank you page [`#6975`](https://github.com/opengovsg/FormSG/pull/6975)
 - build: merge v6.96.0 into develop  [`#6974`](https://github.com/opengovsg/FormSG/pull/6974)
 - build: release v6.96.0 [`#6972`](https://github.com/opengovsg/FormSG/pull/6972)
+- chore: bump version to v6.97.0 [`a59d430`](https://github.com/opengovsg/FormSG/commit/a59d430d4da406447390a4d3fe8e915af63d3473)
 
 #### [v6.96.0](https://github.com/opengovsg/FormSG/compare/v6.95.0...v6.96.0)
 
@@ -55,13 +70,14 @@ 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)
@@ -77,7 +93,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 [`28a8b9c`](https://github.com/opengovsg/FormSG/commit/28a8b9ca95f456c0f2c95d22813bf6d2ae1509ed)
+- chore: bump version to v6.92.0 [`72fac02`](https://github.com/opengovsg/FormSG/commit/72fac021a92df588be577c25690b49e96796387d)
 
 #### [v6.91.1](https://github.com/opengovsg/FormSG/compare/v6.91.0...v6.91.1)
 
@@ -109,17 +125,25 @@ 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.0...v6.89.2)
+#### [v6.89.2](https://github.com/opengovsg/FormSG/compare/v6.89.1...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
@@ -156,21 +180,22 @@ 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 [`1eec9b6`](https://github.com/opengovsg/FormSG/commit/1eec9b63c914b56b7b10adffd03554e07fde0f3a)
+- chore: bump version to v6.86.0 [`1c827cd`](https://github.com/opengovsg/FormSG/commit/1c827cd11844649ca303bb5dc9987db5367637c9)
 
 #### [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
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.97.0",
+  "version": "6.98.0",
   "homepage": ".",
   "private": true,
   "dependencies": {
@@ -16,7 +16,7 @@
     "@stripe/react-stripe-js": "^1.15.0",
     "@stripe/stripe-js": "^1.44.1",
     "@types/stopword": "^2.0.1",
-    "axios": "^1.6.2",
+    "axios": "^1.6.3",
     "broadcast-channel": "^4.13.0",
     "browser-image-compression": "^2.0.2",
     "comlink": "^4.3.1",

diff --git a/frontend/src/assets/icons/MultiParty.tsx b/frontend/src/assets/icons/MultiParty.tsx
@@ -3,18 +3,20 @@ export const MultiParty = (
 ): JSX.Element => {
   return (
     <svg
-      width="40"
-      height="40"
-      viewBox="0 0 40 40"
-      fill="none"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
       xmlns="http://www.w3.org/2000/svg"
+      fill="currentColor"
     >
-      <path
-        d="M20.5732 10.032L18.9012 11.5921L18.8229 11.6652L18.9012 11.7383L19.715 12.4977L19.7833 12.5614L19.8515 12.4977L23.0984 9.46808L23.1768 9.39498L23.0985 9.32186L19.8515 6.29096L19.7833 6.22727L19.715 6.29094L18.9012 7.05031L18.8229 7.1234L18.9012 7.19651L20.5734 8.75793H15.5221C15.2037 5.65438 12.5816 3.2335 9.39403 3.2335C5.99166 3.2335 3.2335 5.99166 3.2335 9.39403C3.2335 12.7964 5.99166 15.5546 9.39403 15.5546C12.581 15.5546 15.2026 13.1346 15.5219 10.032H20.5732ZM10.0317 19.4264L11.5918 21.0985L11.6649 21.1768L11.738 21.0985L12.4974 20.2846L12.5611 20.2164L12.4974 20.1482L9.46778 16.9012L9.39468 16.8229L9.32156 16.9012L6.29066 20.1482L6.22698 20.2164L6.29065 20.2846L7.05001 21.0985L7.1231 21.1768L7.19622 21.0985L8.75763 19.4263V24.4778C5.65422 24.7964 3.2335 27.4184 3.2335 30.6059C3.2335 34.0082 5.99166 36.7664 9.39402 36.7664C12.7964 36.7664 15.5546 34.0082 15.5546 30.6059C15.5546 27.4188 13.1345 24.7971 10.0317 24.478V19.4264ZM29.9682 15.5219L29.9682 20.5735L28.4081 18.9014L28.335 18.8231L28.2619 18.9014L27.5025 19.7153L27.4388 19.7835L27.5025 19.8517L30.5321 23.0987L30.6052 23.177L30.6783 23.0987L33.7092 19.8517L33.7729 19.7835L33.7093 19.7153L32.9499 18.9014L32.8768 18.8231L32.8037 18.9014L31.2423 20.5736V15.5221C34.3457 15.2035 36.7664 12.5815 36.7664 9.39403C36.7664 5.99166 34.0082 3.2335 30.6059 3.2335C27.2035 3.2335 24.4453 5.99166 24.4453 9.39403C24.4453 12.5811 26.8654 15.2028 29.9682 15.5219ZM13.3809 9.39403C13.3809 11.5959 11.5959 13.3809 9.39403 13.3809C7.19214 13.3809 5.40716 11.5959 5.40716 9.39403C5.40716 7.19214 7.19214 5.40716 9.39403 5.40716C11.5959 5.40716 13.3809 7.19214 13.3809 9.39403ZM9.39402 26.619C11.5959 26.619 13.3809 28.404 13.3809 30.6059C13.3809 32.8078 11.5959 34.5927 9.39402 34.5927C7.19214 34.5927 5.40716 32.8078 5.40716 30.6059C5.40715 28.404 7.19214 26.619 9.39402 26.619ZM30.6059 13.3809C28.404 13.3809 26.619 11.5959 26.619 9.39403C26.619 7.19214 28.404 5.40716 30.6059 5.40716C32.8078 5.40716 34.5927 7.19214 34.5927 9.39403C34.5927 11.5959 32.8078 13.3809 30.6059 13.3809ZM34.3734 30.5266C34.3734 32.6514 32.6509 34.3739 30.5261 34.3739C28.4013 34.3739 26.6788 32.6514 26.6788 30.5266C26.6788 28.4017 28.4013 26.6792 30.5261 26.6792C32.6509 26.6792 34.3734 28.4017 34.3734 30.5266ZM30.5261 36.7668C33.9725 36.7668 36.7664 33.973 36.7664 30.5266C36.7664 27.0802 33.9725 24.2863 30.5261 24.2863C27.0797 24.2863 24.2859 27.0802 24.2859 30.5266C24.2859 33.973 27.0797 36.7668 30.5261 36.7668Z"
-        fill="#293044"
-        stroke="#445072"
-        stroke-width="0.2"
-      />
+      <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>
   )
 }
diff --git a/frontend/src/features/admin-form/responses/IndividualResponsePage/queries.ts b/frontend/src/features/admin-form/responses/IndividualResponsePage/queries.ts
@@ -3,6 +3,8 @@ import { useParams } from 'react-router-dom'
 
 import { useToast } from '~hooks/useToast'
 
+import { useUser } from '~features/user/queries'
+
 import { getDecryptedSubmissionById } from '../AdminSubmissionsService'
 import { adminFormResponsesKeys } from '../queries'
 import { useStorageResponsesContext } from '../ResponsesPage/storage'
@@ -16,6 +18,9 @@ export const useIndividualSubmission = () => {
   })
 
   const { formId, submissionId } = useParams()
+  const { user } = useUser()
+  const displayWorkflow = user?.betaFlags?.mrf
+
   if (!formId || !submissionId) {
     throw new Error('No formId or submissionId provided')
   }
@@ -26,8 +31,8 @@ export const useIndividualSubmission = () => {
     adminFormResponsesKeys.individual(formId, submissionId),
     () => getDecryptedSubmissionById({ formId, submissionId, secretKey }),
     {
-      // Will never update once fetched.
-      staleTime: Infinity,
+      // For users with MRF enabled, will always fetch the response. Otherwise, response Will never update once fetched.
+      staleTime: displayWorkflow ? 0 : Infinity,
       enabled: !!secretKey,
       onError: (e) => {
         toast({

diff --git a/.../src/features/admin-form/responses/ResponsesPage/storage/utils/processDecryptedContent.ts b/.../src/features/admin-form/responses/ResponsesPage/storage/utils/processDecryptedContent.ts
@@ -129,8 +129,7 @@ export const processDecryptedContentV3 = async (
     .map((ff) => {
       const response = responses[ff._id]
       if (!response) {
-        console.log('Unexpected empty response for field id', ff._id)
-        return null
+        return transformInputsToOutputs(ff, '')
       }
       if (response.fieldType === BasicField.Attachment) {
         const answer = response.answer as AttachmentFieldResponseV3

diff --git a/frontend/src/features/admin-form/settings/SettingsPage.tsx b/frontend/src/features/admin-form/settings/SettingsPage.tsx
@@ -13,6 +13,7 @@ import {
 
 import { featureFlags } from '~shared/constants'
 
+import { MultiParty } from '~assets/icons/MultiParty'
 import { ADMINFORM_RESULTS_SUBROUTE, ADMINFORM_ROUTE } from '~constants/routes'
 import { useDraggable } from '~hooks/useDraggable'
 
@@ -27,6 +28,7 @@ import { SettingsGeneralPage } from './SettingsGeneralPage'
 import { SettingsPaymentsPage } from './SettingsPaymentsPage'
 import { SettingsTwilioPage } from './SettingsTwilioPage'
 import { SettingsWebhooksPage } from './SettingsWebhooksPage'
+import { SettingsWorkflowPage } from './SettingsWorkflowPage'
 
 const settingsTabsOrder = ['general', 'singpass', 'twilio', 'webhooks']
 
@@ -52,6 +54,8 @@ export const SettingsPage = (): JSX.Element => {
   const displayPayments =
     user?.betaFlags?.payment || flags?.has(featureFlags.payment)
 
+  const displayWorkflow = user?.betaFlags?.mrf
+
   const [tabIndex, setTabIndex] = useState(
     settingsTabsOrder.indexOf(settingsTab ?? ''),
   )
@@ -65,7 +69,11 @@ export const SettingsPage = (): JSX.Element => {
       settingsTabsOrder.push('payments')
       setTabIndex(settingsTabsOrder.indexOf(settingsTab ?? ''))
     }
-  }, [displayPayments, settingsTab])
+    if (displayWorkflow) {
+      settingsTabsOrder.push('workflow')
+      setTabIndex(settingsTabsOrder.indexOf(settingsTab ?? ''))
+    }
+  }, [displayWorkflow, displayPayments, settingsTab])
 
   const handleTabChange = (index: number) => {
     setTabIndex(index)
@@ -120,6 +128,9 @@ export const SettingsPage = (): JSX.Element => {
             {displayPayments && (
               <SettingsTab label="Payments" icon={BiDollar} />
             )}
+            {displayWorkflow && (
+              <SettingsTab label="Workflow" icon={MultiParty} />
+            )}
           </TabList>
         </Flex>
         <TabPanels
@@ -144,6 +155,11 @@ export const SettingsPage = (): JSX.Element => {
               <SettingsPaymentsPage />
             </TabPanel>
           )}
+          {displayWorkflow && (
+            <TabPanel>
+              <SettingsWorkflowPage />
+            </TabPanel>
+          )}
         </TabPanels>
         <Spacer />
       </Tabs>