Mariano/risk improvements

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/update-vendor-action.ts

@@ -24,6 +24,15 @@ export const updateVendorAction = authActionClient
       throw new Error("Invalid user input");
     }
 
+    console.log({
+      id,
+      name,
+      description,
+      category,
+      assigneeId,
+      status,
+    });
+
     try {
       await db.vendor.update({
         where: {

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/secondary-fields/update-secondary-fields-form.tsx

@@ -60,11 +60,14 @@ export function UpdateSecondaryFieldsForm({
 	});
 
 	const onSubmit = (data: z.infer<typeof updateVendorSchema>) => {
+		// Explicitly set assigneeId to null if it's an empty string (representing "None")
+		const finalAssigneeId = data.assigneeId === "" ? null : data.assigneeId;
+
 		updateVendor.execute({
 			id: data.id,
 			name: data.name,
 			description: data.description,
-			assigneeId: data.assigneeId,
+			assigneeId: finalAssigneeId, // Use the potentially nulled value
 			category: data.category,
 			status: data.status,
 		});

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/create-vendor-task-sheet.tsx

@@ -8,7 +8,7 @@ import { ScrollArea } from "@comp/ui/scroll-area";
 import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@comp/ui/sheet";
 import { X } from "lucide-react";
 import { useQueryState } from "nuqs";
-import { CreateVendorTaskForm } from "./create-vendor-task-form";
+// import { CreateVendorTaskForm } from "./create-vendor-task-form";
 
 export function CreateVendorTaskSheet() {
 	const t = useI18n();
@@ -38,7 +38,7 @@ export function CreateVendorTaskSheet() {
 					</SheetHeader>
 
 					<ScrollArea className="h-full p-0 pb-[100px]" hideScrollbar>
-						<CreateVendorTaskForm />
+						{/* <CreateVendorTaskForm assignees={assignees} /> */}
 					</ScrollArea>
 				</SheetContent>
 			</Sheet>
@@ -49,7 +49,7 @@ export function CreateVendorTaskSheet() {
 		<Drawer open={isOpen} onOpenChange={handleOpenChange}>
 			<DrawerTitle hidden>{t("vendors.tasks.sheet.title")}</DrawerTitle>
 			<DrawerContent className="p-6">
-				<CreateVendorTaskForm />
+				{/* <CreateVendorTaskForm assignees={assignees} /> */}
 			</DrawerContent>
 		</Drawer>
 	);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/components/tasks/data-table/empty-states.tsx

@@ -64,7 +64,7 @@ export function NoTasks({ isEmpty }: { isEmpty: boolean }) {
 				</Button>
 			</div>
 
-			<CreateVendorTaskSheet />
+			{/* <CreateVendorTaskSheet assignees={[]} /> */}
 		</div>
 	);
 }

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { useI18n } from "@/locales/client";
-import { Member, useSession } from "@comp/auth";
-import { User, VendorCategory, VendorStatus } from "@comp/db/types";
+import { useSession } from "@comp/auth";
+import { Member, User, VendorCategory, VendorStatus } from "@comp/db/types";
 import {
 	Accordion,
 	AccordionContent,
@@ -49,9 +49,7 @@ const createVendorSchema = z.object({
 
 export function CreateVendorForm({
 	assignees,
-}: {
-	assignees: (Member & { user: User })[];
-}) {
+}: { assignees: (Member & { user: User })[] }) {
 	const t = useI18n();
 	const session = useSession();
 
@@ -292,7 +290,7 @@ export function CreateVendorForm({
 													<FormControl>
 														<SelectAssignee
 															assignees={assignees}
-															assigneeId={field.value}
+															assigneeId={field.value ?? null}
 															withTitle={false}
 															onAssigneeChange={field.onChange}
 														/>

apps/app/src/components/forms/risks/create-risk-form.tsx

@@ -242,7 +242,7 @@ export function CreateRisk({
 													<FormLabel>{t("common.assignee.label")}</FormLabel>
 													<FormControl>
 														<SelectAssignee
-															assigneeId={field.value}
+															assigneeId={field.value ?? null}
 															assignees={assignees}
 															onAssigneeChange={field.onChange}
 															disabled={createRisk.status === "executing"}

apps/app/src/components/forms/risks/risk-overview.tsx

@@ -95,7 +95,7 @@ export function UpdateRiskOverview({
 								<FormLabel>{t("common.assignee.label")}</FormLabel>
 								<FormControl>
 									<SelectAssignee
-										assigneeId={field.value}
+										assigneeId={field.value ?? null}
 										assignees={assignees}
 										onAssigneeChange={field.onChange}
 										disabled={updateRisk.status === "executing"}

apps/app/src/components/tables/risk-register/filter-toolbar.tsx

@@ -176,7 +176,7 @@ export function FilterToolbar({ isEmpty, users }: Props) {
 					<SelectContent>
 						{users.map((user) => (
 							<SelectItem key={user.id} value={user.id}>
-								{user.name}
+								{user.user.name}
 							</SelectItem>
 						))}
 					</SelectContent>