build: release v6.118.0 (#7293)

* fix(deps): bump zod from 3.23.0 to 3.23.4 in /shared (#7283) Bumps [zod](https://github.com/colinhacks/zod) from 3.23.0 to 3.23.4. - [Release notes](https://github.com/colinhacks/zod/releases) - [Changelog](https://github.com/colinhacks/zod/blob/master/CHANGELOG.md) - [Commits](colinhacks/zod@v3.23.0...v3.23.4) --- updated-dependencies: - dependency-name: zod dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: reduce output, check gh login auth status only if not logged in (#7282) * fix(deps): bump type-fest from 4.16.0 to 4.17.0 in /shared (#7287) Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.16.0 to 4.17.0. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](sindresorhus/type-fest@v4.16.0...v4.17.0) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: add localhost domain into cors, used by attachment uploads (#7280) * feat(payments): add min global payment limit override (#7291) * add flag to allow global min override in form * allow fe variable fields to pass fe validators * allow respondent variable payment flow to respect global min override value * remove check min value check on respondent payment submission * fix: add missing default variable * test: add test cases for global limit * feat(btn): phase 2 - add growthbook toggle to control adding twilio creds (#7290) feat: add growthbook toggle to control adding twilio creds * fix: update chromium version (#7294) update chromium version * fix(deps): bump type-fest from 4.17.0 to 4.18.0 in /shared (#7297) Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.17.0 to 4.18.0. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](sindresorhus/type-fest@v4.17.0...v4.18.0) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(payments): allow 0 cents (#7298) fix: allow 0 cents * fix(btn): use different growthbook api (#7299) use different growthbook api * chore: bump version to v6.118.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
opengovsg · Apr 30, 2024 · 6eeb0b9 · 6eeb0b9
1 parent 4dc4e5a
commit 6eeb0b9
Show file tree

Hide file tree

Showing 26 changed files with 210 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,26 @@ 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.117.0](https://github.com/opengovsg/FormSG/compare/v6.117.0...v6.117.0)
+#### [v6.118.0](https://github.com/opengovsg/FormSG/compare/v6.118.0...v6.118.0)
+
+- fix(btn): use different growthbook api [`#7299`](https://github.com/opengovsg/FormSG/pull/7299)
+
+#### [v6.118.0](https://github.com/opengovsg/FormSG/compare/v6.117.0...v6.118.0)
+
+> 30 April 2024
+
+- fix(payments): allow 0 cents [`#7298`](https://github.com/opengovsg/FormSG/pull/7298)
+- fix(deps): bump type-fest from 4.17.0 to 4.18.0 in /shared [`#7297`](https://github.com/opengovsg/FormSG/pull/7297)
+- fix: update chromium version [`#7294`](https://github.com/opengovsg/FormSG/pull/7294)
+- feat(btn): phase 2 - add growthbook toggle to control adding twilio creds [`#7290`](https://github.com/opengovsg/FormSG/pull/7290)
+- feat(payments): add min global payment limit override [`#7291`](https://github.com/opengovsg/FormSG/pull/7291)
+- fix: add localhost domain into cors, used by attachment uploads [`#7280`](https://github.com/opengovsg/FormSG/pull/7280)
+- fix(deps): bump type-fest from 4.16.0 to 4.17.0 in /shared [`#7287`](https://github.com/opengovsg/FormSG/pull/7287)
+- chore: reduce output, check gh login auth status only if not logged in [`#7282`](https://github.com/opengovsg/FormSG/pull/7282)
+- build: merge release v6.117.0 into develop [`#7284`](https://github.com/opengovsg/FormSG/pull/7284)
+- build: release v6.117.0 [`#7266`](https://github.com/opengovsg/FormSG/pull/7266)
+- fix(deps): bump zod from 3.23.0 to 3.23.4 in /shared [`#7283`](https://github.com/opengovsg/FormSG/pull/7283)
+- chore: bump version to v6.118.0 [`9bcc6a0`](https://github.com/opengovsg/FormSG/commit/9bcc6a0140e3f10d6b8df4c1333fcf701ca24d10)
 
 #### [v6.117.0](https://github.com/opengovsg/FormSG/compare/v6.116.0...v6.117.0)
 
@@ -30,7 +49,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: refactor to move endpage block to generic folder [`#7248`](https://github.com/opengovsg/FormSG/pull/7248)
 - build: release v6.116.0 [`#7251`](https://github.com/opengovsg/FormSG/pull/7251)
 - chore: reverting package-lock changes [`040b962`](https://github.com/opengovsg/FormSG/commit/040b96284ea317de22d9de6cf872fd4116f24c51)
-- chore: bump version to v6.117.0 [`b355f4a`](https://github.com/opengovsg/FormSG/commit/b355f4a686445a7863e06a0da2ec136e878d50fd)
+- chore: bump version to v6.117.0 [`6eb4aca`](https://github.com/opengovsg/FormSG/commit/6eb4aca28514e3286c23c0834f9962de291a7fbc)
 
 #### [v6.116.0](https://github.com/opengovsg/FormSG/compare/v6.115.1...v6.116.0)
 

diff --git a/Dockerfile.development b/Dockerfile.development
@@ -29,7 +29,7 @@ RUN apk update && apk upgrade && \
     # https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md#running-on-alpine
     # https://www.npmjs.com/package/puppeteer-core?activeTab=versions for corresponding versions
     # Compatible chromium versions can be found here https://pkgs.alpinelinux.org/packages?name=chromium&branch=v3.19&repo=&arch=&maintainer=
-    chromium=124.0.6367.60-r0 \
+    chromium=124.0.6367.78-r0 \
     nss \
     freetype \
     freetype-dev \

diff --git a/Dockerfile.production b/Dockerfile.production
@@ -82,7 +82,7 @@ RUN mv /opt/formsg/dist/backend/shared /opt/formsg/
 
 RUN apk add --no-cache \
     # Compatible chromium versions can be found here https://pkgs.alpinelinux.org/packages?name=chromium&branch=v3.19&repo=&arch=&maintainer=
-    chromium=124.0.6367.60-r0 \
+    chromium=124.0.6367.78-r0 \
     nss \
     freetype \
     freetype-dev \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -169,6 +169,7 @@ services:
     environment:
       - SERVICES=s3,sqs,secretsmanager
       - DNS_ADDRESS=0
+      - EXTRA_CORS_ALLOWED_ORIGINS=http://localhost:3000
     volumes:
       - ./.localstack/volume:/var/lib/localstack
       - /var/run/docker.sock:/var/run/docker.sock

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.117.0",
+  "version": "6.118.0",
   "homepage": ".",
   "private": true,
   "dependencies": {

diff --git a/...signDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx b/...signDrawer/FieldListDrawer/field-panels/PaymentsInputPanel/VariablePaymentAmountField.tsx
@@ -33,16 +33,21 @@ export const VariablePaymentAmountField = ({
 }) => {
   const {
     data: {
-      maxPaymentAmountCents = Number.MAX_SAFE_INTEGER,
-      minPaymentAmountCents = Number.MIN_SAFE_INTEGER,
+      maxPaymentAmountCents: envMaxPaymentAmountCents = Number.MAX_SAFE_INTEGER,
+      minPaymentAmountCents: envMinPaymentAmountCents = Number.MIN_SAFE_INTEGER,
     } = {},
   } = useEnv()
 
+  const minAmountCents =
+    input.global_min_amount_override || envMinPaymentAmountCents
+
+  const maxAmountCents = envMaxPaymentAmountCents
+
   const minAmountInDollars = `S${formatCurrency(
-    Number(centsToDollars(minPaymentAmountCents)),
+    Number(centsToDollars(minAmountCents)),
   )}`
   const maxAmountInDollars = `S${formatCurrency(
-    Number(centsToDollars(maxPaymentAmountCents)),
+    Number(centsToDollars(maxAmountCents)),
   )}`
 
   const minAmountValidation: RegisterOptions<
@@ -51,6 +56,7 @@ export const VariablePaymentAmountField = ({
   > = usePaymentFieldValidation<FormPaymentsInput, typeof MIN_FIELD_KEY>({
     lesserThanCents: dollarsToCents(input[MAX_FIELD_KEY] || ''),
     msgWhenEmpty: `The minimum amount is ${minAmountInDollars}`,
+    overrideMinAmount: input.global_min_amount_override,
   })
   const maxAmountValidation: RegisterOptions<
     FormPaymentsInput,

diff --git a/...src/features/admin-form/settings/components/TwilioSettingsSection/TwilioDetailsInputs.tsx b/...src/features/admin-form/settings/components/TwilioSettingsSection/TwilioDetailsInputs.tsx
@@ -13,8 +13,10 @@ import {
   Stack,
   useDisclosure,
 } from '@chakra-ui/react'
+import { useFeatureValue } from '@growthbook/growthbook-react'
 import { useToggle } from 'rooks'
 
+import { featureFlags } from '~shared/constants'
 import { TwilioCredentials } from '~shared/types/twilio'
 
 import { trimStringsInObject } from '~utils/trimStringsInObject'
@@ -61,12 +63,16 @@ const TWILIO_INPUT_RULES: Record<keyof TwilioCredentials, RegisterOptions> = {
     },
   },
 }
-
 export const TwilioDetailsInputs = (): JSX.Element => {
   const { data: form, isLoading } = useAdminForm()
 
   const [isApiSecretShown, toggleIsApiSecretShown] = useToggle(false)
 
+  const isAddingTwilioDisabled = useFeatureValue(
+    featureFlags.addingTwilioDisabled,
+    false,
+  )
+
   const hasExistingTwilioCreds = useMemo(
     () => !!form?.msgSrvcName,
     [form?.msgSrvcName],
@@ -93,6 +99,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
 
   const handleUpdateTwilioDetails = handleSubmit((credentials) => {
     if (!form) return
+    if (isAddingTwilioDisabled) return
     return mutateFormTwilioDetails.mutate(trimStringsInObject(credentials), {
       onSuccess: () => reset(),
     })
@@ -129,6 +136,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
         <FormControl
           isReadOnly={mutateFormTwilioDetails.isLoading}
           isInvalid={!!errors.accountSid}
+          isDisabled={isAddingTwilioDisabled}
         >
           <FormLabel isRequired>Account SID</FormLabel>
           <Skeleton isLoaded={!isLoading}>
@@ -139,6 +147,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
         <FormControl
           isReadOnly={mutateFormTwilioDetails.isLoading}
           isInvalid={!!errors.apiKey}
+          isDisabled={isAddingTwilioDisabled}
         >
           <FormLabel isRequired>API Key SID</FormLabel>
           <Skeleton isLoaded={!isLoading}>
@@ -149,6 +158,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
         <FormControl
           isReadOnly={mutateFormTwilioDetails.isLoading}
           isInvalid={!!errors.apiSecret}
+          isDisabled={isAddingTwilioDisabled}
         >
           <FormLabel isRequired>API key secret</FormLabel>
           <Skeleton isLoaded={!isLoading}>
@@ -179,6 +189,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
         <FormControl
           isReadOnly={mutateFormTwilioDetails.isLoading}
           isInvalid={!!errors.messagingServiceSid}
+          isDisabled={isAddingTwilioDisabled}
         >
           <FormLabel isRequired>Messaging service SID</FormLabel>
           <Skeleton isLoaded={!isLoading}>
@@ -198,6 +209,7 @@ export const TwilioDetailsInputs = (): JSX.Element => {
           <Button
             isLoading={mutateFormTwilioDetails.isLoading}
             onClick={handleUpdateTwilioDetails}
+            isDisabled={isAddingTwilioDisabled}
           >
             Save credentials
           </Button>

diff --git a/...c/features/admin-form/settings/components/TwilioSettingsSection/TwilioSettingsSection.tsx b/...c/features/admin-form/settings/components/TwilioSettingsSection/TwilioSettingsSection.tsx
@@ -1,10 +1,20 @@
 import { ListItem, Text, UnorderedList } from '@chakra-ui/react'
+import { useFeatureValue } from '@growthbook/growthbook-react'
+
+import { featureFlags } from '~shared/constants'
 
 import InlineMessage from '~components/InlineMessage'
 
 import { TwilioDetailsInputs } from './TwilioDetailsInputs'
 
 export const TwilioSettingsSection = (): JSX.Element => {
+  const isAddingTwilioDisabled = useFeatureValue(
+    featureFlags.addingTwilioDisabled,
+    false,
+  )
+
+  const verbTense = isAddingTwilioDisabled ? 'has been' : 'will be'
+
   return (
     <>
       <InlineMessage mb="1rem" variant="warning">
@@ -15,8 +25,8 @@ export const TwilioSettingsSection = (): JSX.Element => {
           <UnorderedList spacing="0.5rem" mt="1rem">
             <ListItem>
               There is no longer a limit of 10,000 SMSes per form admin. Given
-              this change, the capability of adding new Twilio credentials will
-              be disabled from 30 April.
+              this change, the capability of adding new Twilio credentials{' '}
+              {verbTense} disabled from 30 April.
             </ListItem>
 
             <ListItem>

diff --git a/...res/public-form/components/FormPaymentPage/components/VariablePaymentItemDetailsBlock.tsx b/...res/public-form/components/FormPaymentPage/components/VariablePaymentItemDetailsBlock.tsx
@@ -20,6 +20,7 @@ export const VariablePaymentItemDetailsBlock = ({
   paymentItemName,
   paymentMin: _paymentMin,
   paymentMax: _paymentMax,
+  globalMinAmountOverride,
 }: VariableItemDetailProps): JSX.Element => {
   const {
     control,
@@ -39,7 +40,11 @@ export const VariablePaymentItemDetailsBlock = ({
       [PAYMENT_VARIABLE_INPUT_AMOUNT_FIELD_ID]: string
     },
     typeof PAYMENT_VARIABLE_INPUT_AMOUNT_FIELD_ID
-  >({ lesserThanCents: paymentMax, greaterThanCents: paymentMin })
+  >({
+    lesserThanCents: paymentMax,
+    greaterThanCents: paymentMin,
+    overrideMinAmount: globalMinAmountOverride,
+  })
 
   const amountHint = `Enter an amount between ${centsToDollarString(
     paymentMin,

diff --git a/frontend/src/features/public-form/components/FormPaymentPage/components/types.ts b/frontend/src/features/public-form/components/FormPaymentPage/components/types.ts
@@ -9,6 +9,7 @@ type PaymentItemDetailsProps = PaymentItemNameDescriptionProps
 export interface VariableItemDetailProps extends PaymentItemDetailsProps {
   paymentMin: number
   paymentMax: number
+  globalMinAmountOverride: number | undefined
 }
 
 export interface FixedItemDetailProps extends PaymentItemDetailsProps {

diff --git a/frontend/src/hooks/usePaymentFieldValidation.ts b/frontend/src/hooks/usePaymentFieldValidation.ts
@@ -8,28 +8,40 @@ import {
 
 import { useEnv } from '~features/env/queries'
 
+/**
+ *
+ * @param options.greaterThanCents The minimum amount in cents
+ * @param options.lesserThanCents The maximum amount in cents
+ * @param options.overrideMinAmount The minimum amount in cents that overrides the global minimum amount
+ * @param options.msgWhenEmpty The message to display when the field is empty
+ * @returns
+ */
 export const usePaymentFieldValidation = <
   T extends FieldValues,
   V extends FieldPath<T>,
 >(options?: {
   greaterThanCents?: number
   lesserThanCents?: number
+  overrideMinAmount?: number
   msgWhenEmpty?: string
 }) => {
   const {
     data: {
-      maxPaymentAmountCents = Number.MAX_SAFE_INTEGER,
-      minPaymentAmountCents = Number.MIN_SAFE_INTEGER,
+      maxPaymentAmountCents: envMaxPaymentAmountCents = Number.MAX_SAFE_INTEGER,
+      minPaymentAmountCents: envMinPaymentAmountCents = Number.MIN_SAFE_INTEGER,
     } = {},
   } = useEnv()
 
+  const maxAmountCents = envMaxPaymentAmountCents
+  const minAmountCents = options?.overrideMinAmount || envMinPaymentAmountCents
+
   const {
     lesserThanCents: maxCents = Number.MAX_SAFE_INTEGER,
     greaterThanCents: minCents = Number.MIN_SAFE_INTEGER,
     msgWhenEmpty = '',
   } = options || {}
-  const maxCentsLimit = Math.min(maxCents, maxPaymentAmountCents)
-  const minCentsLimit = Math.max(minCents, minPaymentAmountCents)
+  const maxCentsLimit = Math.min(maxCents, maxAmountCents)
+  const minCentsLimit = Math.max(minCents, minAmountCents)
 
   const amountValidation: RegisterOptions<T, V> = {
     validate: (val) => {

diff --git a/frontend/src/templates/Field/PaymentPreview/PaymentPreview.tsx b/frontend/src/templates/Field/PaymentPreview/PaymentPreview.tsx
@@ -47,6 +47,7 @@ const PaymentItemDetailsElement = ({
           paymentDescription={paymentDetails.description}
           paymentMin={paymentDetails.min_amount}
           paymentMax={paymentDetails.max_amount}
+          globalMinAmountOverride={paymentDetails.global_min_amount_override}
         />
       )
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.117.0",
+  "version": "6.118.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <[email protected]>"

diff --git a/scripts/release_prep.sh b/scripts/release_prep.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
+set +x
 
-set -x
 
 # pre-requisites: install github CLI
 # - github documentation: https://github.com/cli/cli#installation
 # - github is remote 'origin'
 # - PRs use test section LAST with heading "## Tests"
 # - ALL build and release PRs start with "build: "
 
+if ! command -v gh >/dev/null 2>&1; then
+    echo "Install gh first"
+    exit 1
+fi
+
+if ! gh auth status >/dev/null 2>&1; then
+    echo "You need to login: gh auth login"
+    exit 1
+fi
+
 has_local_changes=$(git status --porcelain --untracked-files=no --ignored=no)
 if [[ ${has_local_changes} ]]; then
   set +x
@@ -70,8 +80,6 @@ echo "## Dev-Dependencies" >> ${pr_body_file_groupped}
 echo "" >> ${pr_body_file_groupped}
 grep -E -- '- [a-z]+\(deps-dev\)' ${pr_body_file} >> ${pr_body_file_groupped}
 
-gh auth login
-
 ## Extract test procedures for feature PRs
 echo "" >> ${pr_body_file_groupped}
 echo "## Tests" >> ${pr_body_file_groupped}

diff --git a/shared/constants/feature-flags.ts b/shared/constants/feature-flags.ts
@@ -5,4 +5,5 @@ export const featureFlags = {
   validateStripeEmailDomain: 'validateStripeEmailDomain' as const,
   myinfoSgid: 'myinfo-sgid' as const,
   chartsMaxResponseCount: 'charts-max-response-count' as const,
+  addingTwilioDisabled: 'adding-twilio-disabled' as const,
 }