fix: ts typing, ts config, test config

opengovsg · Sep 13, 2024 · a88630a · a88630a
1 parent 0ceb51d
commit a88630a
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 25 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -122,7 +122,7 @@ services:
       # Bearer token API key format
       - API_KEY_VERSION=v1
       # env vars for growthbook
-      - GROWTHBOOK_CLIENT_KEY
+      - GROWTHBOOK_CLIENT_KEY=growthbook_client_key
       # env vars for virus scanner
       - VIRUS_SCANNER_LAMBDA_FUNCTION_NAME=function
       - WOGAA_SECRET_KEY

diff --git a/frontend/.storybook/main.ts b/frontend/.storybook/main.ts
@@ -20,6 +20,12 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {},
   },
+  // For injecitng environment variables into Storybook runs
+  // (see: https://github.com/storybookjs/storybook/issues/12270#issuecomment-1139104523)
+  env: (config) => ({
+    ...config,
+    NODE_ENV: 'test',
+  }),
 }
 
 export default config
diff --git a/frontend/src/features/admin-form/AdminFormCreatePage.stories.tsx b/frontend/src/features/admin-form/AdminFormCreatePage.stories.tsx
@@ -165,7 +165,6 @@ FormWithPayment.parameters = {
       publishable_key: 'pk_samplekey',
     },
     payments_field: {
-      payment_type: PaymentType.Fixed,
       enabled: true,
       description: 'Test event registration fee',
       payment_type: PaymentType.Variable,

diff --git a/frontend/src/features/admin-form/preview/PreviewFormProvider.tsx b/frontend/src/features/admin-form/preview/PreviewFormProvider.tsx
@@ -338,6 +338,7 @@ export const PreviewFormProvider = ({
         isPaymentEnabled,
         isPreview: true,
         hasSingleSubmissionValidationError: false,
+        hasRespondentNotWhitelistedError: false,
         ...commonFormValues,
         ...data,
         ...rest,

diff --git a/...dmin-form/settings/components/AuthSettingsSection/SecretKeyDownloadWhitelistFileModal.tsx b/...dmin-form/settings/components/AuthSettingsSection/SecretKeyDownloadWhitelistFileModal.tsx
@@ -43,7 +43,7 @@ export const SecretKeyDownloadWhitelistFileModal = ({
     [errorToast],
   )
   const toastSuccessMessage = useCallback(
-    (message) => {
+    (message: string) => {
       toast.closeAll()
       toast({
         description: message,
@@ -62,7 +62,7 @@ export const SecretKeyDownloadWhitelistFileModal = ({
     [],
   )
   const handleWhitelistCsvDownload = useCallback(
-    ({ secretKey }) => {
+    ({ secretKey }: { secretKey: string }) => {
       fetchAdminFormEncryptedWhitelistedSubmitterIds(formId, queryClient)
         .then((data) => {
           const { encryptedWhitelistedSubmitterIds } = data

diff --git a/...-form/settings/hooks/useSecretKeyForm.tsx → ...n-form/settings/hooks/useSecretKeyForm.ts b/...-form/settings/hooks/useSecretKeyForm.tsx → ...n-form/settings/hooks/useSecretKeyForm.ts
diff --git a/frontend/src/features/admin-form/settings/mutations.ts b/frontend/src/features/admin-form/settings/mutations.ts
@@ -76,7 +76,7 @@ export const useMutateFormSettings = () => {
   )
 
   const generateErrorToast = useCallback(
-    (message) => {
+    (message: string) => {
       toast.closeAll()
       toast({
         description: message,
@@ -87,7 +87,7 @@ export const useMutateFormSettings = () => {
   )
 
   const generateSuccessToast = useCallback(
-    (message) => {
+    (message: string) => {
       toast.closeAll()
       toast({
         description: message,

diff --git a/frontend/src/features/admin-form/template/TemplateFormProvider.tsx b/frontend/src/features/admin-form/template/TemplateFormProvider.tsx
@@ -93,6 +93,7 @@ export const TemplateFormProvider = ({
         isPreview: true,
         isPaymentEnabled: false,
         hasSingleSubmissionValidationError: false,
+        hasRespondentNotWhitelistedError: false,
         ...commonFormValues,
         ...data,
         ...rest,

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "lib": ["DOM", "DOM.Iterable", "ES2020"],
+    "target": "ES2021",
+    "lib": [
+      "DOM",
+      "DOM.Iterable",
+      "ES2021"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -18,22 +22,58 @@
     "downlevelIteration": true,
     "baseUrl": ".",
     "paths": {
-      "~shared/*": ["../shared/*"],
-      "~assets/*": ["./src/assets/*"],
-      "~contexts/*": ["./src/contexts/*"],
-      "~constants/*": ["./src/constants/*"],
-      "~components/*": ["./src/components/*"],
-      "~templates/*": ["./src/templates/*"],
-      "~features/*": ["./src/features/*"],
-      "~hooks/*": ["./src/hooks/*"],
-      "~utils/*": ["./src/utils/*"],
-      "~pages/*": ["./src/pages/*"],
-      "~services/*": ["./src/services/*"],
-      "~theme/*": ["./src/theme/*"],
-      "~typings/*": ["./src/typings/*"],
-      "~/*": ["./src/*"]
+      "~shared/*": [
+        "../shared/*"
+      ],
+      "~assets/*": [
+        "./src/assets/*"
+      ],
+      "~contexts/*": [
+        "./src/contexts/*"
+      ],
+      "~constants/*": [
+        "./src/constants/*"
+      ],
+      "~components/*": [
+        "./src/components/*"
+      ],
+      "~templates/*": [
+        "./src/templates/*"
+      ],
+      "~features/*": [
+        "./src/features/*"
+      ],
+      "~hooks/*": [
+        "./src/hooks/*"
+      ],
+      "~utils/*": [
+        "./src/utils/*"
+      ],
+      "~pages/*": [
+        "./src/pages/*"
+      ],
+      "~services/*": [
+        "./src/services/*"
+      ],
+      "~theme/*": [
+        "./src/theme/*"
+      ],
+      "~typings/*": [
+        "./src/typings/*"
+      ],
+      "~/*": [
+        "./src/*"
+      ]
     }
   },
-  "include": ["src/**/*", ".storybook/**/*", "./vitest-setup.ts"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}
+  "include": [
+    "src/**/*",
+    ".storybook/**/*",
+    "./vitest-setup.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}