From a139cd4034943ba6a81bc865113a18c83147195e Mon Sep 17 00:00:00 2001
From: Youssef <khedher.youssef@hotmail.fr>
Date: Tue, 12 Oct 2021 08:39:31 +0100
Subject: [PATCH] fix reload env and setting tabs

---
 .../src/component/project/Project/Project.tsx | 78 ++++++++++---------
 .../ProjectEnvironment/ProjectEnvironment.tsx |  2 -
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/frontend/src/component/project/Project/Project.tsx b/frontend/src/component/project/Project/Project.tsx
index e9cc62d9db..305ad5d659 100644
--- a/frontend/src/component/project/Project/Project.tsx
+++ b/frontend/src/component/project/Project/Project.tsx
@@ -33,42 +33,6 @@ const Project = () => {
     const { a11yProps, activeTabIdx, setActiveTab } = useTabs(0);
 
     const basePath = `/projects/${id}`;
-
-    useEffect(() => {
-        const created = params.get('created');
-        const edited = params.get('edited');
-
-        if (created || edited) {
-            const text = created ? 'Project created' : 'Project updated';
-            setToastData({
-                show: true,
-                type: 'success',
-                text,
-            });
-        }
-        /* eslint-disable-next-line */
-    }, []);
-
-    useEffect(() => {
-        const tabIdx = tabData.findIndex(tab => tab.name === activeTab);
-        if(tabIdx > 0) {
-            setActiveTab(tabIdx);
-        } else {
-            setActiveTab(0);
-        }
-        
-        /* eslint-disable-next-line */
-    }, []);
-
-    const goToTabWithName = (name: string) => {
-        const index = tabData.findIndex(t => t.name === name);
-        if(index >= 0) {
-            const tab = tabData[index];
-            history.push(tab.path);
-            setActiveTab(index);
-        }
-    }
-
     const tabData = [
         {
             title: 'Overview',
@@ -102,7 +66,47 @@ const Project = () => {
             path: `${basePath}/settings`,
             name: 'settings',
         },
-    ].filter(tab => !tab.disabled);
+    ]
+
+    useEffect(() => {
+        const created = params.get('created');
+        const edited = params.get('edited');
+
+        if (created || edited) {
+            const text = created ? 'Project created' : 'Project updated';
+            setToastData({
+                show: true,
+                type: 'success',
+                text,
+            });
+        }
+
+        tabData.filter(tab => !tab.disabled);
+
+        /* eslint-disable-next-line */
+    }, []);
+
+    useEffect(() => {
+        const tabIdx = tabData.findIndex(tab => tab.name === activeTab);
+        if(tabIdx > 0) {
+            setActiveTab(tabIdx);
+        } else {
+            setActiveTab(0);
+        }
+        
+        /* eslint-disable-next-line */
+    }, []);
+
+    const goToTabWithName = (name: string) => {
+        const index = tabData.findIndex(t => t.name === name);
+        if(index >= 0) {
+            const tab = tabData[index];
+            history.push(tab.path);
+            setActiveTab(index);
+        }
+    }
+
+    
 
 
     const renderTabs = () => {
diff --git a/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx b/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx
index 73a107bee3..1570066c59 100644
--- a/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx
+++ b/frontend/src/component/project/ProjectEnvironment/ProjectEnvironment.tsx
@@ -45,8 +45,6 @@ const ProjectEnvironmentList = ({ projectId }: ProjectEnvironmentListProps) => {
     const { removeEnvironmentFromProject, addEnvironmentToProject } =
         useProjectApi();
 
-    console.log(project);
-
     // local state
     const [selectedEnv, setSelectedEnv] = useState<ProjectEnvironment>();
     const [confirmName, setConfirmName] = useState('');