Fix: resolve validation issue idurar#1202

dhuruvandb · Dec 16, 2024 · 2a47730 · 2a47730
1 parent ce83ef7
commit 2a47730
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/frontend/src/modules/ProfileModule/components/ProfileAdminForm.jsx b/frontend/src/modules/ProfileModule/components/ProfileAdminForm.jsx
@@ -27,6 +27,10 @@ export default function AdminForm({ isUpdateForm = false }) {
           {
             required: true,
           },
+          {
+            pattern: /^[A-Za-z][A-Za-z'-]+$/,
+            message: 'Please enter a valid First Name',
+          }
         ]}
       >
         <Input autoComplete="off" />
@@ -38,6 +42,10 @@ export default function AdminForm({ isUpdateForm = false }) {
           {
             required: true,
           },
+          {
+            pattern: /^[A-Za-z][A-Za-z'-]+$/,
+            message: 'Please enter a valid Last Name',
+          }
         ]}
       >
         <Input autoComplete="off" />

diff --git a/frontend/src/modules/ProfileModule/components/UpdateAdmin.jsx b/frontend/src/modules/ProfileModule/components/UpdateAdmin.jsx
@@ -29,7 +29,15 @@ const UpdateAdmin = ({ config }) => {
   }, [currentAdmin]);
 
   const handleSubmit = () => {
-    form.submit();
+    form
+      .validateFields()
+      .then((values) => {
+        onSubmit(values);
+        updatePanel.close();
+      })
+      .catch((errorInfo) => {
+        console.log('Form validation failed:', errorInfo);
+      });
   };
 
   const onSubmit = (fieldsValue) => {
@@ -58,7 +66,6 @@ const UpdateAdmin = ({ config }) => {
             key={`${uniqueId()}`}
             onClick={() => {
               handleSubmit();
-              updatePanel.close();
             }}
             type="primary"
             icon={<SaveOutlined />}