contentoh-components-library 21.2.58 → 21.2.60

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

@@ -29,8 +29,8 @@ export const Dashboard = ({ jwt, user, company }) => {
   const [categoryId, setCategoryId] = useState([]);
   const [companyId, setCompanyId] = useState([]);
   const [datesRange, setDatesRange] = useState({
-    startDate: new Date("1900-01-01"),
-    endDate: new Date(),
+    startDate: formatDate(new Date("1900-01-01")),
+    endDate: formatDate(new Date()),
   });
   const [dateOptions, setDateOptions] = useState([]);
   const applicants = [
@@ -40,21 +40,19 @@ export const Dashboard = ({ jwt, user, company }) => {
   const [applicantsFilter, setApplicantsFilter] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
 
-  const loadProductVersions = async (queryObject, byStatus = false) => {
+  const loadProductVersions = async (queryObject) => {
     const keys = Object.keys(queryObject);
     let string = [];
     keys.forEach((key) => string.push(`${key}=${queryObject[key]}`));
     const query = string.join("&");
-    const endpoint = byStatus
-      ? process.env.REACT_APP_READ_ORDERS_BY_STATUS
-      : process.env.REACT_APP_READ_REQUIRED_ORDERS;
+    const endpoint = process.env.REACT_APP_READ_ORDERS_BY_STATUS;
     try {
       const response = await axios.get(`${endpoint}?${query}`, {
         headers: {
           Authorization: jwt,
         },
       });
-      return JSON.parse(response.data.body);
+      return JSON.parse(response.data.body).data;
     } catch (error) {
       console.log(error);
     }
@@ -79,34 +77,34 @@ export const Dashboard = ({ jwt, user, company }) => {
     setRetailers(retailers);
   };
 
-  const loadProductsByStatus = async (orderByStatus) => {
-    const { orders } = (await loadProductVersions(orderByStatus, true)) || {};
-    if (orders.null) {
-      orders.total -= orders.null;
-      delete orders.null;
-    }
-    const { total = 0, R = 0, ACA = 0, PA = 0 } = orders;
-    const inProcess = Object.keys(orders).reduce(
+  const loadProductsByStatus = async (orderByStatus, filter) => {
+    const { ordersBydate, ordersByStatus } =
+      (await loadProductVersions(orderByStatus)) || {};
+
+    const { total = 0, R = 0, ACA = 0, PA = 0 } = ordersByStatus;
+    const inProcess = Object.keys(ordersByStatus).reduce(
       (prev, curr) =>
         !["total", "ACA", "PA", "R"].includes(curr)
-          ? prev + orders[curr]
+          ? prev + ordersByStatus[curr]
           : prev,
       0
     );
-    setMetricsData([
-      { label: "Productos totales", value: total },
+    let metricsArray = [
+      metricsData[0]
+        ? metricsData[0]
+        : { label: "Productos totales", value: total },
+    ];
+    metricsArray.push(
+      { label: "Productos filtrados", value: total },
       { label: "Productos sin asignar", value: PA + R },
       { label: "Productos en proceso", value: inProcess },
-      { label: "Productos terminados", value: ACA },
-    ]);
+      { label: "Productos terminados", value: ACA }
+    );
+    setMetricsData(metricsArray);
     setTotalCount(total);
-    delete orders.total;
-    setProductsByStatus(orders);
-  };
-
-  const loadRequiredProducts = async (orderByRequired) => {
-    const { dates } = await loadProductVersions(orderByRequired);
-    setRequiredProducts(dates);
+    delete ordersByStatus.total;
+    setRequiredProducts(ordersBydate);
+    setProductsByStatus(ordersByStatus);
   };
 
   const datesSelect = () => {
@@ -118,8 +116,8 @@ export const Dashboard = ({ jwt, user, company }) => {
         name: "Todo el tiempo",
         function: () =>
           setDatesRange({
-            startDate: new Date("1900-01-01"),
-            endDate: new Date(),
+            startDate: formatDate(new Date("1900-01-01")),
+            endDate: formatDate(new Date()),
           }),
       },
       {
@@ -197,16 +195,13 @@ export const Dashboard = ({ jwt, user, company }) => {
     await getRetailers();
     datesSelect();
     const today = new Date();
-    const startDate = `1900-01-01`;
-    const endDate = `${today.getFullYear()}-${
-      today.getMonth() + 1
-    }-${today.getDate()}`;
+    const startDate = formatDate("1900-01-01");
+    const endDate = formatDate(today);
     const queryObject = { startDate, endDate };
     setDatesRange({ startDate, endDate });
     setOrderByStatus(queryObject);
     setOrderByRequired(queryObject);
     loadProductsByStatus(queryObject);
-    loadRequiredProducts(queryObject);
   }, []);
 
   useEffect(() => {
@@ -219,8 +214,8 @@ export const Dashboard = ({ jwt, user, company }) => {
   useEffect(async () => {
     const { startDate, endDate } = datesRange;
     const queryObject = {
-      startDate: formatDate(startDate),
-      endDate: formatDate(endDate),
+      startDate: startDate,
+      endDate: endDate,
     };
     companyId.length > 0 && (queryObject["companyId"] = companyId.join(","));
     retailerId.length > 0 && (queryObject["retailerId"] = retailerId.join(","));
@@ -228,8 +223,7 @@ export const Dashboard = ({ jwt, user, company }) => {
     applicantsFilter.length > 0 &&
       (queryObject["requestedBy"] = applicantsFilter.join(","));
 
-    await loadProductsByStatus(queryObject);
-    await loadRequiredProducts(queryObject);
+    await loadProductsByStatus(queryObject, true);
   }, [companyId, retailerId, categoryId, datesRange, applicantsFilter]);
 
   return loading ? (
@@ -317,7 +311,8 @@ export const Dashboard = ({ jwt, user, company }) => {
           displayLegend={true}
           showPercent={true}
           displayScale={false}
-          total={totalCount}
+          totalFiltered={totalCount}
+          total={metricsData[0]?.value}
         />
         <DashboardMetric
           label={"Productos solicitados"}
@@ -331,7 +326,6 @@ export const Dashboard = ({ jwt, user, company }) => {
           retailerSelected={orderByRequired.retailerId}
           queryObject={orderByRequired}
           setQueryObject={(evt) => {
-            loadRequiredProducts(evt);
             setOrderByRequired(evt);
           }}
           borderColor={"#3B1366"}