Memoize Config and useConfigErrors

INTO-CPS-Association · Feb 20, 2025 · 6dacf9d · 6dacf9d
1 parent 33dd22f
commit 6dacf9d
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/client/src/route/config/Config.tsx b/client/src/route/config/Config.tsx
@@ -111,22 +111,29 @@ const useValidationResults = () => {
 
 const useConfigErrors = (validationResults: {
   [key: string]: ValidationType;
-}) =>
-  Object.keys(window.env).some(
-    (key) => key !== undefined && validationResults[key]?.error !== undefined,
+}) => {
+  return React.useMemo(() => 
+    Object.keys(window.env || {}).some(
+      (key) => key !== undefined && validationResults[key]?.error !== undefined
+    ),
+    [validationResults]
   );
+};
 
 const Config = (props: { role: string }) => {
   const { validationResults, isLoading } = useValidationResults();
-  const configVerification =
+
+  const configVerification = React.useMemo(() => 
     props.role === 'user'
       ? UserConfig(validationResults)
-      : DeveloperConfig(validationResults);
-
+      : DeveloperConfig(validationResults),
+    [validationResults]
+  );
+
   if (isLoading) {
     return loadingComponent();
   }
-
+  
   return configVerification;
 };