Merge branch 'dev' into rose

Author: jujupro

app/src/components/left/RoomsContainer.tsx

@@ -13,7 +13,8 @@ import {
   addChild,
   changeFocus,
   deleteChild,
-  changePosition
+  changePosition,
+  resetState
 } from '../../redux/reducers/slice/appStateSlice';
 import {
   setRoomCode,
@@ -136,7 +137,6 @@ const RoomsContainer = () => {
     //edge case: if userList is not empty, reset it to empty array
     if (userList.length !== 0) dispatch(setUserList([]));
     handleUserEnteredRoom(roomCode);
-
     dispatch(setRoomCode(roomCode)); //?
     dispatch(setUserJoined(true)); //setting joined room to true for rendering leave room button
   }
@@ -145,6 +145,7 @@ const RoomsContainer = () => {
     let socket = getSocket();
     if (socket) {
       socket.disconnect(); //disconnecting socket from server
+      console.log(socket);
       socket = null;
       console.log('user leaves the room');
     }
@@ -153,6 +154,7 @@ const RoomsContainer = () => {
     dispatch(setUserName(''));
     dispatch(setUserList([]));
     dispatch(setUserJoined(false)); //setting joined to false so join room UI appear
+    dispatch(resetState(''));
   }
 
   //checking empty input field (not including spaces)

app/src/helperFunctions/socket.ts

@@ -16,10 +16,11 @@ import config from '../../../config';
 let socket = null;
 
 export const initializeSocket = () => {
-  if (socket) socket.disconnect();
+  if (socket) socket.connect();
   if (!socket) {
     socket = io(config.API_BASE_URL, { transports: ['websocket'] });
     console.log('A user connected');
+    console.log('socket:', socket);
   }
 };
 

app/src/redux/reducers/slice/userSlice.ts

@@ -163,15 +163,24 @@ io.on('connection', (client) => {
 
   //disconnecting functionality
   client.on('disconnecting', () => {
-    // the client.rooms Set contains at least the socket ID
     const roomCode = Array.from(client.rooms)[1]; //grabbing current room client was in when disconnecting
+    const userList = Object.keys(roomLists[roomCode]); //[ bHhFDmzPGam, mqri45c94E3 ] order is not perserved?
+    const hostID = userList[0];
+    // the client.rooms Set contains at least the socket ID
+    console.log(`${client.id} will be leaving the room`);
+    console.log(client.id === hostID);
+    console.log(roomLists[roomCode]);
     delete roomLists[roomCode][client.id];
+    console.log(roomLists[roomCode]);
     //if room empty, delete room from room list
     if (!Object.keys(roomLists[roomCode]).length) {
       delete roomLists[roomCode];
     } else {
       //else emit updated user list
-      io.to(roomCode).emit('updateUserList', roomLists[roomCode]);
+      io.to(roomCode).emit(
+        'updateUserList',
+        Object.values(roomLists[roomCode])
+      );
     }
   });