refactor: move internal radio field constant over to shared as SSOT

opengovsg · Mar 18, 2024 · f270eea · f270eea
1 parent 86e5e93
commit f270eea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/frontend/src/templates/Field/Radio/constants.ts b/frontend/src/templates/Field/Radio/constants.ts
@@ -1,3 +1,3 @@
+export { CLIENT_RADIO_OTHERS_INPUT_VALUE as RADIO_OTHERS_INPUT_VALUE } from '~shared/constants'
+
 export const RADIO_OTHERS_INPUT_KEY = 'othersInput'
-// TODO: Keep this in sync with the shared value.
-export const RADIO_OTHERS_INPUT_VALUE = '!!FORMSG_INTERNAL_RADIO_OTHERS_VALUE!!'
diff --git a/shared/constants/form.ts b/shared/constants/form.ts
@@ -73,6 +73,9 @@ export const PAYMENT_PRODUCT_FIELD_ID = 'payment_products'
 export const PAYMENT_VARIABLE_INPUT_AMOUNT_FIELD_ID =
   'payment_variable_input_amount_field_id'
 
+export const CLIENT_RADIO_OTHERS_INPUT_VALUE =
+  '!!FORMSG_INTERNAL_RADIO_OTHERS_VALUE!!'
+
 // The current encrypt version to assign to the encrypted submission.
 // This is needed if we ever break backwards compatibility with
 // end-to-end encryption

diff --git a/shared/utils/__tests__/logic.spec.ts b/shared/utils/__tests__/logic.spec.ts
@@ -7,7 +7,6 @@ import {
   LogicFieldClientRadioResponseInput,
   LogicFieldResponse,
   LogicFieldServerResponse,
-  RADIO_OTHERS_INPUT_VALUE,
 } from '../logic'
 
 import {
@@ -22,6 +21,7 @@ import {
   ShortTextFieldBase,
   ShowFieldLogicDto,
 } from '../../types'
+import { CLIENT_RADIO_OTHERS_INPUT_VALUE } from '../../constants'
 
 describe('Logic validation', () => {
   /** Mock a field's bare essentials */
@@ -1100,7 +1100,7 @@ describe('Logic validation', () => {
         getVisibleFieldIds(
           [
             fillInRadioButton({
-              value: RADIO_OTHERS_INPUT_VALUE,
+              value: CLIENT_RADIO_OTHERS_INPUT_VALUE,
               othersInput: 'test',
             }) as unknown as LogicFieldResponse,
             textLogicFieldServerResponse,
@@ -1312,7 +1312,7 @@ describe('Logic validation', () => {
         getLogicUnitPreventingSubmit(
           [
             fillInRadioButton({
-              value: RADIO_OTHERS_INPUT_VALUE,
+              value: CLIENT_RADIO_OTHERS_INPUT_VALUE,
               othersInput: 'test',
             }) as unknown as LogicFieldResponse,
             textLogicFieldServerResponse,

diff --git a/shared/utils/logic.ts b/shared/utils/logic.ts
@@ -1,3 +1,4 @@
+import { CLIENT_RADIO_OTHERS_INPUT_VALUE } from '../constants'
 import {
   BasicField,
   FormDto,
@@ -11,10 +12,6 @@ import {
   LogicableField,
 } from '../types'
 
-// TODO: Keep this in sync with the frontend value.
-// Exported for testing
-export const RADIO_OTHERS_INPUT_VALUE = '!!FORMSG_INTERNAL_RADIO_OTHERS_VALUE!!'
-
 const LOGIC_CONDITIONS: LogicCondition[] = [
   [
     BasicField.Dropdown,
@@ -413,7 +410,7 @@ const isConditionFulfilled = (
         } else {
           // (4) Client-side handling
           if (
-            currentValue.value === RADIO_OTHERS_INPUT_VALUE &&
+            currentValue.value === CLIENT_RADIO_OTHERS_INPUT_VALUE &&
             !!currentValue.othersInput
           ) {
             return true