@ammarkhalidfarooq/dashboard-package 0.4.85 → 0.4.87

package/dist/index.es.js

@@ -3683,7 +3683,34 @@ var DonationTypeBarChart = function DonationTypeBarChart(_ref) {
   var summaries = [];
   var title = "Donation Type";
   var isDistributed = false;
-  if (Array.isArray(donationTypeData) && donationTypeData.length > 0 && donationTypeData[0].totalAmount !== undefined) {
+  if (donationTypeData && donationTypeData.data && Array.isArray(donationTypeData.data)) {
+    // Time series recurring vs one-time format
+    categories = donationTypeData.data.map(function (item) {
+      return item.label || "";
+    });
+    series = [{
+      name: "Recurring",
+      data: donationTypeData.data.map(function (item) {
+        return item.recurring || 0;
+      })
+    }, {
+      name: "One-time",
+      data: donationTypeData.data.map(function (item) {
+        return item.oneTime || 0;
+      })
+    }];
+    summaries = [{
+      label: "Recurring",
+      total: donationTypeData.totalRecurringDonations || 0,
+      color: recurringColor
+    }, {
+      label: "One-time",
+      total: donationTypeData.totalOneTimeDonations || 0,
+      color: oneTimeColor
+    }];
+    title = "Recurring vs One-time";
+    isDistributed = false;
+  } else if (Array.isArray(donationTypeData) && donationTypeData.length > 0 && donationTypeData[0].totalAmount !== undefined) {
     // New array format
     categories = donationTypeData.map(function (item) {
       return item.type || "";
@@ -5212,7 +5239,7 @@ var OverallSection = function OverallSection(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     activeMetric = _useState2[0],
     setActiveMetric = _useState2[1];
-  var donationTypeData = (apiData === null || apiData === void 0 ? void 0 : apiData.donorPieChartData1) || [];
+  var donationTypeData = (apiData === null || apiData === void 0 ? void 0 : apiData.recurringBarChartData) || [];
   var donorGeographyData = (apiData === null || apiData === void 0 ? void 0 : apiData.donorGeography1) || [];
   var trafficSourceData = (apiData === null || apiData === void 0 ? void 0 : apiData.trafficSource1) || [];
   var orderBumpData = (apiData === null || apiData === void 0 ? void 0 : apiData.orderBumpData1) || [];
@@ -5313,7 +5340,6 @@ var OverallSection = function OverallSection(_ref) {
     }
   };
   var activeCampaignsData = (apiData === null || apiData === void 0 ? void 0 : apiData.activeCampaigns) || [];
-  console.log("ACtive campaigns", activeCampaignsData);
   var donorMix = apiData === null || apiData === void 0 ? void 0 : apiData.donorPieChartData;
   var newDonorsCount = 0;
   var returningDonorsCount = 0;
@@ -5346,6 +5372,7 @@ var OverallSection = function OverallSection(_ref) {
     avgGift = donorMix.avgGift || 0;
     donorMixPrev = donorMix.donorMixPrev || 0;
   }
+  console.log("DONOR MIX", donorMix);
   var renderCard = function renderCard(title) {
     return /*#__PURE__*/jsx(MetricCard
     // key={title}
@@ -5665,8 +5692,6 @@ var OverallSection = function OverallSection(_ref) {
     value: selectedInfo.value,
     trend: selectedInfo.subValue
   });
-  console.log("Donation Type Data", donationTypeData);
-  console.log("API DATA", apiData);
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Box, {
       sx: {