@ammarkhalidfarooq/dashboard-package 0.6.31 → 0.6.33

package/dist/index.es.js

@@ -929,7 +929,9 @@ var Dashboard = function Dashboard(_ref) {
     _ref$apiLoading = _ref.apiLoading,
     apiLoading = _ref$apiLoading === void 0 ? false : _ref$apiLoading,
     _ref$numberOfDays = _ref.numberOfDays,
-    numberOfDays = _ref$numberOfDays === void 0 ? 1 : _ref$numberOfDays;
+    numberOfDays = _ref$numberOfDays === void 0 ? 1 : _ref$numberOfDays,
+    _ref$activeFilters = _ref.activeFilters,
+    activeFilters = _ref$activeFilters === void 0 ? [] : _ref$activeFilters;
   return /*#__PURE__*/jsx(ThemeProvider, {
     theme: theme,
     children: /*#__PURE__*/jsx(Suspense, {
@@ -946,7 +948,8 @@ var Dashboard = function Dashboard(_ref) {
         activeSection: overviewType,
         dateName: dateName,
         exportTrigger: exportTrigger,
-        apiLoading: apiLoading
+        apiLoading: apiLoading,
+        activeFilters: activeFilters
       })
     })
   });
@@ -2117,7 +2120,7 @@ var PageHeader = function PageHeader(_ref9) {
         },
         children: ["Page ", page, " of 2"]
       })]
-    }), activeFilters && /*#__PURE__*/jsxs("div", {
+    }), !!"".concat(activeFilters || "").trim() && /*#__PURE__*/jsxs("div", {
       style: {
         marginTop: 7,
         display: "inline-flex",
@@ -2173,7 +2176,9 @@ var ExportPdfLayout = /*#__PURE__*/React.forwardRef(function (_ref1, ref) {
     _ref1$dateName = _ref1.dateName,
     dateName = _ref1$dateName === void 0 ? "Last Period" : _ref1$dateName,
     _ref1$numberOfDays = _ref1.numberOfDays,
-    numberOfDays = _ref1$numberOfDays === void 0 ? 30 : _ref1$numberOfDays;
+    numberOfDays = _ref1$numberOfDays === void 0 ? 30 : _ref1$numberOfDays,
+    _ref1$activeFilters = _ref1.activeFilters,
+    activeFilters = _ref1$activeFilters === void 0 ? [] : _ref1$activeFilters;
   var now = new Date();
   var daysLabel = "".concat(numberOfDays, " day").concat(numberOfDays === 1 ? "" : "s");
   var windowLabel = "".concat(numberOfDays, "-day window");
@@ -2186,7 +2191,26 @@ var ExportPdfLayout = /*#__PURE__*/React.forwardRef(function (_ref1, ref) {
     minute: "2-digit"
   }) + " GMT";
   var dateLabel = dateName;
-  var activeFilters = getActiveFilterChips(apiData).join(" ");
+  var normalizeFiltersText = function normalizeFiltersText(filtersInput) {
+    if (Array.isArray(filtersInput)) {
+      var fromObjects = filtersInput.filter(function (item) {
+        return item && item.value !== undefined && item.value !== null && "".concat(item.value).trim();
+      }).map(function (item) {
+        return "".concat(item.label || item.id || "Filter", ": ").concat(item.value);
+      }).join(" | ").trim();
+      if (fromObjects) return fromObjects;
+      var fromStrings = filtersInput.map(function (item) {
+        return typeof item === "string" ? item.trim() : "";
+      }).filter(Boolean).join(" | ").trim();
+      if (fromStrings) return fromStrings;
+    }
+    if (typeof filtersInput === "string") {
+      var str = filtersInput.trim();
+      if (str) return str;
+    }
+    return "";
+  };
+  var formattedActiveFilters = normalizeFiltersText(activeFilters) || normalizeFiltersText(getActiveFilterChips(apiData));
   var report = buildReportData(apiData, dateName);
   var hero = report.hero,
     metrics = report.metrics,
@@ -2337,7 +2361,7 @@ var ExportPdfLayout = /*#__PURE__*/React.forwardRef(function (_ref1, ref) {
   var headerProps = {
     dateLabel: dateLabel,
     generatedLabel: generatedLabel,
-    activeFilters: activeFilters,
+    activeFilters: formattedActiveFilters,
     windowLabel: windowLabel
   };
   return /*#__PURE__*/jsxs("div", {
@@ -3147,7 +3171,9 @@ var NewOverview = function NewOverview(_ref) {
     _ref$exportTrigger = _ref.exportTrigger,
     exportTrigger = _ref$exportTrigger === void 0 ? 0 : _ref$exportTrigger,
     _ref$apiLoading = _ref.apiLoading,
-    apiLoading = _ref$apiLoading === void 0 ? false : _ref$apiLoading;
+    apiLoading = _ref$apiLoading === void 0 ? false : _ref$apiLoading,
+    _ref$activeFilters = _ref.activeFilters,
+    activeFilters = _ref$activeFilters === void 0 ? [] : _ref$activeFilters;
   var initialMetric = "Revenue";
   var revenueData = (apiData === null || apiData === void 0 ? void 0 : apiData.revenueData) || [3000, 4500, 4200, 5800, 5200, 7100, 8500, 9200, 5000];
   var donationsData = (apiData === null || apiData === void 0 ? void 0 : apiData.donationsData) || [15, 22, 18, 30, 25, 35, 42, 45, 28];
@@ -3453,7 +3479,8 @@ var NewOverview = function NewOverview(_ref) {
         ref: exportLayoutRef,
         apiData: apiData,
         dateName: dateName,
-        numberOfDays: numberOfDays
+        numberOfDays: numberOfDays,
+        activeFilters: activeFilters
       })
     })]
   });