Skip to content

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

Convert Transform Runs page to TreeTable and add a sidebar (#68892)

Alexander Polyankinb9ba7de970f9
diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
index bf3055aaabd..7d739e89122 100644
--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
@@ -1914,7 +1914,7 @@ LIMIT
cy.log("assert that the list is filtered by the current transform");
getRunListLink().click();
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("SQL transform").should("be.visible");
cy.findByText("MBQL transform").should("not.exist");
cy.findByText("Success").should("be.visible");
@@ -2057,17 +2057,14 @@ LIMIT
getRunStatus().should("have.text", "Run in progress…");
getRunsNavLink().click();
- getContentTable().within(() => {
- cy.findByText("In progress").should("be.visible");
- cy.findByLabelText("Cancel run").click();
- });
-
+ getTransformRunTable().findByText("In progress").click();
+ cy.findByTestId("run-list-sidebar").button("Cancel run").click();
H.modal().button("Yes").click();
- getContentTable().findByText("Canceling").should("be.visible");
- getContentTable()
+ getTransformRunTable().findByText("Canceling").should("exist");
+ getTransformRunTable()
.findByText("Canceled", { timeout: 30_000 })
- .should("be.visible");
+ .should("exist");
});
it("should show a message when the run finished before it cancels", () => {
@@ -3038,7 +3035,7 @@ describe("scenarios > admin > transforms > jobs", () => {
});
H.waitForSucceededTransformRuns();
visitRunListPage();
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findAllByText("MBQL transform").should("have.length.gte", 1);
cy.findAllByText("Success").should("have.length.gte", 1);
cy.findAllByText("Schedule").should("have.length.gte", 1);
@@ -3122,7 +3119,7 @@ describe("scenarios > admin > transforms > jobs", () => {
.should("be.visible");
getRunsNavLink().click();
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("Success").should("be.visible");
cy.findByText("Manual").should("be.visible");
@@ -3214,12 +3211,9 @@ describe("scenarios > admin > transforms > jobs", () => {
.findByText("Transforms")
.scrollIntoView()
.should("be.visible");
- getContentTable().within(() => {
- // 1 transform plus the header row
- cy.findAllByRole("row").should("have.length", 2);
-
+ getJobTransformTable().within(() => {
// Check the existence and also their order
- cy.findAllByRole("row").eq(1).should("contain", "MBQL transform");
+ cy.findByText("MBQL transform").should("be.visible");
});
});
@@ -3229,7 +3223,7 @@ describe("scenarios > admin > transforms > jobs", () => {
.findByText(/There are no transforms for this job/)
.scrollIntoView()
.should("be.visible");
- getContentTable().should("not.exist");
+ getJobTransformTable().should("not.exist");
});
});
});
@@ -3268,7 +3262,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testTransformFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3282,7 +3276,7 @@ describe("scenarios > admin > transforms > runs", () => {
getTransformFilterWidget()
.findByText("MBQL transform")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("not.exist");
});
@@ -3297,7 +3291,7 @@ describe("scenarios > admin > transforms > runs", () => {
getTransformFilterWidget()
.findByText("SQL transform")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("not.exist");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3311,7 +3305,7 @@ describe("scenarios > admin > transforms > runs", () => {
getTransformFilterWidget()
.findByText("2 transforms")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3319,7 +3313,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.log("transform filter - remove filter");
getTransformFilterWidget().button("Remove filter").click();
getTransformFilterWidget().findByText("2 transforms").should("not.exist");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3327,7 +3321,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testStatusFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3339,7 +3333,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Add filter").click();
});
getStatusFilterWidget().findByText("Success").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("not.exist");
});
@@ -3352,7 +3346,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Update filter").click();
});
getStatusFilterWidget().findByText("Failed").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("not.exist");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3364,7 +3358,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Update filter").click();
});
getStatusFilterWidget().findByText("2 statuses").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3372,7 +3366,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.log("transform filter - remove filter");
getStatusFilterWidget().button("Remove filter").click();
getStatusFilterWidget().findByText("2 statuses").should("not.exist");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3380,7 +3374,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testTagFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3392,7 +3386,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Add filter").click();
});
getTagFilterWidget().findByText("tag1").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("not.exist");
});
@@ -3405,7 +3399,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Update filter").click();
});
getTagFilterWidget().findByText("tag2").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("not.exist");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3417,7 +3411,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Update filter").click();
});
getTagFilterWidget().findByText("2 tags").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3425,7 +3419,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.log("tag filter - remove filter");
getTagFilterWidget().button("Remove filter").click();
getTagFilterWidget().findByText("2 tags").should("not.exist");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3433,7 +3427,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testRunMethodFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3445,7 +3439,7 @@ describe("scenarios > admin > transforms > runs", () => {
cy.button("Add filter").click();
});
getRunMethodFilterWidget().findByText("Manual").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3470,7 +3464,7 @@ describe("scenarios > admin > transforms > runs", () => {
.findByText("Schedule, Manual")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3480,7 +3474,7 @@ describe("scenarios > admin > transforms > runs", () => {
getRunMethodFilterWidget()
.findByText("Schedule, Manual")
.should("not.exist");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3488,7 +3482,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testStartAtFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3497,7 +3491,7 @@ describe("scenarios > admin > transforms > runs", () => {
getStartAtFilterWidget().click();
H.popover().findByText("Today").click();
getStartAtFilterWidget().findByText("Today").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3512,7 +3506,7 @@ describe("scenarios > admin > transforms > runs", () => {
getStartAtFilterWidget()
.findByText("Previous 30 days or today")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3524,7 +3518,7 @@ describe("scenarios > admin > transforms > runs", () => {
H.main().findByText("No runs found").should("be.visible");
getStartAtFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3532,7 +3526,7 @@ describe("scenarios > admin > transforms > runs", () => {
function testEndAtFilter() {
cy.log("no filters");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3541,7 +3535,7 @@ describe("scenarios > admin > transforms > runs", () => {
getEndAtFilterWidget().click();
H.popover().findByText("Today").click();
getEndAtFilterWidget().findByText("Today").should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3556,7 +3550,7 @@ describe("scenarios > admin > transforms > runs", () => {
getEndAtFilterWidget()
.findByText("Previous 30 days or today")
.should("be.visible");
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3568,7 +3562,7 @@ describe("scenarios > admin > transforms > runs", () => {
H.main().findByText("No runs found").should("be.visible");
getEndAtFilterWidget().button("Remove filter").click();
- getContentTable().within(() => {
+ getTransformRunTable().within(() => {
cy.findByText("MBQL transform").should("be.visible");
cy.findByText("SQL transform").should("be.visible");
});
@@ -3583,6 +3577,85 @@ describe("scenarios > admin > transforms > runs", () => {
testStartAtFilter();
testEndAtFilter();
});
+
+ it("should be able to sort runs", () => {
+ function createInitialData() {
+ H.createTransformTag({ name: "Alpha tag" }).then(({ body: tag1 }) => {
+ H.createTransformTag({ name: "Beta tag" }).then(({ body: tag2 }) => {
+ createMbqlTransform({
+ targetTable: TARGET_TABLE,
+ tagIds: [tag1.id],
+ visitTransform: true,
+ });
+ H.DataStudio.Transforms.runTab().click();
+ runTransformAndWaitForSuccess();
+ createSqlTransform({
+ sourceQuery: "SELECT * FROM abc",
+ targetTable: TARGET_TABLE_2,
+ tagIds: [tag2.id],
+ visitTransform: true,
+ });
+ H.DataStudio.Transforms.runTab().click();
+ runTransformAndWaitForFailure();
+ });
+ });
+ }
+
+ function testSorting({
+ columnName,
+ transformNames,
+ }: {
+ columnName: string;
+ transformNames: string[];
+ }) {
+ cy.log(`sort by ${columnName} ascending`);
+ getTransformRunTable().findByText(columnName).click();
+ checkSortingOrder(transformNames);
+
+ cy.log(`sort by ${columnName} descending`);
+ getTransformRunTable().findByText(columnName).click();
+ checkSortingOrder([...transformNames].reverse());
+ }
+
+ createInitialData();
+ getRunsNavLink().click();
+
+ // ascending: "MBQL transform" < "SQL transform"
+ testSorting({
+ columnName: "Transform",
+ transformNames: ["MBQL transform", "SQL transform"],
+ });
+
+ // ascending: MBQL started earlier
+ testSorting({
+ columnName: "Started at",
+ transformNames: ["MBQL transform", "SQL transform"],
+ });
+
+ // ascending: MBQL ended earlier
+ testSorting({
+ columnName: "Ended at",
+ transformNames: ["MBQL transform", "SQL transform"],
+ });
+
+ // ascending: "Failed" < "Success"
+ testSorting({
+ columnName: "Status",
+ transformNames: ["SQL transform", "MBQL transform"],
+ });
+
+ // ascending: both "Manual", stable sort by id — MBQL created first
+ testSorting({
+ columnName: "Trigger",
+ transformNames: ["MBQL transform", "SQL transform"],
+ });
+
+ // ascending: "Alpha tag" < "Beta tag"
+ testSorting({
+ columnName: "Tags",
+ transformNames: ["MBQL transform", "SQL transform"],
+ });
+ });
});
describe(
@@ -3839,8 +3912,12 @@ function handleQueryComplexityWarningModal(action: "cancel" | "save") {
});
}
-function getContentTable() {
- return cy.findByTestId("admin-content-table");
+function getJobTransformTable() {
+ return cy.findByLabelText("Job transforms");
+}
+
+function getTransformRunTable() {
+ return cy.findByLabelText("Transform runs");
}
function getTransformFilterWidget() {
@@ -4085,3 +4162,13 @@ describe("scenarios > data studio > transforms > permissions", () => {
.should("be.visible");
});
});
+
+function checkSortingOrder(transformNames: string[]) {
+ getTransformRunTable().within(() => {
+ transformNames.forEach((name, index) => {
+ cy.findByText(name)
+ .parents("[data-index]")
+ .should("have.attr", "data-index", index.toString());
+ });
+ });
+}
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/api.clj b/enterprise/backend/src/metabase_enterprise/transforms/api.clj
index ac82c57e5fc..06ffaba434a 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/api.clj
@@ -305,7 +305,7 @@
[_route-params
query-params :-
[:map
- [:sort_column {:optional true} [:enum "started_at" "ended_at"]]
+ [:sort_column {:optional true} [:enum "transform-name" "start-time" "end-time" "status" "run-method" "transform-tags"]]
[:sort_direction {:optional true} [:enum "asc" "desc"]]
[:transform_ids {:optional true} [:maybe (ms/QueryVectorOf ms/IntGreaterThanOrEqualToZero)]]
[:statuses {:optional true} [:maybe (ms/QueryVectorOf [:enum "started" "succeeded" "failed" "timeout"])]]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj b/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj
index d4a37728dc3..98a457ff60e 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/models/transform.clj
@@ -129,7 +129,7 @@
runs
(let [transform-ids (into #{} (keep :transform_id) runs)
id->transform (when (seq transform-ids)
- (t2/select-pk->fn identity [:model/Transform :id :name] :id [:in transform-ids]))]
+ (t2/select-pk->fn identity [:model/Transform :id :name :collection_id] :id [:in transform-ids]))]
(for [run runs]
(assoc run :transform
(if-let [transform-id (:transform_id run)]
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj b/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj
index af3bc4bcef7..542437ff53c 100644
--- a/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj
+++ b/enterprise/backend/src/metabase_enterprise/transforms/models/transform_run.clj
@@ -182,63 +182,124 @@
(when end
[:< field-name end])])))
+(defn- paged-runs-join-clause
+ "Returns a `:left-join` clause for transform runs sort columns that require joining other tables."
+ [{:keys [sort_column]}]
+ (case (keyword sort_column)
+ :transform-name [:transform [:= :transform_run.transform_id :transform.id]]
+ nil))
+
+(defn- paged-runs-where-clause
+ "Builds a `:where` clause for transform runs from the given filter parameters."
+ [{:keys [start_time end_time run_methods transform_ids transform_tag_ids statuses]}]
+ (let [where-cond (cond-> []
+ (some? start_time)
+ (conj (timestamp-constraint :start_time start_time))
+
+ (some? end_time)
+ (conj (timestamp-constraint :end_time end_time))
+
+ (seq run_methods)
+ (conj [:in :run_method (set run_methods)])
+
+ (seq transform_ids)
+ (conj [:in :transform_id transform_ids])
+
+ (seq transform_tag_ids)
+ (conj [:in :transform_id {:select [:transform_id]
+ :from [:transform_transform_tag]
+ :where [:in :tag_id transform_tag_ids]}])
+
+ (seq statuses)
+ (conj [:in :status (set statuses)])
+
+ ;; optimization: is_active condition for started status
+ (and (= (first statuses) "started")
+ (nil? (next statuses)))
+ (conj [:= :is_active true]))]
+ (when (seq where-cond)
+ (into [:and] where-cond))))
+
+(defn- translate-run-method-clause
+ "Returns a HoneySQL `:case` expression that translates run method values to display names."
+ []
+ [:case
+ [:= :run_method "manual"] (tru "Manual")
+ [:= :run_method "cron"] (tru "Schedule")
+ :run_method])
+
+(defn- translate-status-clause
+ "Returns a HoneySQL `:case` expression that translates run status values to display names."
+ []
+ [:case
+ [:= :status "started"] (tru "In progress")
+ [:= :status "succeeded"] (tru "Success")
+ [:= :status "failed"] (tru "Failed")
+ [:= :status "timeout"] (tru "Timeout")
+ [:= :status "canceling"] (tru "Canceling")
+ [:= :status "canceled"] (tru "Canceled")
+ :status])
+
+(defn- translate-tag-name-clause
+ "Returns a HoneySQL `:case` expression that translates built-in tag names.
+ `name-field` is the keyword for the name column (e.g. `:transform_tag.name`),
+ `built-in-type-field` is the keyword for the built_in_type column (e.g. `:transform_tag.built_in_type`)."
+ [name-field built-in-type-field]
+ [:case
+ [:= built-in-type-field "hourly"] (tru "hourly")
+ [:= built-in-type-field "daily"] (tru "daily")
+ [:= built-in-type-field "weekly"] (tru "weekly")
+ [:= built-in-type-field "monthly"] (tru "monthly")
+ :else name-field])
+
+(defn- first-tag-name-subquery
+ "Returns a correlated subquery that selects the translated name of the first tag
+ (by minimum position) assigned to the transform for a transform run."
+ []
+ {:select [[(translate-tag-name-clause :tt.name :tt.built_in_type) :tag_name]]
+ :from [[:transform_transform_tag :ttt]]
+ :join [[:transform_tag :tt] [:= :ttt.tag_id :tt.id]]
+ :where [:and
+ [:= :ttt.transform_id :transform_run.transform_id]
+ [:= :ttt.position {:select [[[:min :ttt2.position]]]
+ :from [[:transform_transform_tag :ttt2]]
+ :where [:= :ttt2.transform_id :transform_run.transform_id]}]]})
+
+(defn- paged-runs-order-by-clause
+ "Builds a HoneySQL `:order-by` clause for transform runs, translating display values for sortable columns."
+ [{:keys [sort_column sort_direction]}]
+ (let [sort-column (or (keyword sort_column) :start-time)
+ sort-direction (or (keyword sort_direction) :desc)
+ nulls-sort (if (= sort-direction :asc)
+ :nulls-last
+ :nulls-first)]
+ (conj
+ (case sort-column
+ :transform-name [[:transform.name sort-direction]]
+ :start-time [[:start_time sort-direction]]
+ :end-time [[:end_time sort-direction nulls-sort]]
+ :status [[(translate-status-clause) sort-direction]]
+ :run-method [[(translate-run-method-clause) sort-direction]]
+ :transform-tags [[(first-tag-name-subquery) sort-direction nulls-sort]]
+ [[:start_time sort-direction]
+ [:end_time sort-direction nulls-sort]])
+ [:transform_run.id sort-direction])))
+
(defn paged-runs
"Return a page of the list of the runs.
Follows the conventions used by the FE."
- [{:keys [offset
- limit
- start_time
- end_time
- run_methods
- sort_column
- sort_direction
- transform_ids
- transform_tag_ids
- statuses]}]
- (let [offset (or offset 0)
- limit (or limit 20)
- sort-direction (or (keyword sort_direction) :desc)
- nulls-sort (if (= sort-direction :asc)
- :nulls-last
- :nulls-first)
- sort-column (keyword sort_column)
- order-by (case sort-column
- :started_at [[sort-column sort-direction]]
- :ended_at [[sort-column sort-direction nulls-sort]]
- [[:start_time sort-direction]
- [:end_time sort-direction nulls-sort]])
- where-cond (cond-> []
- (some? start_time)
- (conj (timestamp-constraint :start_time start_time))
-
- (some? end_time)
- (conj (timestamp-constraint :end_time end_time))
-
- (seq run_methods)
- (conj [:in :run_method (set run_methods)])
-
- (seq transform_ids)
- (conj [:in :transform_id transform_ids])
-
- (seq transform_tag_ids)
- (conj [:in :transform_id {:select [:transform_id]
- :from [:transform_transform_tag]
- :where [:in :tag_id transform_tag_ids]}])
-
- (seq statuses)
- (conj [:in :status (set statuses)])
-
- ;; optimization: is_active condition for started status
- (and (= (first statuses) "started")
- (nil? (next statuses)))
- (conj [:= :is_active true]))
- where-clause (when (seq where-cond)
- (into [:and] where-cond))
- count-options (m/assoc-some {} :where where-clause)
- query-options (merge {:order-by order-by :offset offset :limit limit}
- count-options)
- runs (t2/select :model/TransformRun query-options)]
+ [{:keys [offset limit] :as params}]
+ (let [offset (or offset 0)
+ limit (or limit 20)
+ order-by (paged-runs-order-by-clause params)
+ where-clause (paged-runs-where-clause params)
+ join-clause (paged-runs-join-clause params)
+ count-options (m/assoc-some {} :where where-clause)
+ query-options (m/assoc-some {:order-by order-by :offset offset :limit limit}
+ :where where-clause
+ :left-join join-clause)
+ runs (t2/select :model/TransformRun query-options)]
{:data (t2/hydrate runs [:transform :transform_tag_ids])
:limit limit
:offset offset
diff --git a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
index 2c4619f61d8..f6fd3809983 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms/api_test.clj
@@ -1679,3 +1679,200 @@
:target-incremental-strategy {:type "append"}}})]
(is (some? (:id response))
"Should accept column not in extracted metadata, allowing text input fallback")))))))))))
+
+;;; ------------------------------------------------------------
+;;; Run List Sorting
+;;; ------------------------------------------------------------
+
+(deftest get-runs-sort-by-transform-name-test
+ (testing "GET /api/ee/transform/run - sort by transform-name"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-b-id :id} {:name "Transform B"}
+ :model/Transform {transform-a-id :id} {:name "Transform A"}
+ :model/TransformRun {run-b-id :id} {:transform_id transform-b-id}
+ :model/TransformRun {run-a-id :id} {:transform_id transform-a-id}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "transform-name"
+ :sort_direction sort-direction
+ :transform_ids [transform-a-id transform-b-id])]
+ (is (= (cond-> [run-a-id run-b-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-stable-test
+ (testing "GET /api/ee/transform/run - sorting is stable when values are equal (tiebreaker by :id)"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-1-id :id} {:name "Same Name"}
+ :model/Transform {transform-2-id :id} {:name "Same Name"}
+ :model/TransformRun {run-1-id :id} {:transform_id transform-1-id}
+ :model/TransformRun {run-2-id :id} {:transform_id transform-2-id}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "transform-name"
+ :sort_direction sort-direction
+ :transform_ids [transform-1-id transform-2-id])]
+ (is (= (cond-> [run-1-id run-2-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-start-time-test
+ (testing "GET /api/ee/transform/run - sort by start-time"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id} {}
+ :model/TransformRun {earlier-run-id :id} {:transform_id transform-id
+ :start_time (parse-instant "2025-01-01T00:00:00")}
+ :model/TransformRun {later-run-id :id} {:transform_id transform-id
+ :start_time (parse-instant "2025-01-02T00:00:00")}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "start-time"
+ :sort_direction sort-direction
+ :transform_ids [transform-id])]
+ (is (= (cond-> [earlier-run-id later-run-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-end-time-test
+ (testing "GET /api/ee/transform/run - sort by end-time"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id} {}
+ :model/TransformRun {earlier-run-id :id} {:transform_id transform-id
+ :end_time (parse-instant "2025-01-01T00:00:00")}
+ :model/TransformRun {later-run-id :id} {:transform_id transform-id
+ :end_time (parse-instant "2025-01-02T00:00:00")}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "end-time"
+ :sort_direction sort-direction
+ :transform_ids [transform-id])]
+ (is (= (cond-> [earlier-run-id later-run-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-run-method-test
+ (testing "GET /api/ee/transform/run - sort by run-method (translated names)"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id} {}
+ ;; "Manual" < "Schedule"
+ :model/TransformRun {manual-run-id :id} {:transform_id transform-id :run_method "manual"}
+ :model/TransformRun {schedule-run-id :id} {:transform_id transform-id :run_method "cron"}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "run-method"
+ :sort_direction sort-direction
+ :transform_ids [transform-id])]
+ (is (= (cond-> [manual-run-id schedule-run-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-status-test
+ (testing "GET /api/ee/transform/run - sort by status (translated names)"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/Transform {transform-id :id} {}
+ ;; Sorted by translated name: "Canceled" < "Canceling" < "Failed" < "In progress" < "Success" < "Timeout"
+ :model/TransformRun {canceled-run-id :id} {:transform_id transform-id :status "canceled"}
+ :model/TransformRun {canceling-run-id :id} {:transform_id transform-id :status "canceling"}
+ :model/TransformRun {failed-run-id :id} {:transform_id transform-id :status "failed"}
+ :model/TransformRun {in-progress-run-id :id} {:transform_id transform-id :status "started"
+ :is_active true}
+ :model/TransformRun {success-run-id :id} {:transform_id transform-id :status "succeeded"}
+ :model/TransformRun {timeout-run-id :id} {:transform_id transform-id :status "timeout"}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "status"
+ :sort_direction sort-direction
+ :transform_ids [transform-id])]
+ (is (= (cond-> [canceled-run-id canceling-run-id failed-run-id
+ in-progress-run-id success-run-id timeout-run-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-transform-tags-test
+ (testing "GET /api/ee/transform/run - sort by transform-tags (first tag name)"
+ (mt/with-premium-features #{:transforms}
+ (mt/with-temp [:model/TransformTag {tag-a-id :id} {:name "Tag A"}
+ :model/TransformTag {tag-b-id :id} {:name "Tag B"}
+ :model/TransformTag {tag-ignored-id :id} {:name "Tag Ignored"}
+ ;; Transform with tags "Tag A" (pos 0) and "Tag Ignored" (pos 1) — sorted by first tag "Tag A"
+ :model/Transform {transform-a-id :id} {:name "Transform A"}
+ :model/TransformTransformTag _ {:transform_id transform-a-id :tag_id tag-a-id :position 0}
+ :model/TransformTransformTag _ {:transform_id transform-a-id :tag_id tag-ignored-id :position 1}
+ ;; Transform with tag "Tag B" (pos 0) — sorted by first tag "Tag B"
+ :model/Transform {transform-b-id :id} {:name "Transform B"}
+ :model/TransformTransformTag _ {:transform_id transform-b-id :tag_id tag-b-id :position 0}
+ :model/TransformRun {run-a-id :id} {:transform_id transform-a-id}
+ :model/TransformRun {run-b-id :id} {:transform_id transform-b-id}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "transform-tags"
+ :sort_direction sort-direction
+ :transform_ids [transform-a-id transform-b-id])]
+ (is (= (cond-> [run-a-id run-b-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
+
+(deftest get-runs-sort-by-built-in-transform-tags-test
+ (testing "GET /api/ee/transform/run - sort by built-in transform-tags (translated names)"
+ (mt/with-premium-features #{:transforms}
+ ;; Translated names alphabetically: "daily" < "hourly" < "monthly" < "weekly"
+ (mt/with-temp [:model/TransformTag {tag-daily-id :id}
+ {:name "daily" :built_in_type "daily"}
+
+ :model/TransformTag {tag-hourly-id :id}
+ {:name "hourly" :built_in_type "hourly"}
+
+ :model/TransformTag {tag-monthly-id :id}
+ {:name "monthly" :built_in_type "monthly"}
+
+ :model/TransformTag {tag-weekly-id :id}
+ {:name "weekly" :built_in_type "weekly"}
+
+ :model/Transform {transform-daily-id :id} {}
+ :model/TransformTransformTag _ {:transform_id transform-daily-id
+ :tag_id tag-daily-id
+ :position 0}
+
+ :model/Transform {transform-hourly-id :id} {}
+ :model/TransformTransformTag _ {:transform_id transform-hourly-id
+ :tag_id tag-hourly-id
+ :position 0}
+
+ :model/Transform {transform-monthly-id :id} {}
+ :model/TransformTransformTag _ {:transform_id transform-monthly-id
+ :tag_id tag-monthly-id
+ :position 0}
+
+ :model/Transform {transform-weekly-id :id} {}
+ :model/TransformTransformTag _ {:transform_id transform-weekly-id
+ :tag_id tag-weekly-id
+ :position 0}
+
+ :model/TransformRun {daily-run-id :id}
+ {:transform_id transform-daily-id}
+
+ :model/TransformRun {hourly-run-id :id}
+ {:transform_id transform-hourly-id}
+
+ :model/TransformRun {monthly-run-id :id}
+ {:transform_id transform-monthly-id}
+
+ :model/TransformRun {weekly-run-id :id}
+ {:transform_id transform-weekly-id}]
+ (doseq [sort-direction [:asc :desc]]
+ (testing (str sort-direction)
+ (let [response (mt/user-http-request :crowberto :get 200 "ee/transform/run"
+ :sort_column "transform-tags"
+ :sort_direction sort-direction
+ :transform_ids [transform-daily-id transform-hourly-id
+ transform-monthly-id transform-weekly-id])]
+ (is (= (cond-> [daily-run-id hourly-run-id monthly-run-id weekly-run-id]
+ (= sort-direction :desc) reverse)
+ (->> response :data (map :id)))))))))))
diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.tsx
index 2b155ea3e4f..b3f7f326a63 100644
--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPicker.tsx
@@ -7,7 +7,7 @@ import type { SimpleDataPickerProps } from "metabase/plugins";
import { Box, Popover } from "metabase/ui";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { SearchModel, SearchResult, TableId } from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type { SortingOptions } from "metabase-types/api/sorting";
import type { ModularEmbeddingEntityType } from "metabase-types/store/embedding-data-picker";
import { SimpleDataPickerView } from "./SimpleDataPickerView";
@@ -42,7 +42,7 @@ export function SimpleDataPicker({
: entity.id,
};
}),
- { sort_column: "name", sort_direction: SortDirection.Asc },
+ { sort_column: "name", sort_direction: "asc" },
);
}, [data]);
@@ -96,7 +96,7 @@ function sortEntities(
const result = compareString(aValue, bValue);
// No need to check for 0 since -0 and 0 are equal
- return sort_direction === SortDirection.Asc ? result : -result;
+ return sort_direction === "asc" ? result : -result;
});
}
diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
index 13a9da2aade..d389c109f84 100644
--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
@@ -11,7 +11,6 @@ import { PLUGIN_MODERATION } from "metabase/plugins";
import { Box } from "metabase/ui";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { CardType, Collection, DatabaseId } from "metabase-types/api";
-import { SortDirection } from "metabase-types/api/sorting";
import SavedEntityListS from "./SavedEntityList.module.css";
import { CARD_INFO } from "./constants";
@@ -46,7 +45,7 @@ const SavedEntityList = ({
id: collection.id,
models: [CARD_INFO[type].model],
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
}
: skipToken,
);
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx
index 3d37b9ee4f9..3c54a90b81c 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx
@@ -15,7 +15,7 @@ import { usePagination } from "metabase/common/hooks/use-pagination";
import { Center, Flex, Repeat, Skeleton, Stack } from "metabase/ui";
import type { CacheSortColumn, CacheableModel } from "metabase-types/api";
import { CacheDurationUnit } from "metabase-types/api";
-import { SortDirection } from "metabase-types/api/sorting";
+import type { SortDirection } from "metabase-types/api/sorting";
import type { CacheableItem, UpdateTarget } from "../types";
@@ -39,16 +39,14 @@ export const StrategyEditorForQuestionsAndDashboards = () => {
const { page, setPage, resetPage } = usePagination();
const [sortColumn, setSortColumn] = useState<CacheSortColumn>("name");
- const [sortDirection, setSortDirection] = useState<SortDirection>(
- SortDirection.Asc,
- );
+ const [sortDirection, setSortDirection] = useState<SortDirection>("asc");
const { configs, total, error, isLoading } = useCacheConfigs({
model: ["dashboard", "question"],
limit: PAGE_SIZE,
offset: page * PAGE_SIZE,
sort_column: sortColumn,
- sort_direction: sortDirection === SortDirection.Asc ? "asc" : "desc",
+ sort_direction: sortDirection,
});
// Handle sort column click
diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
index 79bdbebda27..1ea65794c39 100644
--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx
@@ -12,7 +12,7 @@ import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Flex, Modal } from "metabase/ui";
import { useListStaleCollectionItemsQuery } from "metabase-enterprise/api/collection";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type { SortingOptions } from "metabase-types/api/sorting";
import { trackStaleItemsArchived } from "../analytics";
import type {
@@ -57,7 +57,7 @@ const CleanupCollectionModalInner = ({
SortingOptions<ListStaleCollectionItemsSortColumn>
>({
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
});
const handleSortingChange = (
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/ListEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/DependencyEmptyState.tsx
similarity index 77%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/ListEmptyState.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/DependencyEmptyState.tsx
index 2a6b48e8bc3..0d9e1c60beb 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/ListEmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/DependencyEmptyState.tsx
@@ -3,11 +3,11 @@ import { t } from "ttag";
import EmptyDashboardBot from "assets/img/dashboard-empty.svg";
import { Stack, Text } from "metabase/ui";
-type ListEmptyStateProps = {
+type DependencyEmptyStateProps = {
label: string;
};
-export function ListEmptyState({ label }: ListEmptyStateProps) {
+export function DependencyEmptyState({ label }: DependencyEmptyStateProps) {
return (
<Stack p="xl" align="center">
<img
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/index.ts
new file mode 100644
index 00000000000..27a2a8474c0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyEmptyState/index.ts
@@ -0,0 +1 @@
+export * from "./DependencyEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/DependencyFilterBar.tsx
similarity index 94%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/DependencyFilterBar.tsx
index 378b8bae0a9..8202397fa4e 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/ListSearchBar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/DependencyFilterBar.tsx
@@ -11,7 +11,7 @@ import { FilterOptionsPicker } from "../../FilterOptionsPicker";
import type { DependencyListMode } from "../types";
import { getAvailableGroupTypes, getDefaultFilterOptions } from "../utils";
-type ListSearchBarProps = {
+type DependencyFilterBarProps = {
mode: DependencyListMode;
query?: string;
filterOptions: DependencyFilterOptions;
@@ -21,7 +21,7 @@ type ListSearchBarProps = {
onFilterOptionsChange: (filterOptions: DependencyFilterOptions) => void;
};
-export const ListSearchBar = memo(function ListSearchBar({
+export const DependencyFilterBar = memo(function DependencyFilterBar({
mode,
query,
filterOptions,
@@ -29,7 +29,7 @@ export const ListSearchBar = memo(function ListSearchBar({
isLoading,
onQueryChange,
onFilterOptionsChange,
-}: ListSearchBarProps) {
+}: DependencyFilterBarProps) {
const [searchValue, setSearchValue] = useState(query ?? "");
const hasLoader = isFetching && !isLoading;
const hasDefaultFilterOptions = areFilterOptionsEqual(
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/index.ts
new file mode 100644
index 00000000000..e5a3ab75d91
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyFilterBar/index.ts
@@ -0,0 +1 @@
+export * from "./DependencyFilterBar";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/ListHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
similarity index 92%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/ListHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
index dfe042dedaa..2342d3d8e2d 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/ListHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/DependencyHeader.tsx
@@ -9,7 +9,7 @@ import {
PaneHeaderTabs,
} from "metabase-enterprise/data-studio/common/components/PaneHeader";
-export const ListHeader = memo(function ListHeader() {
+export const DependencyHeader = memo(function DependencyHeader() {
const tabs: PaneHeaderTab[] = [
{
label: t`Broken dependencies`,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/index.ts
new file mode 100644
index 00000000000..2d02ca06ed2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyHeader/index.ts
@@ -0,0 +1 @@
+export * from "./DependencyHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
index 8981a9f2cdd..18908269629 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyList.tsx
@@ -18,12 +18,12 @@ import type {
} from "../../types";
import { getCardTypes, getDependencyTypes, isSameNode } from "../../utils";
+import { DependencyFilterBar } from "./DependencyFilterBar";
+import { DependencyHeader } from "./DependencyHeader";
import S from "./DependencyList.module.css";
-import { ListBody } from "./ListBody";
-import { ListHeader } from "./ListHeader";
-import { ListPaginationControls } from "./ListPaginationControls";
-import { ListSearchBar } from "./ListSearchBar";
-import { ListSidebar } from "./ListSidebar";
+import { DependencyPagination } from "./DependencyPagination";
+import { DependencySidebar } from "./DependencySidebar";
+import { DependencyTable } from "./DependencyTable";
import { PAGE_SIZE } from "./constants";
import type { DependencyListMode, DependencyListParamsOptions } from "./types";
import {
@@ -62,10 +62,10 @@ export function DependencyList({
const {
page = 0,
query,
- group_types = getAvailableGroupTypes(mode),
- include_personal_collections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
- sort_column,
- sort_direction,
+ groupTypes = getAvailableGroupTypes(mode),
+ includePersonalCollections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ sortColumn,
+ sortDirection,
} = params;
const {
@@ -75,12 +75,12 @@ export function DependencyList({
error,
} = useListGraphNodesQuery(
{
- types: getDependencyTypes(group_types),
- card_types: getCardTypes(group_types),
+ types: getDependencyTypes(groupTypes),
+ card_types: getCardTypes(groupTypes),
query,
- include_personal_collections,
- sort_column,
- sort_direction,
+ include_personal_collections: includePersonalCollections,
+ sort_column: sortColumn,
+ sort_direction: sortDirection,
offset: page * PAGE_SIZE,
limit: PAGE_SIZE,
},
@@ -111,14 +111,14 @@ export function DependencyList({
};
const handleFilterOptionsChange = ({
- groupTypes,
- includePersonalCollections,
+ groupTypes: newGroupTypes,
+ includePersonalCollections: newIncludePersonalCollections,
}: DependencyFilterOptions) => {
handleParamsChange(
{
...params,
- group_types: groupTypes,
- include_personal_collections: includePersonalCollections,
+ groupTypes: newGroupTypes,
+ includePersonalCollections: newIncludePersonalCollections,
page: undefined,
},
{ withSetLastUsedParams: true },
@@ -131,8 +131,8 @@ export function DependencyList({
handleParamsChange(
{
...params,
- sort_column: sortOptions?.column,
- sort_direction: sortOptions?.direction,
+ sortColumn: sortOptions?.column,
+ sortDirection: sortOptions?.direction,
page: undefined,
},
{ withSetLastUsedParams: true },
@@ -157,8 +157,8 @@ export function DependencyList({
wrap="nowrap"
>
<Stack className={S.main} flex={1} px="3.5rem" pb="md" gap="md">
- <ListHeader />
- <ListSearchBar
+ <DependencyHeader />
+ <DependencyFilterBar
mode={mode}
query={query}
filterOptions={getFilterOptions(mode, params)}
@@ -172,7 +172,7 @@ export function DependencyList({
<DelayedLoadingAndErrorWrapper loading={isLoading} error={error} />
</Center>
) : (
- <ListBody
+ <DependencyTable
nodes={nodes}
mode={mode}
sortOptions={getSortOptions(params)}
@@ -182,7 +182,7 @@ export function DependencyList({
/>
)}
{!isLoading && error == null && (
- <ListPaginationControls
+ <DependencyPagination
page={page}
pageNodesCount={nodes.length}
totalNodesCount={totalNodesCount}
@@ -191,7 +191,7 @@ export function DependencyList({
)}
</Stack>
{selectedNode != null && (
- <ListSidebar
+ <DependencySidebar
node={selectedNode}
mode={mode}
containerWidth={containerWidth}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/DependencyPagination.tsx
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/DependencyPagination.tsx
index 737f5014277..8f5b57a9987 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/ListPaginationControls.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/DependencyPagination.tsx
@@ -3,19 +3,19 @@ import { Flex } from "metabase/ui";
import { PAGE_SIZE } from "../constants";
-type ListPaginationControlsProps = {
+type DependencyPaginationProps = {
page: number;
pageNodesCount: number;
totalNodesCount: number;
onPageChange: (page: number) => void;
};
-export function ListPaginationControls({
+export function DependencyPagination({
page,
pageNodesCount,
totalNodesCount,
onPageChange,
-}: ListPaginationControlsProps) {
+}: DependencyPaginationProps) {
return (
<Flex justify="end">
<PaginationControls
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/index.ts
new file mode 100644
index 00000000000..81d7ab57cfb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyPagination/index.ts
@@ -0,0 +1 @@
+export * from "./DependencyPagination";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/BrokenDependentsSection.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/BrokenDependentsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/BrokenDependentsSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/BrokenDependentsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
index 7ca2d1e48a4..65abee4dd49 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/BrokenDependentsSection.tsx
@@ -167,11 +167,7 @@ function DependentItem({ node }: DependentItemProps) {
pl="sm"
>
{location.links.map((link, linkIndex) => (
- <Box
- key={linkIndex}
- className={cx(S.link, CS.textWrap)}
- lh="1rem"
- >
+ <Box key={linkIndex} className={CS.textWrap} lh="1rem">
{link.label}
</Box>
))}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/BrokenDependentsSection/utils.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/BrokenDependentsSection/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.module.css
new file mode 100644
index 00000000000..062031219ac
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.module.css
@@ -0,0 +1,5 @@
+.sidebar {
+ flex: 1 1 auto;
+ overflow: auto;
+ border-left: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.tsx
index ee1fc9ca949..63848d8d147 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.tsx
@@ -6,15 +6,15 @@ import type { DependencyNode } from "metabase-types/api";
import type { DependencyListMode } from "../types";
import { BrokenDependentsSection } from "./BrokenDependentsSection";
+import S from "./DependencySidebar.module.css";
import { ErrorsSection } from "./ErrorsSection";
import { FieldsSection } from "./FieldsSection";
import { InfoSection } from "./InfoSection";
-import S from "./ListSidebar.module.css";
import { LocationSection } from "./LocationSection";
import { SidebarHeader } from "./SidebarHeader";
import { SidebarResizableBox } from "./SidebarResizableBox";
-type ListSidebarProps = {
+type DependencySidebarProps = {
node: DependencyNode;
mode: DependencyListMode;
containerWidth: number;
@@ -23,14 +23,14 @@ type ListSidebarProps = {
onClose: () => void;
};
-export const ListSidebar = memo(function ListSidebar({
+export const DependencySidebar = memo(function DependencySidebar({
node,
mode,
containerWidth,
onResizeStart,
onResizeStop,
onClose,
-}: ListSidebarProps) {
+}: DependencySidebarProps) {
return (
<SidebarResizableBox
containerWidth={containerWidth}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.unit.spec.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.unit.spec.tsx
index f23942d268a..91658ed7853 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/DependencySidebar.unit.spec.tsx
@@ -13,7 +13,7 @@ import {
import type { DependencyListMode } from "../types";
-import { ListSidebar } from "./ListSidebar";
+import { DependencySidebar } from "./DependencySidebar";
type SetupOpts = {
node?: DependencyNode;
@@ -33,7 +33,7 @@ function setup({
<Route
path="/"
component={() => (
- <ListSidebar
+ <DependencySidebar
node={node}
mode={mode}
containerWidth={1000}
@@ -49,7 +49,7 @@ function setup({
return { onResizeStart, onResizeStop, onClose };
}
-describe("ListSidebar", () => {
+describe("DependencySidebar", () => {
it("should render the sidebar container", () => {
setup();
expect(screen.getByTestId("dependency-list-sidebar")).toBeInTheDocument();
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/ErrorsSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/ErrorsSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ErrorsSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/ErrorsSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/FieldsSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/FieldsSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/FieldsSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/FieldsSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.module.css
new file mode 100644
index 00000000000..cf225830fc0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.module.css
@@ -0,0 +1,5 @@
+.section {
+ &:not(:last-child) {
+ border-bottom: 1px solid var(--mb-color-border);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/InfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.tsx
similarity index 98%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/InfoSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.tsx
index 0879df4b669..f25e1b3523e 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/InfoSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.tsx
@@ -19,7 +19,8 @@ import {
getNodeOwner,
getNodeTransform,
} from "../../../../utils";
-import S from "../ListSidebar.module.css";
+
+import S from "./InfoSection.module.css";
type InfoSectionProps = {
node: DependencyNode;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/InfoSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/InfoSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/InfoSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/InfoSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/InfoSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/LocationSection.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/LocationSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/LocationSection.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/LocationSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/LocationSection.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/LocationSection.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/LocationSection.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/LocationSection/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/LocationSection/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.module.css
new file mode 100644
index 00000000000..9a839f16be9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.module.css
@@ -0,0 +1,8 @@
+.link {
+ color: var(--mb-color-text-primary);
+
+ &:hover {
+ color: var(--mb-color-brand);
+ text-decoration: none;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.tsx
similarity index 97%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.tsx
index 9632e338646..5cfcee11d07 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.tsx
@@ -9,7 +9,8 @@ import type { DependencyNode } from "metabase-types/api";
import { TOOLTIP_OPEN_DELAY_MS } from "../../../../constants";
import { getNodeLabel, getNodeLink } from "../../../../utils";
-import S from "../ListSidebar.module.css";
+
+import S from "./SidebarHeader.module.css";
type SidebarHeaderProps = {
node: DependencyNode;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarHeader/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarHeader/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/SidebarResizableBox.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.module.css
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/SidebarResizableBox.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/SidebarResizableBox.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/SidebarResizableBox.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/SidebarResizableBox.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/SidebarResizableBox/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/SidebarResizableBox/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/index.ts
new file mode 100644
index 00000000000..b1ac4bf11ee
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencySidebar/index.ts
@@ -0,0 +1 @@
+export * from "./DependencySidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/DependencyTable.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/DependencyTable.tsx
index f2366ecc2ed..13150176b78 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ListBody.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/DependencyTable.tsx
@@ -11,7 +11,7 @@ import type { DependencyNode } from "metabase-types/api";
import type { DependencySortOptions } from "../../../types";
import { getNodeId } from "../../../utils";
-import { ListEmptyState } from "../ListEmptyState";
+import { DependencyEmptyState } from "../DependencyEmptyState";
import type { DependencyListMode } from "../types";
import {
@@ -22,7 +22,7 @@ import {
getSortingState,
} from "./utils";
-type ListBodyProps = {
+type DependencyTableProps = {
nodes: DependencyNode[];
mode: DependencyListMode;
sortOptions: DependencySortOptions | undefined;
@@ -31,14 +31,14 @@ type ListBodyProps = {
onSortOptionsChange: (sortOptions: DependencySortOptions | undefined) => void;
};
-export const ListBody = function ListBody({
+export const DependencyTable = function DependencyTable({
nodes,
mode,
sortOptions,
isLoading = false,
onSelect,
onSortOptionsChange,
-}: ListBodyProps) {
+}: DependencyTableProps) {
const columns = useMemo(() => getColumns(mode), [mode]);
const sortingState = useMemo(
() => getSortingState(sortOptions),
@@ -82,7 +82,7 @@ export const ListBody = function ListBody({
) : (
<TreeTable
instance={treeTableInstance}
- emptyState={<ListEmptyState label={getNotFoundMessage(mode)} />}
+ emptyState={<DependencyEmptyState label={getNotFoundMessage(mode)} />}
onRowClick={handleRowActivate}
/>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ErrorsCell/ErrorsCell.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/ErrorsCell/ErrorsCell.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ErrorsCell/ErrorsCell.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/ErrorsCell/ErrorsCell.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ErrorsCell/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/ErrorsCell/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/ErrorsCell/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/ErrorsCell/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/LocationCell/LocationCell.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/LocationCell.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/LocationCell/LocationCell.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/LocationCell/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/LocationCell/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/LocationCell/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/NameCell/NameCell.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/NameCell.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/NameCell/NameCell.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/NameCell/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/NameCell/index.ts
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/NameCell/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/index.ts
new file mode 100644
index 00000000000..fa6481bbf6e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/index.ts
@@ -0,0 +1 @@
+export * from "./DependencyTable";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/utils.tsx
similarity index 96%
rename from enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx
rename to enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/utils.tsx
index 0224d5d1117..4e58f238743 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/utils.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/DependencyTable/utils.tsx
@@ -26,7 +26,8 @@ function getNameColumn(
return {
id: "name" satisfies DependencySortColumn,
header: mode === "broken" ? t`Dependency` : t`Name`,
- minWidth: 100,
+ width: "auto",
+ maxAutoWidth: 520,
enableSorting: true,
accessorFn: (node) => getNodeLabel(node),
cell: ({ row }) => {
@@ -40,7 +41,8 @@ function getLocationColumn(): TreeTableColumnDef<DependencyNode> {
return {
id: "location" satisfies DependencySortColumn,
header: t`Location`,
- minWidth: 100,
+ width: "auto",
+ maxAutoWidth: 520,
enableSorting: true,
accessorFn: (node) => {
const location = getNodeLocationInfo(node);
@@ -58,7 +60,8 @@ function getDependentsErrorsColumn(): TreeTableColumnDef<DependencyNode> {
return {
id: "dependents-errors" satisfies DependencySortColumn,
header: t`Problems`,
- minWidth: 100,
+ width: "auto",
+ maxAutoWidth: 520,
enableSorting: true,
accessorFn: (node) => node.dependents_errors?.length ?? 0,
cell: ({ row }) => {
@@ -76,6 +79,7 @@ function getDependentsWithErrorsColumn(): TreeTableColumnDef<DependencyNode> {
return {
id: "dependents-with-errors" satisfies DependencySortColumn,
header: t`Broken dependents`,
+ width: "auto",
minWidth: 100,
enableSorting: true,
accessorFn: (node) =>
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/index.ts
deleted file mode 100644
index 2ee22290de3..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListBody/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListBody";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/index.ts
deleted file mode 100644
index 4c37680372c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListEmptyState/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListEmptyState";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/index.ts
deleted file mode 100644
index b8dcd5fc70b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/index.ts
deleted file mode 100644
index fcf3b29abb2..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListPaginationControls/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListPaginationControls";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/index.ts
deleted file mode 100644
index 03df54ffa7a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSearchBar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListSearchBar";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css
deleted file mode 100644
index 17aad0b81e7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/ListSidebar.module.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.sidebar {
- flex: 1 1 auto;
- overflow: auto;
- border-left: 1px solid var(--mb-color-border);
-}
-
-.link {
- color: var(--mb-color-text-primary);
-
- &:hover {
- color: var(--mb-color-brand);
- text-decoration: none;
- }
-}
-
-.section {
- &:not(:last-child) {
- border-bottom: 1px solid var(--mb-color-border);
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/index.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/index.ts
deleted file mode 100644
index bbfe620db31..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/ListSidebar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ListSidebar";
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
index 836a35470ef..7b41dc5d073 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyList/utils.ts
@@ -16,13 +16,13 @@ export function getAvailableGroupTypes(mode: DependencyListMode) {
export function getFilterOptions(
mode: DependencyListMode,
{
- group_types = getAvailableGroupTypes(mode),
- include_personal_collections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
+ groupTypes = getAvailableGroupTypes(mode),
+ includePersonalCollections = DEFAULT_INCLUDE_PERSONAL_COLLECTIONS,
}: Urls.DependencyListParams,
): DependencyFilterOptions {
return {
- groupTypes: group_types,
- includePersonalCollections: include_personal_collections,
+ groupTypes,
+ includePersonalCollections,
};
}
@@ -33,11 +33,11 @@ export function getDefaultFilterOptions(
}
export function getSortOptions({
- sort_column,
- sort_direction,
+ sortColumn,
+ sortDirection,
}: Urls.DependencyListParams): DependencySortOptions | undefined {
- return sort_column != null && sort_direction != null
- ? { column: sort_column, direction: sort_direction }
+ return sortColumn != null && sortDirection != null
+ ? { column: sortColumn, direction: sortDirection }
: undefined;
}
@@ -45,8 +45,8 @@ export function getParamsWithoutDefaults(
mode: DependencyListMode,
{
page,
- group_types,
- include_personal_collections,
+ groupTypes,
+ includePersonalCollections,
...params
}: Urls.DependencyListParams,
): Urls.DependencyListParams {
@@ -55,13 +55,11 @@ export function getParamsWithoutDefaults(
return {
...params,
page: page === 0 ? undefined : page,
- group_types:
- group_types?.length === defaultGroupTypes.length
+ groupTypes:
+ groupTypes?.length === defaultGroupTypes.length ? undefined : groupTypes,
+ includePersonalCollections:
+ includePersonalCollections === DEFAULT_INCLUDE_PERSONAL_COLLECTIONS
? undefined
- : group_types,
- include_personal_collections:
- include_personal_collections === DEFAULT_INCLUDE_PERSONAL_COLLECTIONS
- ? undefined
- : include_personal_collections,
+ : includePersonalCollections,
};
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
index c660aa8712b..de571b51b9b 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/SortOptionsPicker.tsx
@@ -9,10 +9,7 @@ import {
SegmentedControl,
Stack,
} from "metabase/ui";
-import {
- DEPENDENCY_SORT_DIRECTIONS,
- type DependencySortColumn,
-} from "metabase-types/api";
+import { type DependencySortColumn, SORT_DIRECTIONS } from "metabase-types/api";
import type { DependencySortOptions } from "../../types";
@@ -72,7 +69,7 @@ function SortOptionsPopover({
};
const handleDirectionChange = (newValue: string) => {
- const newDirection = DEPENDENCY_SORT_DIRECTIONS.find(
+ const newDirection = SORT_DIRECTIONS.find(
(direction) => direction === newValue,
);
if (newDirection != null) {
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts
index 1b27be857c1..2d528a6da3e 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/SortOptionsPicker/types.ts
@@ -1,9 +1,6 @@
import type { ReactNode } from "react";
-import type {
- DependencySortColumn,
- DependencySortDirection,
-} from "metabase-types/api";
+import type { DependencySortColumn, SortDirection } from "metabase-types/api";
export type SortColumnItem = {
value: DependencySortColumn;
@@ -11,6 +8,6 @@ export type SortColumnItem = {
};
export type SortDirectionItem = {
- value: DependencySortDirection;
+ value: SortDirection;
label: ReactNode;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
index bbb11f0297c..67c0ff5cd89 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts
@@ -1,13 +1,11 @@
import * as Urls from "metabase/lib/urls";
import { DEPENDENCY_TYPES, type DependencyEntry } from "metabase-types/api";
-import { parseEnum } from "../../utils";
-
export function parseDependencyEntry(
rawId?: string,
rawType?: string,
): DependencyEntry | undefined {
const id = Urls.extractEntityId(rawId);
- const type = parseEnum(rawType, DEPENDENCY_TYPES);
+ const type = Urls.parseEnumParam(rawType, DEPENDENCY_TYPES);
return id != null && type != null ? { id, type } : undefined;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.tsx
index dabfb29d48e..fb624b4e453 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.tsx
@@ -12,7 +12,6 @@ import type {
DependencyListParamsOptions,
} from "../../components/DependencyList/types";
-import type { DependencyListQueryParams } from "./types";
import {
getPageUrl,
getUserParams,
@@ -22,17 +21,14 @@ import {
} from "./utils";
type DependencyListPageProps = {
- location: Pick<Location<DependencyListQueryParams>, "query">;
+ location: Location;
};
type DependencyListPageOwnProps = DependencyListPageProps & {
mode: DependencyListMode;
};
-export function DependencyListPage({
- mode,
- location,
-}: DependencyListPageOwnProps) {
+function DependencyListPage({ mode, location }: DependencyListPageOwnProps) {
const isInitializingRef = useRef(false);
const dispatch = useDispatch();
@@ -46,10 +42,10 @@ export function DependencyListPage({
});
const params = useMemo(() => {
- return isEmptyParams(location.query)
+ return isEmptyParams(location)
? parseUserParams(rawLastUsedParams)
- : parseUrlParams(location.query);
- }, [location.query, rawLastUsedParams]);
+ : parseUrlParams(location);
+ }, [location, rawLastUsedParams]);
const handleParamsChange = (
params: Urls.DependencyListParams,
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.unit.spec.tsx
index 826bbb04164..48923e563b9 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/DependencyListPage.unit.spec.tsx
@@ -1,5 +1,4 @@
import userEvent from "@testing-library/user-event";
-import type { Location } from "history";
import { Route } from "react-router";
import {
@@ -13,6 +12,7 @@ import {
screen,
within,
} from "__support__/ui";
+import type * as Urls from "metabase/lib/urls";
import type {
DependencyListUserParams,
DependencyNode,
@@ -27,8 +27,10 @@ import {
import type { DependencyListMode } from "../../components/DependencyList/types";
-import { DependencyListPage } from "./DependencyListPage";
-import type { DependencyListQueryParams } from "./types";
+import {
+ BrokenDependencyListPage,
+ UnreferencedDependencyListPage,
+} from "./DependencyListPage";
import { getPageUrl } from "./utils";
const CARD_NODES = [
@@ -44,21 +46,19 @@ const CARD_NODES = [
type SetupOpts = {
mode?: DependencyListMode;
- location?: Pick<Location<DependencyListQueryParams>, "query">;
nodes?: DependencyNode[];
total?: number;
+ urlParams?: Urls.DependencyListParams;
lastUsedParams?: DependencyListUserParams;
};
function setup({
mode = "broken",
- location = { query: {} },
nodes = [],
total,
+ urlParams = {},
lastUsedParams = {},
}: SetupOpts) {
- const path = getPageUrl(mode, {});
-
if (mode === "broken") {
setupListBreakingGraphNodesEndpoint(
createMockListBrokenGraphNodesResponse({
@@ -83,14 +83,16 @@ function setup({
mockGetBoundingClientRect({ width: 100, height: 100 });
+ const PageComponent =
+ mode === "broken"
+ ? BrokenDependencyListPage
+ : UnreferencedDependencyListPage;
+
const { history } = renderWithProviders(
- <Route
- path={path}
- component={() => <DependencyListPage mode={mode} location={location} />}
- />,
+ <Route path={getPageUrl(mode, {})} component={PageComponent} />,
{
withRouter: true,
- initialRoute: path,
+ initialRoute: getPageUrl(mode, urlParams),
storeInitialState: {
currentUser: createMockUser(),
},
@@ -127,11 +129,11 @@ describe("DependencyListPage", () => {
});
describe("URL parameters", () => {
- it("should set the group_types parameter when not all types are selected", async () => {
+ it("should set the group-types parameter when not all types are selected", async () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: { group_types: ["table", "question", "model"] } },
+ urlParams: { groupTypes: ["table", "question", "model"] },
});
await waitForListToLoad();
@@ -140,15 +142,15 @@ describe("DependencyListPage", () => {
await userEvent.click(getTypeCheckbox(popover, "Table"));
expect(history?.getCurrentLocation().query).toEqual({
- group_types: ["question", "model"],
+ "group-types": ["question", "model"],
});
});
- it("should not set the group_types parameter when all types are selected", async () => {
+ it("should not set the group-types parameter when all types are selected", async () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: { group_types: ["table", "question"] } },
+ urlParams: { groupTypes: ["table", "question"] },
});
await waitForListToLoad();
@@ -159,11 +161,11 @@ describe("DependencyListPage", () => {
expect(history?.getCurrentLocation().query).toEqual({});
});
- it("should set the include_personal_collections parameter when it is unchecked", async () => {
+ it("should set the include-personal-collections parameter when it is unchecked", async () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: { include_personal_collections: "true" } },
+ urlParams: { includePersonalCollections: true },
});
await waitForListToLoad();
@@ -175,15 +177,15 @@ describe("DependencyListPage", () => {
await userEvent.click(checkbox);
expect(history?.getCurrentLocation().query).toEqual({
- include_personal_collections: "false",
+ "include-personal-collections": "false",
});
});
- it("should not set the include_personal_collections parameter when it is checked", async () => {
+ it("should not set the include-personal-collections parameter when it is checked", async () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: { include_personal_collections: "false" } },
+ urlParams: { includePersonalCollections: false },
});
await waitForListToLoad();
@@ -202,7 +204,7 @@ describe("DependencyListPage", () => {
mode: "broken",
nodes: CARD_NODES,
total: 50,
- location: { query: {} },
+ urlParams: {},
});
await waitForListToLoad();
@@ -216,7 +218,7 @@ describe("DependencyListPage", () => {
mode: "broken",
nodes: CARD_NODES,
total: 50,
- location: { query: { page: "2" } },
+ urlParams: { page: 2 },
});
await waitForListToLoad();
@@ -229,7 +231,7 @@ describe("DependencyListPage", () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: { page: "1" } },
+ urlParams: { page: 1 },
total: 50,
});
@@ -244,7 +246,7 @@ describe("DependencyListPage", () => {
it("should use default filters when there are no query string or last used parameters", async () => {
setup({
nodes: CARD_NODES,
- location: { query: {} },
+ urlParams: {},
});
await waitForListToLoad();
@@ -259,7 +261,7 @@ describe("DependencyListPage", () => {
it("should use last used parameters when there is no query string", async () => {
setup({
nodes: CARD_NODES,
- location: { query: {} },
+ urlParams: {},
lastUsedParams: { group_types: ["table"] },
});
@@ -275,7 +277,7 @@ describe("DependencyListPage", () => {
it("should use query string filters when there are no last used parameters", async () => {
setup({
nodes: CARD_NODES,
- location: { query: { group_types: ["question"] } },
+ urlParams: { groupTypes: ["question"] },
});
await waitForListToLoad();
@@ -290,7 +292,7 @@ describe("DependencyListPage", () => {
it("should use only query string values when both query string and last used parameters are provided", async () => {
setup({
nodes: CARD_NODES,
- location: { query: { group_types: ["model"] } },
+ urlParams: { groupTypes: ["model"] },
lastUsedParams: { group_types: ["table", "question"] },
});
@@ -307,7 +309,7 @@ describe("DependencyListPage", () => {
const { history } = setup({
mode: "broken",
nodes: CARD_NODES,
- location: { query: {} },
+ urlParams: {},
lastUsedParams: { group_types: ["table", "question"] },
});
@@ -315,7 +317,7 @@ describe("DependencyListPage", () => {
const currentLocation = history?.getCurrentLocation();
expect(currentLocation?.query).toEqual({
- group_types: ["table", "question"],
+ "group-types": ["table", "question"],
});
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts
deleted file mode 100644
index e2bbb05331f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type DependencyListQueryParams = {
- page?: unknown;
- group_types?: unknown;
- query?: unknown;
- include_personal_collections?: unknown;
- sort_column?: unknown;
- sort_direction?: unknown;
-};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
index bec88515036..7a69c671026 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyListPage/utils.ts
@@ -1,21 +1,14 @@
+import type { Location } from "history";
+
import * as Urls from "metabase/lib/urls";
import {
DEPENDENCY_GROUP_TYPES,
DEPENDENCY_SORT_COLUMNS,
- DEPENDENCY_SORT_DIRECTIONS,
type DependencyListUserParams,
+ SORT_DIRECTIONS,
} from "metabase-types/api";
import type { DependencyListMode } from "../../components/DependencyList/types";
-import {
- parseBoolean,
- parseEnum,
- parseList,
- parseNumber,
- parseString,
-} from "../../utils";
-
-import type { DependencyListQueryParams } from "./types";
export function getPageUrl(
mode: DependencyListMode,
@@ -26,23 +19,27 @@ export function getPageUrl(
: Urls.unreferencedDependencies(params);
}
-export function parseUrlParams(
- params: DependencyListQueryParams,
-): Urls.DependencyListParams {
+export function parseUrlParams(location: Location): Urls.DependencyListParams {
+ const {
+ page,
+ query,
+ "group-types": groupTypes,
+ "include-personal-collections": includePersonalCollections,
+ "sort-column": sortColumn,
+ "sort-direction": sortDirection,
+ } = location.query;
+
return {
- page: parseNumber(params.page),
- query: parseString(params.query),
- group_types: parseList(params.group_types, (item) =>
- parseEnum(item, DEPENDENCY_GROUP_TYPES),
+ page: Urls.parseNumberParam(page),
+ query: Urls.parseStringParam(query),
+ groupTypes: Urls.parseListParam(groupTypes, (item) =>
+ Urls.parseEnumParam(item, DEPENDENCY_GROUP_TYPES),
),
- include_personal_collections: parseBoolean(
- params.include_personal_collections,
- ),
- sort_column: parseEnum(params.sort_column, DEPENDENCY_SORT_COLUMNS),
- sort_direction: parseEnum(
- params.sort_direction,
- DEPENDENCY_SORT_DIRECTIONS,
+ includePersonalCollections: Urls.parseBooleanParam(
+ includePersonalCollections,
),
+ sortColumn: Urls.parseEnumParam(sortColumn, DEPENDENCY_SORT_COLUMNS),
+ sortDirection: Urls.parseEnumParam(sortDirection, SORT_DIRECTIONS),
};
}
@@ -50,20 +47,29 @@ export function parseUrlParams(
export function parseUserParams(
params: DependencyListUserParams | undefined | "",
): Urls.DependencyListParams {
- return typeof params === "object" && params != null ? params : {};
+ if (typeof params !== "object" || params == null) {
+ return {};
+ }
+
+ return {
+ groupTypes: params.group_types,
+ includePersonalCollections: params.include_personal_collections,
+ sortColumn: params.sort_column,
+ sortDirection: params.sort_direction,
+ };
}
export function getUserParams(
params: Urls.DependencyListParams,
): DependencyListUserParams {
return {
- group_types: params.group_types,
- include_personal_collections: params.include_personal_collections,
- sort_column: params.sort_column,
- sort_direction: params.sort_direction,
+ group_types: params.groupTypes,
+ include_personal_collections: params.includePersonalCollections,
+ sort_column: params.sortColumn,
+ sort_direction: params.sortDirection,
};
}
-export function isEmptyParams(params: DependencyListQueryParams): boolean {
- return Object.values(params).every((value) => value == null);
+export function isEmptyParams(location: Location): boolean {
+ return Object.values(location.query).every((value) => value == null);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
index ee4efdd813c..21192b83a34 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/types.ts
@@ -4,7 +4,7 @@ import type {
AnalysisFindingErrorType,
DependencyGroupType,
DependencySortColumn,
- DependencySortDirection,
+ SortDirection,
} from "metabase-types/api";
export type NodeId = string;
@@ -51,5 +51,5 @@ export type DependencyFilterOptions = {
export type DependencySortOptions = {
column: DependencySortColumn;
- direction: DependencySortDirection;
+ direction: SortDirection;
};
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
index 79b1208b84f..8eaa4590b32 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.ts
@@ -444,7 +444,6 @@ export function getNodeFields(node: DependencyNode): Field[] | null {
return node.data.fields ?? [];
case "transform":
case "sandbox":
- return node.data.table?.fields ?? [];
case "snippet":
case "dashboard":
case "document":
@@ -836,51 +835,6 @@ export function getDependentErrorNodesCount(
return nodeIds.size;
}
-export function parseString(value: unknown): string | undefined {
- return typeof value === "string" ? value : undefined;
-}
-
-export function parseNumber(value: unknown): number | undefined {
- if (typeof value === "string" && value.trim() !== "") {
- const number = Number(value);
- return Number.isFinite(number) ? number : undefined;
- }
-}
-
-export function parseBoolean(value: unknown): boolean | undefined {
- switch (value) {
- case "true":
- return true;
- case "false":
- return false;
- default:
- return undefined;
- }
-}
-
-export function parseEnum<T extends string>(
- value: unknown,
- items: readonly T[],
-): T | undefined {
- if (typeof value !== "string") {
- return undefined;
- }
- const item = items.find((item) => item === value);
- return item != null ? item : undefined;
-}
-
-export function parseList<T>(
- value: unknown,
- parseItem: (item: unknown) => T | undefined,
-): T[] | undefined {
- if (value != null) {
- const array = Array.isArray(value) ? value : [value];
- return array.map(parseItem).filter((item) => item != null);
- } else {
- return undefined;
- }
-}
-
export function getSearchQuery(searchValue: string): string | undefined {
const searchQuery = searchValue.trim();
return searchQuery.length > 0 ? searchQuery : undefined;
diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
index cd6a5d7632d..88293a6ce3a 100644
--- a/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/utils.unit.spec.ts
@@ -69,11 +69,6 @@ import {
getNodeViewCount,
getSearchQuery,
isSameNode,
- parseBoolean,
- parseEnum,
- parseList,
- parseNumber,
- parseString,
} from "./utils";
registerVisualizations();
@@ -878,78 +873,6 @@ describe("getDependentErrorNodesCount", () => {
});
});
-describe("parseString", () => {
- it.each([
- { value: "hello", expected: "hello" },
- { value: "", expected: "" },
- { value: 123, expected: undefined },
- { value: null, expected: undefined },
- { value: undefined, expected: undefined },
- ])("should parse $value", ({ value, expected }) => {
- expect(parseString(value)).toBe(expected);
- });
-});
-
-describe("parseNumber", () => {
- it.each<{ value: unknown; expected: number | undefined }>([
- { value: "123", expected: 123 },
- { value: "3.14", expected: 3.14 },
- { value: "abc", expected: undefined },
- { value: "", expected: undefined },
- { value: " ", expected: undefined },
- { value: 123, expected: undefined },
- ])("should parse $value", ({ value, expected }) => {
- expect(parseNumber(value)).toBe(expected);
- });
-});
-
-describe("parseBoolean", () => {
- it.each([
- { value: "true", expected: true },
- { value: "false", expected: false },
- { value: "yes", expected: undefined },
- { value: true, expected: undefined },
- { value: null, expected: undefined },
- ])("should parse $value", ({ value, expected }) => {
- expect(parseBoolean(value)).toBe(expected);
- });
-});
-
-describe("parseEnum", () => {
- const items: readonly string[] = ["a", "b", "c"];
-
- it.each<{ value: unknown; expected: string | undefined }>([
- { value: "a", expected: "a" },
- { value: "b", expected: "b" },
- { value: "d", expected: undefined },
- { value: 123, expected: undefined },
- ])("should parse $value", ({ value, expected }) => {
- expect(parseEnum(value, items)).toBe(expected);
- });
-});
-
-describe("parseList", () => {
- it("should parse array of strings", () => {
- const result = parseList(["a", "b"], parseString);
- expect(result).toEqual(["a", "b"]);
- });
-
- it("should wrap single value in array", () => {
- const result = parseList("single", parseString);
- expect(result).toEqual(["single"]);
- });
-
- it("should filter out invalid items", () => {
- const result = parseList(["a", 123, "b"], parseString);
- expect(result).toEqual(["a", "b"]);
- });
-
- it("should return undefined for null/undefined", () => {
- expect(parseList(null, parseString)).toBeUndefined();
- expect(parseList(undefined, parseString)).toBeUndefined();
- });
-});
-
describe("getSearchQuery", () => {
it.each([
{ value: "search term", expected: "search term" },
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/index.ts
deleted file mode 100644
index ea90badf0d9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./DependenciesSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
index 560e30ed996..87dd0656805 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/JobEditor.tsx
@@ -14,9 +14,9 @@ import type { ScheduleDisplayType, TransformTagId } from "metabase-types/api";
import { NAME_MAX_LENGTH } from "../../constants";
-import { DependenciesSection } from "./DependenciesSection";
import { ScheduleSection } from "./ScheduleSection";
import { TagSection } from "./TagSection";
+import { TransformsSection } from "./TransformsSection";
import type { TransformJobInfo } from "./types";
type JobEditorProps = {
@@ -76,7 +76,7 @@ export function JobEditor({
readOnly={readOnly}
onTagsChange={onTagListChange}
/>
- {job.id != null && <DependenciesSection jobId={job.id} />}
+ {job.id != null && <TransformsSection jobId={job.id} />}
</Stack>
</PageContainer>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
similarity index 53%
rename from enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
index 69fef9c6eac..c2bf93d7e1f 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/DependenciesSection/DependenciesSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/TransformsSection.tsx
@@ -1,24 +1,26 @@
+import type { Row } from "@tanstack/react-table";
+import { useCallback, useMemo } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import CS from "metabase/css/core/index.css";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { Card } from "metabase/ui";
+import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";
import { useListTransformJobTransformsQuery } from "metabase-enterprise/api";
import type { Transform, TransformJobId } from "metabase-types/api";
import { ListEmptyState } from "../../ListEmptyState";
import { TitleSection } from "../../TitleSection";
-import S from "./DependenciesSection.module.css";
+import { getColumns } from "./utils";
-type DependenciesSectionProps = {
+type TransformsSectionProps = {
jobId: TransformJobId;
};
-export function DependenciesSection({ jobId }: DependenciesSectionProps) {
+export function TransformsSection({ jobId }: TransformsSectionProps) {
const {
data: transforms = [],
error,
@@ -48,24 +50,40 @@ type TransformTableProps = {
};
export function TransformTable({ transforms }: TransformTableProps) {
+ const columns = useMemo(() => getColumns(), []);
const dispatch = useDispatch();
- const handleRowClick = (transform: Transform) => {
- dispatch(push(Urls.transform(transform.id)));
- };
+ const handleRowActivate = useCallback(
+ (row: Row<Transform>) => {
+ dispatch(push(Urls.transform(row.original.id)));
+ },
+ [dispatch],
+ );
+
+ const treeTableInstance = useTreeTableInstance<Transform>({
+ data: transforms,
+ columns,
+ getNodeId: (transform) => String(transform.id),
+ onRowActivate: handleRowActivate,
+ });
return (
- <AdminContentTable columnTitles={[t`Transform`, t`Target`]}>
- {transforms.map((transform) => (
- <tr
- key={transform.id}
- className={S.row}
- onClick={() => handleRowClick(transform)}
- >
- <td className={S.wrap}>{transform.name}</td>
- <td className={S.wrap}>{transform.target.name}</td>
- </tr>
- ))}
- </AdminContentTable>
+ <Card
+ className={CS.overflowHidden}
+ p={0}
+ flex="0 1 auto"
+ mih={0}
+ shadow="none"
+ withBorder
+ >
+ <TreeTable
+ instance={treeTableInstance}
+ emptyState={
+ <ListEmptyState label={t`There are no transforms for this job.`} />
+ }
+ ariaLabel={t`Job transforms`}
+ onRowClick={handleRowActivate}
+ />
+ </Card>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/index.ts
new file mode 100644
index 00000000000..61060b12994
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/index.ts
@@ -0,0 +1 @@
+export * from "./TransformsSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/utils.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/utils.tsx
new file mode 100644
index 00000000000..49255f93d34
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/JobEditor/TransformsSection/utils.tsx
@@ -0,0 +1,37 @@
+import { t } from "ttag";
+
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import type { TreeTableColumnDef } from "metabase/ui";
+import type { Transform } from "metabase-types/api";
+
+function getTransformColumn(): TreeTableColumnDef<Transform> {
+ return {
+ id: "transform-name",
+ header: t`Transform`,
+ width: "auto",
+ maxAutoWidth: 520,
+ enableSorting: true,
+ accessorFn: (transform) => transform.name,
+ cell: ({ getValue }) => {
+ return <Ellipsified>{String(getValue())}</Ellipsified>;
+ },
+ };
+}
+
+function getTargetColumn(): TreeTableColumnDef<Transform> {
+ return {
+ id: "target-name",
+ header: t`Target`,
+ width: "auto",
+ maxAutoWidth: 520,
+ enableSorting: true,
+ accessorFn: (transform) => transform.target.name,
+ cell: ({ getValue }) => {
+ return <Ellipsified>{String(getValue())}</Ellipsified>;
+ },
+ };
+}
+
+export function getColumns(): TreeTableColumnDef<Transform>[] {
+ return [getTransformColumn(), getTargetColumn()];
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx
deleted file mode 100644
index 117a7c2bff7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/RunCancelButton.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useDisclosure } from "@mantine/hooks";
-import { t } from "ttag";
-
-import { ConfirmModal } from "metabase/common/components/ConfirmModal";
-import { isResourceNotFoundError } from "metabase/lib/errors";
-import { useMetadataToasts } from "metabase/metadata/hooks";
-import { ActionIcon, Icon, Tooltip } from "metabase/ui";
-import {
- useCancelCurrentTransformRunMutation,
- useLazyGetTransformQuery,
-} from "metabase-enterprise/api";
-import type { Transform, TransformRunStatus } from "metabase-types/api";
-
-export function RunCancelButton({
- status,
- transform,
-}: {
- transform?: Transform;
- status: TransformRunStatus;
-}) {
- const isRunning = status === "started";
- const [
- isConfirmCancelationModalOpen,
- { open: openCancelConfirmationModal, close: closeCancelConfirmationModal },
- ] = useDisclosure();
- const { sendErrorToast } = useMetadataToasts();
- const [fetchTransform, { isFetching }] = useLazyGetTransformQuery();
- const [cancelTransformRun, { isLoading: isCanceling }] =
- useCancelCurrentTransformRunMutation();
-
- const handleCancel = async () => {
- if (transform == null) {
- return;
- }
- const { error } = await cancelTransformRun(transform.id);
- closeCancelConfirmationModal();
- if (error && !isResourceNotFoundError(error)) {
- sendErrorToast(t`Failed to cancel transform`);
- } else {
- // fetch the transform to get the correct `last_run` info
- fetchTransform(transform.id);
- }
- return { error };
- };
-
- return (
- <>
- {isRunning && (
- <Tooltip label={t`Cancel`} position="bottom">
- <ActionIcon
- aria-label={t`Cancel run`}
- onClickCapture={(evt) => {
- evt.stopPropagation();
- openCancelConfirmationModal();
- }}
- disabled={isCanceling || isFetching}
- p={0}
- m={0}
- size="xs"
- >
- <Icon name="close" size={12} />
- </ActionIcon>
- </Tooltip>
- )}
- <ConfirmModal
- onClick={(evt) => {
- // Prevent click events from within the modal from bubbling up out of it.
- // This is needed because the model is rendered within the table row and the table
- // row has a click handler that navigates to the transform page.
- evt.stopPropagation();
- }}
- title={t`Cancel this run?`}
- opened={isConfirmCancelationModalOpen}
- onClose={closeCancelConfirmationModal}
- onConfirm={() => {
- handleCancel();
- }}
- closeButtonText={t`No`}
- />
- </>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/index.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/index.tsx
deleted file mode 100644
index 2f41439f757..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunCancelButton/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./RunCancelButton";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.module.css
deleted file mode 100644
index 2d8f2e82f1f..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.runStatusInfo {
- flex-shrink: 0;
- flex-wrap: nowrap;
- white-space: nowrap;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
deleted file mode 100644
index 2ef6e1b2c57..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/RunStatusInfo.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Box, Group } from "metabase/ui";
-import type { Transform, TransformRunStatus } from "metabase-types/api";
-
-import { formatStatus } from "../../utils";
-import { RunCancelButton } from "../RunCancelButton/RunCancelButton";
-import { RunInfo } from "../RunInfo";
-
-import S from "./RunStatusInfo.module.css";
-
-type RunStatusInfoProps = {
- transform?: Transform;
- status: TransformRunStatus;
- message: string | null;
- endTime: Date | null;
-};
-
-export function RunStatusInfo({
- transform,
- status,
- message,
- endTime,
-}: RunStatusInfoProps) {
- const isError = status === "failed" || status === "timeout";
-
- return (
- <Group gap="xs" className={S.runStatusInfo} wrap="nowrap">
- <Box c={isError ? "error" : undefined}>{formatStatus(status)}</Box>
- {isError && message != null && (
- <RunInfo status={status} message={message} endTime={endTime} />
- )}
- <RunCancelButton transform={transform} status={status} />
- </Group>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/index.ts
deleted file mode 100644
index 28b8b6a75fa..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunStatusInfo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./RunStatusInfo";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.module.css
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.module.css
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/FilterFieldSet.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/FilterFieldSet/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
similarity index 65%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
index 0073375efbf..9dcfc0bdf67 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx
@@ -1,8 +1,5 @@
-import { replace } from "react-router-redux";
import { t } from "ttag";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import type { RelativeIntervalDirection } from "metabase/querying/filters/types";
import { Group } from "metabase/ui";
import type {
@@ -14,6 +11,8 @@ import type {
TransformTagId,
} from "metabase-types/api";
+import type { TransformRunFilterOptions } from "../types";
+
import { RunMethodFilterWidget } from "./RunMethodFilterWidget";
import { StatusFilterWidget } from "./StatusFilterWidget";
import { TagFilterWidget } from "./TagFilterWidget";
@@ -25,78 +24,74 @@ const PAST_INTERVAL_DIRECTIONS: RelativeIntervalDirection[] = [
"current",
];
-type RunFilterListProps = {
- params: Urls.TransformRunListParams;
+type RunFilterBarProps = {
+ filterOptions: TransformRunFilterOptions;
transforms: Transform[];
tags: TransformTag[];
+ onFilterOptionsChange: (filterOptions: TransformRunFilterOptions) => void;
};
-export function RunFilterList({
- params,
+export function RunFilterBar({
+ filterOptions,
transforms,
tags,
-}: RunFilterListProps) {
- const dispatch = useDispatch();
-
+ onFilterOptionsChange,
+}: RunFilterBarProps) {
const handleTransformsChange = (transformIds: TransformId[]) => {
- dispatch(
- replace(Urls.transformRunList({ ...params, transformIds: transformIds })),
- );
+ onFilterOptionsChange({ ...filterOptions, transformIds });
};
const handleStatusesChange = (statuses: TransformRunStatus[]) => {
- dispatch(replace(Urls.transformRunList({ ...params, statuses })));
+ onFilterOptionsChange({ ...filterOptions, statuses });
};
const handleTagsChange = (tagIds: TransformTagId[]) => {
- dispatch(
- replace(Urls.transformRunList({ ...params, transformTagIds: tagIds })),
- );
+ onFilterOptionsChange({ ...filterOptions, transformTagIds: tagIds });
};
const handleStartTimeChange = (startTime: string | undefined) => {
- dispatch(replace(Urls.transformRunList({ ...params, startTime })));
+ onFilterOptionsChange({ ...filterOptions, startTime });
};
const handleEndTimeChange = (endTime: string | undefined) => {
- dispatch(replace(Urls.transformRunList({ ...params, endTime })));
+ onFilterOptionsChange({ ...filterOptions, endTime });
};
const handleRunMethodsChange = (runMethods: TransformRunMethod[]) => {
- dispatch(replace(Urls.transformRunList({ ...params, runMethods })));
+ onFilterOptionsChange({ ...filterOptions, runMethods });
};
return (
<Group>
<TransformFilterWidget
- transformIds={params.transformIds ?? []}
+ transformIds={filterOptions.transformIds ?? []}
transforms={transforms}
onChange={handleTransformsChange}
/>
<TimeFilterWidget
label={t`Started at`}
- value={params.startTime}
+ value={filterOptions.startTime}
availableDirections={PAST_INTERVAL_DIRECTIONS}
onChange={handleStartTimeChange}
/>
<TimeFilterWidget
label={t`Ended at`}
- value={params.endTime}
+ value={filterOptions.endTime}
availableDirections={PAST_INTERVAL_DIRECTIONS}
onChange={handleEndTimeChange}
/>
<StatusFilterWidget
label={t`Status`}
- statuses={params.statuses ?? []}
+ statuses={filterOptions.statuses ?? []}
onChange={handleStatusesChange}
/>
<RunMethodFilterWidget
- runMethods={params.runMethods ?? []}
+ runMethods={filterOptions.runMethods ?? []}
onChange={handleRunMethodsChange}
/>
<TagFilterWidget
label={t`Tags`}
- tagIds={params.transformTagIds ?? []}
+ tagIds={filterOptions.transformTagIds ?? []}
tags={tags}
onChange={handleTagsChange}
/>
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/RunFilterBar/RunFilterBar.unit.spec.tsx
similarity index 64%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx
index ce366b52560..f7ed8b4a5d4 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunFilterList.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.unit.spec.tsx
@@ -1,24 +1,36 @@
import userEvent from "@testing-library/user-event";
import { renderWithProviders, screen } from "__support__/ui";
-import type * as Urls from "metabase/lib/urls";
import type { Transform, TransformTag } from "metabase-types/api";
-import { RunFilterList } from "./RunFilterList";
+import type { TransformRunFilterOptions } from "../types";
+
+import { RunFilterBar } from "./RunFilterBar";
type SetupOpts = {
- params?: Urls.TransformRunListParams;
+ filterOptions?: TransformRunFilterOptions;
transforms?: Transform[];
tags?: TransformTag[];
};
-function setup({ params = {}, transforms = [], tags = [] }: SetupOpts = {}) {
+function setup({
+ filterOptions = {},
+ transforms = [],
+ tags = [],
+}: SetupOpts = {}) {
+ const onFilterOptionsChange = jest.fn();
renderWithProviders(
- <RunFilterList params={params} transforms={transforms} tags={tags} />,
+ <RunFilterBar
+ filterOptions={filterOptions}
+ transforms={transforms}
+ tags={tags}
+ onFilterOptionsChange={onFilterOptionsChange}
+ />,
);
+ return { onFilterOptionsChange };
}
-describe("RunFilterList", () => {
+describe("RunFilterBar", () => {
it.each(["Started at", "Ended at"])(
"should allow only past or current date options for start and end date filters",
async (label) => {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/RunMethodFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/RunMethodFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/RunMethodFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunMethodFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/StatusFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/StatusFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/StatusFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/StatusFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/TagFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/TagFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/TagFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TagFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TagFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/TimeFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/TimeFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TimeFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/TransformFilterWidget.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/TransformFilterWidget.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/TransformFilterWidget/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TransformFilterWidget/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/index.ts
new file mode 100644
index 00000000000..4a9d939f7bb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/index.ts
@@ -0,0 +1 @@
+export * from "./RunFilterBar";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/index.ts
deleted file mode 100644
index 5221d90b22c..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./RunFilterList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css
deleted file mode 100644
index 0ade54b1da9..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.row {
- cursor: pointer;
-}
-
-.deletedRow {
- cursor: default;
-}
-
-.deletedRow:hover {
- background-color: inherit;
-}
-
-.wrap {
- overflow-wrap: anywhere;
-}
-
-.nowrap {
- white-space: nowrap;
-}
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.tsx
deleted file mode 100644
index 420b238f928..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.tsx
+++ /dev/null
@@ -1,196 +0,0 @@
-import cx from "classnames";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-
-import { AdminContentTable } from "metabase/common/components/AdminContentTable";
-import { PaginationControls } from "metabase/common/components/PaginationControls";
-import { useSetting } from "metabase/common/hooks";
-import { useDispatch } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { Card, Flex, Group, Stack, Text, Tooltip } from "metabase/ui";
-import type { TransformRun, TransformTag } from "metabase-types/api";
-
-import { ListEmptyState } from "../../../components/ListEmptyState";
-import { RunStatusInfo } from "../../../components/RunStatusInfo";
-import { formatRunMethod, parseTimestampWithTimezone } from "../../../utils";
-import { PAGE_SIZE } from "../constants";
-import { hasFilterParams } from "../utils";
-
-import S from "./RunList.module.css";
-import { TagList } from "./TagList";
-import { TimezoneIndicator } from "./TimezoneIndicator";
-
-type RunListProps = {
- runs: TransformRun[];
- totalCount: number;
- params: Urls.TransformRunListParams;
- tags: TransformTag[];
-};
-
-export function RunList({ runs, totalCount, params, tags }: RunListProps) {
- const { page = 0 } = params;
- const hasPagination = totalCount > PAGE_SIZE;
-
- if (runs.length === 0) {
- const hasFilters = hasFilterParams(params);
- return (
- <Card p={0} shadow="none" withBorder>
- <ListEmptyState
- label={hasFilters ? t`No runs found` : t`No runs yet`}
- />
- </Card>
- );
- }
-
- return (
- <Stack gap="lg">
- <RunTable runs={runs} tags={tags} />
- {hasPagination && (
- <Group justify="end">
- <RunTablePaginationControls
- page={page}
- itemCount={runs.length}
- totalCount={totalCount}
- params={params}
- />
- </Group>
- )}
- </Stack>
- );
-}
-
-type RunTableProps = {
- runs: TransformRun[];
- tags: TransformTag[];
-};
-
-function RunTable({ runs, tags }: RunTableProps) {
- const systemTimezone = useSetting("system-timezone");
- const dispatch = useDispatch();
-
- const handleRowClick = (run: TransformRun) => {
- if (run.transform && !run.transform.deleted) {
- dispatch(push(Urls.transform(run.transform.id)));
- }
- };
-
- return (
- <Card p={0} shadow="none" withBorder>
- <AdminContentTable
- columnTitles={[
- t`Transform`,
- <Flex key="started-at" align="center" gap="xs">
- <span className={S.nowrap}>{t`Started at`}</span>{" "}
- <TimezoneIndicator />
- </Flex>,
- <Flex key="end-at" align="center" gap="xs">
- <span className={S.nowrap}>{t`Ended at`}</span>{" "}
- <TimezoneIndicator />
- </Flex>,
- t`Status`,
- t`Trigger`,
- t`Tags`,
- ]}
- >
- {runs.map((run) => {
- const isTransformDeleted = run.transform?.deleted === true;
- const transformName = run.transform?.name || t`Unnamed transform`;
-
- return (
- <tr
- key={run.id}
- className={cx(S.row, { [S.deletedRow]: isTransformDeleted })}
- onClick={() => handleRowClick(run)}
- >
- <td className={S.wrap}>
- {isTransformDeleted ? (
- <Tooltip label={t`${transformName} has been deleted`}>
- <Text
- c="text-tertiary"
- component="span"
- display="inline"
- fs="italic"
- >
- {transformName}
- </Text>
- </Tooltip>
- ) : (
- transformName
- )}
- </td>
- <td className={S.nowrap}>
- {parseTimestampWithTimezone(
- run.start_time,
- systemTimezone,
- ).format("lll")}
- </td>
- <td className={S.nowrap}>
- {run.end_time
- ? parseTimestampWithTimezone(
- run.end_time,
- systemTimezone,
- ).format("lll")
- : null}
- </td>
- <td className={S.wrap}>
- <RunStatusInfo
- transform={run.transform}
- status={run.status}
- message={run.message}
- endTime={
- run.end_time != null
- ? parseTimestampWithTimezone(
- run.end_time,
- systemTimezone,
- ).toDate()
- : null
- }
- />
- </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>
- </Card>
- );
-}
-
-type RunTablePaginationControlsProps = {
- page: number;
- itemCount: number;
- totalCount: number;
- params: Urls.TransformRunListParams;
-};
-
-function RunTablePaginationControls({
- page,
- itemCount,
- totalCount,
- params,
-}: RunTablePaginationControlsProps) {
- const dispatch = useDispatch();
-
- const handlePreviousPage = () => {
- dispatch(push(Urls.transformRunList({ ...params, page: page - 1 })));
- };
-
- const handleNextPage = () => {
- dispatch(push(Urls.transformRunList({ ...params, page: page + 1 })));
- };
-
- return (
- <PaginationControls
- page={page}
- pageSize={PAGE_SIZE}
- itemsLength={itemCount}
- total={totalCount}
- showTotal
- onPreviousPage={handlePreviousPage}
- onNextPage={handleNextPage}
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.unit.spec.tsx
deleted file mode 100644
index 4a452ad1e8e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/RunList.unit.spec.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Route } from "react-router";
-
-import { renderWithProviders, screen } from "__support__/ui";
-import type { TransformRun } from "metabase-types/api";
-import {
- createMockTransform,
- createMockTransformRun,
-} from "metabase-types/api/mocks";
-
-import { RunList } from "./RunList";
-
-type SetupOpts = {
- runs?: TransformRun[];
-};
-
-function setup({ runs = [] }: SetupOpts = {}) {
- return renderWithProviders(
- <>
- <Route
- path="/data-studio/transforms/runs"
- component={() => (
- <RunList params={{}} runs={runs} tags={[]} totalCount={runs.length} />
- )}
- />
- <Route
- path="/data-studio/transforms/:id"
- component={() => <div data-testid="transform-detail" />}
- />
- </>,
- {
- initialRoute: "/data-studio/transforms/runs",
- withRouter: true,
- },
- );
-}
-
-describe("RunList", () => {
- it("should render transform name", () => {
- const transform = createMockTransform({ name: "My Transform" });
- const run = createMockTransformRun({ transform });
- setup({ runs: [run] });
-
- expect(screen.getByText("My Transform")).toBeInTheDocument();
- });
-
- it("should navigate to transform detail when clicking a row", async () => {
- const transform = createMockTransform({ id: 123, name: "Test Transform" });
- const run = createMockTransformRun({ transform });
- const { history } = setup({ runs: [run] });
-
- const row = screen.getByRole("row", { name: /Test Transform/ });
- await userEvent.click(row);
-
- expect(history?.getCurrentLocation()?.pathname).toBe(
- "/data-studio/transforms/123",
- );
- expect(screen.getByTestId("transform-detail")).toBeInTheDocument();
- });
-
- describe("deleted transforms", () => {
- it("should show deleted indicator for deleted transforms", () => {
- const transform = createMockTransform({
- name: "Deleted Transform",
- deleted: true,
- });
- const run = createMockTransformRun({ transform });
- setup({ runs: [run] });
-
- expect(screen.getByText("Deleted Transform")).toBeInTheDocument();
- });
-
- it("should not navigate when clicking a row with deleted transform", async () => {
- const transform = createMockTransform({
- id: 456,
- name: "Deleted Transform",
- deleted: true,
- });
- const run = createMockTransformRun({ transform });
- const { history } = setup({ runs: [run] });
-
- const row = screen.getByRole("row", { name: /Deleted Transform/ });
- await userEvent.click(row);
-
- expect(history?.getCurrentLocation()?.pathname).toBe(
- "/data-studio/transforms/runs",
- );
- expect(screen.queryByTestId("transform-detail")).not.toBeInTheDocument();
- });
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx
deleted file mode 100644
index 0dd83404c34..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { useMemo } from "react";
-
-import { Group, Pill } from "metabase/ui";
-import type { TransformTag, TransformTagId } from "metabase-types/api";
-
-type TagListProps = {
- tagIds: TransformTagId[];
- tags: TransformTag[];
-};
-
-export function TagList({ tagIds, tags }: TagListProps) {
- const tagById = useMemo(() => getTagById(tags), [tags]);
-
- return (
- <Group gap="sm">
- {getTagList(tagIds, tagById).map((tag) => (
- <Pill key={tag.id} c="text-primary" bg="background-secondary">
- {tag.name}
- </Pill>
- ))}
- </Group>
- );
-}
-
-export function getTagById(
- tags: TransformTag[],
-): Record<TransformTagId, TransformTag> {
- return Object.fromEntries(tags.map((tag) => [tag.id, tag]));
-}
-
-export function getTagList(
- tagIds: TransformTagId[],
- tagById: Record<TransformTagId, TransformTag>,
-) {
- return tagIds.map((tagId) => tagById[tagId]).filter((tag) => tag != null);
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx
deleted file mode 100644
index 6b3e89a81b8..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.unit.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { renderWithProviders, screen } from "__support__/ui";
-import type { TransformTag, TransformTagId } from "metabase-types/api";
-import { createMockTransformTag } from "metabase-types/api/mocks";
-
-import { TagList } from "./TagList";
-
-type SetupOpts = {
- tagIds?: TransformTagId[];
- tags?: TransformTag[];
-};
-
-function setup({ tagIds = [], tags = [] }: SetupOpts = {}) {
- renderWithProviders(<TagList tagIds={tagIds} tags={tags} />);
-}
-
-describe("TagList", () => {
- it("should render tag names when tags exist", () => {
- const dailyTag = createMockTransformTag({ id: 1, name: "daily" });
- const hourlyTag = createMockTransformTag({ id: 2, name: "hourly" });
- const tags = [dailyTag, hourlyTag];
- const tagIds = [dailyTag.id, hourlyTag.id];
-
- setup({ tagIds, tags });
-
- expect(screen.getByText("daily")).toBeInTheDocument();
- expect(screen.getByText("hourly")).toBeInTheDocument();
- });
-
- it("should ignore non-existing tagIds", () => {
- const dailyTag = createMockTransformTag({ id: 1, name: "daily" });
- const hourlyTag = createMockTransformTag({ id: 2, name: "hourly" });
- const tags = [dailyTag, hourlyTag];
- const tagIds = [dailyTag.id, hourlyTag.id, 999];
-
- setup({ tagIds, tags });
-
- expect(screen.getByText("daily")).toBeInTheDocument();
- expect(screen.getByText("hourly")).toBeInTheDocument();
- expect(screen.queryByText("999")).not.toBeInTheDocument();
- });
-});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/index.ts
deleted file mode 100644
index ad13e5ffb3b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./RunList";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css
new file mode 100644
index 00000000000..5780d690fe1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.module.css
@@ -0,0 +1,7 @@
+.main {
+ overflow: hidden;
+}
+
+.resizing {
+ user-select: none;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
index a335473b6d0..f851e52da67 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.tsx
@@ -1,25 +1,42 @@
+import { useDisclosure, useElementSize } from "@mantine/hooks";
+import cx from "classnames";
import type { Location } from "history";
-import { useState } from "react";
+import { useCallback, useLayoutEffect, useMemo, useState } from "react";
+import { replace } from "react-router-redux";
import { t } from "ttag";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import type * as Urls from "metabase/lib/urls";
-import { Center, Stack } from "metabase/ui";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { Center, Flex, Stack } from "metabase/ui";
import {
useListTransformRunsQuery,
useListTransformTagsQuery,
useListTransformsQuery,
} from "metabase-enterprise/api";
import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";
import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";
import { POLLING_INTERVAL } from "metabase-enterprise/transforms/constants";
-import type { TransformRun } from "metabase-types/api";
+import type { TransformRun, TransformRunId } from "metabase-types/api";
-import { RunFilterList } from "./RunFilterList";
-import { RunList } from "./RunList";
+import { RunFilterBar } from "./RunFilterBar";
+import S from "./RunListPage.module.css";
+import { RunPagination } from "./RunPagination";
+import { RunSidebar } from "./RunSidebar/RunSidebar";
+import { RunTable } from "./RunTable";
import { PAGE_SIZE } from "./constants";
-import { getParsedParams } from "./utils";
+import type {
+ TransformRunFilterOptions,
+ TransformRunSortOptions,
+} from "./types";
+import {
+ getFilterOptions,
+ getParsedParams,
+ getSortOptions,
+ hasFilterOptions,
+} from "./utils";
+
+const EMPTY_RUNS: TransformRun[] = [];
type RunListPageProps = {
location: Location;
@@ -27,35 +44,15 @@ type RunListPageProps = {
export function RunListPage({ location }: RunListPageProps) {
const params = getParsedParams(location);
-
- return (
- <PageContainer data-testid="transforms-run-list" gap={0}>
- <PaneHeader
- breadcrumbs={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}
- py={0}
- showMetabotButton
- />
- <RunListPageBody params={params} />
- </PageContainer>
- );
-}
-
-type RunListPageBodyProps = {
- params: Urls.TransformRunListParams;
-};
-
-function RunListPageBody({ params }: RunListPageBodyProps) {
- const {
- page = 0,
- statuses,
- transformIds,
- transformTagIds,
- startTime,
- endTime,
- runMethods,
- } = params;
-
+ const { page = 0 } = params;
+ const { ref: containerRef, width: containerWidth } = useElementSize();
+ const [isResizing, { open: startResizing, close: stopResizing }] =
+ useDisclosure();
+ const [selectedRunId, setSelectedRunId] = useState<
+ TransformRunId | undefined
+ >();
const [isPolling, setIsPolling] = useState(false);
+ const dispatch = useDispatch();
const {
data,
@@ -65,27 +62,32 @@ function RunListPageBody({ params }: RunListPageBodyProps) {
{
offset: page * PAGE_SIZE,
limit: PAGE_SIZE,
- statuses,
- transform_ids: transformIds,
- transform_tag_ids: transformTagIds,
- start_time: startTime,
- end_time: endTime,
- run_methods: runMethods,
+ statuses: params.statuses,
+ transform_ids: params.transformIds,
+ transform_tag_ids: params.transformTagIds,
+ start_time: params.startTime,
+ end_time: params.endTime,
+ run_methods: params.runMethods,
+ sort_column: params.sortColumn,
+ sort_direction: params.sortDirection,
},
{
pollingInterval: isPolling ? POLLING_INTERVAL : undefined,
},
);
+
const {
data: transforms = [],
isLoading: isLoadingTransforms,
error: transformsError,
} = useListTransformsQuery({});
+
const {
data: tags = [],
isLoading: isLoadingTags,
error: tagsError,
} = useListTransformTagsQuery();
+
const isLoading = isLoadingRuns || isLoadingTransforms || isLoadingTags;
const error = runsError ?? transformsError ?? tagsError;
@@ -93,24 +95,112 @@ function RunListPageBody({ params }: RunListPageBodyProps) {
setIsPolling(isPollingNeeded(data?.data));
}
- if (!data || isLoading || error != null) {
- return (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- );
- }
+ const runs = data?.data ?? EMPTY_RUNS;
+
+ const selectedRun = useMemo(
+ () =>
+ selectedRunId != null
+ ? runs.find((run) => run.id === selectedRunId)
+ : undefined,
+ [selectedRunId, runs],
+ );
+
+ useLayoutEffect(() => {
+ if (selectedRunId != null && selectedRun == null) {
+ setSelectedRunId(undefined);
+ }
+ }, [selectedRunId, selectedRun]);
+
+ const handleParamsChange = useCallback(
+ (newParams: Urls.TransformRunListParams) => {
+ dispatch(replace(Urls.transformRunList(newParams)));
+ },
+ [dispatch],
+ );
+
+ const handleFilterOptionsChange = useCallback(
+ (filterOptions: TransformRunFilterOptions) => {
+ handleParamsChange({ ...params, ...filterOptions, page: undefined });
+ },
+ [params, handleParamsChange],
+ );
+
+ const handleSortOptionsChange = useCallback(
+ (sortOptions: TransformRunSortOptions | undefined) => {
+ handleParamsChange({
+ ...params,
+ sortColumn: sortOptions?.column,
+ sortDirection: sortOptions?.direction,
+ page: undefined,
+ });
+ },
+ [params, handleParamsChange],
+ );
+
+ const handlePageChange = useCallback(
+ (page: number) => {
+ handleParamsChange({ ...params, page });
+ },
+ [params, handleParamsChange],
+ );
+
+ const handleSelect = useCallback((runId: TransformRunId) => {
+ setSelectedRunId(runId);
+ }, []);
return (
- <Stack>
- <RunFilterList params={params} transforms={transforms} tags={tags} />
- <RunList
- runs={data.data}
- totalCount={data.total}
- params={params}
- tags={tags}
- />
- </Stack>
+ <Flex
+ className={cx({ [S.resizing]: isResizing })}
+ ref={containerRef}
+ h="100%"
+ wrap="nowrap"
+ data-testid="transforms-run-list"
+ >
+ <Stack className={S.main} flex={1} px="3.5rem" pb="md" gap={0}>
+ <PaneHeader
+ breadcrumbs={<DataStudioBreadcrumbs>{t`Runs`}</DataStudioBreadcrumbs>}
+ py={0}
+ showMetabotButton
+ />
+ {!data || isLoading || error != null ? (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ ) : (
+ <Stack flex="0 1 auto" mih={0} gap="lg">
+ <RunFilterBar
+ filterOptions={getFilterOptions(params)}
+ transforms={transforms}
+ tags={tags}
+ onFilterOptionsChange={handleFilterOptionsChange}
+ />
+ <RunTable
+ runs={runs}
+ tags={tags}
+ hasFilters={hasFilterOptions(getFilterOptions(params))}
+ sortOptions={getSortOptions(params)}
+ onSortOptionsChange={handleSortOptionsChange}
+ onSelect={handleSelect}
+ />
+ <RunPagination
+ page={page}
+ itemsLength={runs.length}
+ totalCount={data.total}
+ onPageChange={handlePageChange}
+ />
+ </Stack>
+ )}
+ </Stack>
+ {selectedRun != null && (
+ <RunSidebar
+ run={selectedRun}
+ containerWidth={containerWidth}
+ onResizeStart={startResizing}
+ onResizeStop={stopResizing}
+ onClose={() => setSelectedRunId(undefined)}
+ />
+ )}
+ </Flex>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
new file mode 100644
index 00000000000..d3ec76ae20d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunListPage.unit.spec.tsx
@@ -0,0 +1,86 @@
+import userEvent from "@testing-library/user-event";
+import { Route } from "react-router";
+
+import {
+ setupListTransformRunsEndpoint,
+ setupListTransformTagsEndpoint,
+ setupListTransformsEndpoint,
+} from "__support__/server-mocks";
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+ within,
+} from "__support__/ui";
+import * as Urls from "metabase/lib/urls";
+import type { TransformRun } from "metabase-types/api";
+import {
+ createMockListTransformRunsResponse,
+ createMockTransform,
+ createMockTransformRun,
+} from "metabase-types/api/mocks";
+
+import { RunListPage } from "./RunListPage";
+
+type SetupOpts = {
+ runs?: TransformRun[];
+};
+
+function setup({ runs = [] }: SetupOpts = {}) {
+ setupListTransformRunsEndpoint(
+ createMockListTransformRunsResponse({
+ data: runs,
+ total: runs.length,
+ }),
+ );
+ setupListTransformsEndpoint([]);
+ setupListTransformTagsEndpoint([]);
+ mockGetBoundingClientRect({ width: 1200, height: 800 });
+
+ const path = Urls.transformRunList();
+
+ renderWithProviders(<Route path={path} component={RunListPage} />, {
+ withRouter: true,
+ initialRoute: path,
+ });
+}
+
+describe("RunListPage", () => {
+ it("should render runs and open sidebar on click", async () => {
+ const transform = createMockTransform({ name: "My Transform" });
+ const run = createMockTransformRun({
+ status: "succeeded",
+ transform,
+ });
+ setup({ runs: [run] });
+
+ const row = await screen.findByRole("row", { name: /My Transform/ });
+ await userEvent.click(row);
+
+ const infoSection = await screen.findByRole("region", { name: "Info" });
+ expect(infoSection).toBeInTheDocument();
+ expect(within(infoSection).getByText("Success")).toBeInTheDocument();
+ });
+
+ it("should show error section in sidebar for failed runs", async () => {
+ const transform = createMockTransform({ name: "Broken Transform" });
+ const run = createMockTransformRun({
+ status: "failed",
+ transform,
+ message: 'relation "abc" does not exist',
+ });
+ setup({ runs: [run] });
+
+ const row = await screen.findByRole("row", {
+ name: /Broken Transform/,
+ });
+ await userEvent.click(row);
+
+ expect(
+ await screen.findByRole("region", { name: "Error" }),
+ ).toBeInTheDocument();
+
+ const infoSection = screen.getByRole("region", { name: "Info" });
+ expect(within(infoSection).getByText("Failed")).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/RunPagination.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/RunPagination.tsx
new file mode 100644
index 00000000000..e38c0a8d7f3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/RunPagination.tsx
@@ -0,0 +1,44 @@
+import { PaginationControls } from "metabase/common/components/PaginationControls";
+import { Group } from "metabase/ui";
+
+import { PAGE_SIZE } from "../constants";
+
+type RunPaginationProps = {
+ page: number;
+ itemsLength: number;
+ totalCount: number;
+ onPageChange: (page: number) => void;
+};
+
+export function RunPagination({
+ page,
+ itemsLength,
+ totalCount,
+ onPageChange,
+}: RunPaginationProps) {
+ const handlePreviousPage = () => {
+ onPageChange(page - 1);
+ };
+
+ const handleNextPage = () => {
+ onPageChange(page + 1);
+ };
+
+ if (totalCount < PAGE_SIZE) {
+ return null;
+ }
+
+ return (
+ <Group justify="end">
+ <PaginationControls
+ page={page}
+ pageSize={PAGE_SIZE}
+ itemsLength={itemsLength}
+ total={totalCount}
+ showTotal
+ onPreviousPage={handlePreviousPage}
+ onNextPage={handleNextPage}
+ />
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/index.ts
new file mode 100644
index 00000000000..96221f34ae3
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunPagination/index.ts
@@ -0,0 +1 @@
+export { RunPagination } from "./RunPagination";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
new file mode 100644
index 00000000000..8411155d31c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/CancelationSection.tsx
@@ -0,0 +1,52 @@
+import { useDisclosure } from "@mantine/hooks";
+import { t } from "ttag";
+
+import { ConfirmModal } from "metabase/common/components/ConfirmModal";
+import { useMetadataToasts } from "metabase/metadata/hooks";
+import { Button } from "metabase/ui";
+import { useCancelCurrentTransformRunMutation } from "metabase-enterprise/api";
+import type { TransformRun } from "metabase-types/api";
+
+type CancelationSectionProps = {
+ run: TransformRun;
+};
+
+export function CancelationSection({ run }: CancelationSectionProps) {
+ const [isModalOpen, { open: openModal, close: closeModal }] = useDisclosure();
+ const { sendErrorToast } = useMetadataToasts();
+ const [cancelTransformRun, { isLoading: isCanceling }] =
+ useCancelCurrentTransformRunMutation();
+
+ const handleCancel = async () => {
+ if (run.transform == null) {
+ return;
+ }
+ const { error } = await cancelTransformRun(run.transform.id);
+ closeModal();
+ if (error) {
+ sendErrorToast(t`Failed to cancel transform`);
+ }
+ };
+
+ return (
+ <>
+ <div>
+ <Button
+ variant="filled"
+ color="error"
+ disabled={isCanceling}
+ onClick={openModal}
+ >
+ {t`Cancel run`}
+ </Button>
+ </div>
+ <ConfirmModal
+ title={t`Cancel this run?`}
+ closeButtonText={t`No`}
+ opened={isModalOpen}
+ onClose={closeModal}
+ onConfirm={handleCancel}
+ />
+ </>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts
new file mode 100644
index 00000000000..ec3d8ab5b11
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/CancelationSection/index.ts
@@ -0,0 +1 @@
+export { CancelationSection } from "./CancelationSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css
new file mode 100644
index 00000000000..ef86f525cf9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.module.css
@@ -0,0 +1,6 @@
+.codeContainer {
+ border: var(--border-size) var(--border-style) var(--mb-color-border);
+ border-radius: var(--default-border-radius);
+ box-shadow: 0 2px 2px var(--mb-color-shadow);
+ overflow: hidden;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx
new file mode 100644
index 00000000000..fe428a4cb7d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.tsx
@@ -0,0 +1,30 @@
+import { t } from "ttag";
+
+import { CodeEditor } from "metabase/common/components/CodeEditor";
+import { CopyButton } from "metabase/common/components/CopyButton";
+import { Box, Stack, Title } from "metabase/ui";
+import type { TransformRun } from "metabase-types/api";
+
+import S from "./ErrorSection.module.css";
+
+type ErrorSectionProps = {
+ run: TransformRun;
+};
+
+export function ErrorSection({ run }: ErrorSectionProps) {
+ if (run.message == null) {
+ return null;
+ }
+
+ return (
+ <Stack role="region" aria-label={t`Error`}>
+ <Title order={5}>{t`Error`}</Title>
+ <Box className={S.codeContainer} pos="relative" pr="lg">
+ <CodeEditor value={run.message} readOnly />
+ <Box p="sm" pos="absolute" right={0} top={0}>
+ <CopyButton value={run.message} />
+ </Box>
+ </Box>
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx
new file mode 100644
index 00000000000..047966968c8
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/ErrorSection.unit.spec.tsx
@@ -0,0 +1,33 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformRun } from "metabase-types/api";
+import { createMockTransformRun } from "metabase-types/api/mocks";
+
+import { ErrorSection } from "./ErrorSection";
+
+type SetupOpts = {
+ run?: TransformRun;
+};
+
+function setup({ run = createMockTransformRun() }: SetupOpts = {}) {
+ renderWithProviders(<ErrorSection run={run} />);
+}
+
+describe("ErrorSection", () => {
+ it("should render the error title and message", () => {
+ const run = createMockTransformRun({
+ status: "failed",
+ message: 'relation "abc" does not exist',
+ });
+ setup({ run });
+
+ expect(screen.getByText("Error")).toBeInTheDocument();
+ expect(screen.getByRole("region", { name: "Error" })).toBeInTheDocument();
+ });
+
+ it("should not render when message is null", () => {
+ const run = createMockTransformRun({ message: null });
+ setup({ run });
+
+ expect(screen.queryByText("Error")).not.toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts
new file mode 100644
index 00000000000..94c8ef519a4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/ErrorSection/index.ts
@@ -0,0 +1 @@
+export { ErrorSection } from "./ErrorSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css
new file mode 100644
index 00000000000..cf225830fc0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.module.css
@@ -0,0 +1,5 @@
+.section {
+ &:not(:last-child) {
+ border-bottom: 1px solid var(--mb-color-border);
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx
new file mode 100644
index 00000000000..47c09a2e3f9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.tsx
@@ -0,0 +1,58 @@
+import type { ReactNode } from "react";
+import { t } from "ttag";
+
+import { DateTime } from "metabase/common/components/DateTime";
+import CS from "metabase/css/core/index.css";
+import { Box, Card, Stack } from "metabase/ui";
+import type { TransformRun } from "metabase-types/api";
+
+import {
+ formatRunMethod,
+ formatStatus,
+ isErrorStatus,
+} from "../../../../utils";
+
+import S from "./InfoSection.module.css";
+
+type InfoSectionProps = {
+ run: TransformRun;
+};
+
+export function InfoSection({ run }: InfoSectionProps) {
+ return (
+ <Card p={0} shadow="none" withBorder role="region" aria-label={t`Info`}>
+ <InfoSectionItem label={t`Started at`}>
+ <DateTime value={run.start_time} unit="minute" />
+ </InfoSectionItem>
+ {run.end_time != null && (
+ <InfoSectionItem label={t`Ended at`}>
+ <DateTime value={run.end_time} unit="minute" />
+ </InfoSectionItem>
+ )}
+ <InfoSectionItem label={t`Status`}>
+ <Box c={isErrorStatus(run.status) ? "error" : undefined}>
+ {formatStatus(run.status)}
+ </Box>
+ </InfoSectionItem>
+ <InfoSectionItem label={t`Trigger`}>
+ {formatRunMethod(run.run_method)}
+ </InfoSectionItem>
+ </Card>
+ );
+}
+
+type InfoSectionItemProps = {
+ label: string;
+ children?: ReactNode;
+};
+
+function InfoSectionItem({ label, children }: InfoSectionItemProps) {
+ return (
+ <Stack className={S.section} p="md" gap="xs">
+ <Box className={CS.textWrap} c="text-secondary" fz="sm" lh="h5">
+ {label}
+ </Box>
+ <Box lh="h4">{children}</Box>
+ </Stack>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx
new file mode 100644
index 00000000000..8a0e50caa8c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/InfoSection.unit.spec.tsx
@@ -0,0 +1,72 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformRun } from "metabase-types/api";
+import { createMockTransformRun } from "metabase-types/api/mocks";
+
+import { InfoSection } from "./InfoSection";
+
+type SetupOpts = {
+ run?: TransformRun;
+};
+
+function setup({ run = createMockTransformRun() }: SetupOpts = {}) {
+ renderWithProviders(<InfoSection run={run} />);
+}
+
+describe("InfoSection", () => {
+ it("should render started at with formatted date", () => {
+ const run = createMockTransformRun({
+ start_time: "2026-01-30T18:00:00Z",
+ });
+ setup({ run });
+
+ expect(screen.getByText("Started at")).toBeInTheDocument();
+ expect(screen.getByText("January 30, 2026, 6:00 PM")).toBeInTheDocument();
+ });
+
+ it("should render ended at with formatted date", () => {
+ const run = createMockTransformRun({
+ end_time: "2026-01-30T19:30:00Z",
+ });
+ setup({ run });
+
+ expect(screen.getByText("Ended at")).toBeInTheDocument();
+ expect(screen.getByText("January 30, 2026, 7:30 PM")).toBeInTheDocument();
+ });
+
+ it("should not render ended at when end_time is null", () => {
+ const run = createMockTransformRun({ end_time: null });
+ setup({ run });
+
+ expect(screen.queryByText("Ended at")).not.toBeInTheDocument();
+ });
+
+ it("should render succeeded status", () => {
+ const run = createMockTransformRun({ status: "succeeded" });
+ setup({ run });
+
+ expect(screen.getByText("Status")).toBeInTheDocument();
+ expect(screen.getByText("Success")).toBeInTheDocument();
+ });
+
+ it("should render failed status", () => {
+ const run = createMockTransformRun({ status: "failed" });
+ setup({ run });
+
+ expect(screen.getByText("Failed")).toBeInTheDocument();
+ });
+
+ it("should render manual trigger", () => {
+ const run = createMockTransformRun({ run_method: "manual" });
+ setup({ run });
+
+ expect(screen.getByText("Trigger")).toBeInTheDocument();
+ expect(screen.getByText("Manual")).toBeInTheDocument();
+ });
+
+ it("should render schedule trigger", () => {
+ const run = createMockTransformRun({ run_method: "cron" });
+ setup({ run });
+
+ expect(screen.getByText("Schedule")).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts
new file mode 100644
index 00000000000..952735a7a9d
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/InfoSection/index.ts
@@ -0,0 +1 @@
+export { InfoSection } from "./InfoSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
new file mode 100644
index 00000000000..562eb16591f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/LocationSection.tsx
@@ -0,0 +1,48 @@
+import { Link } from "react-router";
+import { t } from "ttag";
+
+import CS from "metabase/css/core/index.css";
+import * as Urls from "metabase/lib/urls";
+import { Anchor, Breadcrumbs, FixedSizeIcon, Group } from "metabase/ui";
+import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import type { TransformRun } from "metabase-types/api";
+
+type LocationSectionProps = {
+ run: TransformRun;
+};
+
+export function LocationSection({ run }: LocationSectionProps) {
+ const collectionId = run.transform?.collection_id ?? null;
+ const { path } = useCollectionPath({
+ collectionId,
+ namespace: "transforms",
+ });
+
+ if (collectionId == null || path == null || path.length === 0) {
+ return null;
+ }
+
+ return (
+ <div role="region" aria-label={t`Location`}>
+ <Breadcrumbs
+ lh="1rem"
+ separator={<FixedSizeIcon name="chevronright" size={12} />}
+ >
+ {path.map((folder, index) => (
+ <Anchor
+ key={folder.id}
+ component={Link}
+ className={CS.textWrap}
+ lh="1rem"
+ to={Urls.transformList({ collectionId: folder.id })}
+ >
+ <Group gap="sm" wrap="nowrap">
+ {index === 0 && <FixedSizeIcon name="folder" />}
+ {folder.name}
+ </Group>
+ </Anchor>
+ ))}
+ </Breadcrumbs>
+ </div>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts
new file mode 100644
index 00000000000..3207e483fcb
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/LocationSection/index.ts
@@ -0,0 +1 @@
+export { LocationSection } from "./LocationSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css
new file mode 100644
index 00000000000..062031219ac
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.module.css
@@ -0,0 +1,5 @@
+.sidebar {
+ flex: 1 1 auto;
+ overflow: auto;
+ border-left: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx
new file mode 100644
index 00000000000..d994773a959
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.tsx
@@ -0,0 +1,52 @@
+import { memo } from "react";
+
+import { Stack } from "metabase/ui";
+import type { TransformRun } from "metabase-types/api";
+
+import { CancelationSection } from "./CancelationSection";
+import { ErrorSection } from "./ErrorSection";
+import { InfoSection } from "./InfoSection";
+import { LocationSection } from "./LocationSection";
+import S from "./RunSidebar.module.css";
+import { SidebarHeader } from "./SidebarHeader";
+import { SidebarResizableBox } from "./SidebarResizableBox";
+
+type RunSidebarProps = {
+ run: TransformRun;
+ containerWidth: number;
+ onResizeStart: () => void;
+ onResizeStop: () => void;
+ onClose: () => void;
+};
+
+export const RunSidebar = memo(function RunSidebar({
+ run,
+ containerWidth,
+ onResizeStart,
+ onResizeStop,
+ onClose,
+}: RunSidebarProps) {
+ return (
+ <SidebarResizableBox
+ containerWidth={containerWidth}
+ onResizeStart={onResizeStart}
+ onResizeStop={onResizeStop}
+ >
+ <Stack
+ className={S.sidebar}
+ p="lg"
+ gap="xl"
+ bg="background-primary"
+ data-testid="run-list-sidebar"
+ >
+ <Stack gap="lg">
+ <SidebarHeader run={run} onClose={onClose} />
+ <LocationSection run={run} />
+ <InfoSection run={run} />
+ </Stack>
+ {run.message != null && <ErrorSection run={run} />}
+ {run.status === "started" && <CancelationSection run={run} />}
+ </Stack>
+ </SidebarResizableBox>
+ );
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx
new file mode 100644
index 00000000000..ca2a0b14657
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/RunSidebar.unit.spec.tsx
@@ -0,0 +1,63 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformRun } from "metabase-types/api";
+import {
+ createMockTransform,
+ createMockTransformRun,
+} from "metabase-types/api/mocks";
+
+import { RunSidebar } from "./RunSidebar";
+
+type SetupOpts = {
+ run?: TransformRun;
+};
+
+function setup({ run = createMockTransformRun() }: SetupOpts = {}) {
+ const onClose = jest.fn();
+ renderWithProviders(
+ <RunSidebar
+ run={run}
+ containerWidth={1200}
+ onResizeStart={jest.fn()}
+ onResizeStop={jest.fn()}
+ onClose={onClose}
+ />,
+ );
+ return { onClose };
+}
+
+describe("RunSidebar", () => {
+ it("should render the transform name in the header", () => {
+ const transform = createMockTransform({ name: "Test Transform" });
+ const run = createMockTransformRun({ transform });
+ setup({ run });
+
+ expect(screen.getByText("Test Transform")).toBeInTheDocument();
+ });
+
+ it("should render the info section", () => {
+ const run = createMockTransformRun({ status: "succeeded" });
+ setup({ run });
+
+ expect(screen.getByRole("region", { name: "Info" })).toBeInTheDocument();
+ expect(screen.getByText("Success")).toBeInTheDocument();
+ });
+
+ it("should render the error section when message is present", () => {
+ const run = createMockTransformRun({
+ status: "failed",
+ message: "Something went wrong",
+ });
+ setup({ run });
+
+ expect(screen.getByRole("region", { name: "Error" })).toBeInTheDocument();
+ });
+
+ it("should not render the error section when message is null", () => {
+ const run = createMockTransformRun({ message: null });
+ setup({ run });
+
+ expect(
+ screen.queryByRole("region", { name: "Error" }),
+ ).not.toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css
new file mode 100644
index 00000000000..9a839f16be9
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.module.css
@@ -0,0 +1,8 @@
+.link {
+ color: var(--mb-color-text-primary);
+
+ &:hover {
+ color: var(--mb-color-brand);
+ text-decoration: none;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
new file mode 100644
index 00000000000..e00121e69c2
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.tsx
@@ -0,0 +1,84 @@
+import cx from "classnames";
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import CS from "metabase/css/core/index.css";
+import * as Urls from "metabase/lib/urls";
+import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
+import { ActionIcon, Anchor, FixedSizeIcon, Group, Tooltip } from "metabase/ui";
+import type { TransformRun } from "metabase-types/api";
+
+import { getTransformRunName } from "../../../../utils";
+
+import S from "./SidebarHeader.module.css";
+
+const TOOLTIP_OPEN_DELAY_MS = 700;
+
+type SidebarHeaderProps = {
+ run: TransformRun;
+ onClose: () => void;
+};
+
+export function SidebarHeader({ run, onClose }: SidebarHeaderProps) {
+ const transform = run.transform;
+ const label = getTransformRunName(run);
+
+ return (
+ <Group
+ gap="0.75rem"
+ wrap="nowrap"
+ align="start"
+ justify="space-between"
+ data-testid="run-list-sidebar-header"
+ >
+ <Anchor
+ className={cx(CS.textWrap, S.link)}
+ component={ForwardRefLink}
+ fz="h3"
+ fw="bold"
+ lh="h3"
+ to={transform != null ? Urls.transform(transform.id) : ""}
+ target="_blank"
+ >
+ {label}
+ </Anchor>
+ <Group gap="xs" wrap="nowrap">
+ {transform != null && (
+ <Tooltip
+ label={t`View this transform`}
+ openDelay={TOOLTIP_OPEN_DELAY_MS}
+ >
+ <ActionIcon
+ component={ForwardRefLink}
+ to={Urls.transform(transform.id)}
+ target="_blank"
+ aria-label={t`View this transform`}
+ >
+ <FixedSizeIcon name="external" />
+ </ActionIcon>
+ </Tooltip>
+ )}
+ {PLUGIN_DEPENDENCIES.isEnabled && transform != null && (
+ <Tooltip
+ label={t`View in dependency graph`}
+ openDelay={TOOLTIP_OPEN_DELAY_MS}
+ >
+ <ActionIcon
+ component={ForwardRefLink}
+ to={Urls.dependencyGraph({
+ entry: { id: transform.id, type: "transform" },
+ })}
+ target="_blank"
+ aria-label={t`View in dependency graph`}
+ >
+ <FixedSizeIcon name="dependencies" />
+ </ActionIcon>
+ </Tooltip>
+ )}
+ <ActionIcon aria-label={t`Close`} onClick={onClose}>
+ <FixedSizeIcon name="close" />
+ </ActionIcon>
+ </Group>
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
new file mode 100644
index 00000000000..7a735bb9994
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/SidebarHeader.unit.spec.tsx
@@ -0,0 +1,62 @@
+import userEvent from "@testing-library/user-event";
+
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformRun } from "metabase-types/api";
+import {
+ createMockTransform,
+ createMockTransformRun,
+} from "metabase-types/api/mocks";
+
+import { SidebarHeader } from "./SidebarHeader";
+
+type SetupOpts = {
+ run?: TransformRun;
+};
+
+function setup({ run = createMockTransformRun() }: SetupOpts = {}) {
+ const onClose = jest.fn();
+ renderWithProviders(<SidebarHeader run={run} onClose={onClose} />);
+ return { onClose };
+}
+
+describe("SidebarHeader", () => {
+ it("should render the transform name", () => {
+ const transform = createMockTransform({ name: "My Transform" });
+ const run = createMockTransformRun({ transform });
+ setup({ run });
+
+ expect(screen.getByText("My Transform")).toBeInTheDocument();
+ });
+
+ it("should render 'Unknown transform' when transform is not set", () => {
+ const run = createMockTransformRun({ transform: undefined });
+ setup({ run });
+
+ expect(screen.getByText("Unknown transform")).toBeInTheDocument();
+ });
+
+ it("should show the external link when transform is set", () => {
+ const transform = createMockTransform({ id: 42 });
+ const run = createMockTransformRun({ transform });
+ setup({ run });
+
+ expect(screen.getByLabelText("View this transform")).toBeInTheDocument();
+ });
+
+ it("should not show the external link when transform is not set", () => {
+ const run = createMockTransformRun({ transform: undefined });
+ setup({ run });
+
+ expect(
+ screen.queryByLabelText("View this transform"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("should call onClose when the close button is clicked", async () => {
+ const { onClose } = setup();
+
+ await userEvent.click(screen.getByLabelText("Close"));
+
+ expect(onClose).toHaveBeenCalled();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts
new file mode 100644
index 00000000000..bdc4db6ef46
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarHeader/index.ts
@@ -0,0 +1 @@
+export { SidebarHeader } from "./SidebarHeader";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css
new file mode 100644
index 00000000000..5a7b5e9487b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.module.css
@@ -0,0 +1,3 @@
+.resizableBox {
+ display: flex;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx
new file mode 100644
index 00000000000..8d4237c7441
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/SidebarResizableBox.tsx
@@ -0,0 +1,41 @@
+import type { ReactNode } from "react";
+import { ResizableBox } from "react-resizable";
+
+import { ResizeHandle } from "metabase/common/components/ResizeHandle";
+
+import S from "./SidebarResizableBox.module.css";
+
+const MIN_SIDEBAR_WIDTH = 400;
+const DEFAULT_SIDEBAR_WIDTH = 512;
+
+type SidebarResizableBoxProps = {
+ containerWidth: number;
+ children?: ReactNode;
+ onResizeStart: () => void;
+ onResizeStop: () => void;
+};
+
+export function SidebarResizableBox({
+ containerWidth,
+ children,
+ onResizeStart,
+ onResizeStop,
+}: SidebarResizableBoxProps) {
+ const maxSidebarWidth = Math.max(containerWidth / 2, MIN_SIDEBAR_WIDTH);
+
+ return (
+ <ResizableBox
+ className={S.resizableBox}
+ width={DEFAULT_SIDEBAR_WIDTH}
+ minConstraints={[MIN_SIDEBAR_WIDTH, 0]}
+ maxConstraints={[maxSidebarWidth, 0]}
+ axis="x"
+ resizeHandles={["w"]}
+ handle={<ResizeHandle handleAxis="w" />}
+ onResizeStart={onResizeStart}
+ onResizeStop={onResizeStop}
+ >
+ {children}
+ </ResizableBox>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts
new file mode 100644
index 00000000000..506341c2f6f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunSidebar/SidebarResizableBox/index.ts
@@ -0,0 +1 @@
+export { SidebarResizableBox } from "./SidebarResizableBox";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.tsx
new file mode 100644
index 00000000000..f588879cf3e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.tsx
@@ -0,0 +1,94 @@
+import type { Row, SortingState, Updater } from "@tanstack/react-table";
+import { useCallback, useMemo } from "react";
+import { t } from "ttag";
+
+import { useSetting } from "metabase/common/hooks";
+import CS from "metabase/css/core/index.css";
+import { Card, TreeTable, useTreeTableInstance } from "metabase/ui";
+import type {
+ TransformRun,
+ TransformRunId,
+ TransformTag,
+} from "metabase-types/api";
+
+import { ListEmptyState } from "../../../components/ListEmptyState";
+import type { TransformRunSortOptions } from "../types";
+
+import { getColumns, getSortingOptions, getSortingState } from "./utils";
+
+type RunTableProps = {
+ runs: TransformRun[];
+ tags: TransformTag[];
+ hasFilters: boolean;
+ sortOptions: TransformRunSortOptions | undefined;
+ onSortOptionsChange: (
+ sortOptions: TransformRunSortOptions | undefined,
+ ) => void;
+ onSelect: (runId: TransformRunId) => void;
+};
+
+export function RunTable({
+ runs,
+ tags,
+ hasFilters,
+ sortOptions,
+ onSortOptionsChange,
+ onSelect,
+}: RunTableProps) {
+ const systemTimezone = useSetting("system-timezone");
+
+ const columns = useMemo(
+ () => getColumns(tags, systemTimezone),
+ [tags, systemTimezone],
+ );
+
+ const sortingState = useMemo(
+ () => getSortingState(sortOptions),
+ [sortOptions],
+ );
+
+ const notFoundLabel = hasFilters ? t`No runs found` : t`No runs yet`;
+
+ const handleRowClick = useCallback(
+ (row: Row<TransformRun>) => {
+ onSelect(row.original.id);
+ },
+ [onSelect],
+ );
+
+ const handleSortingChange = useCallback(
+ (updater: Updater<SortingState>) => {
+ const newSortingState =
+ typeof updater === "function" ? updater(sortingState) : updater;
+ onSortOptionsChange(getSortingOptions(newSortingState));
+ },
+ [sortingState, onSortOptionsChange],
+ );
+
+ const treeTableInstance = useTreeTableInstance<TransformRun>({
+ data: runs,
+ columns,
+ sorting: sortingState,
+ manualSorting: true,
+ getNodeId: (run) => String(run.id),
+ onSortingChange: handleSortingChange,
+ });
+
+ return (
+ <Card
+ className={CS.overflowHidden}
+ p={0}
+ flex="0 1 auto"
+ mih={0}
+ shadow="none"
+ withBorder
+ >
+ <TreeTable
+ instance={treeTableInstance}
+ emptyState={<ListEmptyState label={notFoundLabel} />}
+ ariaLabel={t`Transform runs`}
+ onRowClick={handleRowClick}
+ />
+ </Card>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx
new file mode 100644
index 00000000000..e2400dfb17e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/RunTable.unit.spec.tsx
@@ -0,0 +1,88 @@
+import userEvent from "@testing-library/user-event";
+
+import {
+ mockGetBoundingClientRect,
+ renderWithProviders,
+ screen,
+} from "__support__/ui";
+import type { TransformRun } from "metabase-types/api";
+import {
+ createMockTransform,
+ createMockTransformRun,
+} from "metabase-types/api/mocks";
+
+import { RunTable } from "./RunTable";
+
+type SetupOpts = {
+ runs?: TransformRun[];
+};
+
+function setup({ runs = [] }: SetupOpts = {}) {
+ const onSortOptionsChange = jest.fn();
+ const onSelect = jest.fn();
+ mockGetBoundingClientRect({ width: 800, height: 600 });
+
+ renderWithProviders(
+ <RunTable
+ runs={runs}
+ tags={[]}
+ hasFilters={false}
+ sortOptions={undefined}
+ onSortOptionsChange={onSortOptionsChange}
+ onSelect={onSelect}
+ />,
+ );
+
+ return { onSelect };
+}
+
+describe("RunTable", () => {
+ it("should render transform name", async () => {
+ const transform = createMockTransform({ name: "My Transform" });
+ const run = createMockTransformRun({ transform });
+ setup({ runs: [run] });
+
+ expect(await screen.findByText("My Transform")).toBeInTheDocument();
+ });
+
+ it("should call onSelect when clicking a row", async () => {
+ const transform = createMockTransform({ id: 1, name: "Test Transform" });
+ const run = createMockTransformRun({ id: 2, transform });
+ const { onSelect } = setup({ runs: [run] });
+
+ const row = await screen.findByRole("row", { name: /Test Transform/ });
+ await userEvent.click(row);
+
+ expect(onSelect).toHaveBeenCalledWith(run.id);
+ });
+
+ describe("deleted transforms", () => {
+ it("should show deleted indicator for deleted transforms", async () => {
+ const transform = createMockTransform({
+ name: "Deleted Transform",
+ deleted: true,
+ });
+ const run = createMockTransformRun({ transform });
+ setup({ runs: [run] });
+
+ expect(await screen.findByText("Deleted Transform")).toBeInTheDocument();
+ });
+
+ it("should call onSelect when clicking a row with deleted transform", async () => {
+ const transform = createMockTransform({
+ id: 1,
+ name: "Deleted Transform",
+ deleted: true,
+ });
+ const run = createMockTransformRun({ id: 2, transform });
+ const { onSelect } = setup({ runs: [run] });
+
+ const row = await screen.findByRole("row", {
+ name: /Deleted Transform/,
+ });
+ await userEvent.click(row);
+
+ expect(onSelect).toHaveBeenCalledWith(run.id);
+ });
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx
new file mode 100644
index 00000000000..9e262d2d5c6
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.tsx
@@ -0,0 +1,18 @@
+import { Group, Pill } from "metabase/ui";
+import type { TransformTag } from "metabase-types/api";
+
+type TagListProps = {
+ tags: TransformTag[];
+};
+
+export function TagList({ tags }: TagListProps) {
+ return (
+ <Group gap="sm">
+ {tags.map((tag) => (
+ <Pill key={tag.id} c="text-primary" bg="background-secondary">
+ {tag.name}
+ </Pill>
+ ))}
+ </Group>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx
new file mode 100644
index 00000000000..5f0d96b79dc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/TagList.unit.spec.tsx
@@ -0,0 +1,27 @@
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TransformTag } from "metabase-types/api";
+import { createMockTransformTag } from "metabase-types/api/mocks";
+
+import { TagList } from "./TagList";
+
+type SetupOpts = {
+ tags?: TransformTag[];
+};
+
+function setup({ tags = [] }: SetupOpts = {}) {
+ renderWithProviders(<TagList tags={tags} />);
+}
+
+describe("TagList", () => {
+ it("should render tag names", () => {
+ setup({
+ tags: [
+ createMockTransformTag({ id: 1, name: "daily" }),
+ createMockTransformTag({ id: 2, name: "hourly" }),
+ ],
+ });
+
+ expect(screen.getByText("daily")).toBeInTheDocument();
+ expect(screen.getByText("hourly")).toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TagList/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/TimezoneIndicator.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/TimezoneIndicator.tsx
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/TimezoneIndicator.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TimezoneIndicator/index.ts
rename to enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/TimezoneIndicator/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/index.ts
new file mode 100644
index 00000000000..4346cec1881
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/index.ts
@@ -0,0 +1 @@
+export * from "./RunTable";
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/utils.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/utils.tsx
new file mode 100644
index 00000000000..c8222cb798b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunTable/utils.tsx
@@ -0,0 +1,225 @@
+import type { SortingState } from "@tanstack/react-table";
+import { t } from "ttag";
+
+import { Ellipsified } from "metabase/common/components/Ellipsified";
+import type { TreeTableColumnDef } from "metabase/ui";
+import { Box, Group, SortableHeaderPill, Text, Tooltip } from "metabase/ui";
+import {
+ TRANSFORM_RUN_SORT_COLUMNS,
+ type TransformRun,
+ type TransformRunSortColumn,
+ type TransformTag,
+ type TransformTagId,
+} from "metabase-types/api";
+
+import {
+ formatRunMethod,
+ formatStatus,
+ getTransformRunName,
+ isErrorStatus,
+ parseTimestampWithTimezone,
+} from "../../../utils";
+import type { TransformRunSortOptions } from "../types";
+
+import { TagList } from "./TagList";
+import { TimezoneIndicator } from "./TimezoneIndicator";
+
+function getTransformColumn(): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "transform-name" satisfies TransformRunSortColumn,
+ header: t`Transform`,
+ width: "auto",
+ maxAutoWidth: 520,
+ enableSorting: true,
+ accessorFn: (run) => {
+ return getTransformRunName(run);
+ },
+ cell: ({ row, getValue }) => {
+ const run = row.original;
+ const value = String(getValue());
+ const isTransformDeleted = run.transform?.deleted === true;
+
+ return (
+ <Ellipsified>
+ {isTransformDeleted ? (
+ <Tooltip label={t`${value} has been deleted`}>
+ <Text
+ c="text-tertiary"
+ component="span"
+ display="inline"
+ fs="italic"
+ >
+ {value}
+ </Text>
+ </Tooltip>
+ ) : (
+ value
+ )}
+ </Ellipsified>
+ );
+ },
+ };
+}
+
+function getStartedAtColumn(
+ systemTimezone: string | undefined,
+): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "start-time" satisfies TransformRunSortColumn,
+ header: ({ header }) => (
+ <Group gap="xs" wrap="nowrap">
+ <SortableHeaderPill
+ name={t`Started at`}
+ sort={header.column.getIsSorted() || undefined}
+ />
+ <TimezoneIndicator />
+ </Group>
+ ),
+ width: "auto",
+ enableSorting: true,
+ accessorFn: (run) => {
+ return parseTimestampWithTimezone(run.start_time, systemTimezone).format(
+ "lll",
+ );
+ },
+ cell: ({ getValue }) => {
+ const value = getValue();
+ return <Ellipsified>{String(value)}</Ellipsified>;
+ },
+ };
+}
+
+function getEndedAtColumn(
+ systemTimezone: string | undefined,
+): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "end-time" satisfies TransformRunSortColumn,
+ header: ({ header }) => (
+ <Group gap="xs" wrap="nowrap">
+ <SortableHeaderPill
+ name={t`Ended at`}
+ sort={header.column.getIsSorted() || undefined}
+ />
+ <TimezoneIndicator />
+ </Group>
+ ),
+ width: "auto",
+ enableSorting: true,
+ accessorFn: (run) => {
+ return run.end_time != null
+ ? parseTimestampWithTimezone(run.end_time, systemTimezone).format("lll")
+ : null;
+ },
+ cell: ({ getValue }) => {
+ const value = getValue();
+ return value != null ? <Ellipsified>{String(value)}</Ellipsified> : null;
+ },
+ };
+}
+
+function getStatusColumn(): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "status" satisfies TransformRunSortColumn,
+ header: t`Status`,
+ width: 100,
+ enableSorting: true,
+ accessorFn: (row) => formatStatus(row.status),
+ cell: ({ row }) => {
+ const { status } = row.original;
+ return (
+ <Box c={isErrorStatus(status) ? "error" : undefined}>
+ {formatStatus(status)}
+ </Box>
+ );
+ },
+ };
+}
+
+function getRunMethodColumn(): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "run-method" satisfies TransformRunSortColumn,
+ header: t`Trigger`,
+ width: "auto",
+ enableSorting: true,
+ accessorFn: (row) => formatRunMethod(row.run_method),
+ cell: ({ getValue }) => {
+ const value = String(getValue());
+ return <Ellipsified>{value}</Ellipsified>;
+ },
+ };
+}
+
+function getTagById(
+ tags: TransformTag[],
+): Record<TransformTagId, TransformTag> {
+ return Object.fromEntries(tags.map((tag) => [tag.id, tag]));
+}
+
+function getTagList(
+ tagIds: TransformTagId[],
+ tagById: Record<TransformTagId, TransformTag>,
+) {
+ return tagIds.map((tagId) => tagById[tagId]).filter((tag) => tag != null);
+}
+
+function getTagsLabel(tags: TransformTag[]) {
+ return tags.map((tag) => tag.name).join(", ");
+}
+
+function getTransformTagsColumn(
+ tagsById: Record<TransformTagId, TransformTag>,
+): TreeTableColumnDef<TransformRun> {
+ return {
+ id: "transform-tags" satisfies TransformRunSortColumn,
+ header: t`Tags`,
+ width: "auto",
+ enableSorting: true,
+ accessorFn: (row) =>
+ getTagsLabel(getTagList(row.transform?.tag_ids ?? [], tagsById)),
+ cell: ({ row }) => {
+ const run = row.original;
+ const tags = getTagList(run.transform?.tag_ids ?? [], tagsById);
+ return <TagList tags={tags} />;
+ },
+ };
+}
+
+export function getColumns(
+ tags: TransformTag[],
+ systemTimezone: string | undefined,
+): TreeTableColumnDef<TransformRun>[] {
+ const tagsById = getTagById(tags);
+
+ return [
+ getTransformColumn(),
+ getStartedAtColumn(systemTimezone),
+ getEndedAtColumn(systemTimezone),
+ getStatusColumn(),
+ getRunMethodColumn(),
+ getTransformTagsColumn(tagsById),
+ ];
+}
+
+export function getSortingState(
+ sortOptions: TransformRunSortOptions | undefined,
+): SortingState {
+ return sortOptions != null
+ ? [{ id: sortOptions.column, desc: sortOptions.direction === "desc" }]
+ : [];
+}
+
+export function getSortingOptions(
+ sortingState: SortingState,
+): TransformRunSortOptions | undefined {
+ if (sortingState.length === 0) {
+ return undefined;
+ }
+
+ const { id, desc } = sortingState[0];
+ const column = TRANSFORM_RUN_SORT_COLUMNS.find((column) => column === id);
+ if (column == null) {
+ return undefined;
+ }
+
+ return { column, direction: desc ? "desc" : "asc" };
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts
index c0b65ab6b8e..45d559e788d 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/constants.ts
@@ -1 +1 @@
-export const PAGE_SIZE = 50;
+export const PAGE_SIZE = 25;
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/types.ts
new file mode 100644
index 00000000000..be21e65a6ba
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/types.ts
@@ -0,0 +1,22 @@
+import type {
+ SortDirection,
+ TransformId,
+ TransformRunMethod,
+ TransformRunSortColumn,
+ TransformRunStatus,
+ TransformTagId,
+} from "metabase-types/api";
+
+export type TransformRunFilterOptions = {
+ statuses?: TransformRunStatus[];
+ transformIds?: TransformId[];
+ transformTagIds?: TransformTagId[];
+ startTime?: string;
+ endTime?: string;
+ runMethods?: TransformRunMethod[];
+};
+
+export type TransformRunSortOptions = {
+ column: TransformRunSortColumn;
+ direction: SortDirection;
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts
index 46bd72fb19c..9f66d3d7637 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/utils.ts
@@ -1,14 +1,17 @@
import type { Location } from "history";
-import type * as Urls from "metabase/lib/urls";
-
+import * as Urls from "metabase/lib/urls";
import {
- parseInteger,
- parseList,
- parseRunMethod,
- parseRunStatus,
- parseString,
-} from "../../utils";
+ SORT_DIRECTIONS,
+ TRANSFORM_RUN_METHODS,
+ TRANSFORM_RUN_SORT_COLUMNS,
+ TRANSFORM_RUN_STATUSES,
+} from "metabase-types/api";
+
+import type {
+ TransformRunFilterOptions,
+ TransformRunSortOptions,
+} from "./types";
export function getParsedParams(
location: Location,
@@ -16,30 +19,63 @@ export function getParsedParams(
const {
page,
statuses,
- transformIds,
- transformTagIds,
- startTime,
- endTime,
- runMethods,
+ "transform-ids": transformIds,
+ "transform-tag-ids": transformTagIds,
+ "start-time": startTime,
+ "end-time": endTime,
+ "run-methods": runMethods,
+ "sort-column": sortColumn,
+ "sort-direction": sortDirection,
} = location.query;
+
return {
- 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),
+ page: Urls.parseNumberParam(page),
+ statuses: Urls.parseListParam(statuses, (v) =>
+ Urls.parseEnumParam(v, TRANSFORM_RUN_STATUSES),
+ ),
+ transformIds: Urls.parseListParam(transformIds, Urls.parseNumberParam),
+ transformTagIds: Urls.parseListParam(
+ transformTagIds,
+ Urls.parseNumberParam,
+ ),
+ startTime: Urls.parseStringParam(startTime),
+ endTime: Urls.parseStringParam(endTime),
+ runMethods: Urls.parseListParam(runMethods, (v) =>
+ Urls.parseEnumParam(v, TRANSFORM_RUN_METHODS),
+ ),
+ sortColumn: Urls.parseEnumParam(sortColumn, TRANSFORM_RUN_SORT_COLUMNS),
+ sortDirection: Urls.parseEnumParam(sortDirection, SORT_DIRECTIONS),
};
}
-export function hasFilterParams(params: Urls.TransformRunListParams) {
+export function hasFilterOptions(options: TransformRunFilterOptions) {
return (
- params.statuses != null ||
- params.transformIds != null ||
- params.transformTagIds != null ||
- params.startTime != null ||
- params.endTime != null ||
- params.runMethods != null
+ options.statuses != null ||
+ options.transformIds != null ||
+ options.transformTagIds != null ||
+ options.startTime != null ||
+ options.endTime != null ||
+ options.runMethods != null
);
}
+
+export function getFilterOptions(
+ params: Urls.TransformRunListParams,
+): TransformRunFilterOptions {
+ return {
+ statuses: params.statuses,
+ transformIds: params.transformIds,
+ transformTagIds: params.transformTagIds,
+ startTime: params.startTime,
+ endTime: params.endTime,
+ runMethods: params.runMethods,
+ };
+}
+
+export function getSortOptions(
+ params: Urls.TransformRunListParams,
+): TransformRunSortOptions | undefined {
+ return params.sortColumn != null && params.sortDirection != null
+ ? { column: params.sortColumn, direction: params.sortDirection }
+ : undefined;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
index e019f7b54ff..5d843eee0da 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/utils.ts
@@ -4,7 +4,6 @@ import _ from "underscore";
import { hasFeature } from "metabase/admin/databases/utils";
import type { OmniPickerCollectionItem } from "metabase/common/components/Pickers/EntityPicker/types";
import { parseTimestamp } from "metabase/lib/time-dayjs";
-import { isNotNull } from "metabase/lib/types";
import * as Lib from "metabase-lib";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type {
@@ -13,6 +12,7 @@ import type {
DatabaseId,
DraftTransformSource,
Transform,
+ TransformRun,
TransformRunMethod,
TransformRunStatus,
TransformSource,
@@ -87,48 +87,12 @@ 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 getTransformRunName(run: TransformRun): string {
+ return run.transform?.name ?? t`Unknown transform`;
}
-export function parseRunMethod(value: unknown): TransformRunMethod | undefined {
- switch (value) {
- case "manual":
- case "cron":
- return value;
- default:
- return undefined;
- }
+export function isErrorStatus(status: TransformRunStatus) {
+ return status === "failed" || status === "timeout";
}
export function isTransformRunning(transform: Transform) {
diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.ts
index f21a2c8eb16..70b417d4257 100644
--- a/frontend/src/metabase-types/api/dependencies.ts
+++ b/frontend/src/metabase-types/api/dependencies.ts
@@ -10,6 +10,7 @@ import type { Measure } from "./measure";
import type { PaginationRequest, PaginationResponse } from "./pagination";
import type { Segment } from "./segment";
import type { NativeQuerySnippet } from "./snippets";
+import type { SortDirection } from "./sorting";
import type { Table, TableId } from "./table";
import type { Transform } from "./transform";
@@ -255,7 +256,7 @@ export type ListNodeDependentsRequest = {
include_personal_collections?: boolean;
archived?: boolean;
sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ sort_direction?: SortDirection;
};
export type CheckDependenciesResponse = {
@@ -282,17 +283,13 @@ export const DEPENDENCY_SORT_COLUMNS = [
] as const;
export type DependencySortColumn = (typeof DEPENDENCY_SORT_COLUMNS)[number];
-export const DEPENDENCY_SORT_DIRECTIONS = ["asc", "desc"] as const;
-export type DependencySortDirection =
- (typeof DEPENDENCY_SORT_DIRECTIONS)[number];
-
export type ListBreakingGraphNodesRequest = PaginationRequest & {
types?: DependencyType[];
card_types?: CardType[];
query?: string;
include_personal_collections?: boolean;
sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ sort_direction?: SortDirection;
};
export type ListBreakingGraphNodesResponse = PaginationResponse & {
@@ -306,7 +303,7 @@ export type ListBrokenGraphNodesRequest = {
dependent_card_types?: CardType[];
include_personal_collections?: boolean;
sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ sort_direction?: SortDirection;
};
export type ListUnreferencedGraphNodesRequest = PaginationRequest & {
@@ -315,7 +312,7 @@ export type ListUnreferencedGraphNodesRequest = PaginationRequest & {
query?: string;
include_personal_collections?: boolean;
sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ sort_direction?: SortDirection;
};
export type ListUnreferencedGraphNodesResponse = PaginationResponse & {
@@ -326,5 +323,5 @@ export type DependencyListUserParams = {
group_types?: DependencyGroupType[];
include_personal_collections?: boolean;
sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ sort_direction?: SortDirection;
};
diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.ts
index 9590a2125d8..8c8d3733f92 100644
--- a/frontend/src/metabase-types/api/index.ts
+++ b/frontend/src/metabase-types/api/index.ts
@@ -50,6 +50,7 @@ export * from "./settings";
export * from "./setup";
export * from "./slack";
export * from "./snippets";
+export * from "./sorting";
export * from "./store";
export * from "./subscription";
export * from "./support-access-grants";
diff --git a/frontend/src/metabase-types/api/mocks/transform.ts b/frontend/src/metabase-types/api/mocks/transform.ts
index 80462c67c0a..b3062b1c42f 100644
--- a/frontend/src/metabase-types/api/mocks/transform.ts
+++ b/frontend/src/metabase-types/api/mocks/transform.ts
@@ -1,5 +1,6 @@
import type {
DatabaseId,
+ ListTransformRunsResponse,
PythonTransformTableAliases,
Transform,
TransformJob,
@@ -106,6 +107,18 @@ export function createMockTransformRun(
};
}
+export function createMockListTransformRunsResponse(
+ opts?: Partial<ListTransformRunsResponse>,
+): ListTransformRunsResponse {
+ return {
+ data: [],
+ total: 0,
+ limit: null,
+ offset: null,
+ ...opts,
+ };
+}
+
export function createMockTransformTag(
opts?: Partial<TransformTag>,
): TransformTag {
diff --git a/frontend/src/metabase-types/api/performance.ts b/frontend/src/metabase-types/api/performance.ts
index 531fb4ce7db..86fea3c3139 100644
--- a/frontend/src/metabase-types/api/performance.ts
+++ b/frontend/src/metabase-types/api/performance.ts
@@ -1,4 +1,5 @@
import type { CollectionType } from "./collection";
+import type { SortDirection } from "./sorting";
/** 'Model' as in 'type of object' */
export type CacheableModel = "root" | "database" | "dashboard" | "question";
@@ -67,7 +68,6 @@ export interface CacheConfig {
}
export type CacheSortColumn = "name" | "collection" | "policy";
-export type SortDirection = "asc" | "desc";
export interface ListCacheConfigsRequest {
model?: CacheableModel[];
diff --git a/frontend/src/metabase-types/api/sorting.ts b/frontend/src/metabase-types/api/sorting.ts
index df46da33d16..07906b1de0c 100644
--- a/frontend/src/metabase-types/api/sorting.ts
+++ b/frontend/src/metabase-types/api/sorting.ts
@@ -1,7 +1,5 @@
-export enum SortDirection {
- Asc = "asc",
- Desc = "desc",
-}
+export const SORT_DIRECTIONS = ["asc", "desc"] as const;
+export type SortDirection = (typeof SORT_DIRECTIONS)[number];
export type SortingOptions<SortColumn extends string> = {
sort_column: SortColumn;
diff --git a/frontend/src/metabase-types/api/transform.ts b/frontend/src/metabase-types/api/transform.ts
index 86dcc24dc4c..8a1f4061364 100644
--- a/frontend/src/metabase-types/api/transform.ts
+++ b/frontend/src/metabase-types/api/transform.ts
@@ -3,6 +3,7 @@ import type { RowValue } from "./dataset";
import type { PaginationRequest, PaginationResponse } from "./pagination";
import type { DatasetQuery } from "./query";
import type { ScheduleDisplayType } from "./settings";
+import type { SortDirection } from "./sorting";
import type { ConcreteTableId, Table } from "./table";
import type { UserId, UserInfo } from "./user";
@@ -127,15 +128,29 @@ export type TransformRun = {
transform?: Transform;
};
-export type TransformRunStatus =
- | "started"
- | "succeeded"
- | "failed"
- | "timeout"
- | "canceling"
- | "canceled";
-
-export type TransformRunMethod = "manual" | "cron";
+export const TRANSFORM_RUN_STATUSES = [
+ "started",
+ "succeeded",
+ "failed",
+ "timeout",
+ "canceling",
+ "canceled",
+] as const;
+export type TransformRunStatus = (typeof TRANSFORM_RUN_STATUSES)[number];
+
+export const TRANSFORM_RUN_METHODS = ["manual", "cron"] as const;
+export type TransformRunMethod = (typeof TRANSFORM_RUN_METHODS)[number];
+
+export const TRANSFORM_RUN_SORT_COLUMNS = [
+ "transform-name",
+ "start-time",
+ "end-time",
+ "status",
+ "run-method",
+ "transform-tags",
+] as const;
+export type TransformRunSortColumn =
+ (typeof TRANSFORM_RUN_SORT_COLUMNS)[number];
export type TransformTag = {
id: TransformTagId;
@@ -234,6 +249,8 @@ export type ListTransformRunsRequest = {
start_time?: string;
end_time?: string;
run_methods?: TransformRunMethod[];
+ sort_column?: TransformRunSortColumn;
+ sort_direction?: SortDirection;
} & PaginationRequest;
export type ListTransformRunsResponse = {
diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
index 5a899319ecc..213c3e8ed4b 100644
--- a/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/TasksTable.tsx
@@ -13,8 +13,12 @@ import CS from "metabase/css/core/index.css";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { Box, Flex } from "metabase/ui";
-import type { Database, ListTasksSortColumn, Task } from "metabase-types/api";
-import type { SortingOptions } from "metabase-types/api/sorting";
+import type {
+ Database,
+ ListTasksSortColumn,
+ SortingOptions,
+ Task,
+} from "metabase-types/api";
interface Props {
databases: Database[];
diff --git a/frontend/src/metabase/admin/tools/components/TaskListPage/utils.ts b/frontend/src/metabase/admin/tools/components/TaskListPage/utils.ts
index 3f47b189f15..f831fbb6420 100644
--- a/frontend/src/metabase/admin/tools/components/TaskListPage/utils.ts
+++ b/frontend/src/metabase/admin/tools/components/TaskListPage/utils.ts
@@ -3,11 +3,14 @@ import {
type UrlStateConfig,
getFirstParamValue,
} from "metabase/common/hooks/use-url-state";
-import type { ListTasksSortColumn, TaskStatus } from "metabase-types/api";
-import { SortDirection } from "metabase-types/api/sorting";
+import type {
+ ListTasksSortColumn,
+ SortDirection,
+ TaskStatus,
+} from "metabase-types/api";
const DEFAULT_SORT_COLUMN: ListTasksSortColumn = "started_at";
-const DEFAULT_SORT_DIRECTION = SortDirection.Desc;
+const DEFAULT_SORT_DIRECTION = "desc";
type UrlState = {
page: number;
@@ -52,9 +55,7 @@ function isSortColumn(value: string): value is ListTasksSortColumn {
function parseSortDirection(param: QueryParam): UrlState["sort_direction"] {
const value = getFirstParamValue(param);
- return value === SortDirection.Asc
- ? SortDirection.Asc
- : DEFAULT_SORT_DIRECTION;
+ return value === "asc" ? "asc" : DEFAULT_SORT_DIRECTION;
}
function parseStatus(param: QueryParam): UrlState["status"] {
diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
index d678419c0e3..ae74f5a6ac3 100644
--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx
+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx
@@ -35,7 +35,7 @@ import {
Repeat,
Skeleton,
} from "metabase/ui";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type { SortingOptions } from "metabase-types/api";
import {
Cell,
@@ -56,7 +56,7 @@ type MetricsTableProps = {
const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
};
export const itemsTableContainerName = "ItemsTableContainer";
diff --git a/frontend/src/metabase/browse/metrics/utils.ts b/frontend/src/metabase/browse/metrics/utils.ts
index 1ab249235ba..ab7cf37c772 100644
--- a/frontend/src/metabase/browse/metrics/utils.ts
+++ b/frontend/src/metabase/browse/metrics/utils.ts
@@ -3,8 +3,7 @@ import { t } from "ttag";
import { getCollectionPathAsString } from "metabase/collections/utils";
import { formatValue } from "metabase/lib/formatting";
import { isDate } from "metabase-lib/v1/types/utils/isa";
-import type { Dataset } from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type { Dataset, SortingOptions } from "metabase-types/api";
import type { MetricResult, SortColumn } from "./types";
@@ -51,7 +50,7 @@ export function sortMetrics(
result = compare(a2, b2);
}
- return sort_direction === SortDirection.Asc ? result : -result;
+ return sort_direction === "asc" ? result : -result;
});
}
diff --git a/frontend/src/metabase/browse/metrics/utils.unit.spec.ts b/frontend/src/metabase/browse/metrics/utils.unit.spec.ts
index 60dc948e784..8e1cf17ae12 100644
--- a/frontend/src/metabase/browse/metrics/utils.unit.spec.ts
+++ b/frontend/src/metabase/browse/metrics/utils.unit.spec.ts
@@ -4,7 +4,6 @@ import {
createMockDataset,
createMockDatasetData,
} from "metabase-types/api/mocks";
-import { SortDirection } from "metabase-types/api/sorting";
import { createMockMetricResult } from "./test-utils";
import type { MetricResult } from "./types";
@@ -50,7 +49,7 @@ describe("sortMetrics", () => {
it("can sort by name in ascending order", () => {
const sortingOptions = {
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["A", "B", "C"]);
@@ -59,7 +58,7 @@ describe("sortMetrics", () => {
it("can sort by name in descending order", () => {
const sortingOptions = {
sort_column: "name",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["C", "B", "A"]);
@@ -68,7 +67,7 @@ describe("sortMetrics", () => {
it("can sort by collection path in ascending order", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["B", "A", "C"]);
@@ -77,7 +76,7 @@ describe("sortMetrics", () => {
it("can sort by collection path in descending order", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["C", "A", "B"]);
@@ -106,7 +105,7 @@ describe("sortMetrics", () => {
it("can sort by collection path, ascending, and then does a secondary sort by name", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted).toEqual([
@@ -121,7 +120,7 @@ describe("sortMetrics", () => {
it("can sort by collection path, descending, and then does a secondary sort by name", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortMetrics(mockSearchResults, sortingOptions);
expect(sorted).toEqual([
diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsx
index e222a0ba601..872f2180766 100644
--- a/frontend/src/metabase/browse/models/ModelsTable.tsx
+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx
@@ -21,7 +21,7 @@ import { getIcon } from "metabase/lib/icon";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { FixedSizeIcon, Flex, Icon, Repeat, Skeleton } from "metabase/ui";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type { SortingOptions } from "metabase-types/api";
import {
Cell,
@@ -55,7 +55,7 @@ const collectionProps: ResponsiveProps = {
const DEFAULT_SORTING_OPTIONS: SortingOptions<SortColumn> = {
sort_column: "collection",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
};
export const ModelsTable = ({
diff --git a/frontend/src/metabase/browse/models/utils.ts b/frontend/src/metabase/browse/models/utils.ts
index 3b5fbebc980..1c9b95168b0 100644
--- a/frontend/src/metabase/browse/models/utils.ts
+++ b/frontend/src/metabase/browse/models/utils.ts
@@ -1,8 +1,11 @@
import { t } from "ttag";
import { getCollectionPathAsString } from "metabase/collections/utils";
-import type { RecentItem, SearchResult } from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
+import type {
+ RecentItem,
+ SearchResult,
+ SortingOptions,
+} from "metabase-types/api";
import type { ModelResult, RecentModel, SortColumn } from "./types";
@@ -54,7 +57,7 @@ export function sortModels(
result = compare(a2, b2);
}
- return sort_direction === SortDirection.Asc ? result : -result;
+ return sort_direction === "asc" ? result : -result;
});
}
diff --git a/frontend/src/metabase/browse/models/utils.unit.spec.tsx b/frontend/src/metabase/browse/models/utils.unit.spec.tsx
index fd68df22022..770c0376c9c 100644
--- a/frontend/src/metabase/browse/models/utils.unit.spec.tsx
+++ b/frontend/src/metabase/browse/models/utils.unit.spec.tsx
@@ -1,5 +1,4 @@
import { createMockCollection } from "metabase-types/api/mocks";
-import { SortDirection } from "metabase-types/api/sorting";
import { createMockModelResult } from "./test-utils";
import type { ModelResult } from "./types";
@@ -41,7 +40,7 @@ describe("sortModels", () => {
it("can sort by name in ascending order", () => {
const sortingOptions = {
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["A", "B", "C"]);
@@ -50,7 +49,7 @@ describe("sortModels", () => {
it("can sort by name in descending order", () => {
const sortingOptions = {
sort_column: "name",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["C", "B", "A"]);
@@ -59,7 +58,7 @@ describe("sortModels", () => {
it("can sort by collection path in ascending order", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["B", "A", "C"]);
@@ -68,7 +67,7 @@ describe("sortModels", () => {
it("can sort by collection path in descending order", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted?.map((model) => model.name)).toEqual(["C", "A", "B"]);
@@ -95,7 +94,7 @@ describe("sortModels", () => {
it("can sort by collection path, ascending, and then does a secondary sort by name", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted).toEqual([
@@ -110,7 +109,7 @@ describe("sortModels", () => {
it("can sort by collection path, descending, and then does a secondary sort by name", () => {
const sortingOptions = {
sort_column: "collection",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
} as const;
const sorted = sortModels(mockSearchResults, sortingOptions);
expect(sorted).toEqual([
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index 7b37e6684b0..8d247d5d325 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -43,7 +43,6 @@ import type {
CollectionId,
CollectionItem,
} from "metabase-types/api";
-import { SortDirection } from "metabase-types/api/sorting";
import type { State } from "metabase-types/store";
import { ModelUploadModal } from "../ModelUploadModal";
@@ -338,7 +337,7 @@ export const CollectionContentView = Search.loadList({
collection: collectionId,
pinned_state: "is_pinned",
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
}),
loadingAndErrorWrapper: false,
wrapped: true,
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
index fa8d966f26a..7d287ae5ccb 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx
@@ -35,8 +35,8 @@ import type {
CollectionItemModel,
ListCollectionItemsRequest,
ListCollectionItemsSortColumn,
+ SortingOptions,
} from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
import type { State } from "metabase-types/store";
import {
@@ -50,11 +50,11 @@ const getDefaultSortingOptions = (
return isRootTrashCollection(collection)
? {
sort_column: "last_edited_at",
- sort_direction: SortDirection.Desc,
+ sort_direction: "desc",
}
: {
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
};
};
diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
index 568879ba978..16b8ac32f92 100644
--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx
@@ -22,8 +22,9 @@ import type {
Collection,
CollectionItem,
ListCollectionItemsSortColumn,
+ SortDirection,
+ SortingOptions,
} from "metabase-types/api";
-import { SortDirection, type SortingOptions } from "metabase-types/api/sorting";
import {
ColumnHeader,
@@ -57,17 +58,14 @@ export const SortableColumnHeader = <SortColumn extends string>({
const isSortingThisColumn = sortingOptions?.sort_column === name;
const direction = isSortingThisColumn
? sortingOptions?.sort_direction
- : SortDirection.Desc;
+ : "desc";
const onSortingControlClick = useMemo(() => {
if (!isSortable) {
return undefined;
}
const handler = () => {
- const nextDirection =
- direction === SortDirection.Asc
- ? SortDirection.Desc
- : SortDirection.Asc;
+ const nextDirection: SortDirection = direction === "asc" ? "desc" : "asc";
const newSortingOptions = {
sort_column: name,
sort_direction: nextDirection,
@@ -93,7 +91,7 @@ export const SortableColumnHeader = <SortColumn extends string>({
{children}
{isSortable && (
<SortingIcon
- name={direction === SortDirection.Asc ? "chevronup" : "chevrondown"}
+ name={direction === "asc" ? "chevronup" : "chevrondown"}
/>
)}
</SortingControlContainer>
diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
index 6cf8b2bf137..b00147a65c9 100644
--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx
@@ -13,7 +13,6 @@ import {
import type { IconName } from "metabase/ui";
import type { CollectionItem } from "metabase-types/api";
import { createMockCollection } from "metabase-types/api/mocks";
-import { SortDirection } from "metabase-types/api/sorting";
import type { BaseItemsTableProps } from "./BaseItemsTable";
import { BaseItemsTable } from "./BaseItemsTable";
@@ -66,7 +65,7 @@ describe("BaseItemsTable", () => {
items={items}
sortingOptions={{
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
}}
onSortingOptionsChange={jest.fn()}
visibleColumnsMap={VISIBLE_COLUMNS_MAP}
diff --git a/frontend/src/metabase/common/components/Table/ClientSortableTable.tsx b/frontend/src/metabase/common/components/Table/ClientSortableTable.tsx
index f2835d87fe6..dcf72722dc4 100644
--- a/frontend/src/metabase/common/components/Table/ClientSortableTable.tsx
+++ b/frontend/src/metabase/common/components/Table/ClientSortableTable.tsx
@@ -1,6 +1,6 @@
import cx from "classnames";
-import type { SortDirection } from "metabase-types/api/sorting";
+import type { SortDirection } from "metabase-types/api";
import { type BaseRow, Table, type TableProps } from "./Table";
import TableS from "./Table.module.css";
diff --git a/frontend/src/metabase/common/components/Table/Table.tsx b/frontend/src/metabase/common/components/Table/Table.tsx
index c9839e4add7..a48859eb08f 100644
--- a/frontend/src/metabase/common/components/Table/Table.tsx
+++ b/frontend/src/metabase/common/components/Table/Table.tsx
@@ -6,7 +6,7 @@ import {
type PaginationControlsProps,
} from "metabase/common/components/PaginationControls";
import { Box, Flex, type FlexProps, Icon, Stack } from "metabase/ui";
-import { SortDirection } from "metabase-types/api/sorting";
+import type { SortDirection } from "metabase-types/api";
import CS from "./Table.module.css";
import type { ColumnItem } from "./types";
@@ -139,9 +139,7 @@ function ColumnHeader({
onClick={() =>
onSort(
String(column.key),
- sortColumn === column.key && sortDirection === SortDirection.Asc
- ? SortDirection.Desc
- : SortDirection.Asc,
+ sortColumn === column.key && sortDirection === "asc" ? "desc" : "asc",
)
}
{...rest}
@@ -150,9 +148,7 @@ function ColumnHeader({
{
column.name && column.key === sortColumn ? (
<Icon
- name={
- sortDirection === SortDirection.Asc ? "chevronup" : "chevrondown"
- }
+ name={sortDirection === "asc" ? "chevronup" : "chevrondown"}
c="text-secondary"
style={{ flexShrink: 0 }}
size={8}
diff --git a/frontend/src/metabase/common/components/Table/useTableSorting.tsx b/frontend/src/metabase/common/components/Table/useTableSorting.tsx
index 83ef7ea85ca..2e98cbb44b7 100644
--- a/frontend/src/metabase/common/components/Table/useTableSorting.tsx
+++ b/frontend/src/metabase/common/components/Table/useTableSorting.tsx
@@ -1,6 +1,6 @@
import { useCallback, useMemo, useState } from "react";
-import { SortDirection } from "metabase-types/api/sorting";
+import type { SortDirection } from "metabase-types/api";
import type { BaseRow } from "./types";
@@ -9,7 +9,7 @@ const compareNumbers = (a: number, b: number) => a - b;
export const useTableSorting = <Row extends BaseRow>({
rows,
defaultSortColumn,
- defaultSortDirection = SortDirection.Asc,
+ defaultSortDirection = "asc",
formatValueForSorting,
}: {
rows: Row[];
@@ -42,7 +42,7 @@ export const useTableSorting = <Row extends BaseRow>({
typeof a === "string"
? compareStrings(a, b as string)
: compareNumbers(a, b as number);
- return sortDirection === SortDirection.Asc ? result : -result;
+ return sortDirection === "asc" ? result : -result;
});
}
return rows;
diff --git a/frontend/src/metabase/lib/urls/dependencies.ts b/frontend/src/metabase/lib/urls/dependencies.ts
index a5955b6e477..72497062d2c 100644
--- a/frontend/src/metabase/lib/urls/dependencies.ts
+++ b/frontend/src/metabase/lib/urls/dependencies.ts
@@ -2,7 +2,7 @@ import type {
DependencyEntry,
DependencyGroupType,
DependencySortColumn,
- DependencySortDirection,
+ SortDirection,
} from "metabase-types/api";
const BASE_URL = `/data-studio`;
@@ -34,19 +34,19 @@ export function dependencyDiagnostics() {
export type DependencyListParams = {
page?: number;
query?: string;
- group_types?: DependencyGroupType[];
- include_personal_collections?: boolean;
- sort_column?: DependencySortColumn;
- sort_direction?: DependencySortDirection;
+ groupTypes?: DependencyGroupType[];
+ includePersonalCollections?: boolean;
+ sortColumn?: DependencySortColumn;
+ sortDirection?: SortDirection;
};
function dependencyListQueryString({
page,
query,
- group_types,
- include_personal_collections,
- sort_column,
- sort_direction,
+ groupTypes,
+ includePersonalCollections,
+ sortColumn,
+ sortDirection,
}: DependencyListParams = {}) {
const searchParams = new URLSearchParams();
@@ -56,22 +56,22 @@ function dependencyListQueryString({
if (query != null) {
searchParams.set("query", query);
}
- if (group_types != null) {
- group_types.forEach((groupType) => {
- searchParams.append("group_types", groupType);
+ if (groupTypes != null) {
+ groupTypes.forEach((groupType) => {
+ searchParams.append("group-types", groupType);
});
}
- if (include_personal_collections != null) {
+ if (includePersonalCollections != null) {
searchParams.set(
- "include_personal_collections",
- String(include_personal_collections),
+ "include-personal-collections",
+ String(includePersonalCollections),
);
}
- if (sort_column != null) {
- searchParams.set("sort_column", sort_column);
+ if (sortColumn != null) {
+ searchParams.set("sort-column", sortColumn);
}
- if (sort_direction != null) {
- searchParams.set("sort_direction", sort_direction);
+ if (sortDirection != null) {
+ searchParams.set("sort-direction", sortDirection);
}
const queryString = searchParams.toString();
diff --git a/frontend/src/metabase/lib/urls/transforms.ts b/frontend/src/metabase/lib/urls/transforms.ts
index 25510e804c4..5487f88e09a 100644
--- a/frontend/src/metabase/lib/urls/transforms.ts
+++ b/frontend/src/metabase/lib/urls/transforms.ts
@@ -1,10 +1,13 @@
import type {
CardId,
+ CollectionId,
DatabaseId,
+ SortDirection,
TableId,
TransformId,
TransformJobId,
TransformRunMethod,
+ TransformRunSortColumn,
TransformRunStatus,
TransformTagId,
} from "metabase-types/api";
@@ -18,8 +21,20 @@ export type TransformPythonLibraryParams = {
path: string;
};
-export function transformList() {
- return TRANSFORMS_ROOT_URL;
+export type TransformListParams = {
+ collectionId?: CollectionId;
+};
+
+export function transformList({ collectionId }: TransformListParams = {}) {
+ const searchParams = new URLSearchParams();
+ if (collectionId != null) {
+ searchParams.set("collectionId", String(collectionId));
+ }
+
+ const queryString = searchParams.toString();
+ return queryString.length > 0
+ ? `${TRANSFORMS_ROOT_URL}?${queryString}`
+ : TRANSFORMS_ROOT_URL;
}
export function newQueryTransform() {
@@ -78,6 +93,8 @@ export type TransformRunListParams = {
startTime?: string;
endTime?: string;
runMethods?: TransformRunMethod[];
+ sortColumn?: TransformRunSortColumn;
+ sortDirection?: SortDirection;
};
export function transformRunList({
@@ -88,29 +105,37 @@ export function transformRunList({
startTime,
endTime,
runMethods,
+ sortColumn,
+ sortDirection,
}: TransformRunListParams = {}) {
const searchParams = new URLSearchParams();
if (page != null) {
searchParams.set("page", String(page));
}
transformIds?.forEach((transformId) => {
- searchParams.append("transformIds", String(transformId));
+ searchParams.append("transform-ids", String(transformId));
});
statuses?.forEach((status) => {
searchParams.append("statuses", String(status));
});
transformTagIds?.forEach((tagId) => {
- searchParams.append("transformTagIds", String(tagId));
+ searchParams.append("transform-tag-ids", String(tagId));
});
if (startTime != null) {
- searchParams.set("startTime", startTime);
+ searchParams.set("start-time", startTime);
}
if (endTime != null) {
- searchParams.set("endTime", endTime);
+ searchParams.set("end-time", endTime);
}
runMethods?.forEach((runMethod) => {
- searchParams.append("runMethods", runMethod);
+ searchParams.append("run-methods", runMethod);
});
+ if (sortColumn != null) {
+ searchParams.set("sort-column", sortColumn);
+ }
+ if (sortDirection != null) {
+ searchParams.set("sort-direction", sortDirection);
+ }
const queryString = searchParams.toString();
if (queryString.length > 0) {
diff --git a/frontend/src/metabase/lib/urls/utils.ts b/frontend/src/metabase/lib/urls/utils.ts
index bf20d63b823..97abcd127b4 100644
--- a/frontend/src/metabase/lib/urls/utils.ts
+++ b/frontend/src/metabase/lib/urls/utils.ts
@@ -47,3 +47,48 @@ export function getSubpathSafeUrl(url: string) {
export const openInNewTab = (url: string) => {
window.open(url, "_blank");
};
+
+export function parseStringParam(value: unknown): string | undefined {
+ return typeof value === "string" ? value : undefined;
+}
+
+export function parseNumberParam(value: unknown): number | undefined {
+ if (typeof value === "string") {
+ const number = parseFloat(value);
+ return Number.isFinite(number) ? number : undefined;
+ }
+}
+
+export function parseBooleanParam(value: unknown): boolean | undefined {
+ switch (value) {
+ case "true":
+ return true;
+ case "false":
+ return false;
+ default:
+ return undefined;
+ }
+}
+
+export function parseEnumParam<T extends string>(
+ value: unknown,
+ items: readonly T[],
+): T | undefined {
+ if (typeof value !== "string") {
+ return undefined;
+ }
+ const item = items.find((item) => item === value);
+ return item != null ? item : undefined;
+}
+
+export function parseListParam<T>(
+ value: unknown,
+ parseItem: (item: unknown) => T | undefined,
+): T[] | undefined {
+ if (value != null) {
+ const array = Array.isArray(value) ? value : [value];
+ return array.map(parseItem).filter((item) => item != null);
+ } else {
+ return undefined;
+ }
+}
diff --git a/frontend/src/metabase/lib/urls/utils.unit.spec.ts b/frontend/src/metabase/lib/urls/utils.unit.spec.ts
index c768d7f3ec9..5e97de53b15 100644
--- a/frontend/src/metabase/lib/urls/utils.unit.spec.ts
+++ b/frontend/src/metabase/lib/urls/utils.unit.spec.ts
@@ -1,6 +1,14 @@
import api from "metabase/lib/api";
-import { getSubpathSafeUrl, openInNewTab } from "./utils";
+import {
+ getSubpathSafeUrl,
+ openInNewTab,
+ parseBooleanParam,
+ parseEnumParam,
+ parseListParam,
+ parseNumberParam,
+ parseStringParam,
+} from "./utils";
const fakeBasename = "foobar";
const originalBasename = api.basename;
@@ -49,3 +57,75 @@ describe("utils", () => {
);
});
});
+
+describe("parseStringParam", () => {
+ it.each([
+ { value: "hello", expected: "hello" },
+ { value: "", expected: "" },
+ { value: 123, expected: undefined },
+ { value: null, expected: undefined },
+ { value: undefined, expected: undefined },
+ ])("should parse $value", ({ value, expected }) => {
+ expect(parseStringParam(value)).toBe(expected);
+ });
+});
+
+describe("parseNumberParam", () => {
+ it.each<{ value: unknown; expected: number | undefined }>([
+ { value: "123", expected: 123 },
+ { value: "3.14", expected: 3.14 },
+ { value: "abc", expected: undefined },
+ { value: "", expected: undefined },
+ { value: " ", expected: undefined },
+ { value: 123, expected: undefined },
+ ])("should parse $value", ({ value, expected }) => {
+ expect(parseNumberParam(value)).toBe(expected);
+ });
+});
+
+describe("parseBooleanParam", () => {
+ it.each([
+ { value: "true", expected: true },
+ { value: "false", expected: false },
+ { value: "yes", expected: undefined },
+ { value: true, expected: undefined },
+ { value: null, expected: undefined },
+ ])("should parse $value", ({ value, expected }) => {
+ expect(parseBooleanParam(value)).toBe(expected);
+ });
+});
+
+describe("parseEnumParam", () => {
+ const items: readonly string[] = ["a", "b", "c"];
+
+ it.each<{ value: unknown; expected: string | undefined }>([
+ { value: "a", expected: "a" },
+ { value: "b", expected: "b" },
+ { value: "d", expected: undefined },
+ { value: 123, expected: undefined },
+ ])("should parse $value", ({ value, expected }) => {
+ expect(parseEnumParam(value, items)).toBe(expected);
+ });
+});
+
+describe("parseListParam", () => {
+ it("should parse array of strings", () => {
+ const result = parseListParam(["a", "b"], parseStringParam);
+ expect(result).toEqual(["a", "b"]);
+ });
+
+ it("should wrap single value in array", () => {
+ const result = parseListParam("single", parseStringParam);
+ expect(result).toEqual(["single"]);
+ });
+
+ it("should filter out invalid items", () => {
+ const result = parseListParam(["a", 123, "b"], parseStringParam);
+ expect(result).toEqual(["a", "b"]);
+ });
+
+ it("should return undefined for null/undefined", () => {
+ expect(parseListParam(null, parseStringParam)).toBeUndefined();
+ expect(parseListParam(undefined, parseStringParam)).toBeUndefined();
+ });
+});
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
index 6b59211403a..4a1e1e1d989 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityList.tsx
@@ -10,7 +10,6 @@ import { PLUGIN_MODERATION } from "metabase/plugins";
import { Box } from "metabase/ui";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
import type { CardType, Collection, DatabaseId } from "metabase-types/api";
-import { SortDirection } from "metabase-types/api/sorting";
import SavedEntityListS from "./SavedEntityList.module.css";
import { CARD_INFO } from "./constants";
@@ -44,7 +43,7 @@ export const SavedEntityList = ({
id: collection.id,
models: [CARD_INFO[type].model],
sort_column: "name",
- sort_direction: SortDirection.Asc,
+ sort_direction: "asc",
}
: skipToken,
);
diff --git a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx b/frontend/src/metabase/reference/glossary/GlossaryTable.tsx
index 6a9571ffc83..83f8a12f44c 100644
--- a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx
+++ b/frontend/src/metabase/reference/glossary/GlossaryTable.tsx
@@ -18,7 +18,7 @@ import {
Text,
Tooltip,
} from "metabase/ui";
-import { SortDirection } from "metabase-types/api/sorting";
+import type { SortDirection } from "metabase-types/api";
import S from "./Glossary.module.css";
import { GlossaryRowEditor } from "./GlossaryRowEditor";
@@ -51,9 +51,7 @@ export function GlossaryTable({
const [sortColumnName, setSortColumnName] = useState<
keyof GlossaryItem | null
>(null);
- const [sortDirection, setSortDirection] = useState<SortDirection>(
- SortDirection.Asc,
- );
+ const [sortDirection, setSortDirection] = useState<SortDirection>("asc");
const hasMetabot = useHasTokenFeature("metabot_v3");
@@ -68,7 +66,7 @@ export function GlossaryTable({
const ak = a[sortColumnName] ?? "";
const bk = b[sortColumnName] ?? "";
const cmp = String(ak).localeCompare(String(bk));
- return sortDirection === SortDirection.Asc ? cmp : -cmp;
+ return sortDirection === "asc" ? cmp : -cmp;
});
return [
...(isCreating ? [{ id: -1, kind: "create" as const }] : []),
diff --git a/frontend/test/__support__/server-mocks/transform.ts b/frontend/test/__support__/server-mocks/transform.ts
index 896878395d6..cde9c825c13 100644
--- a/frontend/test/__support__/server-mocks/transform.ts
+++ b/frontend/test/__support__/server-mocks/transform.ts
@@ -1,12 +1,23 @@
import fetchMock from "fetch-mock";
import type {
+ ListTransformRunsResponse,
Transform,
TransformJob,
TransformJobId,
TransformTag,
} from "metabase-types/api";
+export function setupListTransformRunsEndpoint(
+ response: ListTransformRunsResponse,
+) {
+ fetchMock.get(`path:/api/ee/transform/run`, response);
+}
+
+export function setupListTransformsEndpoint(transforms: Transform[]) {
+ fetchMock.get(`path:/api/ee/transform`, transforms);
+}
+
export function setupListTransformTagsEndpoint(tags: TransformTag[]) {
fetchMock.get(`path:/api/ee/transform-tag`, tags);
}