Merge pull request #7962 from opengovsg/release_v6.167.0

build: release v6.167.0

.template-env

@@ -68,12 +68,6 @@ FORMSG_SDK_MODE=
 ## If the variable exists, the [verified] feature will be enabled.
 # VERIFICATION_SECRET_KEY=
 
-## Twilio
-## If the below variables exists, the [sms] feature will be enabled.
-# TWILIO_ACCOUNT_SID=
-# TWILIO_API_KEY=
-# TWILIO_API_SECRET=
-# TWILIO_MESSAGING_SERVICE_SID=
 
 ## SingPass, CorpPass related environment variables
 # If you are not a member of the Singapore Government, you can safely exclude
@@ -113,7 +107,6 @@ FORMSG_SDK_MODE=
 
 # Used to check if BE Server is currently running on local development environment
 # One of boolean: "true" | "false"
-# USE_MOCK_TWILIO=
 # USE_MOCK_POSTMAN_SMS=
 
 # POSTMAN_MOP_CAMPAIGN_ID=

CHANGELOG.md

@@ -4,16 +4,21 @@ 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.166.1](https://github.com/opengovsg/FormSG/compare/v6.166.1...v6.166.1)
+#### [v6.167.0](https://github.com/opengovsg/FormSG/compare/v6.166.1...v6.167.0)
 
-- fix: trim previous text responses [`#7949`](https://github.com/opengovsg/FormSG/pull/7949)
+- build: merge release v6.166.1 to develop [`#7961`](https://github.com/opengovsg/FormSG/pull/7961)
+- feat(twilio): remove twilio be [`#7870`](https://github.com/opengovsg/FormSG/pull/7870)
+- feat: update form create modal response options [`#7957`](https://github.com/opengovsg/FormSG/pull/7957)
+- chore: include latest features in whats new page [`#7956`](https://github.com/opengovsg/FormSG/pull/7956)
+- build: release v6.166.1 [`#7950`](https://github.com/opengovsg/FormSG/pull/7950)
 
 #### [v6.166.1](https://github.com/opengovsg/FormSG/compare/v6.166.0...v6.166.1)
 
 > 27 November 2024
 
+- fix: trim previous text responses [`#7949`](https://github.com/opengovsg/FormSG/pull/7949)
 - build: release v6.166.0 [`#7945`](https://github.com/opengovsg/FormSG/pull/7945)
-- chore: bump version to v6.166.1 [`18d9c74`](https://github.com/opengovsg/FormSG/commit/18d9c74cde8739bc96a0833f3764cb518e4e34aa)
+- chore: bump version to v6.166.1 [`844ee29`](https://github.com/opengovsg/FormSG/commit/844ee2912b45fd0d7dc3fedaab7b53adfa1375d8)
 
 #### [v6.166.0](https://github.com/opengovsg/FormSG/compare/v6.165.0...v6.166.0)
 
@@ -70,26 +75,26 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: unify email notification for response copy for storage and email modes   [`#7903`](https://github.com/opengovsg/FormSG/pull/7903)
 - build: merge release v6.162.0 to develop [`#7904`](https://github.com/opengovsg/FormSG/pull/7904)
 - build: release v6.162.0 [`#7897`](https://github.com/opengovsg/FormSG/pull/7897)
-- fix(deps): bump express-rate-limit from 7.4.0 to 7.4.1 [`#7892`](https://github.com/opengovsg/FormSG/pull/7892)
-- 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)
 
 #### [v6.162.0](https://github.com/opengovsg/FormSG/compare/v6.161.0...v6.162.0)
 
-> 14 November 2024
+> 17 November 2024
 
+- fix(deps): bump express-rate-limit from 7.4.0 to 7.4.1 [`#7892`](https://github.com/opengovsg/FormSG/pull/7892)
+- 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: update react-email deps [`#7840`](https://github.com/opengovsg/FormSG/pull/7840)
 - build: merge release v6.161 to develop [`#7886`](https://github.com/opengovsg/FormSG/pull/7886)
 - feat(twilio): remove twilio from fe [`#7869`](https://github.com/opengovsg/FormSG/pull/7869)
 - chore(deps): bump webpack from 5.91.0 to 5.96.1 in /react-email-preview [`#7835`](https://github.com/opengovsg/FormSG/pull/7835)
 - feat: upgrade to use v4 of artifacts action [`#7881`](https://github.com/opengovsg/FormSG/pull/7881)
 - feat: remove openssl flag on deployment and build [`#7882`](https://github.com/opengovsg/FormSG/pull/7882)
 - build: release v6.161.0 [`#7884`](https://github.com/opengovsg/FormSG/pull/7884)
-- chore: bump version to v6.162.0 [`a045ec5`](https://github.com/opengovsg/FormSG/commit/a045ec5883b4178b5b87416a7898fced9beb895b)
+- 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.161.0](https://github.com/opengovsg/FormSG/compare/v6.160.0...v6.161.0)
 

__tests__/unit/backend/helpers/jest-db.ts

@@ -233,50 +233,6 @@ const insertEncryptForm = async ({
   }
 }
 
-const insertFormWithMsgSrvcName = async ({
-  formId,
-  userId,
-  mailDomain = 'test.gov.sg',
-  mailName = 'test',
-  shortName = 'govtest',
-  formOptions = {},
-  msgSrvcName = 'mockMsgSrvcname',
-}: {
-  formId?: Schema.Types.ObjectId
-  userId?: Schema.Types.ObjectId
-  mailName?: string
-  mailDomain?: string
-  shortName?: string
-  formOptions?: Partial<IForm>
-  msgSrvcName?: string
-} = {}): Promise<{
-  form: IFormSchema
-  user: IUserSchema
-  agency: IAgencySchema
-}> => {
-  const { user, agency } = await insertFormCollectionReqs({
-    userId,
-    mailDomain,
-    mailName,
-    shortName,
-  })
-
-  const FormModel = getFormModel(mongoose)
-  const form = await FormModel.create({
-    title: 'example form title',
-    admin: user._id,
-    _id: formId,
-    ...formOptions,
-    msgSrvcName: msgSrvcName,
-  })
-
-  return {
-    form: form as IFormSchema,
-    user,
-    agency,
-  }
-}
-
 const getFullFormById = async (
   formId: string,
 ): Promise<IPopulatedForm | null> =>
@@ -344,7 +300,6 @@ const dbHandler = {
   clearCollection,
   insertEmailForm,
   insertEncryptForm,
-  insertFormWithMsgSrvcName,
   getFullFormById,
   insertFormSubmission,
   insertFormFeedback,

docker-compose.yml

@@ -53,11 +53,6 @@ services:
       # Keep in sync with the development key in
       # https://github.com/opengovsg/formsg-javascript-sdk/blob/develop/src/resource/signing-keys.ts
       - SIGNING_SECRET_KEY=HDBXpu+2/gu10bLHpy8HjpN89xbA6boH9GwibPGJA8BOXmB+zOUpxCP33/S5p8vBWlPokC7gLR0ca8urVwfMUQ==
-      # Mock Twilio credentials. SMSes do not work in dev environment.
-      - TWILIO_ACCOUNT_SID=AC00000000000000000000000000000000
-      - TWILIO_API_KEY=mockTwilioApiKey
-      - TWILIO_API_SECRET=mockTwilioApiSecret
-      - TWILIO_MESSAGING_SERVICE_SID=MG00000000000000000000000000000000
       - SP_OIDC_NDI_DISCOVERY_ENDPOINT=http://localhost:5156/singpass/v2/.well-known/openid-configuration
       - SP_OIDC_NDI_JWKS_ENDPOINT=http://localhost:5156/singpass/v2/.well-known/keys
       - SP_OIDC_RP_CLIENT_ID=rpClientId
@@ -167,7 +162,7 @@ services:
     depends_on:
       - backend
     environment:
-      - SERVICES=s3,sqs,secretsmanager
+      - SERVICES=s3,sqs
       - DNS_ADDRESS=0
       - EXTRA_CORS_ALLOWED_ORIGINS=http://localhost:5173
     volumes:
@@ -189,11 +184,6 @@ services:
       - STRIPE_API_KEY
       - STRIPE_DEVICE_NAME=StripeWebhookListener
 
-  mocktwilio:
-    image: stoplight/prism:4
-    network_mode: 'service:backend' # reuse backend service's network stack so that it can resolve localhost:4010 to prismtwilio:4010
-    command: mock https://raw.githubusercontent.com/twilio/twilio-oai/main/spec/json/twilio_api_v2010.json
-
 volumes:
   mongodb_data:
     driver: local

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.166.1",
+  "version": "6.167.0",
   "homepage": ".",
   "type": "module",
   "private": true,

frontend/src/constants/links.ts

@@ -16,11 +16,12 @@ export const GUIDE_FORM_MRF = 'https://go.gov.sg/formsg-guide-mrf'
 export const GUIDE_MRF_MODE = 'http://go.gov.sg/formsg-mrf'
 export const GUIDE_MYINFO_BUILDER_FIELD =
   'https://go.gov.sg/formsg-guide-singpass-myinfo'
+export const GUIDE_SINGPASS_FEATURES =
+  'https://go.gov.sg/formsg-guide-singpass-myinfo'
 export const GUIDE_SPCP_ESRVCID =
   'https://go.gov.sg/formsg-guide-singpass-myinfo'
 export const GUIDE_ENABLE_SPCP =
   'https://go.gov.sg/formsg-guide-singpass-myinfo-enable'
-export const GUIDE_TWILIO = 'https://go.gov.sg/formsg-guide-verified-smses'
 export const GUIDE_ATTACHMENT_SIZE_LIMIT =
   'https://go.gov.sg/formsg-guide-attachments'
 export const GUIDE_E2EE = 'https://go.gov.sg/formsg-guide-e2e'

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

@@ -6,7 +6,6 @@ import {
   FormPermissionsDto,
   PermissionsUpdateDto,
   PreviewFormViewDto,
-  SmsCountsDto,
 } from '~shared/types/form/form'
 
 import { ADMINFORM_USETEMPLATE_ROUTE } from '~constants/routes'

frontend/src/features/whats-new/FeatureUpdateList.ts

@@ -4,6 +4,7 @@ import { RequireExactlyOne } from 'type-fest'
 import {
   GUIDE_MRF_MODE,
   GUIDE_PAYMENTS_ENTRY,
+  GUIDE_SINGPASS_FEATURES,
   GUIDE_SPCP_ESRVCID,
 } from '~constants/links'
 
@@ -13,6 +14,8 @@ import Animation4 from './assets/4-dnd.json'
 import MyInfoStorageMode from './assets/6-myinfo-storage.svg'
 import ChartsSvg from './assets/7-charts_announcement.svg'
 import MrfAnimation from './assets/8-mrf_announcement.json'
+import MrfEmailNotifications from './assets/9-mrf-email-notifications.gif'
+import MrfApprovals from './assets/10-mrf-approvals.gif'
 import foldersDashboard from './assets/folders_dashboard.svg'
 
 // image can either be a static image (using url) or an animation (using animationData)
@@ -39,8 +42,42 @@ export interface FeatureUpdateList {
 // New features should be added at the top of the list.
 export const FEATURE_UPDATE_LIST: FeatureUpdateList = {
   // Update version whenever a new feature is added.
-  version: 6,
+  version: 7,
   features: [
+    {
+      title: 'Use Multi-respondent forms for approval workflows',
+      date: new Date('20 Nov 2024 GMT+8'),
+      description: dedent`You can now enable approvals from Step 2 onwards using Yes/No fields. This allows you to determine whether an existing workflow should continue based on the approval of the current step.
+
+
+      For every step that enables this feature, a Yes/No field is required. If Yes is selected, the form continues to the next step. If No is selected, the workflow ends at that step.`,
+      image: {
+        url: MrfApprovals,
+        alt: 'Use Multi-respondent forms for approval workflows',
+      },
+    },
+    {
+      title:
+        'Email notifications and summary of responses for Multi-respondent forms',
+      date: new Date('20 Nov 2024 GMT+8'),
+      description: dedent`
+      You can now send the email summary of responses and approval outcomes (approved/rejected/completed) to both form respondents and other parties.`,
+      image: {
+        url: MrfEmailNotifications,
+        alt: 'Email notifications and summary of responses for Multi-respondent forms',
+      },
+    },
+    {
+      title: 'Enhanced Singpass features for Storage mode forms',
+      date: new Date('26 Aug 2024 GMT+8'),
+      description: dedent`
+      * Limit each NRIC/FIN/UEN to one submission per form 
+      * Whitelist respondents by NRIC 
+      * Opt out of collecting NRIC of respondents 
+      
+
+      Find out more about these optional features [here](${GUIDE_SINGPASS_FEATURES})`,
+    },
     {
       title: 'Introducing Multi-respondent forms!',
       date: new Date('04 Apr 2024 GMT+8'),
@@ -113,14 +150,5 @@ export const FEATURE_UPDATE_LIST: FeatureUpdateList = {
         alt: 'The new FormSG experience',
       },
     },
-    {
-      title: 'Big little improvements',
-      date: new Date('12 October 2022 GMT+8'),
-      description: dedent`
-      * Easily paste options into Radio fields
-      * Add your Twilio credentials so form-fillers can verify their mobile number
-      * Enhanced security to prevent malicious inputs in form responses, [read more about it here](https://formsg.gitbook.io/form-user-guide/faq/faq/storage-mode#why-do-i-have-an-additional-quote-in-some-of-my-responses)
-      `,
-    },
   ],
 }

frontend/src/features/whats-new/WhatsNewContent.tsx

@@ -65,9 +65,11 @@ export const WhatsNewContent = ({
         {title}
       </Text>
       <MarkdownText components={mdComponents}>{description}</MarkdownText>
-      <Box mt="2rem" role="presentation">
-        {renderedImage}
-      </Box>
+      {renderedImage ? (
+        <Box mt="2rem" role="presentation">
+          {renderedImage}
+        </Box>
+      ) : null}
     </Box>
   )
 }