From 6716b1e615c6f8c4ec41531408f8fef95420a17d Mon Sep 17 00:00:00 2001
From: Sacha Al Himdani <sacha@getprobo.com>
Date: Mon, 1 Sep 2025 17:59:53 +0200
Subject: [PATCH] Fix non mandatory fields on vendor

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
---
 .../src/components/form/PeopleSelectField.tsx | 11 ++++++--
 .../console/src/hooks/forms/useVendorForm.tsx |  4 +--
 .../vendors/tabs/VendorOverviewTab.tsx        |  2 ++
 pkg/probo/vendor_service.go                   | 28 ++++++++++++-------
 pkg/server/api/console/v1/v1_resolver.go      |  4 +--
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/apps/console/src/components/form/PeopleSelectField.tsx b/apps/console/src/components/form/PeopleSelectField.tsx
index a72a75cfb..3a6f96b1e 100644
--- a/apps/console/src/components/form/PeopleSelectField.tsx
+++ b/apps/console/src/components/form/PeopleSelectField.tsx
@@ -10,6 +10,7 @@ type Props = {
   name: string;
   label?: string;
   error?: string;
+  optional?: boolean;
 } & ComponentProps<typeof Field>;
 
 export function PeopleSelectField({
@@ -27,6 +28,7 @@ export function PeopleSelectField({
           control={control}
           name={props.name}
           disabled={props.disabled}
+          optional={props.optional}
         />
       </Suspense>
     </Field>
@@ -34,7 +36,7 @@ export function PeopleSelectField({
 }
 
 function PeopleSelectWithQuery(
-  props: Pick<Props, "organizationId" | "control" | "name" | "disabled">
+  props: Pick<Props, "organizationId" | "control" | "name" | "disabled" | "optional">
 ) {
   const { __ } = useTranslate();
   const { name, organizationId, control } = props;
@@ -51,12 +53,15 @@ function PeopleSelectWithQuery(
             id={name}
             variant="editor"
             placeholder={__("Select an owner")}
-            onValueChange={field.onChange}
+            onValueChange={(value) => field.onChange(value === "__NONE__" ? null : value)}
             key={people?.length.toString() ?? "0"}
             {...field}
             className="w-full"
-            value={field.value ?? ""}
+            value={field.value ?? (props.optional ? "__NONE__" : "")}
           >
+            {props.optional && (
+              <Option value="__NONE__">{__("None")}</Option>
+            )}
             {people?.map((p) => (
               <Option key={p.id} value={p.id} className="flex gap-2">
                 <Avatar name={p.fullName} />
diff --git a/apps/console/src/hooks/forms/useVendorForm.tsx b/apps/console/src/hooks/forms/useVendorForm.tsx
index 1f1d2d690..1376442f4 100644
--- a/apps/console/src/hooks/forms/useVendorForm.tsx
+++ b/apps/console/src/hooks/forms/useVendorForm.tsx
@@ -21,8 +21,8 @@ const schema = z.object({
   certifications: z.array(z.string()),
   securityPageUrl: z.string(),
   trustPageUrl: z.string(),
-  businessOwnerId: z.string(),
-  securityOwnerId: z.string(),
+  businessOwnerId: z.string().nullish(),
+  securityOwnerId: z.string().nullish(),
 });
 
 const vendorFormFragment = graphql`
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
index ae20f9a8f..3d9c8d065 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
@@ -154,6 +154,7 @@ export default function VendorOverviewTab() {
             label={__("Business owner")}
             error={errors.businessOwnerId?.message}
             disabled={isSubmitting || isSnapshotMode}
+            optional={true}
           />
           <PeopleSelectField
             organizationId={organizationId}
@@ -162,6 +163,7 @@ export default function VendorOverviewTab() {
             label={__("Security owner")}
             error={errors.securityOwnerId?.message}
             disabled={isSubmitting || isSnapshotMode}
+            optional={true}
           />
         </Card>
       </div>
diff --git a/pkg/probo/vendor_service.go b/pkg/probo/vendor_service.go
index 209b8e995..834986851 100644
--- a/pkg/probo/vendor_service.go
+++ b/pkg/probo/vendor_service.go
@@ -70,8 +70,8 @@ type (
 		SecurityPageURL               *string
 		TrustPageURL                  *string
 		StatusPageURL                 *string
-		BusinessOwnerID               *gid.GID
-		SecurityOwnerID               *gid.GID
+		BusinessOwnerID               **gid.GID
+		SecurityOwnerID               **gid.GID
 		ShowOnTrustCenter             *bool
 	}
 
@@ -303,19 +303,27 @@ func (s VendorService) Update(
 			}
 
 			if req.BusinessOwnerID != nil {
-				businessOwner := &coredata.People{}
-				if err := businessOwner.LoadByID(ctx, conn, s.svc.scope, *req.BusinessOwnerID); err != nil {
-					return fmt.Errorf("cannot load business owner: %w", err)
+				if *req.BusinessOwnerID != nil {
+					businessOwner := &coredata.People{}
+					if err := businessOwner.LoadByID(ctx, conn, s.svc.scope, **req.BusinessOwnerID); err != nil {
+						return fmt.Errorf("cannot load business owner: %w", err)
+					}
+					vendor.BusinessOwnerID = &businessOwner.ID
+				} else {
+					vendor.BusinessOwnerID = nil
 				}
-				vendor.BusinessOwnerID = &businessOwner.ID
 			}
 
 			if req.SecurityOwnerID != nil {
-				securityOwner := &coredata.People{}
-				if err := securityOwner.LoadByID(ctx, conn, s.svc.scope, *req.SecurityOwnerID); err != nil {
-					return fmt.Errorf("cannot load security owner: %w", err)
+				if *req.SecurityOwnerID != nil {
+					securityOwner := &coredata.People{}
+					if err := securityOwner.LoadByID(ctx, conn, s.svc.scope, **req.SecurityOwnerID); err != nil {
+						return fmt.Errorf("cannot load security owner: %w", err)
+					}
+					vendor.SecurityOwnerID = &securityOwner.ID
+				} else {
+					vendor.SecurityOwnerID = nil
 				}
-				vendor.SecurityOwnerID = &securityOwner.ID
 			}
 
 			vendor.UpdatedAt = time.Now()
diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index 9da1569a3..5a9c0f22c 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -1443,8 +1443,8 @@ func (r *mutationResolver) UpdateVendor(ctx context.Context, input types.UpdateV
 		WebsiteURL:                    input.WebsiteURL,
 		Category:                      input.Category,
 		Certifications:                input.Certifications,
-		BusinessOwnerID:               input.BusinessOwnerID,
-		SecurityOwnerID:               input.SecurityOwnerID,
+		BusinessOwnerID:               &input.BusinessOwnerID,
+		SecurityOwnerID:               &input.SecurityOwnerID,
 		ShowOnTrustCenter:             input.ShowOnTrustCenter,
 	})
 	if err != nil {