Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Exclude current day from Task Runs date filters (#73994)

Oleh K77066c67525c
diff --git a/frontend/src/metabase-types/api/task.ts b/frontend/src/metabase-types/api/task.ts
index d138b173594..e134cab35f4 100644
--- a/frontend/src/metabase-types/api/task.ts
+++ b/frontend/src/metabase-types/api/task.ts
@@ -69,13 +69,13 @@ export type TaskRunEntityType = "database" | "card" | "dashboard";
export type TaskRunStatus = "started" | "success" | "failed" | "abandoned";
export type TaskRunDateFilterOption =
| "thisday"
- | "past1days~"
- | "past1weeks~"
- | "past7days~"
- | "past30days~"
- | "past1months~"
- | "past3months~"
- | "past12months~";
+ | "past1days"
+ | "past1weeks"
+ | "past7days"
+ | "past30days"
+ | "past1months"
+ | "past3months"
+ | "past12months";
export interface TaskRun {
id: number;
diff --git a/frontend/src/metabase/admin/tools/components/TaskRunStartedAtPicker/TaskRunDatePicker.tsx b/frontend/src/metabase/admin/tools/components/TaskRunStartedAtPicker/TaskRunDatePicker.tsx
index 57bb97817c7..ab57e9d963b 100644
--- a/frontend/src/metabase/admin/tools/components/TaskRunStartedAtPicker/TaskRunDatePicker.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskRunStartedAtPicker/TaskRunDatePicker.tsx
@@ -23,13 +23,13 @@ export const TaskRunDatePicker = ({
*/
const data: SelectData<TaskRunDateFilterOption> = [
{ label: t`Today`, value: "thisday" },
- { label: t`Yesterday`, value: "past1days~" },
- { label: t`Previous week`, value: "past1weeks~" },
- { label: t`Previous 7 days`, value: "past7days~" },
- { label: t`Previous 30 days`, value: "past30days~" },
- { label: t`Previous month`, value: "past1months~" },
- { label: t`Previous 3 months`, value: "past3months~" },
- { label: t`Previous 12 months`, value: "past12months~" },
+ { label: t`Yesterday`, value: "past1days" },
+ { label: t`Previous week`, value: "past1weeks" },
+ { label: t`Previous 7 days`, value: "past7days" },
+ { label: t`Previous 30 days`, value: "past30days" },
+ { label: t`Previous month`, value: "past1months" },
+ { label: t`Previous 3 months`, value: "past3months" },
+ { label: t`Previous 12 months`, value: "past12months" },
];
return (
diff --git a/frontend/src/metabase/admin/tools/utils.ts b/frontend/src/metabase/admin/tools/utils.ts
index 7d29c3de9fd..b509df597ad 100644
--- a/frontend/src/metabase/admin/tools/utils.ts
+++ b/frontend/src/metabase/admin/tools/utils.ts
@@ -111,12 +111,12 @@ export const guardTaskRunStartedAtRange = (
(
[
"thisday",
- "past1days~",
- "past1weeks~",
- "past7days~",
- "past30days~",
- "past1months~",
- "past3months~",
- "past12months~",
+ "past1days",
+ "past1weeks",
+ "past7days",
+ "past30days",
+ "past1months",
+ "past3months",
+ "past12months",
] satisfies TaskRunDateFilterOption[]
).includes(value as TaskRunDateFilterOption);