Skip to content

Commit f545eeb

Browse files
CahllagerfeldCahllagerfeld
authored
Release (#730)
2 parents 0bcb9a0 + dae3e69 commit f545eeb

File tree

13 files changed

+94
-52
lines changed

13 files changed

+94
-52
lines changed

‎.env.example‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
VITE_API_BASE_URL=
22
VITE_FRONTEND_VERSION=
3-
VITE_FEATURE_OS_KEY=
3+
VITE_FEATURE_OS_KEY=
4+
VITE_REO_KEY=

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
VITE_API_BASE_URL: "/api/v1"
3636
VITE_FRONTEND_VERSION: ${{ steps.get_version.outputs.VERSION }}
3737
VITE_FEATURE_OS_KEY: ${{ secrets.FEATURE_OS_KEY }}
38+
VITE_REO_KEY: ${{ secrets.REO_KEY }}
3839

3940
- name: Generate Changelog
4041
uses: heinrichreimer/[email protected]

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"jwt-decode": "^4.0.0",
3939
"lodash.debounce": "^4.0.8",
4040
"papaparse": "^5.5.2",
41-
"prismjs": "^1.29.0",
41+
"prismjs": "^1.30.0",
4242
"react": "^18.3.1",
4343
"react-countdown": "^2.3.6",
4444
"react-dom": "^18.3.1",
@@ -48,6 +48,7 @@
4848
"react-markdown": "^9.0.3",
4949
"react-router-dom": "^6.27.0",
5050
"reactflow": "^11.11.4",
51+
"reodotdev": "^1.0.0",
5152
"unique-names-generator": "^4.7.1",
5253
"zod": "^3.24.1"
5354
},

‎pnpm-lock.yaml‎

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/components/create/flavor-step.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ArrowLeft from "@/assets/icons/arrow-left.svg?react";
22
import { SelectFlavorList } from "@/components/stack-components/create-component/flavor-select";
33
import * as Wizard from "@/components/wizard/Wizard";
4+
import { snakeCaseToTitleCase } from "@/lib/strings";
45
import { StackComponentType } from "@/types/components";
56
import { Flavor } from "@/types/flavors";
67
import { Button } from "@zenml-io/react-component-library/components/server";
@@ -24,7 +25,7 @@ export function FlavorStep({ type, handleFlavorSelect, handleBack }: Props) {
2425
<ArrowLeft className="size-5 shrink-0" />
2526
<span className="sr-only">Go step back</span>
2627
</Button>
27-
<span>Select your Component Flavor</span>
28+
<span>Select your {snakeCaseToTitleCase(type)} Flavor</span>{" "}
2829
</Wizard.Header>
2930
<Wizard.Body>
3031
<SelectFlavorList type={type} setSelectedFlavor={handleFlavorSelect} />

‎src/app/onboarding/Setup/Items.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function ConnectZenMLStep({ completed, hasDownstreamStep, active }: Onboa
3131
<p className="mb-1 text-text-sm text-theme-text-secondary">Log in to your ZenML Server</p>
3232
<Codesnippet code={getLoginCommand(data?.deployment_type || "other")} />
3333
</div>
34-
<HelpBox link="https://docs.zenml.io/user-guide/production-guide/deploying-zenml#connecting-to-a-deployed-zenml" />
34+
<HelpBox link="https://docs.zenml.io/user-guides/production-guide/deploying-zenml#connecting-to-a-deployed-zenml" />
3535
</div>
3636
</ChecklistItem>
3737
);
@@ -93,7 +93,7 @@ export function RunFirstPipeline({ active, completed, hasDownstreamStep }: Onboa
9393
target="_blank"
9494
rel="noopener noreferrer"
9595
className={buttonVariants({ intent: "primary", emphasis: "subtle", size: "md" })}
96-
href="https://docs.zenml.io/user-guide/starter-guide/create-an-ml-pipeline"
96+
href="https://docs.zenml.io/user-guides/starter-guide/create-an-ml-pipeline"
9797
>
9898
Browse our docs
9999
</a>
@@ -116,7 +116,7 @@ export function CreateNewStack({ completed, active, hasDownstreamStep }: Onboard
116116
>
117117
<p className="mb-3">
118118
A stack configures how a pipeline is executed{" "}
119-
<LearnMoreLink href="https://docs.zenml.io/user-guide/production-guide/understand-stacks" />
119+
<LearnMoreLink href="https://docs.zenml.io/user-guides/production-guide/understand-stacks" />
120120
</p>
121121
<div className="space-y-5">
122122
<div className="space-y-3">
@@ -128,7 +128,7 @@ export function CreateNewStack({ completed, active, hasDownstreamStep }: Onboard
128128
</Link>
129129
</Button>
130130
</div>
131-
<HelpBox link="https://docs.zenml.io/user-guide/production-guide/understand-stacks" />
131+
<HelpBox link="https://docs.zenml.io/user-guides/production-guide/understand-stacks" />
132132
</div>
133133
</ChecklistItem>
134134
);
@@ -152,7 +152,7 @@ export function RunNewPipeline({ active, completed, hasDownstreamStep }: Onboard
152152
<Codesnippet wrap codeClasses="whitespace-pre-wrap" code="python run.py" />
153153
</div>
154154
<div>
155-
<HelpBox link="https://docs.zenml.io/user-guide/production-guide/understand-stacks" />
155+
<HelpBox link="https://docs.zenml.io/user-guides/production-guide/understand-stacks" />
156156
</div>
157157
</div>
158158
</ChecklistItem>

‎src/app/page.tsx‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import External from "@/assets/icons/link-external.svg?react";
21
import CloudSquares from "@/assets/illustrations/cloud-squares.svg";
32
import { useServerInfo } from "@/data/server/info-query";
43
import { getLoginCommand } from "@/lib/login-command";
54
import { routes } from "@/router/routes";
6-
import { Badge, Box, Button } from "@zenml-io/react-component-library";
5+
import { Box } from "@zenml-io/react-component-library";
76
import { Link } from "react-router-dom";
87
import { Codesnippet } from "../components/CodeSnippet";
98
import { OverviewHeader } from "./Header";
@@ -14,7 +13,6 @@ export default function IndexPage() {
1413
<OverviewHeader />
1514
<div className="layout-container space-y-5 py-5">
1615
<OverviewContent />
17-
<VsCodeBox />
1816
</div>
1917
</div>
2018
);
@@ -58,28 +56,3 @@ function OverviewContent() {
5856
</Box>
5957
);
6058
}
61-
62-
function VsCodeBox() {
63-
return (
64-
<Box className="flex flex-col items-center justify-between gap-3 overflow-hidden px-7 py-5 md:flex-row md:flex-wrap">
65-
<div className="space-y-1">
66-
<div className="flex items-center space-x-1">
67-
<Badge className="text-text-xs font-semibold" color="green">
68-
NEW
69-
</Badge>
70-
<h2 className="text-text-xl font-semibold">VS Code Quickstart with ZenML</h2>
71-
</div>
72-
<p className="text-theme-text-secondary">
73-
Get started quickly with ZenML using GitHub Codespaces! You can run our quickstart guide
74-
in a pre-configured environment.
75-
</p>
76-
</div>
77-
78-
<Button size="sm" className="w-fit" emphasis="subtle" asChild>
79-
<a target="_blank" rel="noopener noreferrer" href="https://github.com/zenml-io/zenml">
80-
Visit our GitHub repo <External className="h-5 w-5 shrink-0" />
81-
</a>
82-
</Button>
83-
</Box>
84-
);
85-
}

‎src/components/Analytics.tsx‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
11
import { fetcher } from "@/data/fetch";
22
import { useServerInfo } from "@/data/server/info-query";
33
import { useCurrentUser } from "@/data/users/current-user-query";
4-
4+
import { loadReoScript } from "reodotdev";
55
import { analyticsServerUrl } from "@/lib/analytics";
66
import { routes } from "@/router/routes";
77
import { PageEvent, PageEventContext, PageEventPage, PageEventProperties } from "@/types/analytics";
88
import { useEffect } from "react";
99
import { matchPath, useLocation } from "react-router-dom";
1010

11+
const REO_KEY = import.meta.env.VITE_REO_KEY;
12+
1113
export function Analytics() {
1214
const { data } = useServerInfo();
1315
const { data: userData } = useCurrentUser();
1416
const location = useLocation();
1517

18+
useEffect(() => {
19+
if (REO_KEY && data && data.analytics_enabled && userData) {
20+
const reoPromise = loadReoScript({ clientID: REO_KEY });
21+
reoPromise
22+
.then(async (Reo) => {
23+
Reo.init({ clientID: REO_KEY });
24+
if (userData.metadata?.email) {
25+
// wait 2 seconds to ensure the script is loaded
26+
await new Promise((resolve) => setTimeout(resolve, 2000));
27+
const identity = {
28+
username: userData.metadata.email,
29+
type: "email"
30+
};
31+
Reo.identify(identity);
32+
}
33+
})
34+
.catch((error) => {
35+
console.error("Error loading Reo", error);
36+
});
37+
}
38+
}, [data, userData]);
39+
1640
useEffect(() => {
1741
if (data && data.analytics_enabled && userData) {
1842
performPageEvent(

‎src/components/repositories/RepoBadge.tsx‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ export function RepoBadge({ repositoryId, commit }: Props) {
1717
{ enabled: !!repositoryId }
1818
);
1919

20-
const repositoryMetadata = data?.metadata?.config;
20+
if (!repositoryId || !commit) return <p>Not available</p>;
21+
if (isPending) return <Skeleton className="h-6" />;
22+
if (isError) return null;
23+
24+
const repositoryMetadata = data.metadata?.config;
2125

2226
const getRepositoryLink = () => {
2327
let Icon: React.FunctionComponent<
@@ -31,11 +35,17 @@ export function RepoBadge({ repositoryId, commit }: Props) {
3135
if (data?.body?.source?.attribute === "GitHubCodeRepository") {
3236
Icon = Github;
3337
name = `${repositoryMetadata?.owner}/${repositoryMetadata?.repository}`;
34-
url = `https://www.github.com/${name}` + (commit ? `/tree/${commit}` : "");
38+
const defaultHost = "github.com";
39+
url =
40+
`https://www.${(typeof repositoryMetadata?.host === "string" ? repositoryMetadata.host : defaultHost).replace(/\/$/, "")}/${name}` +
41+
(commit ? `/tree/${commit}` : "");
3542
} else if (data?.body?.source?.attribute === "GitLabCodeRepository") {
3643
Icon = Gitlab;
3744
name = `${repositoryMetadata?.group}/${repositoryMetadata?.project}`;
38-
url = `https://www.gitlab.com/${name}` + (commit ? `/tree/${commit}` : "");
45+
const defaultHost = "gitlab.com";
46+
url =
47+
`https://www.${(typeof repositoryMetadata?.host === "string" ? repositoryMetadata.host : defaultHost).replace(/\/$/, "")}/${name}` +
48+
(commit ? `/tree/${commit}` : "");
3949
}
4050

4151
return (
@@ -51,9 +61,7 @@ export function RepoBadge({ repositoryId, commit }: Props) {
5161
</a>
5262
);
5363
};
54-
if (!repositoryId || !commit) return <p>Not available</p>;
55-
if (isPending) return <Skeleton className="h-6" />;
56-
if (isError) return null;
64+
5765
return (
5866
<div className="group/copybutton mr-1">
5967
<Tag

‎src/components/stack-components/create-component/configuration-form.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export function ComponentConfigurationForm({
5858
useMaxHeight={useMaxHeight}
5959
infoTile={
6060
<InfoTile
61+
type={flavor.data.body?.type || "orchestrator"}
6162
name={flavor.data.name}
6263
sdkDocsUrl={flavor.data.metadata?.sdk_docs_url ?? undefined}
6364
logoUrl={flavor.data.body?.logo_url ?? undefined}

0 commit comments

Comments
 (0)