IO-2971 add null coalescing

client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx

@@ -219,7 +219,7 @@ export function JobsExportAllButton({
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

client/src/components/payable-export-all-button/payable-export-all-button.component.jsx

@@ -200,7 +200,7 @@ export function PayableExportAll({
     );
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

client/src/components/payments-export-all-button/payments-export-all-button.component.jsx

@@ -180,7 +180,7 @@ export function PaymentsExportAllButton({
   };
 
   return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

server/web-sockets/redisSocketEvents.js

@@ -33,14 +33,12 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       try {
         const room = getBodyshopRoom(bodyshopUUID);
         socket.join(room);
-
+        await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
         createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`);
 
-        // TODO Removed room functionality for now
-        // await addUserToRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
         // Notify all users in the room about the updated user list
-        // const usersInRoom = await getUsersInRoom(room);
-        // io.to(room).emit("room-users-updated", usersInRoom);
+        const usersInRoom = await getUsersInRoom(room);
+        io.to(room).emit("room-users-updated", usersInRoom);
       } catch (error) {
         createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
       }
@@ -56,14 +54,14 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       }
     });
 
-    // socket.on("get-room-users", async (bodyshopUUID, callback) => {
-    //   try {
-    //     const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID));
-    //     callback(usersInRoom);
-    //   } catch (error) {
-    //     createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
-    //   }
-    // });
+    socket.on("get-room-users", async (bodyshopUUID, callback) => {
+      try {
+        const usersInRoom = await getUsersInRoom(getBodyshopRoom(bodyshopUUID));
+        callback(usersInRoom);
+      } catch (error) {
+        createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
+      }
+    });
 
     socket.on("broadcast-to-bodyshop", async (bodyshopUUID, message) => {
       try {
@@ -79,12 +77,11 @@ const redisSocketEvents = (io, { addUserToRoom, getUsersInRoom, removeUserFromRo
       try {
         createLogEvent(socket, "DEBUG", `User disconnected.`);
 
-        // TODO Remove room functionality for now
         // Get all rooms the socket is part of
-        //   const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
-        //   for (const room of rooms) {
-        //     await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
-        //   }
+        const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
+        for (const room of rooms) {
+          await removeUserFromRoom(room, { uid: socket.user.uid, email: socket.user.email, socket: socket.id });
+        }
       } catch (error) {
         createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
       }