fix: 83 | use projectInputSchema to validate project creation form (#90)

Signed-off-by: Francisco Madeira <francisco.madeira@diconium.com>
diconium · Oct 1, 2024 · 7807ade · 7807ade
1 parent b6b0876
commit 7807ade
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 72 deletions.
diff --git a/.changeset/nice-files-wave.md b/.changeset/nice-files-wave.md
@@ -0,0 +1,5 @@
+---
+'@ethereal-nexus/dashboard': patch
+---
+
+fix: [83] use projectInputSchema to validate project creation form
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/dashboard/package.json b/web/dashboard/package.json
@@ -46,7 +46,7 @@
  "gunzip-maybe": "^1.4.2",
  "lucide-react": "^0.274.0",
  "newrelic": "^11.10.4",
- "next": "14.1.0",
+ "next": "^14.2.13",
  "next-auth": "5.0.0-beta.16",
  "next-swagger-doc": "^0.4.0",
  "next-themes": "^0.2.1",

diff --git a/web/dashboard/src/components/projects/project-form.tsx b/web/dashboard/src/components/projects/project-form.tsx
@@ -10,17 +10,10 @@ import {TextArea} from '@/components/ui/text-area';
 import {zodResolver} from "@hookform/resolvers/zod";
 import React from "react";
 import { useToast } from '@/components/ui/use-toast';
-import { ProjectInput } from '@/data/projects/dto';
+import { ProjectInput, projectInputSchema } from '@/data/projects/dto';
 import { upsertProject } from '@/data/projects/actions';
 import { useSession } from 'next-auth/react';
 
-const projectsFormSchema = z.object({
- name: z.string().min(3, {
- message: "Name must be at least 3 characters.",
- }),
- description: z.string(),
-});
-
 type ProjectsFormProps = {
  project?: ProjectInput,
  onComplete?: () => void,
@@ -31,7 +24,7 @@ export default function ProjectsForm({project, onComplete, onCancel}: ProjectsFo
  const {data: session} = useSession();
  const { toast } = useToast()
  const form: any = useForm<ProjectInput>({
- resolver: zodResolver(projectsFormSchema),
+ resolver: zodResolver(projectInputSchema),
  defaultValues: project ?? {},
  });
  const onSubmit = async (data: ProjectInput) => {

diff --git a/web/dashboard/src/data/projects/dto.ts b/web/dashboard/src/data/projects/dto.ts
@@ -59,7 +59,7 @@ export type ProjectComponentConfig = z.infer<
  */
 export const projectWithComponentIdSchema = projectSchema.extend({
  components: projectComponentConfigSchema.pick({ component_id: true }).array(),
- environments: environmentsSchema.pick({id: true, name: true}).array()
+ environments: environmentsSchema.pick({ id: true, name: true }).array()
 });
 export type ProjectWithComponentId = z.infer<
  typeof projectWithComponentIdSchema
@@ -148,7 +148,7 @@ export const projectInputSchema = createInsertSchema(projects, {
  name: (schema) =>
  schema.name.min(4, 'Name must be longer than 4 characters.')
 })
- .required({ name: true });
+ .required({ name: true, description: true });
 export type ProjectInput = z.infer<typeof projectInputSchema>;
 
 export const projectComponentConfigInputSchema = createInsertSchema(
@@ -169,11 +169,11 @@ export const environmentWithComponentsSchema = environmentsSchema.extend({
  components: componentsSchema.pick({
  id: true,
  name: true,
- title: true,
+ title: true
  }).extend({
  config_id: projectComponentConfigSchema.shape.id,
  is_active: projectComponentConfigSchema.shape.is_active,
- version: componentVersionsSchema.shape.version.nullable(),
+ version: componentVersionsSchema.shape.version.nullable()
  }).array()
 });
 export type EnvironmentWithComponents = z.infer<typeof environmentWithComponentsSchema>;