feat: add beta flag for main mfb button

opengovsg · Apr 26, 2024 · e8a0468 · e8a0468
1 parent 832ff2f
commit e8a0468
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/...r-and-design/BuilderAndDesignContent/BuilderAndDesignPlaceholder/EmptyFormPlaceholder.tsx b/...r-and-design/BuilderAndDesignContent/BuilderAndDesignPlaceholder/EmptyFormPlaceholder.tsx
@@ -14,12 +14,15 @@ import { useFeatureIsOn } from '@growthbook/growthbook-react'
 import { isValidMotionProp, motion } from 'framer-motion'
 
 import { featureFlags } from '~shared/constants'
+import { SubmissionType } from '~shared/types'
 
 import { BxsMagicWand } from '~assets/icons/BxsMagicWand'
 import { BxsWidget } from '~assets/icons/BxsWidget'
 import { useIsMobile } from '~hooks/useIsMobile'
 import Button from '~components/Button'
 
+import { useUser } from '~features/user/queries'
+
 const ChakraBox = chakra(motion.div, {
   /**
    * Allow motion props and non-Chakra props to be forwarded.
@@ -53,7 +56,10 @@ export const EmptyFormPlaceholder = forwardRef<
         : 'Drag a field from the Builder on the left to start'
     }, [isDraggingOver, isMobile])
 
-    const showMagicFormButton = useFeatureIsOn(featureFlags.magicFormBuilder)
+    const { user } = useUser()
+
+    const showMagicFormButton =
+      useFeatureIsOn(featureFlags.magicFormBuilder) && user?.betaFlags?.mfb
 
     const showMagicFormButtonFinal = useMemo(() => {
       return showMagicFormButton ? (

diff --git a/shared/types/user.ts b/shared/types/user.ts
@@ -15,6 +15,7 @@ export const UserBase = z.object({
     .object({
       payment: z.boolean().optional(),
       children: z.boolean().optional(),
+      mfb: z.boolean().optional(),
     })
     .optional(),
   flags: z

diff --git a/src/app/models/user.server.model.ts b/src/app/models/user.server.model.ts
@@ -74,6 +74,7 @@ const compileUserModel = (db: Mongoose) => {
       betaFlags: {
         payment: Boolean,
         children: Boolean,
+        mfb: Boolean,
       },
       flags: {
         lastSeenFeatureUpdateVersion: Number,

diff --git a/src/app/modules/form/admin-form/admin-form.controller.ts b/src/app/modules/form/admin-form/admin-form.controller.ts
@@ -5,7 +5,7 @@ import { celebrate, Joi as BaseJoi, Segments } from 'celebrate'
 import { AuthedSessionData } from 'express-session'
 import { StatusCodes } from 'http-status-codes'
 import JSONStream from 'JSONStream'
-import { ResultAsync } from 'neverthrow'
+import { okAsync, ResultAsync } from 'neverthrow'
 
 import {
   MAX_UPLOAD_FILE_SIZE,
@@ -104,6 +104,7 @@ import { PermissionLevel } from './admin-form.types'
 import {
   mapGoGovErrors,
   mapRouteError,
+  verifyUserBetaflag,
   verifyValidUnicodeString,
 } from './admin-form.utils'
 
@@ -1182,6 +1183,12 @@ export const createForm: ControllerHandler<
   return (
     // Step 1: Retrieve currently logged in user.
     UserService.findUserById(sessionUserId)
+      .andThen((user) =>
+        formParams.responseMode === FormResponseMode.Encrypt ||
+        formParams.responseMode === FormResponseMode.Email
+          ? verifyUserBetaflag(user, 'mfb')
+          : okAsync(user),
+      )
       // Step 2: Create form with given params and set admin to logged in user.
       .andThen((user) =>
         AdminFormService.createForm(