From eb02a3ce49d29af8c597c51964cb61f2e7f1da25 Mon Sep 17 00:00:00 2001
From: mathieu <mathieu.dreano@gmail.com>
Date: Mon, 27 Nov 2023 00:01:50 +0100
Subject: [PATCH] toto

Signed-off-by: mathieu <mathieu.dreano@gmail.com>
---
 .../Environments/EnvironmentSelector/index.js | 24 ++++++++++---------
 .../EnvironmentColor/index.js                 |  1 -
 .../EnvironmentList/index.js                  |  2 +-
 .../Environments/EnvironmentSettings/index.js |  2 +-
 packages/bruno-lang/v2/src/jsonToEnv.js       |  1 -
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
index ac1ec69261..2e93c2c693 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
@@ -1,4 +1,4 @@
-import React, { useRef, forwardRef, useState, useEffect } from 'react';
+import React, { useRef, forwardRef, useState } from 'react';
 import find from 'lodash/find';
 import Dropdown from 'components/Dropdown';
 import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
@@ -8,16 +8,19 @@ import toast from 'react-hot-toast';
 import { useDispatch } from 'react-redux';
 import StyledWrapper from './StyledWrapper';
 
-const EnvironmentSelector = ({ collection }) => {
+const EnvironmentSelector = (props) => {
   const dispatch = useDispatch();
   const dropdownTippyRef = useRef();
   const [openSettingsModal, setOpenSettingsModal] = useState(false);
-  const { activeEnvironmentUid } = collection;
-  const [environments, setEnvironments] = useState(collection.environments);
-  useEffect(() => {
-    console.log('useEffect EnvironmentSelector');
-  }, [environments]);
-  const activeEnvironment = activeEnvironmentUid ? find(environments, (e) => e.uid === activeEnvironmentUid) : null;
+  const { activeEnvironmentUid } = props.collection;
+  const [collection, setCollection] = useState(props.collection);
+  const setEnvironments = (environments) => {
+    setCollection({ ...collection, environments: environments });
+  };
+
+  const activeEnvironment = activeEnvironmentUid
+    ? find(collection.environments, (e) => e.uid === activeEnvironmentUid)
+    : null;
 
   const Icon = forwardRef((props, ref) => {
     return (
@@ -50,8 +53,8 @@ const EnvironmentSelector = ({ collection }) => {
     <StyledWrapper>
       <div className="flex items-center cursor-pointer environment-selector">
         <Dropdown onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">
-          {environments && environments.length
-            ? environments.map((e) => (
+          {collection.environments?.length
+            ? collection.environments.map((e) => (
                 <div
                   className="dropdown-item"
                   key={e.uid}
@@ -86,7 +89,6 @@ const EnvironmentSelector = ({ collection }) => {
       {openSettingsModal && (
         <EnvironmentSettings
           collection={collection}
-          environments={environments}
           setEnvironments={setEnvironments}
           onClose={() => setOpenSettingsModal(false)}
         />
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentColor/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentColor/index.js
index 3974b09210..fd6f88b221 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentColor/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentColor/index.js
@@ -43,7 +43,6 @@ const EnvironmentColor = ({ environment, onColorChange, collectionUid }) => {
     }
   }, [formik.values.color]);
 
-  console.log(environment.color);
   return (
     <CirclePicker
       id="environment-color"
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
index 77d486e7e8..537423c049 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
@@ -49,7 +49,7 @@ const EnvironmentList = ({ collection, setEnvironments }) => {
 
     // check env delete
     if (prevEnvUids?.length && envUids.length < prevEnvUids.length) {
-      setSelectedEnvironment(collection.environments?.length ? environments[0] : null);
+      setSelectedEnvironment(collection.environments?.length ? collection.environments[0] : null);
     }
   }, [envUids, collection, prevEnvUids]);
 
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
index 3f08c06309..3c8979c270 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
@@ -1,5 +1,5 @@
 import Modal from 'components/Modal/index';
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import CreateEnvironment from './CreateEnvironment';
 import EnvironmentList from './EnvironmentList';
 import StyledWrapper from './StyledWrapper';
diff --git a/packages/bruno-lang/v2/src/jsonToEnv.js b/packages/bruno-lang/v2/src/jsonToEnv.js
index a7b4a89e71..b35622e6a1 100644
--- a/packages/bruno-lang/v2/src/jsonToEnv.js
+++ b/packages/bruno-lang/v2/src/jsonToEnv.js
@@ -43,7 +43,6 @@ ${secretVars.join(',\n')}
   }
 
   if (color !== undefined) {
-    console.log('jsonToEnv color', color);
     output += `color: ${color}
 `;
   }