associate environment to a color

Signed-off-by: mathieu <mathieu.dreano@gmail.com> # Conflicts: # packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js # packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js # packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js # packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
usebruno · Jul 24, 2024 · 77c6714 · 77c6714
1 parent 3f290e4
commit 77c6714
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
@@ -25,7 +25,6 @@ const EnvironmentList = ({ collection, isModified, setIsModified }) => {
   useEffect(() => {
     if (selectedEnvironment) {
       setOriginalEnvironmentVariables(selectedEnvironment.variables);
-      setSelectedEnvironment(findEnvironmentInCollection(collection, selectedEnvironment.uid));
       return;
     }
 
@@ -37,6 +36,12 @@ const EnvironmentList = ({ collection, isModified, setIsModified }) => {
     }
   }, [collection, selectedEnvironment]);
 
+  useEffect(() => {
+    if (selectedEnvironment) {
+      setSelectedEnvironment(findEnvironmentInCollection(collection, selectedEnvironment.uid));
+    }
+  }, [environments]);
+
   useEffect(() => {
     // check env add
     if (prevEnvUids?.length && envUids.length > prevEnvUids.length) {

diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
@@ -43,11 +43,12 @@ const DefaultTab = ({ setTab }) => {
 };
 
 const EnvironmentSettings = ({ collection, onClose }) => {
+  const { environments } = collection;
   const [isModified, setIsModified] = useState(false);
   const [tab, setTab] = useState('default');
   const [openCreateModal, setOpenCreateModal] = useState(false);
   const [openImportModal, setOpenImportModal] = useState(false);
-  if (!collection.environments?.length) {
+  if (!environments?.length) {
     return (
       <StyledWrapper>
         <Modal size="md" title="Environments" handleCancel={onClose} hideCancel={true} hideFooter={true}>