antd validation fixes

Author: huseyingoztok

reactjs/src/scenes/Tenants/components/createOrUpdateTenant.tsx

@@ -11,7 +11,7 @@ export interface ICreateOrUpdateTenantProps {
   modalType: string;
   onCreate: () => Promise<void>;
   onCancel: () => void;
-  formRef: React.RefObject<FormInstance>
+  formRef: React.RefObject<FormInstance>;
 }
 
 class CreateOrUpdateTenant extends React.Component<ICreateOrUpdateTenantProps> {
@@ -66,7 +66,7 @@ class CreateOrUpdateTenant extends React.Component<ICreateOrUpdateTenantProps> {
             <Input />
           </Form.Item>
           {this.props.modalType === 'edit' ? (
-            <Form.Item label={L('AdminEmailAddress')} name={'adminEmailAddress'} rules={rules.adminEmailAddress} {...formItemLayout}>
+            <Form.Item label={L('AdminEmailAddress')} name={'adminEmailAddress'} rules={rules.adminEmailAddress as []} {...formItemLayout}>
               <Input />
             </Form.Item>
           ) : null}

reactjs/src/scenes/Tenants/components/createOrUpdateTenant.validation.ts

@@ -4,11 +4,11 @@ const rules = {
   tenancyName: [{ required: true, message: L('ThisFieldIsRequired') }],
   name: [{ required: true, message: L('ThisFieldIsRequired') }],
   adminEmailAddress: [
+    { required: true, message: L('ThisFieldIsRequired') },
     {
-      type: 'bool',
+      type: 'email',
       message: 'The input is not valid E-mail!',
-    },
-    { required: true, message: L('ThisFieldIsRequired') }
+    }
   ],
 };
 

reactjs/src/scenes/Users/components/createOrUpdateUser.tsx

@@ -106,7 +106,7 @@ class CreateOrUpdateUser extends React.Component<ICreateOrUpdateUserProps> {
               <Form.Item label={L('UserName')} {...formItemLayout} name={'userName'} rules={rules.userName}>
                 <Input />
               </Form.Item>
-              <Form.Item label={L('Email')} {...formItemLayout} name={'emailAddress'} rules={rules.emailAddress}>
+              <Form.Item label={L('Email')} {...formItemLayout} name={'emailAddress'} rules={rules.emailAddress as []}>
                 <Input />
               </Form.Item>
               {this.props.modalType === 'edit' ? (

reactjs/src/scenes/Users/components/createOrUpdateUser.validation.ts

@@ -4,7 +4,13 @@ const rules = {
   name: [{ required: true, message: L('ThisFieldIsRequired') }],
   surname: [{ required: true, message: L('ThisFieldIsRequired') }],
   userName: [{ required: true, message: L('ThisFieldIsRequired') }],
-  emailAddress: [{ required: true, message: L('ThisFieldIsRequired') }],
+  emailAddress: [
+    { required: true, message: L('ThisFieldIsRequired') },
+    {
+      type: 'email',
+      message: 'The input is not valid E-mail!',
+    },
+  ],
 };
 
 export default rules;