Merge pull request #712 from trycompai/main

[comp] Production Deploy

Author: claudfuen

apps/app/src/actions/policies/create-new-policy.ts

@@ -16,10 +16,10 @@ export const createPolicyAction = authActionClient
 			channel: "server",
 		},
 	})
-	.action(async ({ parsedInput, ctx }) => {
-		const { title, description, frameworkIds, controlIds } = parsedInput;
-		const { activeOrganizationId } = ctx.session;
-		const { user } = ctx;
+        .action(async ({ parsedInput, ctx }) => {
+                const { title, description, controlIds } = parsedInput;
+                const { activeOrganizationId } = ctx.session;
+                const { user } = ctx;
 
 		if (!activeOrganizationId) {
 			return {

apps/app/src/actions/schema.ts

@@ -240,13 +240,19 @@ export const updateResidualRiskEnumSchema = z.object({
 
 // Policies
 export const createPolicySchema = z.object({
-	title: z.string(),
-	description: z.string(),
-	frameworkIds: z.array(z.string()),
-	controlIds: z.array(z.string()),
-	entityId: z.string(),
+       title: z
+               .string({ required_error: "Title is required" })
+               .min(1, "Title is required"),
+       description: z
+               .string({ required_error: "Description is required" })
+               .min(1, "Description is required"),
+       frameworkIds: z.array(z.string()).optional(),
+       controlIds: z.array(z.string()).optional(),
+       entityId: z.string().optional(),
 });
 
+export type CreatePolicySchema = z.infer<typeof createPolicySchema>;
+
 export const updatePolicySchema = z.object({
 	id: z.string(),
 	content: z.any(),

apps/app/src/components/forms/policies/create-new-policy.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { createPolicyAction } from "@/actions/policies/create-new-policy";
-import { createPolicySchema } from "@/actions/schema";
+import { createPolicySchema, type CreatePolicySchema } from "@/actions/schema";
 import { useI18n } from "@/locales/client";
 import {
 	Accordion,
@@ -27,7 +27,6 @@ import { useQueryState } from "nuqs";
 import React from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import type { z } from "zod";
 
 export function CreateNewPolicyForm() {
 	const t = useI18n();
@@ -43,19 +42,17 @@ export function CreateNewPolicyForm() {
 		},
 	});
 
-	const form = useForm<z.infer<typeof createPolicySchema>>({
-		resolver: zodResolver(createPolicySchema),
-		defaultValues: {
-			title: "",
-			description: "",
-			frameworkIds: [],
-			controlIds: [],
-		},
-	});
+       const form = useForm<CreatePolicySchema>({
+               resolver: zodResolver(createPolicySchema),
+               defaultValues: {
+                       title: "",
+                       description: "",
+               },
+       });
 
-	const onSubmit = (data: z.infer<typeof createPolicySchema>) => {
-		createPolicy.execute(data);
-	};
+       const onSubmit = (data: CreatePolicySchema) => {
+               createPolicy.execute(data);
+       };
 
 	return (
 		<Form {...form}>