[skip ci]

metabase · wzimrin · Jul 21, 2025 · Jul 21, 2025 · Jul 21, 2025 · Jul 21, 2025
commit a4e8364b2202bceaae2fac4d83d9f67e0d25267c
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform.ts b/enterprise/frontend/src/metabase-enterprise/api/transform.ts
@@ -1,5 +1,6 @@
 import type {
   CreateTransformRequest,
+  ListTransformsRequest,
   Transform,
   TransformId,
   UpdateTransformRequest,
@@ -17,11 +18,10 @@ import {
 
 export const transformApi = EnterpriseApi.injectEndpoints({
   endpoints: (builder) => ({
-    listTransforms: builder.query<Transform[], void>({
-      query: (params) => ({
+    listTransforms: builder.query<Transform[], ListTransformsRequest>({
+      query: () => ({
         method: "GET",
         url: "/api/ee/transform",
-        params,
       }),
       providesTags: (transforms = []) => provideTransformListTags(transforms),
     }),

diff --git a/frontend/src/metabase-types/api/transform.ts b/frontend/src/metabase-types/api/transform.ts
@@ -1,3 +1,5 @@
+import type { DatabaseId } from "metabase-types/api/database";
+
 import type { DatasetQuery } from "./query";
 
 export type TransformId = number;
@@ -22,6 +24,10 @@ export type TransformTarget = {
   table: string;
 };
 
+export type ListTransformsRequest = {
+  database_id?: DatabaseId;
+};
+
 export type CreateTransformRequest = {
   name: string;
   source: TransformSource;

diff --git a/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/utils.ts b/frontend/src/metabase/metadata/pages/DataModel/components/TablePicker/utils.ts
@@ -130,13 +130,20 @@ export function useTableLoader(path: TreePath) {
         return [];
       }
 
-      if (transformsRef.current.isError) {
+      const newArgs = {
+        database_id: databaseId,
+      };
+
+      if (
+        transformsRef.current.isError &&
+        _.isEqual(transformsRef.current.originalArgs, newArgs)
+      ) {
         // Do not refetch when this call failed previously.
         // This is to prevent infinite data-loading loop as RTK query does not cache error responses.
         return [];
       }
 
-      const response = await fetchTransforms();
+      const response = await fetchTransforms(newArgs, true);
       return response?.data?.map((transform) =>
         node<TransformNode>({
           type: "transform",

diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
@@ -71,6 +71,7 @@ import type {
   Group,
   GroupPermissions,
   GroupsPermissions,
+  ListTransformsRequest,
   ModelCacheRefreshStatus,
   ParameterId,
   Pulse,
@@ -794,12 +795,16 @@ export type UseLazyListTransformsData = {
 };
 
 export type UseLazyListTransformsState = {
+  originalArgs?: ListTransformsRequest;
   isFetching: boolean;
   isError: boolean;
 };
 
 export type UseLazyListTransformsResult = [
-  () => Promise<UseLazyListTransformsData>,
+  (
+    args: ListTransformsRequest,
+    preferCacheValue?: boolean,
+  ) => Promise<UseLazyListTransformsData>,
   UseLazyListTransformsState,
 ];