ordering-components-external 13.2.4 → 13.2.6

package/_modules/components/BusinessAndProductList/index.js

@@ -408,6 +408,7 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
           case 0:
             page = _ref5.page, _ref5$pageSize = _ref5.pageSize, pageSize = _ref5$pageSize === void 0 ? categoryStateDefault.pagination.pageSize : _ref5$pageSize;
             parameters = _objectSpread(_objectSpread(_objectSpread({
+              version: 'v2',
               type: (_orderState$options$t = (_orderState$options = orderState.options) === null || _orderState$options === void 0 ? void 0 : _orderState$options.type) !== null && _orderState$options$t !== void 0 ? _orderState$options$t : 1
             }, !isFetchAllProducts && {
               page: page

package/_modules/components/OrderListGroups/index.js

@@ -91,7 +91,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     error: null,
     orders: [],
     pagination: {
-      currentPage: paginationSettings.controlType === 'pages' && paginationSettings.initialPage && paginationSettings.initialPage >= 1 ? paginationSettings.initialPage - 1 : 0,
+      currentPage: paginationSettings.controlType === 'pages' && paginationSettings.initialPage && paginationSettings.initialPage >= 1 ? paginationSettings.initialPage - 1 : 1,
       pageSize: (_paginationSettings$p = paginationSettings.pageSize) !== null && _paginationSettings$p !== void 0 ? _paginationSettings$p : 10,
       total: null
     }
@@ -1352,7 +1352,6 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     events.emit(evts[event], value);
   };
   (0, _react.useEffect)(function () {
-    var _session$user7, _session$user8, _socket$socket, _socket$socket2, _socket$socket3, _socket$socket4, _socket$socket5, _socket$socket6, _socket$socket7, _socket$socket8;
     if (!(socket !== null && socket !== void 0 && socket.socket)) return;
     var handleUpdateOrder = function handleUpdateOrder(order) {
       var _order$products, _session$user5, _orderFound, _order$driver, _session$user6;
@@ -1437,28 +1436,10 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
         setRecentlyReceivedMessage(message);
       }
     };
-    var ordersRoom = (session === null || session === void 0 || (_session$user7 = session.user) === null || _session$user7 === void 0 ? void 0 : _session$user7.level) === 0 ? 'orders' : "orders_".concat(session === null || session === void 0 || (_session$user8 = session.user) === null || _session$user8 === void 0 ? void 0 : _session$user8.id);
-    socket.join(ordersRoom);
-    if (!(socket !== null && socket !== void 0 && (_socket$socket = socket.socket) !== null && _socket$socket !== void 0 && (_socket$socket = _socket$socket._callbacks) !== null && _socket$socket !== void 0 && _socket$socket.$orders_register) || socket !== null && socket !== void 0 && (_socket$socket2 = socket.socket) !== null && _socket$socket2 !== void 0 && (_socket$socket2 = _socket$socket2._callbacks) !== null && _socket$socket2 !== void 0 && (_socket$socket2 = _socket$socket2.$orders_register) !== null && _socket$socket2 !== void 0 && _socket$socket2.find(function (func) {
-      return (func === null || func === void 0 ? void 0 : func.name) !== 'handleAddNewOrder';
-    })) {
-      socket.on('orders_register', handleAddNewOrder);
-    }
-    if (!(socket !== null && socket !== void 0 && (_socket$socket3 = socket.socket) !== null && _socket$socket3 !== void 0 && (_socket$socket3 = _socket$socket3._callbacks) !== null && _socket$socket3 !== void 0 && _socket$socket3.$order_assigned) || socket !== null && socket !== void 0 && (_socket$socket4 = socket.socket) !== null && _socket$socket4 !== void 0 && (_socket$socket4 = _socket$socket4._callbacks) !== null && _socket$socket4 !== void 0 && (_socket$socket4 = _socket$socket4.$order_assigned) !== null && _socket$socket4 !== void 0 && _socket$socket4.find(function (func) {
-      return (func === null || func === void 0 ? void 0 : func.name) !== 'handleAddNewOrder';
-    })) {
-      socket.on('order_assigned', handleAddNewOrder);
-    }
-    if (!(socket !== null && socket !== void 0 && (_socket$socket5 = socket.socket) !== null && _socket$socket5 !== void 0 && (_socket$socket5 = _socket$socket5._callbacks) !== null && _socket$socket5 !== void 0 && _socket$socket5.$update_order) || socket !== null && socket !== void 0 && (_socket$socket6 = socket.socket) !== null && _socket$socket6 !== void 0 && (_socket$socket6 = _socket$socket6._callbacks) !== null && _socket$socket6 !== void 0 && (_socket$socket6 = _socket$socket6.$update_order) !== null && _socket$socket6 !== void 0 && _socket$socket6.find(function (func) {
-      return (func === null || func === void 0 ? void 0 : func.name) !== 'handleUpdateOrder';
-    })) {
-      socket.on('update_order', handleUpdateOrder);
-    }
-    if (!(socket !== null && socket !== void 0 && (_socket$socket7 = socket.socket) !== null && _socket$socket7 !== void 0 && (_socket$socket7 = _socket$socket7._callbacks) !== null && _socket$socket7 !== void 0 && _socket$socket7.$message) || socket !== null && socket !== void 0 && (_socket$socket8 = socket.socket) !== null && _socket$socket8 !== void 0 && (_socket$socket8 = _socket$socket8._callbacks) !== null && _socket$socket8 !== void 0 && (_socket$socket8 = _socket$socket8.$message) !== null && _socket$socket8 !== void 0 && _socket$socket8.find(function (func) {
-      return (func === null || func === void 0 ? void 0 : func.name) !== 'handleReceiveMessage';
-    })) {
-      socket.on('message', handleReceiveMessage);
-    }
+    socket.on('orders_register', handleAddNewOrder);
+    socket.on('order_assigned', handleAddNewOrder);
+    socket.on('update_order', handleUpdateOrder);
+    socket.on('message', handleReceiveMessage);
     return function () {
       socket.off('orders_register', handleAddNewOrder);
       socket.off('order_assigned', handleAddNewOrder);
@@ -1536,32 +1517,36 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     };
   }, [socket, session, isLogisticActivated]);
   (0, _react.useEffect)(function () {
-    var _session$user15, _session$user16, _session$user17, _session$user18, _session$user19, _session$user20;
     if (!session.user) return;
-    socket.on('disconnect', function () {
-      var _session$user9, _session$user10, _session$user11, _session$user12, _session$user13, _session$user14;
-      var ordersRoom = (session === null || session === void 0 || (_session$user9 = session.user) === null || _session$user9 === void 0 ? void 0 : _session$user9.level) === 0 ? 'orders' : "orders_".concat(session === null || session === void 0 || (_session$user10 = session.user) === null || _session$user10 === void 0 ? void 0 : _session$user10.id);
+    var userId = session.user.id;
+    var userLevel = session.user.level;
+    var ordersRoom = !isDriverApp ? {
+      project: ordering.project,
+      room: 'orders',
+      user_id: userId,
+      role: 'manager'
+    } : userLevel === 0 ? 'orders' : "orders_".concat(userId);
+    var requestsRoom = "requests_".concat(userId);
+    var groupsRoom = "ordergroups_".concat(userId);
+    var messagesOrdersRoom = userLevel === 0 ? 'messages_orders' : "messages_orders_".concat(userId);
+    var joinRooms = function joinRooms() {
       socket.join(ordersRoom);
-      var requestsRoom = "requests_".concat(session === null || session === void 0 || (_session$user11 = session.user) === null || _session$user11 === void 0 ? void 0 : _session$user11.id);
       socket.join(requestsRoom);
-      var groupsRoom = "ordergroups_".concat(session === null || session === void 0 || (_session$user12 = session.user) === null || _session$user12 === void 0 ? void 0 : _session$user12.id);
       socket.join(groupsRoom);
-      socket.join((session === null || session === void 0 || (_session$user13 = session.user) === null || _session$user13 === void 0 ? void 0 : _session$user13.level) === 0 ? 'messages_orders' : "messages_orders_".concat(session === null || session === void 0 || (_session$user14 = session.user) === null || _session$user14 === void 0 ? void 0 : _session$user14.id));
-    });
-    var ordersRoom = (session === null || session === void 0 || (_session$user15 = session.user) === null || _session$user15 === void 0 ? void 0 : _session$user15.level) === 0 ? 'orders' : "orders_".concat(session === null || session === void 0 || (_session$user16 = session.user) === null || _session$user16 === void 0 ? void 0 : _session$user16.id);
-    var messagesOrdersRoom = (session === null || session === void 0 || (_session$user17 = session.user) === null || _session$user17 === void 0 ? void 0 : _session$user17.level) === 0 ? 'messages_orders' : "messages_orders_".concat(session === null || session === void 0 || (_session$user18 = session.user) === null || _session$user18 === void 0 ? void 0 : _session$user18.id);
-    var requestsRoom = "requests_".concat(session === null || session === void 0 || (_session$user19 = session.user) === null || _session$user19 === void 0 ? void 0 : _session$user19.id);
-    var groupsRoom = "ordergroups_".concat(session === null || session === void 0 || (_session$user20 = session.user) === null || _session$user20 === void 0 ? void 0 : _session$user20.id);
-    socket.join(ordersRoom);
-    socket.join(requestsRoom);
-    socket.join(groupsRoom);
-    socket.join(messagesOrdersRoom);
-    return function () {
+      socket.join(messagesOrdersRoom);
+    };
+    var leaveRooms = function leaveRooms() {
       socket.leave(ordersRoom);
       socket.leave(requestsRoom);
       socket.leave(groupsRoom);
       socket.leave(messagesOrdersRoom);
     };
+    socket.on('disconnect', joinRooms);
+    joinRooms();
+    return function () {
+      leaveRooms();
+      socket.off('disconnect', joinRooms);
+    };
   }, [socket, session]);
   (0, _react.useEffect)(function () {
     var request = requestsState === null || requestsState === void 0 ? void 0 : requestsState.orders;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.4",
+  "version": "13.2.6",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/BusinessAndProductList/index.js

@@ -295,6 +295,7 @@ export const BusinessAndProductList = (props) => {
 
   const getLazyProducts = async ({ page, pageSize = categoryStateDefault.pagination.pageSize }) => {
     const parameters = {
+      version: 'v2',
       type: orderState.options?.type ?? 1,
       ...(!isFetchAllProducts && { page }),
       ...(!isFetchAllProducts && { page_size: pageSize }),

package/src/components/OrderListGroups/index.js

@@ -53,7 +53,7 @@ export const OrderListGroups = (props) => {
     pagination: {
       currentPage: (paginationSettings.controlType === 'pages' && paginationSettings.initialPage && paginationSettings.initialPage >= 1)
         ? paginationSettings.initialPage - 1
-        : 0,
+        : 1,
       pageSize: paginationSettings.pageSize ?? 10,
       total: null
     }
@@ -965,7 +965,6 @@ export const OrderListGroups = (props) => {
         }
         delete order.total
         delete order.subtotal
-
         const currentFilter = ordersGroup[getStatusById(order?.status) ?? '']?.currentFilter
         !currentFilter.includes(order.status)
           ? actionOrderToTab(order, getStatusById(order?.status), 'remove')
@@ -1037,20 +1036,11 @@ export const OrderListGroups = (props) => {
         setRecentlyReceivedMessage(message)
       }
     }
-    const ordersRoom = session?.user?.level === 0 ? 'orders' : `orders_${session?.user?.id}`
-    socket.join(ordersRoom)
-    if (!socket?.socket?._callbacks?.$orders_register || socket?.socket?._callbacks?.$orders_register?.find(func => func?.name !== 'handleAddNewOrder')) {
-      socket.on('orders_register', handleAddNewOrder)
-    }
-    if (!socket?.socket?._callbacks?.$order_assigned || socket?.socket?._callbacks?.$order_assigned?.find(func => func?.name !== 'handleAddNewOrder')) {
-      socket.on('order_assigned', handleAddNewOrder)
-    }
-    if (!socket?.socket?._callbacks?.$update_order || socket?.socket?._callbacks?.$update_order?.find(func => func?.name !== 'handleUpdateOrder')) {
-      socket.on('update_order', handleUpdateOrder)
-    }
-    if (!socket?.socket?._callbacks?.$message || socket?.socket?._callbacks?.$message?.find(func => func?.name !== 'handleReceiveMessage')) {
-      socket.on('message', handleReceiveMessage)
-    }
+    socket.on('orders_register', handleAddNewOrder)
+    socket.on('order_assigned', handleAddNewOrder)
+    socket.on('update_order', handleUpdateOrder)
+    socket.on('message', handleReceiveMessage)
+
     return () => {
       socket.off('orders_register', handleAddNewOrder)
       socket.off('order_assigned', handleAddNewOrder)
@@ -1133,31 +1123,46 @@ export const OrderListGroups = (props) => {
 
   useEffect(() => {
     if (!session.user) return
-    socket.on('disconnect', () => {
-      const ordersRoom = session?.user?.level === 0 ? 'orders' : `orders_${session?.user?.id}`
+
+    const userId = session.user.id
+    const userLevel = session.user.level
+
+    const ordersRoom = !isDriverApp
+      ? {
+        project: ordering.project,
+        room: 'orders',
+        user_id: userId,
+        role: 'manager'
+      }
+      : userLevel === 0
+        ? 'orders'
+        : `orders_${userId}`
+
+    const requestsRoom = `requests_${userId}`
+    const groupsRoom = `ordergroups_${userId}`
+    const messagesOrdersRoom = userLevel === 0 ? 'messages_orders' : `messages_orders_${userId}`
+    const joinRooms = () => {
       socket.join(ordersRoom)
-      const requestsRoom = `requests_${session?.user?.id}`
       socket.join(requestsRoom)
-      const groupsRoom = `ordergroups_${session?.user?.id}`
       socket.join(groupsRoom)
-      socket.join(session?.user?.level === 0 ? 'messages_orders' : `messages_orders_${session?.user?.id}`)
-    })
-    const ordersRoom = session?.user?.level === 0 ? 'orders' : `orders_${session?.user?.id}`
-    const messagesOrdersRoom = session?.user?.level === 0 ? 'messages_orders' : `messages_orders_${session?.user?.id}`
-    const requestsRoom = `requests_${session?.user?.id}`
-    const groupsRoom = `ordergroups_${session?.user?.id}`
-
-    socket.join(ordersRoom)
-    socket.join(requestsRoom)
-    socket.join(groupsRoom)
-    socket.join(messagesOrdersRoom)
+      socket.join(messagesOrdersRoom)
+    }
 
-    return () => {
+    const leaveRooms = () => {
       socket.leave(ordersRoom)
       socket.leave(requestsRoom)
       socket.leave(groupsRoom)
       socket.leave(messagesOrdersRoom)
     }
+
+    socket.on('disconnect', joinRooms)
+
+    joinRooms()
+
+    return () => {
+      leaveRooms()
+      socket.off('disconnect', joinRooms)
+    }
   }, [socket, session])
 
   useEffect(() => {