From f6a34188e3460408191ea3870369c735fe65c344 Mon Sep 17 00:00:00 2001
From: Mehrdad <m.azmin>
Date: Thu, 21 Sep 2023 16:29:44 +0330
Subject: [PATCH 1/2] Added tooltip functionality to SliceHeader components

---
 .../dashboard/components/SliceHeaderControls/index.tsx    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
index 4037234f74fd0..0b7002d26a3c2 100644
--- a/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
+++ b/superset-frontend/src/dashboard/components/SliceHeaderControls/index.tsx
@@ -538,6 +538,14 @@ class SliceHeaderControls extends React.PureComponent<
 
     return (
       <>
+        {slice.description && (
+          <Tooltip title={slice.description}>
+            <Icons.QuestionCircleOutlined
+              style={{ fontSize: 22, cursor: 'pointer' }}
+            />
+          </Tooltip>
+        )}
+
         <CrossFilterScopingModal
           chartId={slice.slice_id}
           isOpen={this.state.showCrossFilterScopingModal}

From ad1f124790e15749e2acdf77e7f944747cacc491 Mon Sep 17 00:00:00 2001
From: Mehrdad <m.azmin>
Date: Thu, 21 Sep 2023 16:33:47 +0330
Subject: [PATCH 2/2] fix: Date filter: Shows default values, times corrected
 in datetime values to 00:00:00 for "from_date" and 23:59:59 for "to_date".

---
 .../components/CustomFrame.tsx                | 74 ++++++++++++++-----
 .../DateFilterControl/utils/dateParser.ts     | 32 --------
 2 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
index 4f67f620581e2..32750ea14f5fb 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/components/CustomFrame.tsx
@@ -50,6 +50,7 @@ enum DateType {
   Month = 'month',
   LastMonth = 'lastMonth',
   LastYear = 'LastYear',
+  Last30Day = 'Last30Day',
 }
 
 export function CustomFrame(props: FrameComponentProps) {
@@ -82,9 +83,16 @@ export function CustomFrame(props: FrameComponentProps) {
   const localFromFlaskBabel = useSelector(
     (state: ExplorePageState) => state?.common?.locale,
   );
-
-  const [untilDate, setUntilDate] = useState('' as unknown as moment.Moment);
-  const [sinceDate, setSinceDate] = useState('' as unknown as moment.Moment);
+  const [untilDate, setUntilDate] = useState(
+    props.value !== 'No filter' && props.value.split(' : ').length > 1
+      ? moment(props.value.split(' : ')[1])
+      : ('' as unknown as moment.Moment),
+  );
+  const [sinceDate, setSinceDate] = useState(
+    props.value !== 'No filter' && props.value.split(' : ').length > 1
+      ? moment(props.value.split(' : ')[0])
+      : ('' as unknown as moment.Moment),
+  );
 
   const datePickerLocale =
     locales[LOCALE_MAPPING[localFromFlaskBabel]]?.DatePicker;
@@ -115,24 +123,38 @@ export function CustomFrame(props: FrameComponentProps) {
       [sinceDatetime, untilDatetime] = setLastMonth();
     } else if (type === DateType.LastYear) {
       [sinceDatetime, untilDatetime] = setLastYear();
-    } else if (type === DateType.Week) {
-      untilDatetime = moment().format(MOMENT_FORMAT);
-      setUntilDate(moment());
-      sinceDatetime = moment().subtract(1, 'weeks').format(MOMENT_FORMAT);
-      setSinceDate(moment().subtract(1, 'weeks'));
-    } else if (type === DateType.Month) {
-      untilDatetime = moment().format(MOMENT_FORMAT);
-      setUntilDate(moment());
+    } else {
+      const untilDate = moment().format(dateFormat);
+      untilDatetime = moment(
+        `${untilDate} 23:59:59`,
+        `YYYY/MM/DD HH:mm:ss`,
+      ).format(MOMENT_FORMAT);
+      setUntilDate(moment(`${untilDate} 23:59:59`, `YYYY/MM/DD HH:mm:ss`));
+    }
+    if (type === DateType.Week) {
+      const sinceDate = moment().subtract(1, 'weeks').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.Last30Day) {
+      const sinceDate = moment().subtract(1, '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'));
-    } else if (type === DateType.Year) {
-      untilDatetime = moment().format(MOMENT_FORMAT);
-      setUntilDate(moment());
+    }
+    if (type === DateType.Year) {
       sinceDatetime = moment().startOf('year').format(MOMENT_FORMAT);
       setSinceDate(moment().startOf('year'));
     }
-    console.log(sinceDatetime);
-    console.log(untilDatetime);
     onChange({ sinceDatetime, untilDatetime });
   };
 
@@ -159,6 +181,12 @@ export function CustomFrame(props: FrameComponentProps) {
           >
             Last Month
           </Button>
+          <Button
+            onClick={() => selectDate(DateType.Last30Day)}
+            buttonStyle="link"
+          >
+            Last 30 Day
+          </Button>
           <Button
             onClick={() => selectDate(DateType.LastYear)}
             buttonStyle="link"
@@ -177,9 +205,19 @@ export function CustomFrame(props: FrameComponentProps) {
               if (arr !== null) {
                 setSinceDate(arr[0]!);
                 setUntilDate(arr[1]!);
+                const sinceDate = arr[0]?.format(dateFormat);
+                const untilDate = arr[1]?.format(dateFormat);
+                const sinceDatetime = moment(
+                  `${sinceDate} 00:00:00`,
+                  `YYYY/MM/DD HH:mm:ss`,
+                ).format(MOMENT_FORMAT);
+                const untilDatetime = moment(
+                  `${untilDate} 23:59:59`,
+                  `YYYY/MM/DD HH:mm:ss`,
+                ).format(MOMENT_FORMAT);
                 onChange({
-                  sinceDatetime: arr[0]?.format(MOMENT_FORMAT),
-                  untilDatetime: arr[1]?.format(MOMENT_FORMAT),
+                  sinceDatetime,
+                  untilDatetime,
                 });
               } else {
                 setSinceDate('' as unknown as moment.Moment);
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
index fc582f2607f2e..5fbbc5127ee2d 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/utils/dateParser.ts
@@ -199,13 +199,6 @@ export const customTimeRangeEncode = (customRange: CustomRangeType): string => {
     untilGrainValue,
     anchorValue,
   } = { ...customRange };
-  // specific : specific
-  // if (SPECIFIC_MODE.includes(sinceMode) && SPECIFIC_MODE.includes(untilMode)) {
-  //   const since =
-  //     sinceMode === 'specific' ? dttmToString(sinceDatetime) : sinceMode;
-  //   const until =
-  //     untilMode === 'specific' ? dttmToString(untilDatetime) : untilMode;
-  // }
   if (sinceDatetime || untilDatetime) {
     const since =
       sinceMode === 'specific' ? dttmToString(sinceDatetime) : sinceMode;
@@ -214,29 +207,4 @@ export const customTimeRangeEncode = (customRange: CustomRangeType): string => {
     return `${since} : ${until}`;
   }
   return 'No filter';
-
-  // specific : relative
-  // if (SPECIFIC_MODE.includes(sinceMode) && untilMode === 'relative') {
-  //   const since =
-  //     sinceMode === 'specific' ? dttmToString(sinceDatetime) : sinceMode;
-  //   const until = `DATEADD(DATETIME("${since}"), ${untilGrainValue}, ${untilGrain})`;
-  //   return `${since} : ${until}`;
-  // }
-
-  // relative : specific
-  // if (sinceMode === 'relative' && SPECIFIC_MODE.includes(untilMode)) {
-  //   const until =
-  //     untilMode === 'specific' ? dttmToString(untilDatetime) : untilMode;
-  //   const since = `DATEADD(DATETIME("${until}"), ${-Math.abs(
-  //     sinceGrainValue,
-  //   )}, ${sinceGrain})`;
-  //   return `${since} : ${until}`;
-  // }
-
-  // relative : relative
-  // const since = `DATEADD(DATETIME("${anchorValue}"), ${-Math.abs(
-  //   sinceGrainValue,
-  // )}, ${sinceGrain})`;
-  // const until = `DATEADD(DATETIME("${anchorValue}"), ${untilGrainValue}, ${untilGrain})`;
-  // return `${since} : ${until}`;
 };