QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(explore): timepicker show human readable string in pill (#12300)

Browse Source 
* fix(explore): timepicker show human readable string in pill

* fix lint
This commit is contained in:
Yongjie Zhao
2021-01-06 22:37:35 +08:00
committed by GitHub
parent e660723a2f
commit 1f8347228e
5 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterControl.tsx
View File

@@ -183,15 +183,25 @@ export default function DateFilterControl(props: DateFilterLabelProps) {
const [evalResponse, setEvalResponse] = useState<string>(value);
useEffect(() => {
fetchTimeRange(value, endpoints).then(({ value, error }) => {
if (error) {
setEvalResponse(error || '');
setValidTimeRange(false);
} else {
setActualTimeRange(value || '');
setValidTimeRange(true);
}
});
const valueToLower = value.toLowerCase();
if (
valueToLower.startsWith('last') ||
valueToLower.startsWith('next') ||
valueToLower.startsWith('previous')
) {
setActualTimeRange(value);
setValidTimeRange(true);
} else {
fetchTimeRange(value, endpoints).then(({ value, error }) => {
if (error) {
setEvalResponse(error || '');
setValidTimeRange(false);
} else {
setActualTimeRange(value || '');
setValidTimeRange(true);
}
});
}
}, [value]);
useEffect(() => {

9
superset-frontend/src/explore/components/controls/DateFilterControl/types.ts
View File

@@ -77,12 +77,9 @@ export type CommonRangeType =
| 'Last quarter'
| 'Last year';
export const PreviousCalendarWeek =
'DATETRUNC(DATEADD(DATETIME("TODAY"), -1, WEEK), WEEK) : LASTDAY(DATEADD(DATETIME("TODAY"), -1, WEEK), WEEK)';
export const PreviousCalendarMonth =
'DATETRUNC(DATEADD(DATETIME("TODAY"), -1, MONTH), MONTH) : LASTDAY(DATEADD(DATETIME("TODAY"), -1, MONTH), MONTH)';
export const PreviousCalendarYear =
'DATETRUNC(DATEADD(DATETIME("TODAY"), -1, YEAR), YEAR) : LASTDAY(DATEADD(DATETIME("TODAY"), -1, YEAR), YEAR)';
export const PreviousCalendarWeek = 'previous calendar week';
export const PreviousCalendarMonth = 'previous calendar month';
export const PreviousCalendarYear = 'previous calendar year';
export type CalendarRangeType =
| typeof PreviousCalendarWeek
| typeof PreviousCalendarMonth