Skip to content

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

Add transform count to the job list (#63647)

Alexander Polyankince5a554d4d75
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts b/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts
index 81778c5d387..c50c8f14741 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/transform-job.ts
@@ -14,7 +14,7 @@ import {
listTag,
provideTransformJobListTags,
provideTransformJobTags,
- provideTransformTags,
+ provideTransformListTags,
tag,
} from "./tags";
@@ -40,11 +40,10 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
method: "GET",
url: `/api/ee/transform-job/${id}/transforms`,
}),
- providesTags: (transforms, error, id) =>
- invalidateTags(error, [
- idTag("transform-job", id),
- ...(transforms?.flatMap(provideTransformTags) ?? []),
- ]),
+ providesTags: (transforms = [], _error, id) => [
+ idTag("transform-job", id),
+ ...provideTransformListTags(transforms),
+ ],
}),
runTransformJob: builder.mutation<void, TransformJobId>({
query: (id) => ({
@@ -104,6 +103,7 @@ export const transformJobApi = EnterpriseApi.injectEndpoints({
}),
invalidatesTags: (_, error, { id, tag_ids = [] }) =>
invalidateTags(error, [
+ listTag("transform-job"),
idTag("transform-job", id),
...tag_ids.map((tagId) => idTag("transform-job-via-tag", tagId)),
]),
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts b/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts
index 2e14d9d94df..667feb76ece 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/transform-tag.ts
@@ -45,18 +45,18 @@ export const transformTagApi = EnterpriseApi.injectEndpoints({
body,
}),
invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [idTag("transform-tag", id)]),
+ invalidateTags(error, [
+ listTag("transform-tag"),
+ idTag("transform-tag", id),
+ ]),
}),
deleteTransformTag: builder.mutation<void, TransformTagId>({
query: (id) => ({
method: "DELETE",
url: `/api/ee/transform-tag/${id}`,
}),
- invalidatesTags: (_, error, id) =>
- invalidateTags(error, [
- listTag("transform-tag"),
- idTag("transform-tag", id),
- ]),
+ invalidatesTags: (_, error) =>
+ invalidateTags(error, [listTag("transform-tag")]),
}),
}),
});
diff --git a/enterprise/frontend/src/metabase-enterprise/api/transform.ts b/enterprise/frontend/src/metabase-enterprise/api/transform.ts
index 10bc1b75413..df6ef2e7ae4 100644
--- a/enterprise/frontend/src/metabase-enterprise/api/transform.ts
+++ b/enterprise/frontend/src/metabase-enterprise/api/transform.ts
@@ -155,7 +155,7 @@ export const transformApi = EnterpriseApi.injectEndpoints({
body,
}),
invalidatesTags: (_, error, { id }) =>
- invalidateTags(error, [idTag("transform", id)]),
+ invalidateTags(error, [listTag("transform"), idTag("transform", id)]),
onQueryStarted: async (
{ id, ...patch },
{ dispatch, queryFulfilled },
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
index 71ec3769fe3..b2f532c8dd5 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.tsx
@@ -1,18 +1,20 @@
import { push } from "react-router-redux";
import { t } from "ttag";
+import { getErrorMessage } from "metabase/api/utils";
import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetting } from "metabase/common/hooks";
import { useDispatch } from "metabase/lib/redux";
-import { Card, Flex } from "metabase/ui";
+import { Card, FixedSizeIcon, Flex, Loader } from "metabase/ui";
import {
+ useListTransformJobTransformsQuery,
useListTransformJobsQuery,
useListTransformTagsQuery,
} from "metabase-enterprise/api";
import { TimezoneIndicator } from "metabase-enterprise/transforms/components/TimezoneIndicator";
import type { JobListParams } from "metabase-enterprise/transforms/types";
-import type { TransformJob } from "metabase-types/api";
+import type { TransformJob, TransformJobId } from "metabase-types/api";
import { ListEmptyState } from "../../../components/ListEmptyState";
import { TagList } from "../../../components/TagList";
@@ -66,6 +68,7 @@ export function JobList({ params }: { params: JobListParams }) {
<span className={S.nowrap}>{t`Next run`}</span>{" "}
<TimezoneIndicator />
</Flex>,
+ t`Transforms`,
t`Tags`,
]}
>
@@ -92,6 +95,9 @@ export function JobList({ params }: { params: JobListParams }) {
).format("lll")
: null}
</td>
+ <td className={S.nowrap}>
+ <JobTransformCount jobId={job.id} />
+ </td>
<td className={S.wrap}>
<TagList tags={tags} tagIds={job.tag_ids ?? []} />
</td>
@@ -101,3 +107,22 @@ export function JobList({ params }: { params: JobListParams }) {
</Card>
);
}
+
+type JobTransformCountProps = {
+ jobId: TransformJobId;
+};
+
+function JobTransformCount({ jobId }: JobTransformCountProps) {
+ const {
+ data = [],
+ isLoading,
+ error,
+ } = useListTransformJobTransformsQuery(jobId);
+ if (isLoading) {
+ return <Loader size="sm" />;
+ }
+ if (error != null) {
+ return <FixedSizeIcon name="warning" tooltip={getErrorMessage(error)} />;
+ }
+ return <>{data.length}</>;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx
new file mode 100644
index 00000000000..0d5ad5820bc
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobListPage/JobList/JobList.unit.spec.tsx
@@ -0,0 +1,105 @@
+import userEvent from "@testing-library/user-event";
+import { Route } from "react-router";
+
+import {
+ setupListTransformJobTransformsEndpoint,
+ setupListTransformJobTransformsEndpointWithError,
+ setupListTransformJobsEndpoint,
+ setupListTransformTagsEndpoint,
+} from "__support__/server-mocks";
+import { renderWithProviders, screen, within } from "__support__/ui";
+import type { JobListParams } from "metabase-enterprise/transforms/types";
+import { getJobListUrl } from "metabase-enterprise/transforms/urls";
+import type {
+ Transform,
+ TransformJob,
+ TransformJobId,
+ TransformTag,
+} from "metabase-types/api";
+import {
+ createMockTransform,
+ createMockTransformJob,
+} from "metabase-types/api/mocks";
+
+import { JobList } from "./JobList";
+
+type TransformListInfo = {
+ data: Transform[];
+ error?: unknown;
+};
+
+type SetupOpts = {
+ jobs?: TransformJob[];
+ jobTransforms?: Map<TransformJobId, TransformListInfo>;
+ tags?: TransformTag[];
+ params?: JobListParams;
+};
+
+function setup({
+ jobs = [],
+ jobTransforms = new Map(),
+ tags = [],
+ params = {},
+}: SetupOpts) {
+ setupListTransformJobsEndpoint(jobs);
+ setupListTransformTagsEndpoint(tags);
+
+ jobTransforms.forEach(({ data, error }, jobId) => {
+ if (error != null) {
+ setupListTransformJobTransformsEndpointWithError(jobId, error);
+ } else {
+ setupListTransformJobTransformsEndpoint(jobId, data);
+ }
+ });
+
+ renderWithProviders(
+ <Route
+ path={getJobListUrl(params)}
+ component={() => <JobList params={params} />}
+ />,
+ { withRouter: true, initialRoute: getJobListUrl(params) },
+ );
+}
+
+describe("JobList", () => {
+ it("should show the number of transforms per job", async () => {
+ const job1Id = 1;
+ const job2Id = 2;
+ setup({
+ jobs: [
+ createMockTransformJob({ id: job1Id, name: "Job1" }),
+ createMockTransformJob({ id: job2Id, name: "Job2" }),
+ ],
+ jobTransforms: new Map([
+ [job1Id, { data: [createMockTransform(), createMockTransform()] }],
+ [job2Id, { data: [createMockTransform()] }],
+ ]),
+ });
+
+ const job1Row = await screen.findByRole("row", { name: /Job1/ });
+ const job2Row = await screen.findByRole("row", { name: /Job2/ });
+ expect(await within(job1Row).findByText("2")).toBeInTheDocument();
+ expect(await within(job2Row).findByText("1")).toBeInTheDocument();
+ });
+
+ it("should show BE errors when loading transforms", async () => {
+ const jobId = 1;
+ const errorMessage = "Custom error";
+
+ setup({
+ jobs: [createMockTransformJob({ id: jobId, name: "Job1" })],
+ jobTransforms: new Map([
+ [
+ jobId,
+ { data: [createMockTransform()], error: { message: errorMessage } },
+ ],
+ ]),
+ });
+
+ const jobRow = await screen.findByRole("row", { name: /Job1/ });
+ const warningIcon = await within(jobRow).findByLabelText("warning icon");
+ await userEvent.hover(warningIcon);
+
+ expect(await screen.findByText(errorMessage)).toBeInTheDocument();
+ });
+});
diff --git a/frontend/test/__support__/server-mocks/transform.ts b/frontend/test/__support__/server-mocks/transform.ts
index 69a636a8541..19365edf159 100644
--- a/frontend/test/__support__/server-mocks/transform.ts
+++ b/frontend/test/__support__/server-mocks/transform.ts
@@ -1,6 +1,7 @@
import fetchMock from "fetch-mock";
import type {
+ Transform,
TransformJob,
TransformJobId,
TransformTag,
@@ -10,6 +11,27 @@ export function setupListTransformTagsEndpoint(tags: TransformTag[]) {
fetchMock.get(`path:/api/ee/transform-tag`, tags);
}
+export function setupListTransformJobsEndpoint(jobs: TransformJob[]) {
+ fetchMock.get(`path:/api/ee/transform-job`, jobs);
+}
+
+export function setupListTransformJobTransformsEndpoint(
+ jobId: TransformJobId,
+ transforms: Transform[],
+) {
+ fetchMock.get(`path:/api/ee/transform-job/${jobId}/transforms`, transforms);
+}
+
+export function setupListTransformJobTransformsEndpointWithError(
+ jobId: TransformJobId,
+ error?: unknown,
+) {
+ fetchMock.get(`path:/api/ee/transform-job/${jobId}/transforms`, {
+ status: 500,
+ body: error,
+ });
+}
+
export function setupGetTransformJobEndpoint(job: TransformJob) {
fetchMock.get(`path:/api/ee/transform-job/${job.id}`, job);
}