Skip to content

Commit 6fb83d6

Browse files
refactor: remove pipeline versions (#636)
1 parent 0e5c0ef commit 6fb83d6

File tree

14 files changed

+729
-358
lines changed

14 files changed

+729
-358
lines changed

src/app/pipelines/[namespace]/columns.tsx

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import { InlineAvatar } from "@/components/InlineAvatar";
66
import { routes } from "@/router/routes";
77
import { CodeRepository } from "@/types/code-repository";
88
import { PipelineRun, PipelineRunBody } from "@/types/pipeline-runs";
9-
import { PipelineBody } from "@/types/pipelines";
109
import { Stack } from "@/types/stack";
1110
import { User } from "@/types/user";
1211
import { ColumnDef } from "@tanstack/react-table";
13-
import { Badge, Tag } from "@zenml-io/react-component-library";
12+
import { Tag } from "@zenml-io/react-component-library";
1413
import { Link } from "react-router-dom";
1514

1615
export function getPipelineDetailColumns(): ColumnDef<PipelineRun>[] {
@@ -48,19 +47,6 @@ export function getPipelineDetailColumns(): ColumnDef<PipelineRun>[] {
4847
);
4948
}
5049
},
51-
{
52-
id: "version",
53-
header: "Version",
54-
accessorFn: (row) => row.body?.pipeline?.body?.version,
55-
cell: ({ getValue }) => {
56-
const version = getValue<PipelineBody["version"]>();
57-
return (
58-
<Badge color="purple" className="inline-flex" size="sm">
59-
{version}
60-
</Badge>
61-
);
62-
}
63-
},
6450
{
6551
id: "stack",
6652
header: "Stack",

src/app/pipelines/columns.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import RunIcon from "@/assets/icons/terminal.svg?react";
21
import PipelineIcon from "@/assets/icons/pipeline.svg?react";
2+
import RunIcon from "@/assets/icons/terminal.svg?react";
3+
import { CopyButton } from "@/components/CopyButton";
34
import { ExecutionStatusIcon, getExecutionStatusColor } from "@/components/ExecutionStatus";
5+
import { routes } from "@/router/routes";
46
import { ExecutionStatus } from "@/types/pipeline-runs";
5-
import { PipelineNamespace, PipelineNamespaceBody } from "@/types/pipelines";
7+
import { Pipeline } from "@/types/pipelines";
68
import { ColumnDef } from "@tanstack/react-table";
79
import { Tag, TagProps } from "@zenml-io/react-component-library";
810
import { Link } from "react-router-dom";
9-
import { routes } from "@/router/routes";
10-
import { CopyButton } from "@/components/CopyButton";
1111

12-
export function getPipelineColumns(): ColumnDef<PipelineNamespace>[] {
12+
export function getPipelineColumns(): ColumnDef<Pipeline>[] {
1313
return [
1414
{
1515
id: "name",
1616
header: "Pipeline",
1717
accessorFn: (row) => ({ name: row.name, status: row.body?.latest_run_status }),
1818
cell: ({ getValue }) => {
1919
const { name, status } = getValue<{
20-
name: PipelineNamespace["name"];
21-
status: PipelineNamespaceBody["latest_run_status"];
20+
name: string;
21+
status: ExecutionStatus;
2222
}>();
2323

2424
return (
@@ -46,7 +46,7 @@ export function getPipelineColumns(): ColumnDef<PipelineNamespace>[] {
4646
cell: ({ getValue }) => {
4747
const { runId, status } = getValue<{
4848
runId?: string;
49-
status?: PipelineNamespaceBody["latest_run_status"];
49+
status?: ExecutionStatus;
5050
}>();
5151

5252
if (!runId || !status) return <div>No run</div>;

src/app/pipelines/page.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
11
import Refresh from "@/assets/icons/refresh.svg?react";
22
import { PageHeader } from "@/components/PageHeader";
3+
import Pagination from "@/components/Pagination";
34
import { SearchField } from "@/components/SearchField";
4-
import { useAllPipelineNamespaces } from "@/data/pipelines/pipeline-namespaces-query";
5+
import { pipelineQueries } from "@/data/pipelines";
6+
import { useBreadcrumbsContext } from "@/layouts/AuthenticatedLayout/BreadcrumbsContext";
7+
import { useQuery } from "@tanstack/react-query";
58
import { Button, DataTable, Skeleton } from "@zenml-io/react-component-library";
9+
import { useEffect } from "react";
610
import { getPipelineColumns } from "./columns";
711
import { usePipelineOverviewSearchParams } from "./service";
8-
import Pagination from "@/components/Pagination";
9-
import { useBreadcrumbsContext } from "@/layouts/AuthenticatedLayout/BreadcrumbsContext";
10-
import { useEffect } from "react";
1112

1213
export default function PipelinesPage() {
1314
const { setCurrentBreadcrumbData } = useBreadcrumbsContext();
1415
const queryParams = usePipelineOverviewSearchParams();
1516

16-
const { data, refetch } = useAllPipelineNamespaces(
17-
{
18-
params: {
19-
...queryParams,
20-
sort_by: "desc:updated"
21-
}
22-
},
23-
{ throwOnError: true }
24-
);
17+
const { data, refetch } = useQuery({
18+
...pipelineQueries.pipelineList({ ...queryParams, sort_by: "desc:latest_run" }),
19+
throwOnError: true
20+
});
2521

2622
useEffect(() => {
2723
setCurrentBreadcrumbData({ segment: "pipelines", data: null });

src/app/pipelines/service.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PipelineNamespacesParams } from "@/types/pipelines";
1+
import { PipelineListParams } from "@/types/pipelines";
22
import { useSearchParams } from "react-router-dom";
33

44
import { z } from "zod";
@@ -11,7 +11,7 @@ const filterParamsSchema = z.object({
1111
operator: z.enum(["and", "or"]).optional()
1212
});
1313

14-
export function usePipelineOverviewSearchParams(): PipelineNamespacesParams {
14+
export function usePipelineOverviewSearchParams(): PipelineListParams {
1515
const [searchParams] = useSearchParams();
1616

1717
const { page, name, operator } = filterParamsSchema.parse({

src/app/runs/[id]/_Tabs/Overview/Details.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ export function Details() {
8787
>
8888
<Pipelines className="h-4 w-4 fill-theme-text-brand" />
8989
{data.body?.pipeline?.name}
90-
<div className="rounded-sm bg-primary-50 px-1 py-0.25">
91-
{data.body?.pipeline?.body?.version}
92-
</div>
9390
</Tag>
9491
</Link>
9592
</Value>

src/app/stacks/create/new-infrastructure/Steps/schemas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from "zod";
22
import { stackNameSchema } from "../../components/sharedSchema";
33

4-
export const providerSchema = z.enum(["aws", "gcp"]);
4+
export const providerSchema = z.enum(["aws", "gcp", "azure"]);
55

66
export const providerFormSchema = z.object({
77
provider: providerSchema

src/components/artifacts/artifact-node-sheet/DetailCards.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ export function DetailsCard({ artifactVersionId }: Props) {
7171
>
7272
<Pipelines className="mr-1 h-4 w-4 fill-theme-text-brand" />
7373
{pipelineRun.data.body?.pipeline?.name}
74-
75-
<div className="rounded-sm bg-primary-50 px-1 py-0.25">
76-
{pipelineRun.data.body?.pipeline?.body?.version}
77-
</div>
7874
</Tag>
7975
</Link>
8076
}

src/components/steps/step-sheet/DetailsTab.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,6 @@ export function StepDetailsTab({ stepId, runId }: Props) {
181181
>
182182
<Pipelines className="mr-1 h-4 w-4 fill-theme-text-brand" />
183183
{pipelineRunData.body?.pipeline?.name}
184-
<div className="rounded-sm bg-primary-50 px-1 py-0.25">
185-
{pipelineRunData.body?.pipeline?.body?.version}
186-
</div>
187184
</Tag>
188185
</Link>
189186
}

src/data/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const apiPaths = {
77
settings: "/settings",
88
onboarding: "/onboarding_state",
99
pipelines: {
10-
namespaces: "/pipeline_namespaces"
10+
all: "/pipelines"
1111
},
1212
artifactVersions: {
1313
detail: (versionId: string) => `/artifact_versions/${versionId}`,

src/data/pipelines/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { PipelineListParams } from "@/types/pipelines";
2+
import { queryOptions } from "@tanstack/react-query";
3+
import { fetchAllPipelines } from "./pipeline-list-query";
4+
5+
export const pipelineQueries = {
6+
all: ["pipelines"],
7+
pipelineList: (queryParams: PipelineListParams) =>
8+
queryOptions({
9+
queryKey: [...pipelineQueries.all, queryParams],
10+
queryFn: async () => fetchAllPipelines({ params: queryParams })
11+
})
12+
};

0 commit comments

Comments
 (0)