mozrest-sdk-react-dev 0.2.38 → 0.2.40

package/mozrest-sdk.es.js

@@ -102038,31 +102038,23 @@ const LoadingBarChart = ({ data: data2, type: type4, dateType }) => {
   const checkIfIsLoading = () => {
     if (data2) {
       if (type4 === "bookings") {
-        if (dateType === "creationDate") {
-          if ((data2 == null ? void 0 : data2.bookingsCreationDate) !== void 0) {
-            return false;
-          }
-        } else if (dateType === "mealDate") {
-          if ((data2 == null ? void 0 : data2.bookingsMealDate) !== void 0) {
-            return false;
-          }
+        if (dateType === "creationDate" && (data2 == null ? void 0 : data2.bookingsCreationDate) !== void 0) {
+          return false;
+        } else if (dateType === "mealDate" && (data2 == null ? void 0 : data2.bookingsMealDate) !== void 0) {
+          return false;
         }
       } else if (type4 === "covers") {
-        if (dateType === "creationDate") {
-          if ((data2 == null ? void 0 : data2.coversCreationDate) !== void 0) {
-            return false;
-          }
-        } else if (dateType === "mealDate") {
-          if ((data2 == null ? void 0 : data2.coversMealDate) !== void 0) {
-            return false;
-          }
+        if (dateType === "creationDate" && (data2 == null ? void 0 : data2.coversCreationDate) !== void 0) {
+          return false;
+        } else if (dateType === "mealDate" && (data2 == null ? void 0 : data2.coversMealDate) !== void 0) {
+          return false;
         }
       }
     }
+    return true;
   };
   useEffect(() => {
-    var _a2;
-    setIsLoading((_a2 = checkIfIsLoading()) != null ? _a2 : true);
+    setIsLoading(checkIfIsLoading());
   }, [data2, type4, dateType]);
   return isLoading;
 };
@@ -102101,7 +102093,7 @@ const Chart = ({
   const [statsToDisplay, setStatsToDisplay] = useState(1);
   const fetchBookingData = async (payload, dateType) => {
     var _a2, _b, _c, _d;
-    const params2 = { ...payload, "filters[status]": "confirmed" };
+    const params2 = { ...payload };
     const [, response] = await handlePromise(dateType === "creationDate" ? ReservationAnalyticsService.getBookingItemCount(params2) : ReservationAnalyticsService.getBookingItemMealCount(params2));
     if (!response)
       return;
@@ -102129,6 +102121,11 @@ const Chart = ({
     { value: 1, label: t2("CREATIONDATE") },
     { value: 2, label: t2("MEALDATE") }
   ];
+  const isLoading = LoadingBarChart({
+    data: dataCollection,
+    type: displayConcept === 1 ? "bookings" : "covers",
+    dateType: displayType === 1 ? "creationDate" : "mealDate"
+  });
   const calculateStats = useCallback(() => {
     const concept = displayConcept === 1 ? "bookings" : "covers", type4 = displayType === 1 ? "creation" : "meal", by = displayBy === 0 ? "day" : displayBy === 1 ? "week" : displayBy;
     let dataCollectionToShow = [];
@@ -102223,11 +102220,7 @@ const Chart = ({
       label: "",
       onChange: (data2) => setDisplayBy(data2.value)
     })))
-  }, statsToDisplay && sources && !LoadingBarChart({
-    data: dataCollection,
-    type: displayConcept === 1 ? "bookings" : "covers",
-    dateType: displayType === 1 ? "creationDate" : "mealDate"
-  }) && /* @__PURE__ */ React__default.createElement(ResponsiveContainer, null, /* @__PURE__ */ React__default.createElement(BarChart, {
+  }, statsToDisplay && sources && !isLoading && /* @__PURE__ */ React__default.createElement(ResponsiveContainer, null, /* @__PURE__ */ React__default.createElement(BarChart, {
     height: 300,
     data: statsToDisplay,
     barSize: 100,
@@ -102246,11 +102239,7 @@ const Chart = ({
     });
   }), /* @__PURE__ */ React__default.createElement(Legend, {
     verticalAlign: "bottom"
-  }))), LoadingBarChart({
-    data: dataCollection,
-    type: displayConcept === 1 ? "bookings" : "covers",
-    dateType: displayType === 1 ? "creationDate" : "mealDate"
-  }) && /* @__PURE__ */ React__default.createElement("div", {
+  }))), isLoading && /* @__PURE__ */ React__default.createElement("div", {
     style: { marginTop: 20 }
   }, /* @__PURE__ */ React__default.createElement(SkeletonDiv, null)));
 };
@@ -102781,10 +102770,10 @@ const LoadingStat = ({ data: data2, type: type4 }) => {
         return false;
       }
     }
+    return true;
   };
   useEffect(() => {
-    var _a2;
-    setIsLoading((_a2 = checkIfIsLoading()) != null ? _a2 : true);
+    setIsLoading(checkIfIsLoading());
   }, [data2, type4]);
   return isLoading;
 };
@@ -102800,10 +102789,10 @@ const LoadingPrevStat = ({ data: data2, type: type4 }) => {
         return false;
       }
     }
+    return true;
   };
   useEffect(() => {
-    var _a2;
-    setIsLoading((_a2 = checkIfIsLoading()) != null ? _a2 : true);
+    setIsLoading(checkIfIsLoading());
   }, [data2, type4]);
   return isLoading;
 };
@@ -102813,7 +102802,10 @@ const StatsBar = ({ params }) => {
   const [periodDates, setPeriodDates] = useState([]);
   const [bookingStats, setBookingStats] = useState({});
   const fetchBookingStat = async (payload, cancellations, prevPeriod) => {
-    const params2 = { ...payload, "filters[status]": !cancellations ? "confirmed" : "canceled" };
+    const params2 = { ...payload };
+    if (cancellations) {
+      params2["filters[status]"] = "canceled";
+    }
     const [, response] = await handlePromise(ReservationAnalyticsService.getBookingItemTotal(params2));
     if (!response)
       return;
@@ -102857,6 +102849,30 @@ const StatsBar = ({ params }) => {
       ]);
     }
   };
+  const isLoadingBookings = LoadingStat({
+    data: bookingStats,
+    type: "bookings"
+  });
+  const isLoadingPrevBookings = LoadingPrevStat({
+    data: bookingStats,
+    type: "bookings"
+  });
+  const isLoadingCovers = LoadingStat({
+    data: bookingStats,
+    type: "covers"
+  });
+  const isLoadingPrevCovers = LoadingPrevStat({
+    data: bookingStats,
+    type: "covers"
+  });
+  const isLoadingCancelations = LoadingStat({
+    data: bookingStats,
+    type: "cancelations"
+  });
+  const isLoadingPrevCancelations = LoadingPrevStat({
+    data: bookingStats,
+    type: "cancelations"
+  });
   useEffect(() => {
     if (periodDates.length > 0) {
       fetchBookingStat({ ...params, "filters[from]": periodDates[2], "filters[till]": periodDates[3] }, true, true);
@@ -102888,14 +102904,8 @@ const StatsBar = ({ params }) => {
       data: bookingStats,
       type: "bookings"
     })) != null ? _b : "-",
-    loading: LoadingStat({
-      data: bookingStats,
-      type: "bookings"
-    }),
-    loadingComparison: LoadingPrevStat({
-      data: bookingStats,
-      type: "bookings"
-    })
+    loading: isLoadingBookings,
+    loadingComparison: isLoadingPrevBookings
   }, /* @__PURE__ */ React__default.createElement("small", null, t2("ComparedPeriod"), ": ", `${periodDates[0] ? periodDates[0] : ""}-${periodDates[1] ? periodDates[1] : ""}`))), /* @__PURE__ */ React__default.createElement(Col$1, {
     xs: 24,
     sm: 12,
@@ -102911,14 +102921,8 @@ const StatsBar = ({ params }) => {
       data: bookingStats,
       type: "covers"
     })) != null ? _d : "-",
-    loading: LoadingStat({
-      data: bookingStats,
-      type: "covers"
-    }),
-    loadingComparison: LoadingPrevStat({
-      data: bookingStats,
-      type: "covers"
-    })
+    loading: isLoadingCovers,
+    loadingComparison: isLoadingPrevCovers
   }, /* @__PURE__ */ React__default.createElement("small", null, t2("ComparedPeriod"), ": ", `${periodDates[0] ? periodDates[0] : ""}-${periodDates[1] ? periodDates[1] : ""}`))), /* @__PURE__ */ React__default.createElement(Col$1, {
     xs: 24,
     sm: 24,
@@ -102934,14 +102938,8 @@ const StatsBar = ({ params }) => {
       data: bookingStats,
       type: "cancelations"
     })) != null ? _f : "-",
-    loading: LoadingStat({
-      data: bookingStats,
-      type: "cancelations"
-    }),
-    loadingComparison: LoadingPrevStat({
-      data: bookingStats,
-      type: "cancelations"
-    })
+    loading: isLoadingCancelations,
+    loadingComparison: isLoadingPrevCancelations
   }, /* @__PURE__ */ React__default.createElement("small", null, t2("ComparedPeriod"), ": ", `${periodDates[0] ? periodDates[0] : ""}-${periodDates[1] ? periodDates[1] : ""}`))));
 };
 const ReservationsAnalytics = ({ userEmail, userFullName }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mozrest-sdk-react-dev",
-  "version": "0.2.38",
+  "version": "0.2.40",
   "main": "mozrest-sdk.es.js",
   "keywords": ["mozrest"],
   "author": {