From c437437b5023e6a2772b4730c0e9e7718a3f36b8 Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Wed, 23 Jun 2021 10:42:42 +0200 Subject: [PATCH] F OpenNebula/one#5422: Remove event state in global sockets --- .../src/client/providers/socketProvider.js | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/fireedge/src/client/providers/socketProvider.js b/src/fireedge/src/client/providers/socketProvider.js index dfcfd6ddf5..b629c59430 100644 --- a/src/fireedge/src/client/providers/socketProvider.js +++ b/src/fireedge/src/client/providers/socketProvider.js @@ -7,16 +7,15 @@ import { useSelector, useDispatch } from 'react-redux' import { WEBSOCKET_URL, SOCKETS } from 'client/constants' import * as sockets from 'client/features/One/socket/actions' -const createWebsocket = query => socketIO({ path: WEBSOCKET_URL, query }) - -const CONNECT = 'connect' -const DISCONNECT = 'disconnect' +const createProvisionWebsocket = query => socketIO({ + path: `${WEBSOCKET_URL}/${SOCKETS.provision}`, + query +}) export const SocketContext = createContext(null) const SocketProvider = ({ children }) => { const [socket, setSocket] = useState({}) - const [isConnected, setConnected] = useState(false) const dispatch = useDispatch() const { jwt, zone } = useSelector(state => ({ @@ -27,16 +26,9 @@ const SocketProvider = ({ children }) => { useEffect(() => { if (!jwt) return - const client = createWebsocket({ token: jwt, zone }) + const client = createProvisionWebsocket({ token: jwt, zone }) setSocket(client) - client.on(CONNECT, () => setConnected(true)) - client.on(DISCONNECT, () => setConnected(false)) - - client.on(SOCKETS.hooks, data => { - dispatch(sockets.socketEventState(data)) - }) - client.on(SOCKETS.provision, data => { dispatch(sockets.socketCreateProvision(data)) }) @@ -48,7 +40,7 @@ const SocketProvider = ({ children }) => { }, [jwt, zone]) return ( - + {children} )