Merge main into sweep/convert-main-to-functional-component

porter-dev · Sep 20, 2023 · 99de77b · 99de77b
2 parents ab6c91f + 75753d0
commit 99de77b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/dashboard/src/main/home/cluster-dashboard/env-groups/EnvGroupArrayStacks.tsx b/dashboard/src/main/home/cluster-dashboard/env-groups/EnvGroupArrayStacks.tsx
@@ -45,9 +45,10 @@ const EnvGroupArray = ({
   }, [values]);
   const isKeyOverriding = (key: string) => {
     if (!syncedEnvGroups || !values) return false;
-    return syncedEnvGroups?.some(envGroup =>
-      (envGroup?.variables) && key in envGroup?.variables || key in envGroup?.secret_variables
-    );
+    return syncedEnvGroups?.some(envGroup => {
+      if (!envGroup || !envGroup.variables) return false;
+      return key in envGroup.variables || (envGroup.secret_variables && key in envGroup.secret_variables);
+    });
   };
 
   const readFile = (env: string) => {