contentoh-components-library 21.4.65 → 21.4.67

package/dist/components/pages/Dashboard/index.js

@@ -175,19 +175,22 @@ var Dashboard = function Dashboard(_ref) {
 
             case 8:
               response = _context.sent;
+              console.log({
+                res: JSON.parse(response.data.body).data
+              });
               return _context.abrupt("return", JSON.parse(response.data.body).data);
 
-            case 12:
-              _context.prev = 12;
+            case 13:
+              _context.prev = 13;
               _context.t0 = _context["catch"](5);
               console.log(_context.t0);
 
-            case 15:
+            case 16:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[5, 12]]);
+      }, _callee, null, [[5, 13]]);
     }));
 
     return function loadProductVersions(_x) {
@@ -247,28 +250,35 @@ var Dashboard = function Dashboard(_ref) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
+              _context3.prev = 0;
               isRetailer = user.is_retailer && company.retailers;
               isProvider = !user.is_retailer && user.id_role === 0;
               isCollaborator = user.id_role > 0;
-              _context3.next = 5;
+              _context3.next = 6;
               return loadProductVersions(orderByStatus);
 
-            case 5:
+            case 6:
               _context3.t0 = _context3.sent;
 
               if (_context3.t0) {
-                _context3.next = 8;
+                _context3.next = 9;
                 break;
               }
 
               _context3.t0 = {};
 
-            case 8:
+            case 9:
               _ref5 = _context3.t0;
               ordersBydate = _ref5.ordersBydate;
               ordersByStatus = _ref5.ordersByStatus;
               ordersByActive = _ref5.ordersByActive;
               companyTrades = _ref5.companyTrades;
+              console.log({
+                ordersBydate: ordersBydate,
+                ordersByStatus: ordersByStatus,
+                ordersByActive: ordersByActive,
+                companyTrades: companyTrades
+              });
               if (trades.length === 0) setTrades(companyTrades);
               _ordersByStatus$total = ordersByStatus.total, total = _ordersByStatus$total === void 0 ? 0 : _ordersByStatus$total, _ordersByStatus$R = ordersByStatus.R, R = _ordersByStatus$R === void 0 ? 0 : _ordersByStatus$R, _ordersByStatus$PA = ordersByStatus.PA, PA = _ordersByStatus$PA === void 0 ? 0 : _ordersByStatus$PA, _ordersByStatus$Ex = ordersByStatus.Ex, Ex = _ordersByStatus$Ex === void 0 ? 0 : _ordersByStatus$Ex, _ordersByStatus$ACA = ordersByStatus.ACA, ACA = _ordersByStatus$ACA === void 0 ? 0 : _ordersByStatus$ACA;
               productsFinished = 0;
@@ -302,15 +312,26 @@ var Dashboard = function Dashboard(_ref) {
               setMetricsData(metricsArray);
               setTotalCount(total);
               delete ordersByStatus.total;
+              console.log({
+                ordersBydate: ordersBydate,
+                ordersByStatus: ordersByStatus
+              });
               setRequiredProducts(ordersBydate);
               setProductsByStatus(ordersByStatus);
+              _context3.next = 36;
+              break;
+
+            case 33:
+              _context3.prev = 33;
+              _context3.t1 = _context3["catch"](0);
+              console.log("Ismael", _context3.t1);
 
-            case 28:
+            case 36:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[0, 33]]);
     }));
 
     return function loadProductsByStatus(_x2) {
@@ -437,7 +458,9 @@ var Dashboard = function Dashboard(_ref) {
     }, _callee4);
   })), []);
   (0, _react.useEffect)(function () {
-    (orderByRequired === null || orderByRequired === void 0 ? void 0 : orderByRequired.startDate) && (orderByStatus === null || orderByStatus === void 0 ? void 0 : orderByStatus.endDate) && metricsData.length > 0 && setLoading(false);
+    if (orderByRequired !== null && orderByRequired !== void 0 && orderByRequired.startDate && orderByStatus !== null && orderByStatus !== void 0 && orderByStatus.endDate && metricsData.length > 0) {
+      setLoading(false);
+    }
   }, [orderByRequired, orderByStatus, metricsData]);
   (0, _react.useEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
     var startDate, endDate, queryObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.4.65",
+  "version": "21.4.67",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",

package/src/components/pages/Dashboard/index.js

@@ -55,6 +55,7 @@ export const Dashboard = ({ jwt, user, company }) => {
           Authorization: jwt,
         },
       });
+      console.log({ res: JSON.parse(response.data.body).data });
       return JSON.parse(response.data.body).data;
     } catch (error) {
       console.log(error);
@@ -83,46 +84,57 @@ export const Dashboard = ({ jwt, user, company }) => {
   };
 
   const loadProductsByStatus = async (orderByStatus) => {
-    const isRetailer = user.is_retailer && company.retailers;
-    const isProvider = !user.is_retailer && user.id_role === 0;
-    const isCollaborator = user.id_role > 0;
-    const { ordersBydate, ordersByStatus, ordersByActive, companyTrades } =
-      (await loadProductVersions(orderByStatus)) || {};
+    try {
+      const isRetailer = user.is_retailer && company.retailers;
+      const isProvider = !user.is_retailer && user.id_role === 0;
+      const isCollaborator = user.id_role > 0;
+      const { ordersBydate, ordersByStatus, ordersByActive, companyTrades } =
+        (await loadProductVersions(orderByStatus)) || {};
+      console.log({
+        ordersBydate,
+        ordersByStatus,
+        ordersByActive,
+        companyTrades,
+      });
 
-    if (trades.length === 0) setTrades(companyTrades);
-    const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
-    let productsFinished = 0;
-    if (isRetailer) productsFinished = Ex;
-    if (isProvider) productsFinished = ACA;
-    if (isCollaborator) productsFinished = Ex + ACA;
+      if (trades.length === 0) setTrades(companyTrades);
+      const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
+      let productsFinished = 0;
+      if (isRetailer) productsFinished = Ex;
+      if (isProvider) productsFinished = ACA;
+      if (isCollaborator) productsFinished = Ex + ACA;
 
-    const inProcess = Object.keys(ordersByStatus).reduce(
-      (prev, curr) =>
-        !["total", "PA", "R", "Ex", "ACA"].includes(curr)
-          ? prev + ordersByStatus[curr]
-          : prev,
-      0
-    );
+      const inProcess = Object.keys(ordersByStatus).reduce(
+        (prev, curr) =>
+          !["total", "PA", "R", "Ex", "ACA"].includes(curr)
+            ? prev + ordersByStatus[curr]
+            : prev,
+        0
+      );
 
-    const registeredProducts = ordersByActive.registered;
-    let metricsArray = [
-      metricsData[0]
-        ? metricsData[0]
-        : { label: "Productos totales", value: total },
-    ];
+      const registeredProducts = ordersByActive.registered;
+      let metricsArray = [
+        metricsData[0]
+          ? metricsData[0]
+          : { label: "Productos totales", value: total },
+      ];
 
-    metricsArray.push(
-      { label: "Productos activos", value: registeredProducts },
-      { label: "Productos filtrados", value: total },
-      { label: "Productos sin asignar", value: PA + R },
-      { label: "Productos en proceso", value: inProcess },
-      { label: "Productos terminados", value: productsFinished }
-    );
-    setMetricsData(metricsArray);
-    setTotalCount(total);
-    delete ordersByStatus.total;
-    setRequiredProducts(ordersBydate);
-    setProductsByStatus(ordersByStatus);
+      metricsArray.push(
+        { label: "Productos activos", value: registeredProducts },
+        { label: "Productos filtrados", value: total },
+        { label: "Productos sin asignar", value: PA + R },
+        { label: "Productos en proceso", value: inProcess },
+        { label: "Productos terminados", value: productsFinished }
+      );
+      setMetricsData(metricsArray);
+      setTotalCount(total);
+      delete ordersByStatus.total;
+      console.log({ ordersBydate, ordersByStatus });
+      setRequiredProducts(ordersBydate);
+      setProductsByStatus(ordersByStatus);
+    } catch (err) {
+      console.log("Ismael", err);
+    }
   };
 
   const datesSelect = () => {
@@ -223,10 +235,13 @@ export const Dashboard = ({ jwt, user, company }) => {
   }, []);
 
   useEffect(() => {
-    orderByRequired?.startDate &&
+    if (
+      orderByRequired?.startDate &&
       orderByStatus?.endDate &&
-      metricsData.length > 0 &&
+      metricsData.length > 0
+    ) {
       setLoading(false);
+    }
   }, [orderByRequired, orderByStatus, metricsData]);
 
   useEffect(async () => {