ordering-components-external 13.2.14 → 13.2.15

package/_modules/components/OrderListGroups/index.js

@@ -40,7 +40,6 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
   var UIComponent = props.UIComponent,
     orderBy = props.orderBy,
     isIos = props.isIos,
-    useDefualtSessionManager = props.useDefualtSessionManager,
     paginationSettings = props.paginationSettings,
     asDashboard = props.asDashboard,
     orderGroupStatusCustom = props.orderGroupStatusCustom,
@@ -199,8 +198,20 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     _useState28 = _slicedToArray(_useState27, 2),
     ordersFiltered = _useState28[0],
     setOrdersFiltered = _useState28[1];
-  var accessToken = useDefualtSessionManager ? session.token : props.accessToken;
   var requestsState = {};
+  var handleSelectCurrentTab = function handleSelectCurrentTab(value) {
+    if (!isDriverApp) {
+      setOrdersGroup(_objectSpread(_objectSpread({}, ordersGroup), {}, _defineProperty({}, value, _objectSpread(_objectSpread({}, ordersGroup[value]), {}, {
+        loading: true
+      }))));
+    }
+    if (value === 'logisticOrders') {
+      setlogisticOrders(_objectSpread(_objectSpread({}, logisticOrders), {}, {
+        loading: true
+      }));
+    }
+    setCurrentTabSelected(value);
+  };
   var getOrders = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _filtered$customer, _filtered$customer2, _filtered$date, _filtered$date3;
@@ -375,7 +386,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
             source = {};
             requestsState.orders = source;
             options.cancelToken = source;
-            functionFetch = asDashboard ? ordering.setAccessToken(accessToken).orders().asDashboard() : ordering.setAccessToken(accessToken).orders();
+            functionFetch = asDashboard ? ordering.setAccessToken(session.token).orders().asDashboard() : ordering.setAccessToken(session.token).orders();
             _context.next = 29;
             return functionFetch.get(options);
           case 29:
@@ -401,7 +412,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
               loading: true
             }));
             _context2.next = 4;
-            return ordering.setAccessToken(accessToken).controls().get();
+            return ordering.setAccessToken(session.token).controls().get();
           case 4:
             _yield$ordering$setAc = _context2.sent;
             _yield$ordering$setAc2 = _yield$ordering$setAc.content;
@@ -680,7 +691,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
               method: 'GET',
               headers: {
                 'Content-Type': 'application/json',
-                Authorization: "Bearer ".concat(accessToken),
+                Authorization: "Bearer ".concat(session.token),
                 'X-App-X': ordering.appId,
                 'X-Socket-Id-X': socket === null || socket === void 0 ? void 0 : socket.getId()
               }
@@ -740,7 +751,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
               break;
             }
             _context6.next = 6;
-            return ordering.setAccessToken(accessToken).orders(orderIds[0]).delete();
+            return ordering.setAccessToken(session.token).orders(orderIds[0]).delete();
           case 6:
             _yield$ordering$setAc3 = _context6.sent;
             error = _yield$ordering$setAc3.content.error;
@@ -765,7 +776,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
             }
             id = _step.value;
             _context6.next = 19;
-            return ordering.setAccessToken(accessToken).orders(id).delete();
+            return ordering.setAccessToken(session.token).orders(id).delete();
           case 19:
             _yield$ordering$setAc4 = _context6.sent;
             multiError = _yield$ordering$setAc4.content.error;
@@ -843,7 +854,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
               method: 'GET',
               headers: {
                 'Content-Type': 'application/json',
-                Authorization: "Bearer ".concat(accessToken),
+                Authorization: "Bearer ".concat(session.token),
                 'X-App-X': ordering.appId,
                 'X-Socket-Id-X': socket === null || socket === void 0 ? void 0 : socket.getId()
               }
@@ -965,40 +976,40 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     return combineTabs ? combinedStatus : status;
   };
   var actionOrderToTab = function actionOrderToTab(orderAux, status, type) {
-    var _ordersGroup$status;
-    var orderList = (_ordersGroup$status = ordersGroup[status]) === null || _ordersGroup$status === void 0 ? void 0 : _ordersGroup$status.orders;
-    var orders;
-    var order = _objectSpread(_objectSpread({}, orderAux), {}, {
-      showNotification: true
-    });
-    if (type === 'update') {
-      var indexToUpdate = orderList.findIndex(function (o) {
-        return o.id === order.id;
-      });
-      orderList[indexToUpdate] = _objectSpread(_objectSpread({}, order), {}, {
-        action: type + (order === null || order === void 0 ? void 0 : order.status)
-      });
-      orders = orderList;
-    } else {
-      orders = type === 'add' ? [_objectSpread(_objectSpread({}, order), {}, {
-        action: type + (order === null || order === void 0 ? void 0 : order.status)
-      })].concat(_toConsumableArray(orderList)) : orderList.filter(function (_order) {
-        return _order.id !== order.id;
+    setOrdersGroup(function (prevState) {
+      var _prevState$status, _prevState$status2;
+      if (!((_prevState$status = prevState[status]) !== null && _prevState$status !== void 0 && _prevState$status.orders)) return;
+      var orderList = (_prevState$status2 = prevState[status]) === null || _prevState$status2 === void 0 ? void 0 : _prevState$status2.orders;
+      var order = _objectSpread(_objectSpread({}, orderAux), {}, {
+        showNotification: false
       });
-    }
-    var _pagination = ordersGroup[status].pagination;
-    if (type !== 'update') {
-      _pagination = _objectSpread(_objectSpread({}, ordersGroup[status].pagination), {}, {
-        total: ordersGroup[status].pagination.total + (type === 'add' ? 1 : -1)
+      var updatedOrders;
+      switch (type) {
+        case 'update':
+          updatedOrders = orderList.map(function (o) {
+            return o.id === order.id ? _objectSpread(_objectSpread({}, order), {}, {
+              action: "".concat(type).concat(order === null || order === void 0 ? void 0 : order.status)
+            }) : o;
+          });
+          break;
+        case 'add':
+          updatedOrders = [_objectSpread(_objectSpread({}, order), {}, {
+            action: "".concat(type).concat(order === null || order === void 0 ? void 0 : order.status)
+          })].concat(_toConsumableArray(orderList));
+          break;
+        case 'remove':
+          updatedOrders = orderList.filter(function (o) {
+            return o.id !== order.id;
+          });
+          break;
+      }
+      var updatedPagination = _objectSpread(_objectSpread({}, prevState[status].pagination), {}, {
+        total: prevState[status].pagination.total + (type === 'add' ? 1 : type === 'remove' ? -1 : 0)
       });
-    }
-    setOrdersGroup(function (prevState) {
-      return _objectSpread(_objectSpread({}, prevState), {}, _defineProperty(_defineProperty({
-        orders: filterByIdUnique(sortOrders(orders), status)
-      }, status, _objectSpread(_objectSpread({}, prevState[status]), {}, {
-        orders: sortOrders(orders),
-        pagination: _pagination
-      })), "pagination", _pagination));
+      return _objectSpread(_objectSpread({}, prevState), {}, _defineProperty({}, status, _objectSpread(_objectSpread({}, prevState[status]), {}, {
+        orders: filterByIdUnique(sortOrders(updatedOrders), status),
+        pagination: updatedPagination
+      })));
     });
   };
   var handleClickOrder = function handleClickOrder(orderAux) {
@@ -1008,9 +1019,9 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     });
     var ordersGroups = order === null || order === void 0 || (_order$order_group2 = order.order_group) === null || _order$order_group2 === void 0 ? void 0 : _order$order_group2.orders;
     if (!ordersGroups) {
-      var _ordersGroup$status2;
+      var _ordersGroup$status;
       var status = getStatusById(order === null || order === void 0 ? void 0 : order.status);
-      var orderList = (_ordersGroup$status2 = ordersGroup[status]) === null || _ordersGroup$status2 === void 0 ? void 0 : _ordersGroup$status2.orders;
+      var orderList = (_ordersGroup$status = ordersGroup[status]) === null || _ordersGroup$status === void 0 ? void 0 : _ordersGroup$status.orders;
       var indexToUpdate = orderList === null || orderList === void 0 ? void 0 : orderList.findIndex(function (o) {
         return (o === null || o === void 0 ? void 0 : o.id) === (order === null || order === void 0 ? void 0 : order.id);
       });
@@ -1047,7 +1058,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
               method: 'PUT',
               headers: {
                 'Content-Type': 'application/json',
-                Authorization: "Bearer ".concat(accessToken)
+                Authorization: "Bearer ".concat(session.token)
               },
               body: JSON.stringify({
                 status: status,
@@ -1365,8 +1376,8 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
       for (var i = 0; i < ordersStatusArray.length; i++) {
         var status = ordersStatusArray[i];
         if (order !== null && order !== void 0 && order.products) {
-          var _ordersGroup$status3;
-          orderFound = (_ordersGroup$status3 = ordersGroup[status]) === null || _ordersGroup$status3 === void 0 || (_ordersGroup$status3 = _ordersGroup$status3.orders) === null || _ordersGroup$status3 === void 0 ? void 0 : _ordersGroup$status3.find(function (_order) {
+          var _ordersGroup$status2;
+          orderFound = (_ordersGroup$status2 = ordersGroup[status]) === null || _ordersGroup$status2 === void 0 || (_ordersGroup$status2 = _ordersGroup$status2.orders) === null || _ordersGroup$status2 === void 0 ? void 0 : _ordersGroup$status2.find(function (_order) {
             return _order.id === order.id;
           });
         }
@@ -1520,12 +1531,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     if (!session.user) return;
     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 ordersRoom = 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);
@@ -1558,9 +1564,9 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     var handleCustomerReviewed = function handleCustomerReviewed(review) {
       var orderFound = null;
       for (var i = 0; i < ordersStatusArray.length; i++) {
-        var _ordersGroup$status4;
+        var _ordersGroup$status3;
         var status = ordersStatusArray[i];
-        orderFound = (_ordersGroup$status4 = ordersGroup[status]) === null || _ordersGroup$status4 === void 0 || (_ordersGroup$status4 = _ordersGroup$status4.orders) === null || _ordersGroup$status4 === void 0 ? void 0 : _ordersGroup$status4.find(function (_order) {
+        orderFound = (_ordersGroup$status3 = ordersGroup[status]) === null || _ordersGroup$status3 === void 0 || (_ordersGroup$status3 = _ordersGroup$status3.orders) === null || _ordersGroup$status3 === void 0 ? void 0 : _ordersGroup$status3.find(function (_order) {
           return _order.id === review.order_id;
         });
         if (orderFound) break;
@@ -1584,7 +1590,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
     currentFilters: currentFilters,
     setCurrentFilters: setCurrentFilters,
     currentTabSelected: currentTabSelected,
-    setCurrentTabSelected: setCurrentTabSelected,
+    setCurrentTabSelected: handleSelectCurrentTab,
     ordersGroup: ordersGroup,
     setOrdersGroup: setOrdersGroup,
     logisticOrders: logisticOrders,

package/package.json

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

package/src/components/OrderListGroups/index.js

@@ -12,7 +12,6 @@ export const OrderListGroups = (props) => {
     UIComponent,
     orderBy,
     isIos,
-    useDefualtSessionManager,
     paginationSettings,
     asDashboard,
     orderGroupStatusCustom,
@@ -102,6 +101,7 @@ export const OrderListGroups = (props) => {
   const [orderLogisticAdded, setOrderLogisticAdded] = useState(null)
   const [orderLogisticUpdated, setOrderLogisticUpdated] = useState(null)
   const [recentlyReceivedMessage, setRecentlyReceivedMessage] = useState(null)
+
   const [ordersFiltered, setOrdersFiltered] = useState({
     orders: [],
     loading: false,
@@ -115,9 +115,27 @@ export const OrderListGroups = (props) => {
     }
   })
 
-  const accessToken = useDefualtSessionManager ? session.token : props.accessToken
   const requestsState = {}
 
+  const handleSelectCurrentTab = (value) => {
+    if (!isDriverApp) {
+      setOrdersGroup({
+        ...ordersGroup,
+        [value]: {
+          ...ordersGroup[value],
+          loading: true
+        }
+      })
+    }
+    if (value === 'logisticOrders') {
+      setlogisticOrders({
+        ...logisticOrders,
+        loading: true
+      })
+    }
+    setCurrentTabSelected(value)
+  }
+
   const getOrders = async ({
     page,
     pageSize = paginationSettings.pageSize,
@@ -285,8 +303,8 @@ export const OrderListGroups = (props) => {
     options.cancelToken = source
 
     const functionFetch = asDashboard
-      ? ordering.setAccessToken(accessToken).orders().asDashboard()
-      : ordering.setAccessToken(accessToken).orders()
+      ? ordering.setAccessToken(session.token).orders().asDashboard()
+      : ordering.setAccessToken(session.token).orders()
     return await functionFetch.get(options)
   }
 
@@ -294,7 +312,7 @@ export const OrderListGroups = (props) => {
     try {
       setControlsState({ ...controlsState, loading: true })
       const { content: { error, result } } = await ordering
-        .setAccessToken(accessToken)
+        .setAccessToken(session.token)
         .controls()
         .get()
       const obj = {
@@ -527,7 +545,7 @@ export const OrderListGroups = (props) => {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
-          Authorization: `Bearer ${accessToken}`,
+          Authorization: `Bearer ${session.token}`,
           'X-App-X': ordering.appId,
           'X-Socket-Id-X': socket?.getId()
         }
@@ -557,11 +575,11 @@ export const OrderListGroups = (props) => {
       const errorState = []
 
       if (orderIds.length === 1) {
-        const { content: { error } } = await ordering.setAccessToken(accessToken).orders(orderIds[0]).delete()
+        const { content: { error } } = await ordering.setAccessToken(session.token).orders(orderIds[0]).delete()
         errorState.push({ error, id: orderIds[0] })
       } else if (orderIds.length > 1) {
         for (const id of orderIds) {
-          const { content: { error: multiError } } = await ordering.setAccessToken(accessToken).orders(id).delete()
+          const { content: { error: multiError } } = await ordering.setAccessToken(session.token).orders(id).delete()
           errorState.push({ error: multiError, id })
         }
       }
@@ -602,7 +620,7 @@ export const OrderListGroups = (props) => {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
-          Authorization: `Bearer ${accessToken}`,
+          Authorization: `Bearer ${session.token}`,
           'X-App-X': ordering.appId,
           'X-Socket-Id-X': socket?.getId()
         }
@@ -699,38 +717,38 @@ export const OrderListGroups = (props) => {
   }
 
   const actionOrderToTab = (orderAux, status, type) => {
-    const orderList = ordersGroup[status]?.orders
-    let orders
-    const order = {
-      ...orderAux,
-      showNotification: true
-    }
-    if (type === 'update') {
-      const indexToUpdate = orderList.findIndex((o) => o.id === order.id)
-      orderList[indexToUpdate] = { ...order, action: type + order?.status }
-      orders = orderList
-    } else {
-      orders = type === 'add'
-        ? [{ ...order, action: type + order?.status }, ...orderList]
-        : orderList.filter((_order) => _order.id !== order.id)
-    }
-    let _pagination = ordersGroup[status].pagination
-    if (type !== 'update') {
-      _pagination = {
-        ...ordersGroup[status].pagination,
-        total: ordersGroup[status].pagination.total + (type === 'add' ? 1 : -1)
+    setOrdersGroup(prevState => {
+      if (!prevState[status]?.orders) return
+      const orderList = prevState[status]?.orders
+      const order = { ...orderAux, showNotification: false }
+      let updatedOrders
+
+      switch (type) {
+        case 'update':
+          updatedOrders = orderList.map(o => o.id === order.id ? { ...order, action: `${type}${order?.status}` } : o)
+          break
+        case 'add':
+          updatedOrders = [{ ...order, action: `${type}${order?.status}` }, ...orderList]
+          break
+        case 'remove':
+          updatedOrders = orderList.filter(o => o.id !== order.id)
+          break
       }
-    }
-    setOrdersGroup((prevState) => ({
-      ...prevState,
-      orders: filterByIdUnique(sortOrders(orders), status),
-      [status]: {
-        ...prevState[status],
-        orders: sortOrders(orders),
-        pagination: _pagination
-      },
-      pagination: _pagination
-    }))
+
+      const updatedPagination = {
+        ...prevState[status].pagination,
+        total: prevState[status].pagination.total + (type === 'add' ? 1 : type === 'remove' ? -1 : 0)
+      }
+
+      return {
+        ...prevState,
+        [status]: {
+          ...prevState[status],
+          orders: filterByIdUnique(sortOrders(updatedOrders), status),
+          pagination: updatedPagination
+        }
+      }
+    })
   }
 
   const handleClickOrder = (orderAux) => {
@@ -773,7 +791,7 @@ export const OrderListGroups = (props) => {
     try {
       const response = await fetch(`${ordering.root}/drivers/${session.user?.id}/assign_requests/${orderId}`, {
         method: 'PUT',
-        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${accessToken}` },
+        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${session.token}` },
         body: JSON.stringify({
           status,
           user_id: session.user?.id
@@ -1127,16 +1145,9 @@ export const OrderListGroups = (props) => {
     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 ordersRoom = userLevel === 0
+      ? 'orders'
+      : `orders_${userId}`
 
     const requestsRoom = `requests_${userId}`
     const groupsRoom = `ordergroups_${userId}`
@@ -1204,7 +1215,7 @@ export const OrderListGroups = (props) => {
           currentFilters={currentFilters}
           setCurrentFilters={setCurrentFilters}
           currentTabSelected={currentTabSelected}
-          setCurrentTabSelected={setCurrentTabSelected}
+          setCurrentTabSelected={handleSelectCurrentTab}
           ordersGroup={ordersGroup}
           setOrdersGroup={setOrdersGroup}
           logisticOrders={logisticOrders}