contentoh-components-library 21.4.64 → 21.4.66

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

@@ -58,7 +58,7 @@ DashboardDeafult.args = {
       products_limit: "10000",
       type: "Enterprise"
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-343/343.png?1699470782542"
+    src: "https://content-management-profile.s3.amazonaws.com/id-343/343.png?1699640943284"
   },
   company: {
     id_company: 234,
@@ -76,5 +76,5 @@ DashboardDeafult.args = {
     financedRetailers: [],
     retailers: []
   },
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0NTEyYjVhNS0zNjZhLTRiYjUtOTE2ZS1hYWZlMDU0MDI5OTIiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjQ1MTJiNWE1LTM2NmEtNGJiNS05MTZlLWFhZmUwNTQwMjk5MiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIzYmY0NzAzZC1iMzlmLTRlNDQtYjRiMi03OWVjZGM0N2MyYjYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5OTQ3MDc4MCwibmFtZSI6IkphaXIgTGXDs24iLCJwaG9uZV9udW1iZXIiOiIrNTI1NTU1NTU1NTU1IiwiZXhwIjoxNjk5NDc0MzgwLCJpYXQiOjE2OTk0NzA3ODAsImVtYWlsIjoiaGxlb25AY29udGVudG9oLmNvbSJ9.TWHLcBHgP91ROeYE2slm6xpxba7EMksrOZnBe0X49EXfFhPi8z3NzjomiH3mLTg-ZHR-Rrer_qHxPxv_SLfISYupKENiO7K5E3vqV1dXBzmZdQClcFQb_OskpbMlMBGrOEtGJdWaI37-c-w9an9c_PiNSruF_UuqktyxkUIfWP-UGjFAKp3dhh_Nr1ZjpjJX2PXtDH33qMopr1LLMI84x3Y4ej-pWkJpFcF-3EuUWeEZubQEmapoBj9xNPpaOKvCQ5i2DDe46779YDoyIy0fhIiBEYtMVlHLa2-JqqDvJef29byJPXqebOGZJRSOKAxZyqlaXtUqL8LUFSLeZMwkjw"
+  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0NTEyYjVhNS0zNjZhLTRiYjUtOTE2ZS1hYWZlMDU0MDI5OTIiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjQ1MTJiNWE1LTM2NmEtNGJiNS05MTZlLWFhZmUwNTQwMjk5MiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI4YTJhOTE3ZS0xZWU2LTQ5ODAtODZiZS0yZTEzMGI4ZTcyMmIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5OTY0MDk0MSwibmFtZSI6IkphaXIgTGXDs24iLCJwaG9uZV9udW1iZXIiOiIrNTI1NTU1NTU1NTU1IiwiZXhwIjoxNjk5NjQ0NTQxLCJpYXQiOjE2OTk2NDA5NDEsImVtYWlsIjoiaGxlb25AY29udGVudG9oLmNvbSJ9.YrLhtF5cee0S_iWX1gXBTJPxF8zls25SMK9GfCWoCpAabGRy9HtGSZ9KUuZlXICz13TTvgOfxFIv5duwS2vxYIlE1ZuLPHXSm2L4FuwJHcppedxssPNgfmxmVu-4B0SaMNWynjIWwbt_wumb2spwe3ONTcuRI-UgmJo_Rfa_cKUOiL-oNCQwkX6KhuWRGcfcpoUkfhi6tfOAgkA8VT5D8h-Dgawg5ibRnbjRMQejfNg1vVh_d2MpYhX9ve5SM9r1JdRCowgxMjb3ii6eXnng_UqjRdrB4008wkG8iZbz2C_NVJjJGrt1B454MZZmRvHbRogs-uu6U1JUsDW09qhcCg"
 };

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

@@ -247,23 +247,24 @@ 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;
@@ -283,7 +284,6 @@ var Dashboard = function Dashboard(_ref) {
                 label: "Productos totales",
                 value: total
               }];
-              console.log(registeredProducts);
               metricsArray.push({
                 label: "Productos activos",
                 value: registeredProducts
@@ -305,13 +305,20 @@ var Dashboard = function Dashboard(_ref) {
               delete ordersByStatus.total;
               setRequiredProducts(ordersBydate);
               setProductsByStatus(ordersByStatus);
+              _context3.next = 34;
+              break;
+
+            case 31:
+              _context3.prev = 31;
+              _context3.t1 = _context3["catch"](0);
+              console.log(_context3.t1);
 
-            case 29:
+            case 34:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[0, 31]]);
     }));
 
     return function loadProductsByStatus(_x2) {
@@ -438,7 +445,15 @@ 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);
+    console.log({
+      orderByRequired: orderByRequired,
+      orderByStatus: orderByStatus,
+      metricsData: metricsData
+    });
+
+    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.64",
+  "version": "21.4.66",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",

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

@@ -40,7 +40,7 @@ DashboardDeafult.args = {
       products_limit: "10000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-343/343.png?1699470782542",
+    src: "https://content-management-profile.s3.amazonaws.com/id-343/343.png?1699640943284",
   },
   company: {
     id_company: 234,
@@ -58,5 +58,5 @@ DashboardDeafult.args = {
     financedRetailers: [],
     retailers: [],
   },
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0NTEyYjVhNS0zNjZhLTRiYjUtOTE2ZS1hYWZlMDU0MDI5OTIiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjQ1MTJiNWE1LTM2NmEtNGJiNS05MTZlLWFhZmUwNTQwMjk5MiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIzYmY0NzAzZC1iMzlmLTRlNDQtYjRiMi03OWVjZGM0N2MyYjYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5OTQ3MDc4MCwibmFtZSI6IkphaXIgTGXDs24iLCJwaG9uZV9udW1iZXIiOiIrNTI1NTU1NTU1NTU1IiwiZXhwIjoxNjk5NDc0MzgwLCJpYXQiOjE2OTk0NzA3ODAsImVtYWlsIjoiaGxlb25AY29udGVudG9oLmNvbSJ9.TWHLcBHgP91ROeYE2slm6xpxba7EMksrOZnBe0X49EXfFhPi8z3NzjomiH3mLTg-ZHR-Rrer_qHxPxv_SLfISYupKENiO7K5E3vqV1dXBzmZdQClcFQb_OskpbMlMBGrOEtGJdWaI37-c-w9an9c_PiNSruF_UuqktyxkUIfWP-UGjFAKp3dhh_Nr1ZjpjJX2PXtDH33qMopr1LLMI84x3Y4ej-pWkJpFcF-3EuUWeEZubQEmapoBj9xNPpaOKvCQ5i2DDe46779YDoyIy0fhIiBEYtMVlHLa2-JqqDvJef29byJPXqebOGZJRSOKAxZyqlaXtUqL8LUFSLeZMwkjw",
+  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0NTEyYjVhNS0zNjZhLTRiYjUtOTE2ZS1hYWZlMDU0MDI5OTIiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjQ1MTJiNWE1LTM2NmEtNGJiNS05MTZlLWFhZmUwNTQwMjk5MiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI4YTJhOTE3ZS0xZWU2LTQ5ODAtODZiZS0yZTEzMGI4ZTcyMmIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5OTY0MDk0MSwibmFtZSI6IkphaXIgTGXDs24iLCJwaG9uZV9udW1iZXIiOiIrNTI1NTU1NTU1NTU1IiwiZXhwIjoxNjk5NjQ0NTQxLCJpYXQiOjE2OTk2NDA5NDEsImVtYWlsIjoiaGxlb25AY29udGVudG9oLmNvbSJ9.YrLhtF5cee0S_iWX1gXBTJPxF8zls25SMK9GfCWoCpAabGRy9HtGSZ9KUuZlXICz13TTvgOfxFIv5duwS2vxYIlE1ZuLPHXSm2L4FuwJHcppedxssPNgfmxmVu-4B0SaMNWynjIWwbt_wumb2spwe3ONTcuRI-UgmJo_Rfa_cKUOiL-oNCQwkX6KhuWRGcfcpoUkfhi6tfOAgkA8VT5D8h-Dgawg5ibRnbjRMQejfNg1vVh_d2MpYhX9ve5SM9r1JdRCowgxMjb3ii6eXnng_UqjRdrB4008wkG8iZbz2C_NVJjJGrt1B454MZZmRvHbRogs-uu6U1JUsDW09qhcCg",
 };

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

@@ -83,48 +83,50 @@ 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)) || {};
 
-    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 registeredProducts = ordersByActive.registered;
-    let metricsArray = [
-      metricsData[0]
-        ? metricsData[0]
-        : { label: "Productos totales", value: total },
-    ];
+      const inProcess = Object.keys(ordersByStatus).reduce(
+        (prev, curr) =>
+          !["total", "PA", "R", "Ex", "ACA"].includes(curr)
+            ? prev + ordersByStatus[curr]
+            : prev,
+        0
+      );
 
-    console.log(registeredProducts);
+      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;
+      setRequiredProducts(ordersBydate);
+      setProductsByStatus(ordersByStatus);
+    } catch (err) {
+      console.log(err);
+    }
   };
 
   const datesSelect = () => {
@@ -225,10 +227,14 @@ export const Dashboard = ({ jwt, user, company }) => {
   }, []);
 
   useEffect(() => {
-    orderByRequired?.startDate &&
+    console.log({ orderByRequired, orderByStatus, metricsData });
+    if (
+      orderByRequired?.startDate &&
       orderByStatus?.endDate &&
-      metricsData.length > 0 &&
+      metricsData.length > 0
+    ) {
       setLoading(false);
+    }
   }, [orderByRequired, orderByStatus, metricsData]);
 
   useEffect(async () => {