Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 3 additions & 16 deletions apps/web/src/components/(dashboard)/jobs/jobs-management.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,6 @@ export default function JobsManagement() {
}
)

const jobYamlQuery = trpc.jobsRouter.getJobYaml.useQuery(
{
namespace: selectedJob?.namespace || "",
name: selectedJob?.name || "",
},
{
enabled: false,
onError: (err) => {
console.error("Error fetching job YAML:", err);
setError(t("errors.yamlApi", { message: err.message }));
},
},
);

const availableNamespaces = jobs ?
Array.from(new Set(jobs.map(job => job.namespace).filter(Boolean))).sort()
Expand Down Expand Up @@ -199,15 +186,15 @@ export default function JobsManagement() {
setError(null);

try {
const response = await jobYamlQuery.refetch();
const yaml = response.data || job.yaml || "";
const data = await utils.jobsRouter.getJobYaml.fetch({ namespace: job.namespace, name: job.name });
const yaml = data || job.yaml || "";
setSelectedJob({ ...job, yaml });
setShowJobDetails(true);
} catch (err) {
setError(t("errors.fetchYaml"));
console.error(err)
}
}, [jobYamlQuery]);
}, [utils]);

const handleJobCreate = () => {
setShowCreateJobModal(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export default function PodGroupManagement() {
const t = useTranslations("podgroups")
const tc = useTranslations("common")
const format = useFormatter()
const utils = trpc.useUtils()
const [podGroups, setPodGroups] = useState<PodGroupStatus[]>()
const [loading, setLoading] = useState(false)
const [error, setError] = useState<string | null>(null)
Expand Down Expand Up @@ -74,19 +75,6 @@ export default function PodGroupManagement() {
}
)

const podGroupYamlQuery = trpc.podgroupsRouter.getPodGroupYaml.useQuery(
{
namespace: selectedPodGroup?.namespace || "",
name: selectedPodGroup?.name || ""
},
{
enabled: false,
onError: (err) => {
console.error("Error fetching podgroup YAML:", err);
setError(t("errors.yamlApi", { message: err.message }));
},
},
);

const availableNamespaces = podGroups ?
Array.from(new Set(podGroups.map(pg => pg.namespace).filter(Boolean))).sort()
Expand Down Expand Up @@ -148,15 +136,15 @@ export default function PodGroupManagement() {
setError(null);

try {
const response = await podGroupYamlQuery.refetch();
const yaml = response.data || podGroup.yaml || "";
const data = await utils.podgroupsRouter.getPodGroupYaml.fetch({ namespace: podGroup.namespace, name: podGroup.name });
const yaml = data || podGroup.yaml || "";
setSelectedPodGroup({ ...podGroup, yaml });
setShowPodGroupDetails(true);
} catch (err) {
setError(t("errors.fetchYaml"));
console.error(err)
}
}, [podGroupYamlQuery])
}, [utils])

const handlePageSizeChange = (newPageSize: string) => {
setPagination({
Expand Down
19 changes: 3 additions & 16 deletions apps/web/src/components/(dashboard)/pods/pod-management.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,6 @@ export default function PodManagement() {
)


const podYamlQuery = trpc.podRouter.getPodYaml.useQuery(
{
namespace: selectedPod?.namespace || "",
name: selectedPod?.name || ""
},
{
enabled: false,
onError: (err) => {
console.error("Error fetching pod YAML:", err);
setError(t("errors.yamlApi", { message: err.message }));
},
},
);

const availableNamespaces = pods ?
Array.from(new Set(pods.map(pod => pod.namespace).filter(Boolean))).sort()
Expand Down Expand Up @@ -201,15 +188,15 @@ export default function PodManagement() {
setError(null);

try {
const response = await podYamlQuery.refetch();
const yaml = response.data || pod.yaml || "";
const data = await utils.podRouter.getPodYaml.fetch({ namespace: pod.namespace, name: pod.name });
const yaml = data || pod.yaml || "";
setSelectedPod({ ...pod, yaml });
setShowPodDetails(true);
} catch (err) {
setError(t("errors.fetchYaml"));
console.error(err)
}
}, [podYamlQuery])
}, [utils])

const handlePodCreate = () => {
setShowCreatePodModal(true)
Expand Down
16 changes: 3 additions & 13 deletions apps/web/src/components/(dashboard)/queues/queue-management.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,6 @@ export default function QueueManagement() {
onDelete: handleDelete
})

const queueYamlQuery = trpc.queueRouter.getQueueYaml.useQuery(
{ name: selectedQueue?.name || "" },
{
enabled: false,
onError: (err) => {
console.error("Error fetching queue YAML:", err);
setError(t("errors.yamlApi", { message: err.message }));
},
},
);

useEffect(() => {
if (queuesQuery.data) {
Expand Down Expand Up @@ -193,15 +183,15 @@ export default function QueueManagement() {
setError(null);

try {
const response = await queueYamlQuery.refetch();
const yaml = response.data || queue.yaml || "";
const data = await utils.queueRouter.getQueueYaml.fetch({ name: queue.name });
const yaml = data || queue.yaml || "";
setSelectedQueue({ ...queue, yaml });
setShowQueueDetails(true);
} catch (err) {
setError(t("errors.fetchYaml"));
console.error(err)
}
}, [queueYamlQuery])
}, [utils])

const handleCreateQueue = () => {
setShowCreateQueueModal(true)
Expand Down
4 changes: 4 additions & 0 deletions packages/trpc/server/router/identifier.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { z } from "zod";

/** Required Kubernetes resource name or namespace: rejects empty and whitespace-only values. */
export const k8sIdentifierSchema = z.string().trim().min(1);
13 changes: 7 additions & 6 deletions packages/trpc/server/router/jobs/schema.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { z } from "zod";

import { k8sIdentifierSchema } from "../identifier";
import { paginationInputSchema } from "../pagination";

export const getJobsInputSchema = paginationInputSchema.extend({});

export const getJobInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});

export const createJobInputSchema = z.object({
Expand All @@ -22,12 +23,12 @@ export const createJobInputSchema = z.object({
});

export const updateJobInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
patchData: z.any(),
});

export const deleteJobInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});
9 changes: 5 additions & 4 deletions packages/trpc/server/router/podgroups/schema.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { z } from "zod";

import { k8sIdentifierSchema } from "../identifier";
import { paginationInputSchema } from "../pagination";

export const getPodGroupsInputSchema = paginationInputSchema.extend({
Expand All @@ -9,12 +10,12 @@ export const getPodGroupsInputSchema = paginationInputSchema.extend({
});

export const getPodGroupInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});

export const getPodGroupYamlInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});

13 changes: 7 additions & 6 deletions packages/trpc/server/router/pods/schema.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { z } from "zod";

import { k8sIdentifierSchema } from "../identifier";
import { paginationInputSchema } from "../pagination";

export const getPodsInputSchema = paginationInputSchema.extend({});

export const getPodYamlInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});

export const createPodInputSchema = z.object({
Expand All @@ -22,12 +23,12 @@ export const createPodInputSchema = z.object({
});

export const deletePodInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
});

export const updatePodInputSchema = z.object({
namespace: z.string(),
name: z.string(),
namespace: k8sIdentifierSchema,
name: k8sIdentifierSchema,
patchData: z.any(),
});
7 changes: 4 additions & 3 deletions packages/trpc/server/router/queues/schema.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { z } from "zod";

import { k8sIdentifierSchema } from "../identifier";
import { paginationInputSchema } from "../pagination";

export const getQueueInputSchema = z.object({
name: z.string(),
name: k8sIdentifierSchema,
});

export const getQueuesInputSchema = paginationInputSchema.extend({});
Expand All @@ -21,12 +22,12 @@ export const createQueueInputSchema = z.object({
});

export const updateQueueInputSchema = z.object({
name: z.string(),
name: k8sIdentifierSchema,
updatedBody: z.object({
spec: z.any(),
}),
});

export const deleteQueueInputSchema = z.object({
name: z.string(),
name: k8sIdentifierSchema,
});