fix(BUX-112): improvements to CR

docker-compose.yml

@@ -18,6 +18,7 @@ services:
     image: postgres:15.2-alpine
     volumes:
       - pgdata:/var/lib/postgresql/data
+      # - ./data/sql/db:/var/lib/postgresql/data:Z
     environment:
       - POSTGRES_NAME=postgres
       - POSTGRES_USER=postgres

src/App.tsx

@@ -69,7 +69,6 @@ export const App = () => {
   useEffect(() => {
     setError('')
     apiUrl &&
-      apiUrl &&
       getUser(apiUrl)
         .then((response) => {
           const currentUserData: LoggedInUser = {

src/providers/config/index.ts

@@ -1,2 +1 @@
-export * from './hooks'
 export * from './provider'

src/providers/config/provider.tsx

@@ -1,17 +1,17 @@
 import { loadConfigFromFile } from '@/utils/loadConfig'
-import { FC, ReactNode, createContext, useEffect, useState } from 'react'
+import { FC, ReactNode, createContext, useContext, useEffect, useState } from 'react'
 
 export type ConfigType = {
   apiUrl: string | undefined
   paymailDomain: string | undefined
 }
 
-export type ConfigContextType = {
+type ConfigContextType = {
   config: ConfigType
   setConfig: React.Dispatch<React.SetStateAction<ConfigType>>
 }
 
-export const ConfigContext = createContext<ConfigContextType | undefined>(undefined)
+const ConfigContext = createContext<ConfigContextType | undefined>(undefined)
 ConfigContext.displayName = 'ConfigContext'
 
 type ConfigProviderProps = {
@@ -37,3 +37,11 @@ export const ConfigProvider: FC<ConfigProviderProps> = ({ children }) => {
 
   return <ConfigContext.Provider value={value}>{children}</ConfigContext.Provider>
 }
+
+export const useConfig = () => {
+  const ctx = useContext(ConfigContext)
+  if (!ctx) {
+    throw new Error('useConfig must be use within ConfigProvider')
+  }
+  return ctx
+}

src/utils/loadConfig.ts

@@ -1,34 +1,37 @@
 import { ConfigType } from '@/providers'
 
 export const loadConfigFromFile = async () => {
-  let defaultConfig;
+  let defaultConfig
   try {
-    const defaultPublicConfigFile = await fetch("/config.default.json");
-    defaultConfig = await defaultPublicConfigFile.json();
+    const defaultPublicConfigFile = await fetch('/config.default.json')
+    defaultConfig = await defaultPublicConfigFile.json()
   } catch {
-    throw new Error("Default config does not exist in the public directory");
+    throw new Error('Default config does not exist in the public directory')
   }
 
-  let overrideConfig;
+  let overrideConfig
   try {
-    const overrideConfigFile = await fetch("/env-config.json");
-    overrideConfig = await overrideConfigFile.json();
+    const overrideConfigFile = await fetch('/env-config.json')
+    overrideConfig = await overrideConfigFile.json()
   } catch {
-    console.info("File env-config.json not specified or wrong format (requires json). Using default config...");
-    return defaultConfig;
+    console.info('File env-config.json not specified or wrong format (requires json). Using default config...')
+    return defaultConfig
   }
 
-  console.info("Using merged (default with override) config...");
-  return mergeConfig(defaultConfig, overrideConfig);
+  console.info('Using merged (default with override) config...')
+  return mergeConfig(defaultConfig, overrideConfig)
 }
 
 const mergeConfig = (defaultConfig: ConfigType, overrideConfig: ConfigType) => {
   const initialConfigKeys = Object.keys(defaultConfig)
-  const overrideConfigMatchingKeys = Object.keys(overrideConfig).filter((key) => initialConfigKeys.includes(key))
+  const overrideConfigMatchingKeys = Object.keys(overrideConfig).filter((key) =>
+    initialConfigKeys.includes(key)
+  ) as (keyof ConfigType)[]
 
   overrideConfigMatchingKeys.forEach((key) => {
-    // @ts-ignore: types will always match here, because of using the same key for both objects
-    defaultConfig[key] = overrideConfig[key]
+    if (typeof defaultConfig[key] === typeof overrideConfig[key]) {
+      defaultConfig[key] = overrideConfig[key]
+    }
   })
 
   return defaultConfig