The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Add missing transform filters (#63998)
Alexander Polyankin894176cf26a1
diff --git a/e2e/test/scenarios/admin/transforms.cy.spec.ts b/e2e/test/scenarios/admin/transforms.cy.spec.tsindex d680d7451a7..60ef560d58f 100644--- a/e2e/test/scenarios/admin/transforms.cy.spec.ts+++ b/e2e/test/scenarios/admin/transforms.cy.spec.ts@@ -637,6 +637,114 @@ LIMIT});});+ describe("filtering", () => {+ it("should be able to filter transforms", () => {+ createMbqlTransform({ visitTransform: true });+ runJobAndWaitForSuccess();++ createSqlTransform({+ sourceQuery: `SELECT * FROM "${TARGET_SCHEMA}"."${SOURCE_TABLE}"`,+ targetTable: TARGET_TABLE_2,+ visitTransform: true,+ });+ getTagsInput().click();+ H.popover().findByText("hourly").click();+ H.undoToast().findByText("Transform tags updated").should("be.visible");++ visitTransformListPage();++ function testLastRunDateFilter() {+ cy.log("no filters");+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });++ cy.log("last run at - add a filter");+ getLastRunDateFilterWidget().click();+ H.popover().within(() => {+ cy.findByText("Relative date range…").click();+ cy.findByText("Current").click();+ cy.findByText("Week").click();+ });++ getLastRunDateFilterWidget().should("contain", "This week");+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("not.exist");+ });++ cy.log("last run at filter - remove filter");+ getLastRunDateFilterWidget().button("Remove filter").click();+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });+ }++ function testLastRunStatusFilter() {+ cy.log("no filters");+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });++ cy.log("last run status - add a filter");+ getLastRunStatusFilterWidget().click();+ H.popover().within(() => {+ cy.findByText("Success").click();+ cy.findByText("Add filter").click();+ });++ getLastRunStatusFilterWidget().should("contain", "Success");+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("not.exist");+ });++ cy.log("last run status filter - remove filter");+ getLastRunStatusFilterWidget().button("Remove filter").click();+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });+ }++ function testTagFilter() {+ cy.log("no filters");+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });++ cy.log("tags - add a filter");+ getTagFilterWidget().click();+ H.popover().within(() => {+ cy.findByText("hourly").click();+ cy.findByText("daily").click();+ cy.button("Add filter").click();+ });++ getTagFilterWidget().should("contain", "2 tags");+ getContentTable().within(() => {+ cy.findByText("SQL transform").should("be.visible");+ cy.findByText("MBQL transform").should("not.exist");+ });++ cy.log("last run status filter - remove filter");+ getTagFilterWidget().button("Remove filter").click();+ getContentTable().within(() => {+ cy.findByText("MBQL transform").should("be.visible");+ cy.findByText("SQL transform").should("be.visible");+ });+ }++ testLastRunDateFilter();+ testLastRunStatusFilter();+ testTagFilter();+ });+ });+describe("name and description", () => {it("should be able to edit the name and description after creation", () => {createMbqlTransform({ visitTransform: true });@@ -1116,6 +1224,7 @@ LIMIT},target: {type: "table",+ database: WRITABLE_DB_ID,name: TARGET_TABLE,schema: TARGET_SCHEMA,},@@ -1229,6 +1338,7 @@ LIMIT},target: {type: "table",+ database: WRITABLE_DB_ID,name: TARGET_TABLE,schema: TARGET_SCHEMA,},@@ -1437,6 +1547,7 @@ LIMIT},target: {type: "table",+ database: WRITABLE_DB_ID,name: TARGET_TABLE,schema: TARGET_SCHEMA,},@@ -1997,13 +2108,11 @@ describe("scenarios > admin > transforms > jobs", () => {it("should be able to filter jobs ", () => {cy.log("run hourly job so know that was recently run");visitJobListPage();-getContentTable().findByText("Hourly job").click();runJobAndWaitForSuccess();-visitJobListPage();- function testLastRunFilter() {+ function testLastRunDateFilter() {cy.log("no filters");getContentTable().within(() => {cy.findByText("Hourly job").should("be.visible");@@ -2013,14 +2122,14 @@ describe("scenarios > admin > transforms > jobs", () => {});cy.log("last run at - add a filter");- getLastRunAtFilterWidget().click();+ getLastRunDateFilterWidget().click();H.popover().findByText("Previous month").click();- getLastRunAtFilterWidget().should("contain", "Previous month");+ getLastRunDateFilterWidget().should("contain", "Previous month");getContentTable().should("not.exist");cy.log("last run at filter - remove filter");- getLastRunAtFilterWidget().button("Remove filter").click();+ getLastRunDateFilterWidget().button("Remove filter").click();getContentTable().within(() => {cy.findByText("Hourly job").should("be.visible");cy.findByText("Daily job").should("be.visible");@@ -2029,7 +2138,42 @@ describe("scenarios > admin > transforms > jobs", () => {});}- function testNextRunFilter() {+ function testLastRunStatusFilter() {+ cy.log("no filters");+ getContentTable().within(() => {+ cy.findByText("Hourly job").should("be.visible");+ cy.findByText("Daily job").should("be.visible");+ cy.findByText("Weekly job").should("be.visible");+ cy.findByText("Monthly job").should("be.visible");+ });++ cy.log("last run status - add a filter");+ getLastRunStatusFilterWidget().click();+ H.popover().within(() => {+ cy.findByText("In progress").click();+ cy.findByText("Success").click();+ cy.button("Add filter").click();+ });++ getLastRunStatusFilterWidget().should("contain", "2 statuses");+ getContentTable().within(() => {+ cy.findByText("Hourly job").should("be.visible");+ cy.findByText("Daily job").should("not.exist");+ cy.findByText("Weekly job").should("not.exist");+ cy.findByText("Monthly job").should("not.exist");+ });++ cy.log("last run at filter - remove filter");+ getLastRunStatusFilterWidget().button("Remove filter").click();+ getContentTable().within(() => {+ cy.findByText("Hourly job").should("be.visible");+ cy.findByText("Daily job").should("be.visible");+ cy.findByText("Weekly job").should("be.visible");+ cy.findByText("Monthly job").should("be.visible");+ });+ }++ function testNextRunDateFilter() {cy.log("no filters");getContentTable().within(() => {cy.findByText("Hourly job").should("be.visible");@@ -2039,7 +2183,7 @@ describe("scenarios > admin > transforms > jobs", () => {});cy.log("next run - add a filter");- getNextRunFilterWidget().click();+ getNextRunDateFilterWidget().click();H.popover().within(() => {cy.findByText("Fixed date range…").click();cy.findByLabelText("Start date").clear().type("12/10/2024");@@ -2047,14 +2191,14 @@ describe("scenarios > admin > transforms > jobs", () => {cy.button("Apply").click();});- getNextRunFilterWidget().should(+ getNextRunDateFilterWidget().should("contain","December 10, 2024 - January 5, 2025",);getContentTable().should("not.exist");cy.log("next run filter - remove filter");- getNextRunFilterWidget().button("Remove filter").click();+ getNextRunDateFilterWidget().button("Remove filter").click();getContentTable().within(() => {cy.findByText("Hourly job").should("be.visible");cy.findByText("Daily job").should("be.visible");@@ -2127,8 +2271,9 @@ describe("scenarios > admin > transforms > jobs", () => {});}- testLastRunFilter();- testNextRunFilter();+ testLastRunDateFilter();+ testLastRunStatusFilter();+ testNextRunDateFilter();testTagFilter();});});@@ -2617,11 +2762,15 @@ function getTransformFilterWidget() {return cy.findByRole("group", { name: "Transform" });}-function getLastRunAtFilterWidget() {+function getLastRunDateFilterWidget() {return cy.findByRole("group", { name: "Last run at" });}-function getNextRunFilterWidget() {+function getLastRunStatusFilterWidget() {+ return cy.findByRole("group", { name: "Last run status" });+}++function getNextRunDateFilterWidget() {return cy.findByRole("group", { name: "Next run at" });}@@ -2638,11 +2787,11 @@ function getRunMethodFilterWidget() {}function getStartAtFilterWidget() {- return cy.findByRole("group", { name: "Start at" });+ return cy.findByRole("group", { name: "Started at" });}function getEndAtFilterWidget() {- return cy.findByRole("group", { name: "End at" });+ return cy.findByRole("group", { name: "Ended at" });}function visitTransformListPage() {@@ -2712,6 +2861,7 @@ function createMbqlTransform({},target: {type: "table",+ database: WRITABLE_DB_ID,name: targetTable,schema: targetSchema,},@@ -2750,6 +2900,7 @@ function createSqlTransform({},target: {type: "table",+ database: WRITABLE_DB_ID,name: targetTable,schema: targetSchema,},diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api.clj b/enterprise/backend/src/metabase_enterprise/transforms/api.cljindex 28e174d6cf3..25be43fe7e5 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/api.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/api.clj@@ -88,11 +88,19 @@(api.macros/defendpoint :get "/""Get a list of transforms."[_route-params- _query-params]+ {:keys [last_run_start_time last_run_statuses tag_ids]} :-+ [:map+ [:last_run_start_time {:optional true} [:maybe ms/NonBlankString]]+ [:last_run_statuses {:optional true} [:maybe (ms/QueryVectorOf [:enum "started" "succeeded" "failed" "timeout"])]]+ [:tag_ids {:optional true} [:maybe (ms/QueryVectorOf ms/IntGreaterThanOrEqualToZero)]]]](api/check-superuser)- (-> (t2/select :model/Transform)- (t2/hydrate :last_run :transform_tag_ids)- (->> (map #(update % :last_run transforms.util/localize-run-timestamps)))))+ (let [transforms (t2/select :model/Transform)]+ (into []+ (comp (transforms.util/->date-field-filter-xf [:last_run :start_time] last_run_start_time)+ (transforms.util/->status-filter-xf [:last_run :status] last_run_statuses)+ (transforms.util/->tag-filter-xf [:tag_ids] tag_ids)+ (map #(update % :last_run transforms.util/localize-run-timestamps)))+ (t2/hydrate transforms :last_run :transform_tag_ids))))(api.macros/defendpoint :post "/""Create a new transform."diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj b/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.cljindex 983338b2276..c90ea76c25a 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/api/transform_job.clj@@ -8,8 +8,6 @@[metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.api.routes.common :refer [+auth]]- [metabase.driver.common.parameters.dates :as params.dates]- [metabase.util.date-2 :as u.date][metabase.util.i18n :refer [deferred-tru]][metabase.util.jvm :as u.jvm][metabase.util.log :as log]@@ -143,23 +141,6 @@(assoc job :next_run {:start_time (str (transforms.util/->instant start-time))})job))-(defn- matching-timestamp?- [job field-path {:keys [start end]}]- (when-let [field-instant (transforms.util/->instant (get-in job field-path))]- (let [start-instant (some-> start u.date/parse transforms.util/->instant)- end-instant (some-> end u.date/parse transforms.util/->instant)]- (and (or (nil? start)- (not (.isBefore field-instant start-instant)))- (or (nil? end)- (.isAfter end-instant field-instant))))))--(defn- ->date-field-filter-xf- [field-path filter-value]- (let [range (some-> filter-value (params.dates/date-string->range {:inclusive-end? false}))]- (if range- (filter #(matching-timestamp? % field-path range))- identity)))-(api.macros/defendpoint :get "/:job-id/transforms""Get the transforms of job specified by the job's ID."[{:keys [job-id]} :- [:map@@ -172,22 +153,21 @@(api.macros/defendpoint :get "/""Get all transform jobs."[_route-params- {:keys [last_run_start_time next_run_start_time transform_tag_ids]} :-+ {:keys [last_run_start_time next_run_start_time last_run_statuses tag_ids]} :-[:map[:last_run_start_time {:optional true} [:maybe ms/NonBlankString]][:next_run_start_time {:optional true} [:maybe ms/NonBlankString]]- [:transform_tag_ids {:optional true} [:maybe (ms/QueryVectorOf ms/IntGreaterThanOrEqualToZero)]]]]+ [:last_run_statuses {:optional true} [:maybe (ms/QueryVectorOf [:enum "started" "succeeded" "failed" "timeout"])]]+ [:tag_ids {:optional true} [:maybe (ms/QueryVectorOf ms/IntGreaterThanOrEqualToZero)]]]](log/info "Getting all transform jobs")(api/check-superuser)- (let [jobs (t2/select :model/TransformJob {:order-by [[:created_at :desc]]})- transform-tag-ids (-> transform_tag_ids set not-empty)]+ (let [jobs (t2/select :model/TransformJob {:order-by [[:created_at :desc]]})](into [](comp (map add-next-run)- (->date-field-filter-xf [:last_run :start_time] last_run_start_time)- (->date-field-filter-xf [:next_run :start_time] next_run_start_time)- (if transform-tag-ids- (filter #(some transform-tag-ids (:tag_ids %)))- identity)+ (transforms.util/->date-field-filter-xf [:last_run :start_time] last_run_start_time)+ (transforms.util/->date-field-filter-xf [:next_run :start_time] next_run_start_time)+ (transforms.util/->status-filter-xf [:last_run :status] last_run_statuses)+ (transforms.util/->tag-filter-xf [:tag_ids] tag_ids)(map #(update % :last_run transforms.util/localize-run-timestamps))(map #(update % :next_run transforms.util/localize-run-timestamps)))(t2/hydrate jobs :tag_ids :last_run))))diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj b/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.cljindex cc34f34e236..e96079de1f7 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj@@ -228,7 +228,7 @@query-options (merge {:order-by order-by :offset offset :limit limit}count-options)runs (t2/select :model/TransformRun query-options)]- {:data (t2/hydrate runs :transform)+ {:data (t2/hydrate runs [:transform :transform_tag_ids]):limit limit:offset offset:total (t2/count :model/TransformRun count-options)}))diff --git a/enterprise/backend/src/metabase_enterprise/transforms/util.clj b/enterprise/backend/src/metabase_enterprise/transforms/util.cljindex ccd5a47bdef..b091db4f67a 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/util.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/util.clj@@ -7,6 +7,7 @@[metabase-enterprise.transforms.models.transform-run :as transform-run][metabase-enterprise.transforms.settings :as transforms.settings][metabase.driver :as driver]+ [metabase.driver.common.parameters.dates :as params.dates][metabase.lib.schema.common :as lib.schema.common][metabase.premium-features.core :as premium-features][metabase.query-processor.compile :as qp.compile]@@ -275,3 +276,37 @@(or (t2/exists? :model/DatabaseRouter :database_id (u/the-id db-or-id))(some->> (:router-database-id db-or-id)(t2/exists? :model/DatabaseRouter :database_id))))++(defn- matching-timestamp?+ [job field-path {:keys [start end]}]+ (when-let [field-instant (->instant (get-in job field-path))]+ (let [start-instant (some-> start u.date/parse ->instant)+ end-instant (some-> end u.date/parse ->instant)]+ (and (or (nil? start)+ (not (.isBefore field-instant start-instant)))+ (or (nil? end)+ (.isAfter end-instant field-instant))))))++(defn ->date-field-filter-xf+ "Returns an xform for a date filter."+ [field-path filter-value]+ (let [range (some-> filter-value (params.dates/date-string->range {:inclusive-end? false}))]+ (if range+ (filter #(matching-timestamp? % field-path range))+ identity)))++(defn ->status-filter-xf+ "Returns an xform for a transform run status filter."+ [field-path statuses]+ (let [statuses (->> statuses (map keyword) set not-empty)]+ (if statuses+ (filter #(statuses (get-in % field-path)))+ identity)))++(defn ->tag-filter-xf+ "Returns an xform for a transform tag filter."+ [field-path tag-ids]+ (let [tag-ids (-> tag-ids set not-empty)]+ (if tag-ids+ (filter #(some tag-ids (get-in % field-path)))+ identity)))diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.cljindex 1547e73a279..868fa462528 100644--- a/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj+++ b/enterprise/backend/test/metabase_enterprise/transforms/api/transform_job_test.clj@@ -105,8 +105,8 @@(testing "listing without filtering"(let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job")](is (= our-job-ids (returned-job-ids response)))))- (testing "filtering by transform_tag_ids"- (let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job" :transform_tag_ids [t2-id])]+ (testing "filtering by tag_ids"+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job" :tag_ids [t2-id])](is (=? [{:schedule "0 0 0 * * ?":tag_ids [t2-id]:name "Job 3"@@ -115,6 +115,9 @@(testing "filtering by last_run_start_time"(let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job" :last_run_start_time "2025-08-26~")](is (= #{j2-id} (returned-job-ids response)))))+ (testing "filtering by last_run_statuses"+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job" :last_run_statuses ["started" "succeeded"])]+ (is (= #{j2-id} (returned-job-ids response)))))(testing "filtering by last_run_end_time without scheduled job"(let [response (mt/user-http-request :crowberto :get 200 "ee/transform-job" :next_run_start_time "2025-08-26~")](is (= #{} (returned-job-ids response)))))diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api_test.cljindex 225a25ea430..79bd31a85bd 100644--- a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj@@ -161,6 +161,35 @@list-resp (mt/user-http-request :crowberto :get 200 "ee/transform")](is (seq list-resp)))))))))+(deftest filter-transforms-test+ (testing "should be able to filter transforms"+ (mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)+ (mt/with-premium-features #{:transforms}+ (mt/with-temp [:model/Transform {t1-id :id} {}+ :model/Transform {t2-id :id} {}+ :model/TransformTag {tag1-id :id} {:name "tag1"}+ :model/TransformTag {tag2-id :id} {:name "tag2"}+ :model/TransformTransformTag _ {:transform_id t1-id :tag_id tag1-id :position 1}+ :model/TransformTransformTag _ {:transform_id t2-id :tag_id tag2-id :position 1}+ :model/TransformRun _ {:transform_id t1-id :status "started" :run_method "manual"+ :start_time (parse-instant "2025-08-26T10:12:11")+ :end_time nil+ :is_active true}]+ (testing "no filters"+ (is (=? [{:id t1-id} {:id t2-id}]+ (mt/user-http-request :crowberto :get 200 "ee/transform"))))+ (testing "last_run_start_time filter"+ (is (=? [{:id t1-id}]+ (mt/user-http-request :crowberto :get 200 "ee/transform" :last_run_start_time "2025-08-26T10:12:11"))))+ (testing "last_run_statuses filter"+ (is (=? [{:id t1-id}]+ (mt/user-http-request :crowberto :get 200 "ee/transform" :last_run_statuses ["started" "succeeded"]))))+ (testing "tag_ids filter"+ (is (=? [{:id t1-id}]+ (mt/user-http-request :crowberto :get 200 "ee/transform" :tag_ids [tag1-id])))+ (is (=? [{:id t2-id}]+ (mt/user-http-request :crowberto :get 200 "ee/transform" :tag_ids [tag2-id])))))))))+(deftest get-transforms-test(mt/test-drivers (mt/normal-drivers-with-feature :transforms/table)(mt/with-premium-features #{:transforms}diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform.ts b/enterprise/frontend/src/metabase-enterprise/api/transform.tsindex df6ef2e7ae4..45345abca88 100644--- a/enterprise/frontend/src/metabase-enterprise/api/transform.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/transform.ts@@ -3,6 +3,7 @@ import type {CreateTransformRequest,ListTransformRunsRequest,ListTransformRunsResponse,+ ListTransformsRequest,RunTransformResponse,Transform,TransformId,@@ -22,7 +23,7 @@ import {export const transformApi = EnterpriseApi.injectEndpoints({endpoints: (builder) => ({- listTransforms: builder.query<Transform[], void>({+ listTransforms: builder.query<Transform[], ListTransformsRequest>({query: (params) => ({method: "GET",url: "/api/ee/transform",diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsxsimilarity index 91%rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsxrename to enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsxindex 2d4a55ce613..bd4b772e974 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/StatusFilterWidget.tsx@@ -1,6 +1,6 @@import { useDisclosure } from "@mantine/hooks";import { type FormEvent, useState } from "react";-import { msgid, ngettext, t } from "ttag";+import { msgid, ngettext } from "ttag";import {Box,@@ -13,9 +13,9 @@ import {} from "metabase/ui";import type { TransformRunStatus } from "metabase-types/api";-import { FilterFieldSet } from "../../../../components/FilterFieldSet";-import { FILTER_WIDGET_MIN_WIDTH } from "../../../../constants";-import { formatStatus } from "../../../../utils";+import { FILTER_WIDGET_MIN_WIDTH } from "../../constants";+import { formatStatus } from "../../utils";+import { FilterFieldSet } from "../FilterFieldSet";const STATUSES: TransformRunStatus[] = ["started",@@ -25,11 +25,13 @@ const STATUSES: TransformRunStatus[] = [];type StatusFilterWidgetProps = {+ label: string;statuses: TransformRunStatus[];onChange: (statuses: TransformRunStatus[]) => void;};export function StatusFilterWidget({+ label,statuses,onChange,}: StatusFilterWidgetProps) {@@ -48,7 +50,7 @@ export function StatusFilterWidget({<Popover opened={isOpened} position="bottom-start" onDismiss={close}><Popover.Target><FilterFieldSet- label={t`Status`}+ label={label}icon="check_filled"displayValue={getDisplayValue(statuses)}onClick={toggle}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/index.tssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.tsrename to enterprise/frontend/src/metabase-enterprise/transforms/components/StatusFilterWidget/index.tsdiff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsxindex d07d4ef2990..b1e081a54f2 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagFilterWidget/TagFilterWidget.tsx@@ -20,12 +20,14 @@ import {import { FilterFieldSet } from "../FilterFieldSet";type TagFilterWidgetProps = {+ label: string;tagIds: TransformTagId[];tags: TransformTag[];onChange: (tagIds: TransformTagId[]) => void;};export function TagFilterWidget({+ label,tagIds,tags,onChange,@@ -45,7 +47,7 @@ export function TagFilterWidget({<Popover opened={isOpened} position="bottom-start" onDismiss={close}><Popover.Target><FilterFieldSet- label={t`Tags`}+ label={label}icon="label"displayValue={getDisplayValue(tagIds, tags)}onClick={toggle}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsxindex bea8938c879..7daa672f1ce 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobFilterList/JobFilterList.tsx@@ -5,13 +5,18 @@ import { useDispatch } from "metabase/lib/redux";import type { RelativeIntervalDirection } from "metabase/querying/filters/types";import { Group } from "metabase/ui";import { getJobListUrl } from "metabase-enterprise/transforms/urls";-import type { TransformTag, TransformTagId } from "metabase-types/api";+import type {+ TransformRunStatus,+ TransformTag,+ TransformTagId,+} from "metabase-types/api";+import { StatusFilterWidget } from "../../../components/StatusFilterWidget";import { TagFilterWidget } from "../../../components/TagFilterWidget";import { TimeFilterWidget } from "../../../components/TimeFilterWidget";import type { JobListParams } from "../../../types";-type FilterListProps = {+type JobFilterListProps = {params: JobListParams;tags: TransformTag[];};@@ -26,19 +31,25 @@ const FUTURE_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = ["future",];-export function JobFilterList({ params, tags }: FilterListProps) {+export function JobFilterList({ params, tags }: JobFilterListProps) {const dispatch = useDispatch();const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {dispatch(replace(getJobListUrl({ ...params, lastRunStartTime })));};+ const handleLastRunStatusesChange = (+ lastRunStatuses?: TransformRunStatus[],+ ) => {+ dispatch(replace(getJobListUrl({ ...params, lastRunStatuses })));+ };+const handleNextRunStartTimeChange = (nextRunStartTime?: string) => {dispatch(replace(getJobListUrl({ ...params, nextRunStartTime })));};const handleTagsChange = (tagIds: TransformTagId[]) => {- dispatch(replace(getJobListUrl({ ...params, transformTagIds: tagIds })));+ dispatch(replace(getJobListUrl({ ...params, tagIds })));};return (@@ -49,6 +60,11 @@ export function JobFilterList({ params, tags }: FilterListProps) {availableDirections={PAST_INTERVAL_DIRECTIONS}onChange={handleLastRunStartTimeChange}/>+ <StatusFilterWidget+ label={t`Last run status`}+ statuses={params.lastRunStatuses ?? []}+ onChange={handleLastRunStatusesChange}+ /><TimeFilterWidgetlabel={t`Next run at`}value={params.nextRunStartTime}@@ -56,7 +72,8 @@ export function JobFilterList({ params, tags }: FilterListProps) {onChange={handleNextRunStartTimeChange}/><TagFilterWidget- tagIds={params.transformTagIds ?? []}+ label={t`Tags`}+ tagIds={params.tagIds ?? []}tags={tags}onChange={handleTagsChange}/>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsxindex 70b4e1bd9ef..984d0cc261b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx@@ -33,8 +33,9 @@ export function JobList({ params }: { params: JobListParams }) {error: jobsError,} = useListTransformJobsQuery({last_run_start_time: params.lastRunStartTime,+ last_run_statuses: params.lastRunStatuses,next_run_start_time: params.nextRunStartTime,- transform_tag_ids: params.transformTagIds,+ tag_ids: params.tagIds,});const {data: tags = [],diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsxindex d10e7637a72..2527ea66694 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobListPage.tsx@@ -18,7 +18,6 @@ type JobListPageProps = {export function JobListPage({ location }: JobListPageProps) {const params = getParsedParams(location);-const { data: tags = [], isLoading, error } = useListTransformTagsQuery();if (!tags || isLoading || error != null) {@@ -41,7 +40,6 @@ export function JobListPage({ location }: JobListPageProps) {{t`Create a job`}</Button></Group>-<JobFilterList params={params} tags={tags} /><JobList params={params} /></Stack>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.tsindex 35308015709..7e0b72c6b4a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/utils.ts@@ -1,47 +1,31 @@import type { Location } from "history";-import { isNotNull } from "metabase/lib/types";import type { JobListParams } from "metabase-enterprise/transforms/types";+import {+ parseInteger,+ parseList,+ parseRunStatus,+ parseString,+} from "../../utils";+export function getParsedParams(location: Location): JobListParams {- const { transformTagIds, lastRunStartTime, nextRunStartTime } =+ const { lastRunStartTime, lastRunStatuses, nextRunStartTime, tagIds } =location.query;return {- lastRunStartTime: parseTime(lastRunStartTime),- nextRunStartTime: parseTime(nextRunStartTime),- transformTagIds: parseList(transformTagIds, parseNumber),+ lastRunStartTime: parseString(lastRunStartTime),+ lastRunStatuses: parseList(lastRunStatuses, parseRunStatus),+ nextRunStartTime: parseString(nextRunStartTime),+ tagIds: parseList(tagIds, parseInteger),};}-function parseTime(value: unknown): string | undefined {- if (typeof value === "string") {- return value;- }- return undefined;-}--function parseList<T>(- value: unknown,- parseItem: (value: unknown) => T | undefined,-): T[] | undefined {- if (typeof value === "string") {- const item = parseItem(value);- return item != null ? [item] : [];- }- if (Array.isArray(value)) {- return value.map(parseItem).filter(isNotNull);- }-}--function parseNumber(value: unknown) {- return typeof value === "string" ? parseInt(value, 10) : undefined;-}-export function hasFilterParams(params: JobListParams) {return (params.lastRunStartTime != null ||+ params.lastRunStatuses != null ||params.nextRunStartTime != null ||- params.transformTagIds != null+ params.tagIds != null);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsxindex 0eb38aa3c5b..589bfdec9a8 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx@@ -14,12 +14,12 @@ import type {TransformTagId,} from "metabase-types/api";+import { StatusFilterWidget } from "../../../components/StatusFilterWidget";import { TagFilterWidget } from "../../../components/TagFilterWidget";import { TimeFilterWidget } from "../../../components/TimeFilterWidget";import type { RunListParams } from "../../../types";import { RunMethodFilterWidget } from "./RunMethodFilterWidget";-import { StatusFilterWidget } from "./StatusFilterWidget";import { TransformFilterWidget } from "./TransformFilterWidget";const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [@@ -71,31 +71,33 @@ export function RunFilterList({transforms={transforms}onChange={handleTransformsChange}/>- <StatusFilterWidget- statuses={params.statuses ?? []}- onChange={handleStatusesChange}- />- <TagFilterWidget- tagIds={params.transformTagIds ?? []}- tags={tags}- onChange={handleTagsChange}- /><TimeFilterWidget- label={t`Start at`}+ label={t`Started at`}value={params.startTime}availableDirections={PAST_INTERVAL_DIRECTIONS}onChange={handleStartTimeChange}/><TimeFilterWidget- label={t`End at`}+ label={t`Ended at`}value={params.endTime}availableDirections={PAST_INTERVAL_DIRECTIONS}onChange={handleEndTimeChange}/>+ <StatusFilterWidget+ label={t`Status`}+ statuses={params.statuses ?? []}+ onChange={handleStatusesChange}+ /><RunMethodFilterWidgetrunMethods={params.runMethods ?? []}onChange={handleRunMethodsChange}/>+ <TagFilterWidget+ label={t`Tags`}+ tagIds={params.transformTagIds ?? []}+ tags={tags}+ onChange={handleTagsChange}+ /></Group>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsxindex 116d31d8e8d..9629379a337 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx@@ -19,7 +19,7 @@ function setup({ params = {}, transforms = [], tags = [] }: SetupOpts = {}) {}describe("RunFilterList", () => {- it.each(["Start at", "End at"])(+ it.each(["Started at", "Ended at"])("should allow only past or current date options for start and end date filters",async (label) => {setup();diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsxindex fbac8095ce7..d69d7d6236d 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx@@ -7,10 +7,11 @@ import { useSetting } from "metabase/common/hooks";import { useDispatch } from "metabase/lib/redux";import { Card, Flex, Group, Stack } from "metabase/ui";import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";-import type { TransformRun } from "metabase-types/api";+import type { TransformRun, TransformTag } from "metabase-types/api";import { ListEmptyState } from "../../../components/ListEmptyState";import { RunStatusInfo } from "../../../components/RunStatusInfo";+import { TagList } from "../../../components/TagList";import type { RunListParams } from "../../../types";import { getRunListUrl, getTransformUrl } from "../../../urls";import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";@@ -23,9 +24,10 @@ type RunListProps = {runs: TransformRun[];totalCount: number;params: RunListParams;+ tags: TransformTag[];};-export function RunList({ runs, totalCount, params }: RunListProps) {+export function RunList({ runs, totalCount, params, tags }: RunListProps) {const { page = 0 } = params;const hasPagination = totalCount > PAGE_SIZE;@@ -38,7 +40,7 @@ export function RunList({ runs, totalCount, params }: RunListProps) {return (<Stack gap="lg">- <RunTable runs={runs} />+ <RunTable runs={runs} tags={tags} />{hasPagination && (<Group justify="end"><RunTablePaginationControls@@ -55,9 +57,10 @@ export function RunList({ runs, totalCount, params }: RunListProps) {type RunTableProps = {runs: TransformRun[];+ tags: TransformTag[];};-function RunTable({ runs }: RunTableProps) {+function RunTable({ runs, tags }: RunTableProps) {const systemTimezone = useSetting("system-timezone");const dispatch = useDispatch();@@ -77,10 +80,12 @@ function RunTable({ runs }: RunTableProps) {<TimezoneIndicator /></Flex>,<Flex key="end-at" align="center" gap="xs">- <span className={S.nowrap}>{t`End at`}</span> <TimezoneIndicator />+ <span className={S.nowrap}>{t`Ended at`}</span>{" "}+ <TimezoneIndicator /></Flex>,t`Status`,t`Trigger`,+ t`Tags`,]}>{runs.map((run) => (@@ -120,6 +125,9 @@ function RunTable({ runs }: RunTableProps) {/></td><td className={S.wrap}>{formatRunMethod(run.run_method)}</td>+ <td className={S.wrap}>+ <TagList tags={tags} tagIds={run.transform?.tag_ids ?? []} />+ </td></tr>))}</AdminContentTable>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsxindex f1dee9d6536..73ba0678dfe 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx@@ -68,14 +68,14 @@ function RunListPageBody({ params }: RunListPageBodyProps) {run_methods: runMethods,},{- pollingInterval: POLLING_INTERVAL,+ pollingInterval: isPolling ? POLLING_INTERVAL : undefined,},);const {data: transforms = [],isLoading: isLoadingTransforms,error: transformsError,- } = useListTransformsQuery();+ } = useListTransformsQuery({});const {data: tags = [],isLoading: isLoadingTags,@@ -92,18 +92,21 @@ function RunListPageBody({ params }: RunListPageBodyProps) {return <LoadingAndErrorWrapper loading={isLoading} error={error} />;}- const shouldPoll = isPollingNeeded(data.data);- if (shouldPoll !== isPolling) {- setIsPolling(shouldPoll);- }return (<Stack data-testid="run-list-page">- <RunFilterList transforms={transforms} tags={tags} params={params} />- <RunList runs={data.data} totalCount={data.total} params={params} />+ <RunFilterList params={params} transforms={transforms} tags={tags} />+ <RunList+ runs={data.data}+ totalCount={data.total}+ params={params}+ tags={tags}+ /></Stack>);}-export function isPollingNeeded(transformRuns?: TransformRun[]) {- return transformRuns?.some((run) => run.status === "started") ?? false;+export function isPollingNeeded(runs: TransformRun[] = []) {+ return runs.some(+ (run) => run.status === "started" || run.status === "canceling",+ );}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.tsindex a0f7c7a584a..5c18fc08c72 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts@@ -1,11 +1,14 @@import type { Location } from "history";-import { isNotNull } from "metabase/lib/types";import type { RunListParams } from "metabase-enterprise/transforms/types";-import type {- TransformRunMethod,- TransformRunStatus,-} from "metabase-types/api";++import {+ parseInteger,+ parseList,+ parseRunMethod,+ parseRunStatus,+ parseString,+} from "../../utils";export function getParsedParams(location: Location): RunListParams {const {@@ -18,61 +21,16 @@ export function getParsedParams(location: Location): RunListParams {runMethods,} = location.query;return {- page: parseNumber(page),- statuses: parseList(statuses, parseStatus),- transformIds: parseList(transformIds, parseNumber),- transformTagIds: parseList(transformTagIds, parseNumber),- startTime: parseTime(startTime),- endTime: parseTime(endTime),- runMethods: parseList(runMethods, parseMethod),+ page: parseInteger(page),+ statuses: parseList(statuses, parseRunStatus),+ transformIds: parseList(transformIds, parseInteger),+ transformTagIds: parseList(transformTagIds, parseInteger),+ startTime: parseString(startTime),+ endTime: parseString(endTime),+ runMethods: parseList(runMethods, parseRunMethod),};}-function parseNumber(value: unknown) {- return typeof value === "string" ? parseInt(value, 10) : undefined;-}--function parseList<T>(- value: unknown,- parseItem: (value: unknown) => T | undefined,-): T[] | undefined {- if (typeof value === "string") {- const item = parseItem(value);- return item != null ? [item] : [];- }- if (Array.isArray(value)) {- return value.map(parseItem).filter(isNotNull);- }-}--function parseStatus(value: unknown): TransformRunStatus | undefined {- switch (value) {- case "started":- case "succeeded":- case "failed":- case "timeout":- return value;- default:- return undefined;- }-}--function parseTime(value: unknown): string | undefined {- if (typeof value === "string") {- return value;- }- return undefined;-}--function parseMethod(value: unknown): TransformRunMethod | undefined {- switch (value) {- case "manual":- case "cron":- return value;- }- return undefined;-}-export function hasFilterParams(params: RunListParams) {return (params.statuses != null ||diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsxnew file mode 100644index 00000000000..52f06825587--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.tsx@@ -0,0 +1,70 @@+import { replace } from "react-router-redux";+import { t } from "ttag";++import { useDispatch } from "metabase/lib/redux";+import type { RelativeIntervalDirection } from "metabase/querying/filters/types";+import { Group } from "metabase/ui";+import { getTransformListUrl } from "metabase-enterprise/transforms/urls";+import type {+ TransformRunStatus,+ TransformTag,+ TransformTagId,+} from "metabase-types/api";++import { StatusFilterWidget } from "../../../components/StatusFilterWidget";+import { TagFilterWidget } from "../../../components/TagFilterWidget";+import { TimeFilterWidget } from "../../../components/TimeFilterWidget";+import type { TransformListParams } from "../../../types";++type TransformFilterListProps = {+ params: TransformListParams;+ tags: TransformTag[];+};++const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [+ "past",+ "current",+];++export function TransformFilterList({+ params,+ tags,+}: TransformFilterListProps) {+ const dispatch = useDispatch();++ const handleLastRunStartTimeChange = (lastRunStartTime?: string) => {+ dispatch(replace(getTransformListUrl({ ...params, lastRunStartTime })));+ };++ const handleLastRunStatusesChange = (+ lastRunStatuses?: TransformRunStatus[],+ ) => {+ dispatch(replace(getTransformListUrl({ ...params, lastRunStatuses })));+ };++ const handleTagsChange = (tagIds: TransformTagId[]) => {+ dispatch(replace(getTransformListUrl({ ...params, tagIds })));+ };++ return (+ <Group>+ <TimeFilterWidget+ label={t`Last run at`}+ value={params.lastRunStartTime}+ availableDirections={PAST_INTERVAL_DIRECTIONS}+ onChange={handleLastRunStartTimeChange}+ />+ <StatusFilterWidget+ label={t`Last run status`}+ statuses={params.lastRunStatuses ?? []}+ onChange={handleLastRunStatusesChange}+ />+ <TagFilterWidget+ label={t`Tags`}+ tagIds={params.tagIds ?? []}+ tags={tags}+ onChange={handleTagsChange}+ />+ </Group>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsxnew file mode 100644index 00000000000..a4295d8e457--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/TransformFilterList.unit.spec.tsx@@ -0,0 +1,31 @@+import userEvent from "@testing-library/user-event";++import { renderWithProviders, screen } from "__support__/ui";+import type { TransformListParams } from "metabase-enterprise/transforms/types";+import type { TransformTag } from "metabase-types/api";++import { TransformFilterList } from "./TransformFilterList";++type SetupOpts = {+ params?: TransformListParams;+ tags?: TransformTag[];+};++function setup({ params = {}, tags = [] }: SetupOpts = {}) {+ renderWithProviders(<TransformFilterList params={params} tags={tags} />);+}++describe("TransformFilterList", () => {+ it("should allow only past or current date options for the last run filter", async () => {+ setup();++ await userEvent.click(screen.getByText("Last run at"));+ expect(await screen.findByText("Today")).toBeInTheDocument();+ expect(screen.getByText("Yesterday")).toBeInTheDocument();++ await userEvent.click(screen.getByText("Relative date range…"));+ expect(await screen.findByText("Previous")).toBeInTheDocument();+ expect(screen.getByText("Current")).toBeInTheDocument();+ expect(screen.queryByText("Next")).not.toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.tsnew file mode 100644index 00000000000..2b822bd3a0f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformFilterList/index.ts@@ -0,0 +1 @@+export * from "./TransformFilterList";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsxindex 1cd7dd9363e..32bcb29e42f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformList/TransformList.tsx@@ -16,18 +16,28 @@ import type { Transform } from "metabase-types/api";import { ListEmptyState } from "../../../components/ListEmptyState";import { RunStatusInfo } from "../../../components/RunStatusInfo";import { TagList } from "../../../components/TagList";+import type { TransformListParams } from "../../../types";import { getTransformUrl } from "../../../urls";import { parseTimestampWithTimezone } from "../../../utils";+import { hasFilterParams } from "../utils";import S from "./TransformList.module.css";-export function TransformList() {+type TransformListProps = {+ params: TransformListParams;+};++export function TransformList({ params }: TransformListProps) {const systemTimezone = useSetting("system-timezone");const {data: transforms = [],isLoading: isLoadingTransforms,error: transformsError,- } = useListTransformsQuery();+ } = useListTransformsQuery({+ last_run_start_time: params.lastRunStartTime,+ last_run_statuses: params.lastRunStatuses,+ tag_ids: params.tagIds,+ });const {data: tags = [],isLoading: isLoadingTags,@@ -46,7 +56,12 @@ export function TransformList() {}if (transforms.length === 0) {- return <ListEmptyState label={t`No transforms yet`} />;+ const hasFilters = hasFilterParams(params);+ return (+ <ListEmptyState+ label={hasFilters ? t`No transforms found` : t`No transforms yet`}+ />+ );}return (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsxindex bb4f5be658a..ecce9e7b75b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx@@ -1,11 +1,27 @@+import type { Location } from "history";import { t } from "ttag";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Box, Group, Stack, Title } from "metabase/ui";+import { useListTransformTagsQuery } from "metabase-enterprise/api";import { CreateTransformMenu } from "./CreateTransformMenu";+import { TransformFilterList } from "./TransformFilterList";import { TransformList } from "./TransformList";+import { getParsedParams } from "./utils";++type TransformListPageProps = {+ location: Location;+};++export function TransformListPage({ location }: TransformListPageProps) {+ const params = getParsedParams(location);+ const { data: tags = [], isLoading, error } = useListTransformTagsQuery();++ if (!tags || isLoading || error != null) {+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;+ }-export function TransformListPage() {return (<Stack gap="xl" data-testid="transform-list-page"><Group justify="space-between" align="start">@@ -15,7 +31,8 @@ export function TransformListPage() {</Stack><CreateTransformMenu /></Group>- <TransformList />+ <TransformFilterList params={params} tags={tags} />+ <TransformList params={params} /></Stack>);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.tsnew file mode 100644index 00000000000..7922f0633c9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts@@ -0,0 +1,28 @@+import type { Location } from "history";++import type { TransformListParams } from "metabase-enterprise/transforms/types";++import {+ parseInteger,+ parseList,+ parseRunStatus,+ parseString,+} from "../../utils";++export function getParsedParams(location: Location): TransformListParams {+ const { lastRunStartTime, lastRunStatuses, tagIds } = location.query;++ return {+ lastRunStartTime: parseString(lastRunStartTime),+ lastRunStatuses: parseList(lastRunStatuses, parseRunStatus),+ tagIds: parseList(tagIds, parseInteger),+ };+}++export function hasFilterParams(params: TransformListParams) {+ return (+ params.lastRunStartTime != null ||+ params.lastRunStatuses != null ||+ params.tagIds != null+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/types.tsindex d3bd4fb8a03..5a6ba1e41ee 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/types.ts@@ -5,6 +5,19 @@ import type {TransformTagId,} from "metabase-types/api";+export type TransformListParams = {+ lastRunStartTime?: string;+ lastRunStatuses?: TransformRunStatus[];+ tagIds?: TransformTagId[];+};++export type JobListParams = {+ lastRunStartTime?: string;+ lastRunStatuses?: TransformRunStatus[];+ nextRunStartTime?: string;+ tagIds?: TransformTagId[];+};+export type RunListParams = {page?: number;statuses?: TransformRunStatus[];@@ -14,9 +27,3 @@ export type RunListParams = {endTime?: string;runMethods?: TransformRunMethod[];};--export type JobListParams = {- lastRunStartTime?: string;- nextRunStartTime?: string;- transformTagIds?: TransformTagId[];-};diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/urls.ts b/enterprise/frontend/src/metabase-enterprise/transforms/urls.tsindex 143828b9c07..8aba3596fe0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/urls.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/urls.ts@@ -7,12 +7,35 @@ import type {TransformJobId,} from "metabase-types/api";-import type { JobListParams, RunListParams } from "./types";+import type {+ JobListParams,+ RunListParams,+ TransformListParams,+} from "./types";export const ROOT_URL = "/admin/transforms";-export function getTransformListUrl() {- return ROOT_URL;+export function getTransformListUrl({+ lastRunStartTime,+ lastRunStatuses,+ tagIds,+}: TransformListParams = {}) {+ const searchParams = new URLSearchParams();+ if (lastRunStartTime != null) {+ searchParams.set("lastRunStartTime", lastRunStartTime);+ }+ lastRunStatuses?.forEach((status) => {+ searchParams.append("lastRunStatuses", status);+ });+ tagIds?.forEach((tagId) => {+ searchParams.append("tagIds", String(tagId));+ });+ const queryString = searchParams.toString();+ if (queryString.length > 0) {+ return `${ROOT_URL}?${queryString}`;+ } else {+ return ROOT_URL;+ }}export function getNewTransformFromTypeUrl(@@ -35,18 +58,22 @@ export function getTransformQueryUrl(transformId: TransformId) {export function getJobListUrl({lastRunStartTime,+ lastRunStatuses,nextRunStartTime,- transformTagIds,+ tagIds,}: JobListParams = {}) {const searchParams = new URLSearchParams();if (lastRunStartTime != null) {searchParams.set("lastRunStartTime", lastRunStartTime);}+ lastRunStatuses?.forEach((status) => {+ searchParams.append("lastRunStatuses", status);+ });if (nextRunStartTime != null) {searchParams.set("nextRunStartTime", nextRunStartTime);}- transformTagIds?.forEach((tagId) => {- searchParams.append("transformTagIds", String(tagId));+ tagIds?.forEach((tagId) => {+ searchParams.append("tagIds", String(tagId));});const queryString = searchParams.toString();if (queryString.length > 0) {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/utils.tsindex 9e93c5ddd7c..dff0be14d4e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts@@ -2,6 +2,7 @@ import { t } from "ttag";import { hasFeature } from "metabase/admin/databases/utils";import { parseTimestamp } from "metabase/lib/time-dayjs";+import { isNotNull } from "metabase/lib/types";import type {Database,DatabaseId,@@ -76,3 +77,47 @@ export function sourceDatabaseId(source: TransformSource): DatabaseId | null {return null;}++export function parseList<T>(+ value: unknown,+ parseItem: (value: unknown) => T | undefined,+): T[] | undefined {+ if (typeof value === "string") {+ const item = parseItem(value);+ return item != null ? [item] : [];+ }+ if (Array.isArray(value)) {+ return value.map(parseItem).filter(isNotNull);+ }+ return undefined;+}++export function parseInteger(value: unknown) {+ return typeof value === "string" ? parseInt(value, 10) : undefined;+}++export function parseString(value: unknown): string | undefined {+ return typeof value === "string" ? value : undefined;+}++export function parseRunStatus(value: unknown): TransformRunStatus | undefined {+ switch (value) {+ case "started":+ case "succeeded":+ case "failed":+ case "timeout":+ return value;+ default:+ return undefined;+ }+}++export function parseRunMethod(value: unknown): TransformRunMethod | undefined {+ switch (value) {+ case "manual":+ case "cron":+ return value;+ default:+ return undefined;+ }+}diff --git a/frontend/src/metabase-types/api/transform.ts b/frontend/src/metabase-types/api/transform.tsindex 4987a03f2e7..17eb3329e94 100644--- a/frontend/src/metabase-types/api/transform.ts+++ b/frontend/src/metabase-types/api/transform.ts@@ -140,10 +140,17 @@ export type RunTransformResponse = {message?: string;};+export type ListTransformsRequest = {+ last_run_start_time?: string;+ last_run_statuses?: TransformRunStatus[];+ tag_ids?: TransformTagId[];+};+export type ListTransformJobsRequest = {last_run_start_time?: string;+ last_run_statuses?: TransformRunStatus[];next_run_start_time?: string;- transform_tag_ids?: TransformTagId[];+ tag_ids?: TransformTagId[];};export type ListTransformRunsRequest = {