Merge pull request #7897 from opengovsg/release_v6.162.0

build: release v6.162.0
opengovsg · Nov 18, 2024 · cb30b36 · cb30b36
2 parents 40faa4c + c1b4ecf
commit cb30b36
Show file tree

Hide file tree

Showing 37 changed files with 903 additions and 5,107 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,10 +73,10 @@ jobs:
           key: ${{ runner.OS }}-node-modules-${{ hashFiles('**/package-lock.json') }}
       - run: npm run build
         env:
-          NODE_OPTIONS: '--max-old-space-size=4096 --openssl-legacy-provider'
+          NODE_OPTIONS: '--max-old-space-size=4096'
           AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE: 1
       - name: Upload build files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: build-output
@@ -147,7 +147,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         if: always()
         with:
           name: build-output

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -28,7 +28,7 @@ jobs:
           api-key: ${{ secrets.DD_API_KEY }}
       - name: Build
         env:
-          NODE_OPTIONS: --max-old-space-size=4096 --openssl-legacy-provider -r ${{ env.DD_TRACE_PACKAGE }}
+          NODE_OPTIONS: --max-old-space-size=4096 -r ${{ env.DD_TRACE_PACKAGE }}
           VITE_APP_FORMSG_SDK_MODE: 'test'
         run: npm run build
       - name: Run Playwright tests (login)
@@ -46,7 +46,7 @@ jobs:
           NODE_OPTIONS: -r ${{ env.DD_TRACE_PACKAGE }}
         run: npx playwright test __tests__/e2e/encrypt-submission.spec.ts
         timeout-minutes: 15
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +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.162.0](/~https://github.com/opengovsg/FormSG/compare/v6.161.0...v6.162.0)
+
+- 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)
+- 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)
+- trying to solve formatting issues [`85d66c6`](/~https://github.com/opengovsg/FormSG/commit/85d66c6d4a7f2f5970821561a5d923350ffa13a1)
+
 #### [v6.161.0](/~https://github.com/opengovsg/FormSG/compare/v6.160.0...v6.161.0)
 
+> 13 November 2024
+
 - build: merge release v6.160.0 to develop [`#7880`](/~https://github.com/opengovsg/FormSG/pull/7880)
 - chore(deps-dev): bump @typescript-eslint/eslint-plugin from 8.12.2 to 8.14.0 in /shared [`#7877`](/~https://github.com/opengovsg/FormSG/pull/7877)
 - fix: mrf be validation isSignatureTimeValid false positive [`#7878`](/~https://github.com/opengovsg/FormSG/pull/7878)
 - build: release v6.160.0 [`#7873`](/~https://github.com/opengovsg/FormSG/pull/7873)
+- chore: bump version to v6.161.0 [`7097551`](/~https://github.com/opengovsg/FormSG/commit/70975519829e332519a708b6e49df56dc2885452)
 
 #### [v6.160.0](/~https://github.com/opengovsg/FormSG/compare/v6.159.0...v6.160.0)
 

diff --git a/Dockerfile.development b/Dockerfile.development
@@ -8,15 +8,8 @@ RUN chown 1001:1001 /mongodb_data
 
 ENV CHROMIUM_BIN=/usr/bin/chromium-browser
 ENV NODE_ENV=development
-# --openssl-legacy-provider flag
-# A breaking change in the SSL provider was introduced in node 17. This caused
-# webpack 4 to break. This is an interim solution; we should investigate removing
-# this flag once angular has been removed and we have upgraded to CRA5 (which uses
-# webpack 5).
-# See also:
-# * https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-# * /~https://github.com/webpack/webpack/issues/14532#issuecomment-1304378535
-ENV NODE_OPTIONS="--max-old-space-size=2048 --openssl-legacy-provider"
+
+ENV NODE_OPTIONS="--max-old-space-size=2048"
 RUN apk update && apk upgrade && \
     # Build dependencies for node_modules
     apk add --virtual native-deps \

diff --git a/Dockerfile.production b/Dockerfile.production
@@ -28,16 +28,8 @@ RUN npm ci --legacy-peer-deps
 
 COPY . ./
 
-# --openssl-legacy-provider flag
-# A breaking change in the SSL provider was introduced in node 17. This caused
-# webpack 4 to break. This is an interim solution; we should investigate removing
-# this flag once angular has been removed and we have upgraded to CRA5 (which uses
-# webpack 5).
-# See also:
-# * https://stackoverflow.com/questions/69692842/error-message-error0308010cdigital-envelope-routinesunsupported
-# * /~https://github.com/webpack/webpack/issues/14532#issuecomment-1304378535
 # These options are only used in the build stage, not the start stage.
-ENV NODE_OPTIONS="--max-old-space-size=4096 --openssl-legacy-provider"
+ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 RUN npm run build
 

diff --git a/README.md b/README.md
@@ -85,12 +85,6 @@ To install the relevant npm packages (frontend, backend and virus-scanner), run
 npm install && npm --prefix serverless/virus-scanner install
 ```
 
-To prevent breaking changes to webpack4 introduced in node 17 and above, enable the `--openssl-legacy-provider` flag:
-
-```bash
-export NODE_OPTIONS=--openssl-legacy-provider
-```
-
 If you are on Mac OS X, you may want to allow Docker to use more RAM (minimum of 4GB) by clicking on the Docker icon on the toolbar, clicking on the "Preferences" menu item, then clicking on the "Resources" link on the left.
 
 ### Running Locally

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.161.0",
+  "version": "6.162.0",
   "homepage": ".",
   "type": "module",
   "private": true,

diff --git a/frontend/src/features/admin-form/AdminFormCreatePage.stories.tsx b/frontend/src/features/admin-form/AdminFormCreatePage.stories.tsx
@@ -17,7 +17,6 @@ import {
   MOCK_FORM_FIELDS_WITH_MYINFO,
   MOCK_FORM_LOGICS,
 } from '~/mocks/msw/handlers/admin-form'
-import { getFreeSmsQuota } from '~/mocks/msw/handlers/admin-form/twilio'
 import { getUser, MOCK_USER } from '~/mocks/msw/handlers/user'
 
 import {
@@ -56,7 +55,6 @@ const buildMswRoutes = (
       delay: 0,
       mockUser: { ...MOCK_USER, _id: 'adminFormTestUserId' as UserId },
     }),
-    getFreeSmsQuota({ delay }),
   ]
 }
 

diff --git a/frontend/src/features/admin-form/AdminFormSettingsPage.stories.tsx b/frontend/src/features/admin-form/AdminFormSettingsPage.stories.tsx
@@ -15,7 +15,6 @@ import {
   getAdminFormSubmissions,
   patchAdminFormSettings,
 } from '~/mocks/msw/handlers/admin-form'
-import { getFreeSmsQuota } from '~/mocks/msw/handlers/admin-form/twilio'
 import { getUser } from '~/mocks/msw/handlers/user'
 
 import { ADMINFORM_ROUTE, ADMINFORM_SETTINGS_SUBROUTE } from '~constants/routes'
@@ -55,7 +54,6 @@ export default {
     chromatic: { pauseAnimationAtEnd: true },
     layout: 'fullscreen',
     msw: [
-      getFreeSmsQuota(),
       ...createFormBuilderMocks(),
       getAdminFormSettings(),
       getAdminFormSubmissions(),
@@ -73,7 +71,6 @@ export const PreventActivation = Template.bind({})
 PreventActivation.parameters = {
   msw: [
     ...createFormBuilderMocks(),
-    getFreeSmsQuota(),
     getAdminFormSubmissions(),
     patchAdminFormSettings(),
     getAdminFormSettings({
@@ -112,7 +109,6 @@ StorageModeSettings.parameters = {
     storyDescription: `The passing secret key is ${storageModeKeypair.secretKey}`,
   },
   msw: [
-    getFreeSmsQuota(),
     ...createFormBuilderMocks({ responseMode: FormResponseMode.Encrypt }),
     getAdminFormSettings({
       mode: FormResponseMode.Encrypt,

diff --git a/frontend/src/features/admin-form/common/AdminViewFormService.ts b/frontend/src/features/admin-form/common/AdminViewFormService.ts
@@ -104,12 +104,6 @@ export const viewFormTemplate = async (
     .then(transformAllIsoStringsToDate)
 }
 
-export const getFreeSmsQuota = async (formId: string) => {
-  return ApiService.get<SmsCountsDto>(
-    `${ADMIN_FORM_ENDPOINT}/${formId}/verified-sms/count/free`,
-  ).then(({ data }) => data)
-}
-
 export const getFormCollaborators = async (
   formId: string,
 ): Promise<FormPermissionsDto> => {

diff --git a/frontend/src/features/admin-form/common/queries.ts b/frontend/src/features/admin-form/common/queries.ts
@@ -14,16 +14,13 @@ import { useUser } from '~features/user/queries'
 import {
   getAdminFormView,
   getFormCollaborators,
-  getFreeSmsQuota,
   previewForm,
   viewFormTemplate,
 } from './AdminViewFormService'
 
 export const adminFormKeys = {
   base: ['adminForm'] as const,
   id: (id: string) => ['adminForm', id] as const,
-  freeSmsCount: (id: string) =>
-    [...adminFormKeys.id(id), 'freeSmsCount'] as const,
   collaborators: (id: string) =>
     [...adminFormKeys.id(id), 'collaborators'] as const,
   previewForm: (id: string) =>
@@ -67,17 +64,6 @@ export const useAdminFormWithId = (
   )
 }
 
-export const useFreeSmsQuota = () => {
-  const { formId } = useParams()
-  if (!formId) throw new Error('No formId provided to useFreeSmsQuota')
-
-  return useQuery(
-    adminFormKeys.freeSmsCount(formId),
-    () => getFreeSmsQuota(formId),
-    { staleTime: 0 },
-  )
-}
-
 /**
  * @params formId - The formId of the form to get the collaborators for.
  * Params required as formId may come from various sources, either via url params

diff --git a/...n/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/EditMobile.stories.tsx b/...n/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/EditMobile.stories.tsx
@@ -3,7 +3,6 @@ import { Meta, StoryFn } from '@storybook/react'
 import { BasicField, MobileFieldBase } from '~shared/types'
 
 import { createFormBuilderMocks } from '~/mocks/msw/handlers/admin-form'
-import { getFreeSmsQuota } from '~/mocks/msw/handlers/admin-form/twilio'
 
 import { EditFieldDrawerDecorator, StoryRouter } from '~utils/storybook'
 
@@ -33,7 +32,7 @@ export default {
   parameters: {
     // Required so skeleton "animation" does not hide content.
     chromatic: { pauseAnimationAtEnd: true },
-    msw: [getFreeSmsQuota(), ...createFormBuilderMocks({}, 0)],
+    msw: [...createFormBuilderMocks({}, 0)],
   },
   args: {
     field: DEFAULT_MOBILE_FIELD,
@@ -58,34 +57,5 @@ Default.args = {
 
 export const Loading = Template.bind({})
 Loading.parameters = {
-  msw: [
-    getFreeSmsQuota({ delay: 'infinite' }),
-    ...createFormBuilderMocks({}, 0),
-  ],
-}
-
-export const VerifiedQuotaExceeded = Template.bind({})
-VerifiedQuotaExceeded.parameters = {
-  msw: [
-    getFreeSmsQuota({
-      override: {
-        freeSmsCounts: 10000,
-        quota: 10000,
-      },
-    }),
-    ...createFormBuilderMocks({}, 0),
-  ],
-}
-
-export const HasCustomCredentials = Template.bind({})
-HasCustomCredentials.parameters = {
-  msw: [
-    getFreeSmsQuota({
-      override: {
-        freeSmsCounts: 10000,
-        quota: 10000,
-      },
-    }),
-    ...createFormBuilderMocks({ msgSrvcName: 'custom-credentials' }, 0),
-  ],
+  msw: [...createFormBuilderMocks({}, 0)],
 }
diff --git a/...nd-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/EditMobile.tsx b/...nd-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/EditMobile.tsx
@@ -12,15 +12,11 @@ import Input from '~components/Input'
 import Textarea from '~components/Textarea'
 import Toggle from '~components/Toggle'
 
-import { useFreeSmsQuota } from '~features/admin-form/common/queries'
-
 import { CreatePageDrawerContentContainer } from '../../../../../common'
 import { FormFieldDrawerActions } from '../common/FormFieldDrawerActions'
 import { EditFieldProps } from '../common/types'
 import { useEditFieldForm } from '../common/useEditFieldForm'
 
-import { SmsCountMessage } from './SmsCountMessage'
-
 const EDIT_MOBILE_KEYS = [
   'title',
   'description',
@@ -56,8 +52,6 @@ export const EditMobile = ({ field }: EditMobileProps): JSX.Element => {
     [],
   )
 
-  const { data: freeSmsCount } = useFreeSmsQuota()
-
   return (
     <>
       <CreatePageDrawerContentContainer>
@@ -111,7 +105,6 @@ export const EditMobile = ({ field }: EditMobileProps): JSX.Element => {
               )}
             />
           </FormControl>
-          <SmsCountMessage freeSmsCount={freeSmsCount} />
         </Box>
         <FormFieldDrawerActions
           isLoading={isLoading}

diff --git a/...sign/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/SmsCountMessage.tsx b/...sign/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/SmsCountMessage.tsx
diff --git a/...lder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/utils.ts b/...lder-and-design/BuilderAndDesignDrawer/EditFieldDrawer/edit-fieldtype/EditMobile/utils.ts
diff --git a/frontend/src/features/admin-form/create/featureTour/FeatureTour.stories.tsx b/frontend/src/features/admin-form/create/featureTour/FeatureTour.stories.tsx
@@ -6,7 +6,6 @@ import {
   createFormBuilderMocks,
   getAdminFormCollaborators,
 } from '~/mocks/msw/handlers/admin-form'
-import { getFreeSmsQuota } from '~/mocks/msw/handlers/admin-form/twilio'
 import { getUser } from '~/mocks/msw/handlers/user'
 
 import { AdminFormCreatePageDecorator } from '~utils/storybook'
@@ -21,7 +20,6 @@ const buildMswRoutes = (
     ...createFormBuilderMocks(overrides, delay),
     getUser(),
     getAdminFormCollaborators(),
-    getFreeSmsQuota({ delay }),
   ]
 }