refactor to utils function

Author: KenLSM

frontend/src/features/admin-form/settings/components/AuthSettingsSection/SingpassAuthOptionsRadio.tsx

@@ -18,6 +18,7 @@ import { useMutateFormSettings } from '../../mutations'
 import { FORM_SINGPASS_AUTHTYPES } from './constants'
 import { EsrvcIdBox } from './EsrvcIdBox'
 import { pickBy } from 'lodash'
+import { isEsrvcidRequired } from '../utils'
 
 export interface SingpassAuthOptionsRadioProps {
   settings: FormSettings
@@ -26,21 +27,6 @@ export interface SingpassAuthOptionsRadioProps {
 
 type RadioOptionsType = [FormAuthType, string][]
 
-/**
- * Only CorpPass requires esrvcid as other options will use FormSG's
- * supplied value to increase Singpass Myinfo adoption
- * @param authType
- * @returns
- */
-const isEsrvcidRequired = (authType: FormAuthType) => {
-  switch (authType) {
-    case FormAuthType.CP:
-      return true
-    default:
-      return false
-  }
-}
-
 const COLLAPSED_FORM_SINGPASS_AUTHTYPES = pickBy(
   FORM_SINGPASS_AUTHTYPES,
   (_, key) =>

frontend/src/features/admin-form/settings/components/FormStatusToggle.tsx

@@ -20,6 +20,7 @@ import { useAdminFormSettings } from '../queries'
 
 import { EmailModeConvertModal } from './EmailModeConvertModal'
 import { SecretKeyActivationModal } from './SecretKeyActivationModal'
+import { isEsrvcidRequired } from './utils'
 
 export const FormStatusToggle = (): JSX.Element => {
   const { t } = useTranslation()
@@ -41,7 +42,7 @@ export const FormStatusToggle = (): JSX.Element => {
     if (status === FormStatus.Public) return
 
     // Prevent form activation if form has authType but no esrvcId.
-    if (authType && [FormAuthType.CP].includes(authType) && !esrvcId) {
+    if (authType && isEsrvcidRequired(authType) && !esrvcId) {
       return t(
         'features.adminForm.settings.general.status.supplySingpassEServiceId',
       )

frontend/src/features/admin-form/settings/components/utils.ts

@@ -0,0 +1,17 @@
+import { FormAuthType } from '~shared/types'
+
+/**
+ * Only CorpPass requires esrvcid as other options will use FormSG's
+ * supplied value to increase Singpass Myinfo adoption
+ * @param authType
+ * @returns
+ */
+
+export const isEsrvcidRequired = (authType: FormAuthType) => {
+  switch (authType) {
+    case FormAuthType.CP:
+      return true
+    default:
+      return false
+  }
+}