Merge remote-tracking branch 'upstream/main' into admin-master

tekdi · Jul 29, 2024 · 07f9bc8 · 07f9bc8
2 parents 6e24881 + 2408d9b
commit 07f9bc8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -192,8 +192,10 @@
     "MAX_LENGTH_DIGITS_ERROR": "Maximum {{maxLength}} Digits allowed",
     "MIN_LENGTH_CHARACTERS_ERROR": "Minimum {{minLength}} characters required",
     "MAX_LENGTH_CHARACTERS_ERROR": "Maximum {{maxLength}} characters allowed",
-    "NUMBER_AND_SPECIAL_CHARACTERS_NOT_ALLOWED": "Numbers and special characters are not allowed"
-  },
+    "NUMBER_AND_SPECIAL_CHARACTERS_NOT_ALLOWED": "Numbers and special characters are not allowed",
+     "NAME_CANNOT_INCLUDE_DIGITS":"Name can not include digits",
+    "INVALID_EMAIL_FORMAT":"Invalid email format"
+},
   "TABLE_TITLE": {
     "NAME": "Name",
     "STATUS": "Status",

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -28,6 +28,7 @@ interface DynamicFormProps {
   };
   children?: ReactNode;
 }
+
 const DynamicForm: React.FC<DynamicFormProps> = ({
   schema,
   uiSchema,
@@ -44,11 +45,8 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
   };
   const { t } = useTranslation();
 
-  // console.log('CustomErrorList', CustomErrorList);
-
   const handleError = (errors: any) => {
     if (errors.length > 0) {
-      // Adjust the selector based on the actual structure of the form element names
       const property = errors[0].property?.replace(/^root\./, '');
       const errorField = document.querySelector(
         `[name$="${property}"]`
@@ -57,7 +55,6 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
       if (errorField) {
         errorField.focus();
       } else {
-        // If the name-based selector fails, try to select by ID as a fallback
         const fallbackField = document.getElementById(property) as HTMLElement;
         if (fallbackField) {
           fallbackField.focus();
@@ -73,16 +70,11 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     return errors.map((error: any) => {
       switch (error.name) {
         case 'required': {
-          // error.message = t('FORM_ERROR_MESSAGES.FIELD_REQUIRED', {
-          //   field: t(`FORM.${schema.properties[error.property].title}`),
-          // });
-
           error.message = t('FORM_ERROR_MESSAGES.THIS_IS_REQUIRED_FIELD');
           break;
         }
         case 'pattern': {
           const property = error.property.substring(1);
-          console.log('schema===>', schema);
           if (schema.properties?.[property]?.validation?.includes('numeric')) {
             error.message = t('FORM_ERROR_MESSAGES.ENTER_ONLY_DIGITS');
           } else if (
@@ -125,6 +117,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     onChange(event);
   }
 
+
   return (
     <div>
       <FormWithMaterialUI
@@ -141,6 +134,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
         onError={handleError}
         transformErrors={transformErrors}
         fields={customFields}
+
       >
         {children}
       </FormWithMaterialUI>

diff --git a/src/components/UserTable.tsx b/src/components/UserTable.tsx
@@ -393,7 +393,7 @@ const UserTable: React.FC<UserTableProps> = ({ role , userType, searchPlaceholde
             name: user.name.charAt(0).toUpperCase() + user.name.slice(1).toLowerCase(),
             role: user.role,
             gender:user.gender,
-            mobile: user.mobile==="NAN"?"":user.mobile,
+            mobile: user.mobile==="NaN"?"":user.mobile,
             age: ageField ? ageField.value : null,
             district: districtField ? districtField.value : null,
             state: stateField ? stateField.value : null,