Skip to content

fix: Job agent config in create deployment form #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix: Job agent config in create deployment form #259

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2028ea2
fix: Job agent config in create deployment form
adityachoudhari26 Dec 10, 2024
d14e43c
more
adityachoudhari26 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 186 additions & 121 deletions apps/webservice/src/app/[workspaceSlug]/(app)/_components/CreateDeployment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import React, { useState } from "react";
import { useParams, useRouter } from "next/navigation";
import { IconLoader2 } from "@tabler/icons-react";
import slugify from "slugify";
import { z } from "zod";

import { deploymentSchema } from "@ctrlplane/db/schema";
import * as SCHEMA from "@ctrlplane/db/schema";
import { Button } from "@ctrlplane/ui/button";
import {
Dialog,
Expand Down Expand Up @@ -37,29 +37,35 @@ import {
} from "@ctrlplane/ui/select";
import { Textarea } from "@ctrlplane/ui/textarea";

import { JobAgentConfig } from "~/components/form/job-agent/JobAgentConfig";
import { JobAgentSelector } from "~/components/form/job-agent/JobAgentSelector";
import { api } from "~/trpc/react";

const deploymentForm = z.object(deploymentSchema.omit({ id: true }).shape);

export const CreateDeploymentDialog: React.FC<{
children?: React.ReactNode;
systemId?: string;
onSuccess?: () => void;
}> = ({ children, onSuccess, ...props }) => {
const [open, setOpen] = useState(false);
const { workspaceSlug } = useParams<{ workspaceSlug: string }>();
const workspace = api.workspace.bySlug.useQuery(workspaceSlug);
const systems = api.system.list.useQuery(
{ workspaceId: workspace.data?.id ?? "" },
{ enabled: workspace.isSuccess },
const { data: workspace, ...workspaceQ } =
api.workspace.bySlug.useQuery(workspaceSlug);
const { data: systems, ...systemsQ } = api.system.list.useQuery(
{ workspaceId: workspace?.id ?? "" },
{ enabled: workspace != null },
);
const createDeployment = api.deployment.create.useMutation();
const router = useRouter();
const { data: jobAgentsResult, ...jobAgentsQ } =
api.job.agent.byWorkspaceId.useQuery(workspace?.id ?? "", {
enabled: workspace != null,
});
const jobAgents = jobAgentsResult ?? [];

const form = useForm({
schema: deploymentForm,
schema: SCHEMA.createDeployment,
defaultValues: {
systemId: props.systemId ?? systems.data?.items[0]?.id,
systemId: props.systemId ?? systems?.items[0]?.id,
name: "",
slug: "",
description: "",
Expand All @@ -70,38 +76,41 @@ export const CreateDeploymentDialog: React.FC<{

const { handleSubmit, watch, setValue, setError } = form;

const selectedJobAgentId = watch("jobAgentId");
const selectedJobAgent = jobAgents.find(
(agent) => agent.id === selectedJobAgentId,
);

watch((data, { name: fieldName }) => {
if (fieldName === "name")
setValue("slug", slugify(data.name ?? "", { lower: true }));
});

const onSubmit = handleSubmit(async (deployment) => {
const systemSlug = systems.data?.items.find(
(system) => system.id === form.getValues("systemId"),
const systemSlug = systems?.items.find(
(system) => system.id === deployment.systemId,
)?.slug;
await createDeployment
.mutateAsync(
deployment as {
systemId: string;
name: string;
slug: string;
description: string;
},
.mutateAsync(deployment)
.then(
() =>
systemSlug != null &&
router.push(
`/${workspaceSlug}/systems/${systemSlug}/deployments/${deployment.slug}`,
),
)
.then(() => {
router.push(
`/${workspaceSlug}/systems/${systemSlug}/deployments/${deployment.slug}`,
);
setOpen(false);
onSuccess?.();
})
.catch(() => {
.then(() => setOpen(false))
.then(() => onSuccess?.())
.catch(() =>
setError("root", {
message: "Deployment with this slug already exists",
});
});
}),
);
});

const loading =
workspaceQ.isLoading || systemsQ.isLoading || jobAgentsQ.isLoading;

return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>{children}</DialogTrigger>
Expand All @@ -116,98 +125,154 @@ export const CreateDeploymentDialog: React.FC<{
</DialogDescription>
</DialogHeader>

<FormField
control={form.control}
name="systemId"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>System</FormLabel>
<FormControl>
<Select value={value} onValueChange={onChange}>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectGroup>
{systems.data?.items.map((system) => (
<SelectItem key={system.id} value={system.id}>
{system.name}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>Name</FormLabel>
<FormControl>
<Input
placeholder="Website, Identity Service..."
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="slug"
render={({ field }) => (
<FormItem>
<FormLabel>Slug</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="description"
render={({ field }) => (
<FormItem>
<FormLabel>Description</FormLabel>
<FormControl>
<Textarea {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="retryCount"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>Retry Count</FormLabel>
<FormControl>
<Input
type="number"
min={0}
step={1}
value={value}
onChange={(e) => onChange(e.target.valueAsNumber)}
className="w-16"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormRootError />
<DialogFooter>
<Button type="submit">Create</Button>
</DialogFooter>
{loading && (
<div className="flex h-full w-full items-center justify-center">
<IconLoader2 className="h-4 w-4 animate-spin" />
</div>
)}

{!loading && (
<>
<FormField
control={form.control}
name="systemId"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>System</FormLabel>
<FormControl>
<Select value={value} onValueChange={onChange}>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectGroup>
{systems?.items.map((system) => (
<SelectItem key={system.id} value={system.id}>
{system.name}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>Name</FormLabel>
<FormControl>
<Input
placeholder="Website, Identity Service..."
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="slug"
render={({ field }) => (
<FormItem>
<FormLabel>Slug</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="description"
render={({ field }) => (
<FormItem>
<FormLabel>Description</FormLabel>
<FormControl>
<Textarea {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
{workspace != null && (
<FormField
control={form.control}
name="jobAgentId"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>Job Agent</FormLabel>
<FormControl>
<JobAgentSelector
className="max-w-[350px]"
jobAgents={jobAgents}
workspace={workspace}
value={value ?? undefined}
onChange={onChange}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
{workspace != null && (
<FormField
control={form.control}
name="jobAgentConfig"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>Config</FormLabel>
<FormControl>
<JobAgentConfig
workspace={workspace}
jobAgent={selectedJobAgent}
value={value ?? {}}
onChange={onChange}
githubFormStyleConfig={{
className:
"flex flex-col gap-2 items-center w-[450px]",
buttonWidth: "w-[450px]",
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
<FormField
control={form.control}
name="retryCount"
render={({ field: { value, onChange } }) => (
<FormItem>
<FormLabel>Retry Count</FormLabel>
<FormControl>
<Input
type="number"
min={0}
step={1}
value={value}
onChange={(e) => onChange(e.target.valueAsNumber)}
className="w-16"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormRootError />
<DialogFooter>
<Button type="submit">Create</Button>
</DialogFooter>
</>
)}
</form>
</Form>
</DialogContent>
Expand Down
Loading