From c3d3db63ffaa3a8d0d2560cee3a334704047faae Mon Sep 17 00:00:00 2001
From: Amit Fainholts <amit@up9.com>
Date: Tue, 1 Feb 2022 17:49:31 +0200
Subject: [PATCH 1/2] changed api to namespaces

---
 ui/src/components/Modals/AddUserModal/AddUserModal.tsx | 2 +-
 ui/src/components/Pages/TrafficPage/TrafficPage.tsx    | 6 +++++-
 ui/src/helpers/api.js                                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
index b61a36969..af31bb52d 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
@@ -104,7 +104,7 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
   const workspaceChange = (workspaces) => {
     //setWorkspaces(newVal);
     const  data = {...userDataModel, workspaceId : workspaces.length ? workspaces[0] : ""}
-    setUserData((prevState) => {return data});
+    setUserData(data)
     setGenarateDisabledState()
   }
 
diff --git a/ui/src/components/Pages/TrafficPage/TrafficPage.tsx b/ui/src/components/Pages/TrafficPage/TrafficPage.tsx
index b350bcae9..1f9ffd703 100644
--- a/ui/src/components/Pages/TrafficPage/TrafficPage.tsx
+++ b/ui/src/components/Pages/TrafficPage/TrafficPage.tsx
@@ -116,7 +116,11 @@ export const TrafficPage: React.FC<TrafficPageProps> = ({setAnalyzeStatus}) => {
             setLeftOffTop(null);
             setNoMoreDataTop(false);
         }
-        ws.current = new WebSocket(MizuWebsocketURL);
+        let websocketUrl = MizuWebsocketURL;
+        if (api.token) {
+          websocketUrl += `?sessionToken=${api.token}`;
+        }
+        ws.current = new WebSocket(websocketUrl);
         ws.current.onopen = () => {
             setWsConnection(WsConnectionStatus.Connected);
             ws.current.send(query);
diff --git a/ui/src/helpers/api.js b/ui/src/helpers/api.js
index 65349201c..69c067927 100644
--- a/ui/src/helpers/api.js
+++ b/ui/src/helpers/api.js
@@ -104,7 +104,7 @@ export default class Api {
     }
 
     getNamespaces = async() =>{
-        const response = await this.client.get(`/config/namespaces`);
+        const response = await this.client.get(`/kube/namespaces`);
         return response.data;
     }
 

From d7280661cc1fb494eecf0fd6ab404523350a3e3f Mon Sep 17 00:00:00 2001
From: Amit Fainholts <amit@up9.com>
Date: Wed, 2 Feb 2022 13:17:55 +0200
Subject: [PATCH 2/2] added api to connect default ws to admin

---
 .../components/SettingsModal/SettingModal.tsx |  3 +-
 ui/src/helpers/api.js                         | 29 ++++---------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/ui/src/components/SettingsModal/SettingModal.tsx b/ui/src/components/SettingsModal/SettingModal.tsx
index 0dfbb9ad1..621973ad7 100644
--- a/ui/src/components/SettingsModal/SettingModal.tsx
+++ b/ui/src/components/SettingsModal/SettingModal.tsx
@@ -7,6 +7,7 @@ import spinner from "../assets/spinner.svg";
 import {useCommonStyles} from "../../helpers/commonStyle";
 import {toast} from "react-toastify";
 import SelectList from "../UI/SelectList";
+import { adminUsername } from "../../consts";
 
 interface SettingsModalProps {
     isOpen: boolean
@@ -59,7 +60,7 @@ export const SettingsModal: React.FC<SettingsModalProps> = ({isOpen, onClose, is
                 name: "default",
                 namespaces: checkedNamespacesKeys
             }
-            await api.createWorkspace(defaultWorkspace);
+            await api.createWorkspace(defaultWorkspace,adminUsername);
             onClose();
             toast.success("Saved successfully");
         } catch (e) {
diff --git a/ui/src/helpers/api.js b/ui/src/helpers/api.js
index 69c067927..3351036d9 100644
--- a/ui/src/helpers/api.js
+++ b/ui/src/helpers/api.js
@@ -88,8 +88,12 @@ export default class Api {
         return response.data;
     }
 
-    createWorkspace = async(workspaceData) =>{
-        const response = await this.client.post(`/workspace`,workspaceData);
+    createWorkspace = async(workspaceData,linkUser) =>{
+        let path = `/workspace`;
+        if(linkUser){
+            path = `/workspace?linkUser=${linkUser}`;
+        }
+        const response = await this.client.post(path,workspaceData);
         return response.data;
     }    
 
@@ -196,27 +200,6 @@ export default class Api {
         }
     }
 
-    // register = async (username, password) => {
-    //     const form = new FormData();
-    //     form.append('username', username);
-    //     form.append('password', password);
-
-    //     try {
-    //         const response = await this.client.post(`/user/register`, form);
-    //         this.persistToken(response.data.token);
-    //         return response;
-    //     } catch (e) {
-    //         if (e.response.status === 400) {
-    //             const error = {
-    //                 'type': FormValidationErrorType,
-    //                 'messages': e.response.data
-    //             };
-    //             throw error;
-    //         } else {
-    //             throw e;
-    //         }
-    //     }
-    // }
 
     setupAdminUser = async (password) => {
         const form = new FormData();