From c3d3db63ffaa3a8d0d2560cee3a334704047faae Mon Sep 17 00:00:00 2001 From: Amit Fainholts Date: Tue, 1 Feb 2022 17:49:31 +0200 Subject: [PATCH] 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 = ({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 = ({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; }