From d01b93981dc60e1063f2a3d3be4490533b350a81 Mon Sep 17 00:00:00 2001
From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:52:22 +0500
Subject: [PATCH 1/3] fix: fixed `Form.Control` prop types for port and
 password

---
 src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
index b8a7ab81ec..d99f9c6538 100644
--- a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
+++ b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
@@ -49,7 +49,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
               />
             </Form.Label>
             <Form.Control
-              as="number"
+              type="number"
               defaultValue={config ? config.sftpPort : 22}
               onBlur={e => handleBlur(e)}
             />
@@ -127,7 +127,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
           >
             <Form.Label>SFTP Password</Form.Label>
             <Form.Control
-              as="password"
+              type="password"
               onBlur={e => handleBlur(e)}
               disabled={config && !checked}
               data-hj-suppress

From ea95882c11df7c15f65f052fa4bd061a29d74fcf Mon Sep 17 00:00:00 2001
From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 20:09:59 +0500
Subject: [PATCH 2/3] fix: fixed the form doing incorrect validations

feat: added name and id attributes to the form fields
---
 .../ReportingConfig/SFTPDeliveryMethodForm.jsx         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
index d99f9c6538..e5cfa1335c 100644
--- a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
+++ b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
@@ -11,6 +11,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
       <div className="row">
         <div className="col">
           <Form.Group
+            controlId="sftpHostname"
             isInvalid={invalidFields.sftpHostname}
           >
             <Form.Label>
@@ -21,6 +22,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
               />
             </Form.Label>
             <Form.Control
+              name="sftpHostname"
               defaultValue={config ? config.sftpHostname : undefined}
               onBlur={e => handleBlur(e)}
               data-hj-suppress
@@ -39,6 +41,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
         </div>
         <div className="col col-2">
           <Form.Group
+          controlId="sftpPort"
             isInvalid={invalidFields.sftpPort}
           >
             <Form.Label>
@@ -50,6 +53,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
             </Form.Label>
             <Form.Control
               type="number"
+              name="sftpPort"
               defaultValue={config ? config.sftpPort : 22}
               onBlur={e => handleBlur(e)}
             />
@@ -75,6 +79,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
       <div className="row">
         <div className="col">
           <Form.Group
+            controlId="sftpUsername"
             isInvalid={invalidFields.sftpUsername}
           >
             <Form.Label>
@@ -85,6 +90,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
               />
             </Form.Label>
             <Form.Control
+              name="sftpUsername"
               defaultValue={config ? config.sftpUsername : undefined}
               onBlur={e => handleBlur(e)}
               data-hj-suppress
@@ -123,10 +129,12 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
             </Form.Group>
           )}
           <Form.Group
+            controlId="encryptedSftpPassword"
             isInvalid={invalidFields.encryptedSftpPassword}
           >
             <Form.Label>SFTP Password</Form.Label>
             <Form.Control
+              name="encryptedSftpPassword"
               type="password"
               onBlur={e => handleBlur(e)}
               disabled={config && !checked}
@@ -150,6 +158,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
             )}
           </Form.Group>
           <Form.Group
+            controlId="sftpFilePath"
             isInvalid={invalidFields.sftpFilePath}
           >
             <Form.Label>
@@ -160,6 +169,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
               />
             </Form.Label>
             <Form.Control
+              name="sftpFilePath"
               defaultValue={config ? config.sftpFilePath : undefined}
               onBlur={e => handleBlur(e)}
               data-hj-suppress

From 3d7b873960ae621156133fa12c7ac03d5abd5350 Mon Sep 17 00:00:00 2001
From: Muhammad Sameer Amin <35958006+sameeramin@users.noreply.github.com>
Date: Wed, 31 Jul 2024 20:11:06 +0500
Subject: [PATCH 3/3] fix: fixed the form doing incorrect validations

feat: added name and id attributes to the form fields
---
 src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
index e5cfa1335c..c92db93d1c 100644
--- a/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
+++ b/src/components/ReportingConfig/SFTPDeliveryMethodForm.jsx
@@ -41,7 +41,7 @@ const SFTPDeliveryMethodForm = ({ invalidFields, config, handleBlur }) => {
         </div>
         <div className="col col-2">
           <Form.Group
-          controlId="sftpPort"
+            controlId="sftpPort"
             isInvalid={invalidFields.sftpPort}
           >
             <Form.Label>