From bef178b118895404372511639d860ec55bdf7df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Cie=C5=9Blak?= <piotr.cieslak@grupawp.pl>
Date: Fri, 27 Feb 2026 15:18:04 +0100
Subject: [PATCH 1/3] add-field-form form id

---
 src/components/SchemaEditor/AddFieldButton.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SchemaEditor/AddFieldButton.tsx b/src/components/SchemaEditor/AddFieldButton.tsx
index fbfb80e..8e720e0 100644
--- a/src/components/SchemaEditor/AddFieldButton.tsx
+++ b/src/components/SchemaEditor/AddFieldButton.tsx
@@ -120,7 +120,7 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
             </DialogDescription>
           </DialogHeader>
 
-          <form onSubmit={handleSubmit} className="space-y-6">
+          <form onSubmit={handleSubmit} className="space-y-6" id="add-field-form">
             <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
               <div className="space-y-4 min-w-[280px]">
                 <div>
@@ -263,7 +263,7 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
               >
                 {t.fieldAddNewCancel}
               </Button>
-              <Button type="submit" size="sm">
+              <Button type="submit" size="sm" form="add-field-form">
                 {t.fieldAddNewConfirm}
               </Button>
             </DialogFooter>

From e81d5209f3f2426003f29ff546feb09c1564a849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Cie=C5=9Blak?= <piotr.cieslak@grupawp.pl>
Date: Fri, 27 Feb 2026 15:21:32 +0100
Subject: [PATCH 2/3] lint fix

---
 src/components/SchemaEditor/AddFieldButton.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/SchemaEditor/AddFieldButton.tsx b/src/components/SchemaEditor/AddFieldButton.tsx
index 8e720e0..6024c9e 100644
--- a/src/components/SchemaEditor/AddFieldButton.tsx
+++ b/src/components/SchemaEditor/AddFieldButton.tsx
@@ -120,7 +120,11 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
             </DialogDescription>
           </DialogHeader>
 
-          <form onSubmit={handleSubmit} className="space-y-6" id="add-field-form">
+          <form
+            onSubmit={handleSubmit}
+            className="space-y-6"
+            id="add-field-form"
+          >
             <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
               <div className="space-y-4 min-w-[280px]">
                 <div>

From 243cc085a520555226b46d17e55fab39b8f51cfc Mon Sep 17 00:00:00 2001
From: Ophir LOJKINE <ophir.lojkine@datadoghq.com>
Date: Fri, 22 May 2026 15:21:19 +0200
Subject: [PATCH 3/3] hardcoded IDs in react libs are forbidden, can conflict

---
 src/components/SchemaEditor/AddFieldButton.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/SchemaEditor/AddFieldButton.tsx b/src/components/SchemaEditor/AddFieldButton.tsx
index 6024c9e..7e2b184 100644
--- a/src/components/SchemaEditor/AddFieldButton.tsx
+++ b/src/components/SchemaEditor/AddFieldButton.tsx
@@ -42,6 +42,7 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
   const fieldRequiredId = useId();
   const fieldTypeId = useId();
   const additionalPropertiesId = useId();
+  const formId = useId();
 
   const t = useTranslation();
   const regexError = (() => {
@@ -120,11 +121,7 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
             </DialogDescription>
           </DialogHeader>
 
-          <form
-            onSubmit={handleSubmit}
-            className="space-y-6"
-            id="add-field-form"
-          >
+          <form onSubmit={handleSubmit} className="space-y-6" id={formId}>
             <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
               <div className="space-y-4 min-w-[280px]">
                 <div>
@@ -267,7 +264,7 @@ const AddFieldButton: FC<AddFieldButtonProps> = ({
               >
                 {t.fieldAddNewCancel}
               </Button>
-              <Button type="submit" size="sm" form="add-field-form">
+              <Button type="submit" size="sm" form={formId}>
                 {t.fieldAddNewConfirm}
               </Button>
             </DialogFooter>