feat: add last 90 days

Mehrdad-A · Sep 25, 2023 · 0367225 · 0367225
1 parent 2621db0
commit 0367225
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
@@ -25,7 +25,7 @@ var CalHeatMap = function () {
     .offset([-5, 0])
     .html(
       d => `
-      ${self.options.timeFormatter(d.t)}: <strong>${self.options.valueFormatter(
+      ${self.options.timeFormatter(d.t)}: <strong>${d.v === null ? 0 : self.options.valueFormatter(
         d.v,
       )}</strong>
     `,
@@ -742,7 +742,7 @@ var CalHeatMap = function () {
           self.getSubDomain(d).map(function (d) {
             return {
               t: self._domainType[self.options.subDomain].extractUnit(d),
-              v: null,
+              v: 0,
             };
           }),
         );

diff --git a/...set-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx b/...set-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
@@ -51,6 +51,7 @@ enum DateType {
   LastMonth = 'lastMonth',
   LastYear = 'LastYear',
   Last30Day = 'Last30Day',
+  Last90Day = 'Last90Day',
 }
 
 export function CustomFrame(props: FrameComponentProps) {
@@ -147,6 +148,14 @@ export function CustomFrame(props: FrameComponentProps) {
       ).format(MOMENT_FORMAT);
       setSinceDate(moment(`${sinceDate} 00:00:00`, `YYYY/MM/DD HH:mm:ss`));
     }
+    if (type === DateType.Last90Day) {
+      const sinceDate = moment().subtract(3, 'month').format(dateFormat);
+      sinceDatetime = moment(
+        `${sinceDate} 00:00:00`,
+        `YYYY/MM/DD HH:mm:ss`,
+      ).format(MOMENT_FORMAT);
+      setSinceDate(moment(`${sinceDate} 00:00:00`, `YYYY/MM/DD HH:mm:ss`));
+    }
     if (type === DateType.Month) {
       sinceDatetime = moment().startOf('month').format(MOMENT_FORMAT);
       setSinceDate(moment().startOf('month'));
@@ -185,7 +194,13 @@ export function CustomFrame(props: FrameComponentProps) {
             onClick={() => selectDate(DateType.Last30Day)}
             buttonStyle="link"
           >
-            Last 30 Day
+            Last 30 Days
+          </Button>
+          <Button
+            onClick={() => selectDate(DateType.Last90Day)}
+            buttonStyle="link"
+          >
+            Last 90 Days
           </Button>
           <Button
             onClick={() => selectDate(DateType.LastYear)}