From 4ae0b321b91dfba2ec6d81fd02c9ee93e735a69e Mon Sep 17 00:00:00 2001
From: ewandor <ewandor@dorfsvald.net>
Date: Tue, 13 May 2025 21:22:25 +0200
Subject: [PATCH] Correcting foreign key short comings

---
 .../src/lib/crud/components/widgets/foreign-key.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gui/rpk-gui/src/lib/crud/components/widgets/foreign-key.tsx b/gui/rpk-gui/src/lib/crud/components/widgets/foreign-key.tsx
index cc2ccd6..fe01dfa 100644
--- a/gui/rpk-gui/src/lib/crud/components/widgets/foreign-key.tsx
+++ b/gui/rpk-gui/src/lib/crud/components/widgets/foreign-key.tsx
@@ -60,7 +60,7 @@ const RealAutocomplete = <T = any, S extends ForeignKeySchema = ForeignKeySchema
   const { data, isLoading } = useList({
     resource: `${basePath}/${resource}`,
     pagination: { current: 1, pageSize: 10, mode: "server" },
-    filters: [{ field: "label", operator: "contains", value: debouncedInputValue }],
+    filters: [{ field: "search", operator: "contains", value: debouncedInputValue }],
     sorters: [{ field: "label", order: "asc" }],
   });
 
@@ -110,7 +110,7 @@ const RealAutocomplete = <T = any, S extends ForeignKeySchema = ForeignKeySchema
             uiSchema={{}}
             onSuccess={(data: any) => {
               setOpenFormModal(false)
-              onChange(data.data.id);
+              onChange(data.id);
             }}
           />
         </DialogContent>
@@ -233,7 +233,8 @@ const FormContainerNew = (props: FormContainerProps) => {
   const { schemaName, resourceBasePath, resource, uiSchema = {}, onSuccess } = props;
   const { onFinish } = useForm({
     resource: `${resourceBasePath}/${resource}`,
-    action: "create"
+    action: "create",
+    onMutationSuccess: data => onSuccess(data.data)
   });
 
   return (
@@ -242,10 +243,8 @@ const FormContainerNew = (props: FormContainerProps) => {
         schemaName={schemaName}
         uiSchema={uiSchema}
         resourceBasePath={resourceBasePath}
-        onSubmit={(data:any) => {
-          onFinish(data);
-          onSuccess(data);
-        }} />
+        onSubmit={(data:any) => { onFinish(data);}}
+      />
     </Box>
   )
 }