Merge pull request #3279 from OneCommunityGlobal/ghazi-fix-create-new-user

Ghazi - fix: implement default password handling and remove env variable depe…

Author: one-community

src/components/NotFound/NotFoundPage.jsx

@@ -12,9 +12,9 @@ function NotFoundPage() {
   const darkMode = useSelector(state => state.theme.darkMode);
 
   return (
-    <div className={cn(styles.notFoundContainer, darkMode ? cn(
-      styles.darkMode, styles.bgBlack
-    ) : '')}>
+    <div
+      className={cn(styles.notFoundContainer, darkMode ? cn(styles.darkMode, styles.bgBlack) : '')}
+    >
       <img
         className={styles.notFoundImage}
         src={darkMode ? NotFoundDarkImage : NotFoundImage}

src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx

@@ -47,6 +47,7 @@ import { ENDPOINTS } from '~/utils/URL';
 
 const patt = RegExp(/^([\w.%+-]+)@([\w-]+\.)+([\w]{2,})$/i);
 const DATE_PICKER_MIN_DATE = '01/01/2010';
+const DEFAULT_PASSWORD = '123Welcome!';
 
 class UserProfileAdd extends Component {
   constructor(props) {
@@ -81,6 +82,7 @@ class UserProfileAdd extends Component {
         createdDate: new Date(),
         actualEmail: '',
         actualPassword: '',
+        defaultPassword: DEFAULT_PASSWORD,
         startDate: new Date(),
         actualConfirmedPassword: '',
       },
@@ -93,6 +95,7 @@ class UserProfileAdd extends Component {
         actualEmail: 'Actual Email is required',
         actualPassword: 'Actual Password is required',
         actualConfirmedPassword: 'Actual Confirmed Password is required',
+        defaultPassword: 'Default Password is required',
         jobTitle: 'Job Title is required',
       },
       timeZoneFilter: '',
@@ -161,6 +164,7 @@ class UserProfileAdd extends Component {
       actualPassword,
       actualConfirmedPassword,
       jobTitle,
+      defaultPassword,
     } = this.state.userProfile;
 
     const darkMode = this.props.darkMode;
@@ -374,6 +378,25 @@ class UserProfileAdd extends Component {
                     </FormGroup>
                   </Col>
                 </Row>
+                <Row className="user-add-row">
+                  <Col md={{ size: 4 }} className="text-md-right my-2">
+                    <Label className={fontColor}>Default Password</Label>
+                  </Col>
+                  <Col md="6">
+                    <FormGroup>
+                      <CommonInput
+                        type="password"
+                        name="defaultPassword"
+                        id="defaultPassword"
+                        value={DEFAULT_PASSWORD}
+                        disabled
+                        readOnly
+                        
+                        className="d-flex justify-start items-start"
+                      />
+                    </FormGroup>
+                  </Col>
+                </Row>
                 {(role === 'Administrator' || role === 'Owner') && (
                   <>
                     <Row className="user-add-row">
@@ -409,7 +432,7 @@ class UserProfileAdd extends Component {
                             value={actualPassword}
                             onChange={(e) => this.handleUserProfile(e)}
                             placeholder="Actual Password"
-                            invalid={!!this.state.formErrors.actualPassword ? this.state.formErrors.actualPassword : ""}
+                            invalid={!!this.state.formErrors.actualPassword}
                             className="d-flex justify-start items-start"
                           />
                         </FormGroup>
@@ -704,25 +727,13 @@ class UserProfileAdd extends Component {
   };
 
   fieldsAreValid = () => {
-    const { firstName, lastName, email, phoneNumber, jobTitle, weeklyCommittedHours } = this.state.userProfile;
-    const emailPattern = /^[\w.%+-]+@[a-zA-Z\d]+(\.[a-zA-Z]{2,})+$/i;
-
-    if (!firstName.trim()) {
-      toast.error('First Name is required');
-      return false;
-    } else if (!lastName.trim()) {
-      toast.error('Last Name is required');
-      return false;
-    } else if (!jobTitle.trim()) {
-      toast.error('Job Title is required');
-      return false;
-    } else if (!email) {
-      toast.error('Email is required');
-      return false;
-    } else if (!email.match(emailPattern)) {
-      toast.error('Email format is invalid');
-      return false;
-    } else if (!phoneNumber) {
+    const firstLength = this.state.userProfile.firstName !== '';
+    const lastLength = this.state.userProfile.lastName !== '';
+    const phone = this.state.userProfile.phoneNumber;
+    const role = this.state.userProfile.role;
+    const defaultPassword = this.state.userProfile.defaultPassword;
+    
+    if (phone === null) {
       toast.error('Phone Number is required');
       return false;
     } else if (!weeklyCommittedHours) {
@@ -731,7 +742,10 @@ class UserProfileAdd extends Component {
     } else if (this.state.teamCode && !this.state.codeValid) {
       toast.error('Team Code is invalid');
       return false;
-    } else if (firstName.trim() && lastName.trim() && phoneNumber.length >= 9) {
+    } else if (role !== 'Administrator' && role !== 'Owner' && !defaultPassword) {
+      toast.error('Default Password is required for non-admin users');
+      return false;
+    } else if (firstLength && lastLength && phone.length >= 9) {
       return true;
     } else {
       toast.error('Please fill all the required fields');
@@ -773,11 +787,11 @@ class UserProfileAdd extends Component {
       actualEmail,
       actualPassword,
       startDate,
-      actualConfirmedPassword
+      actualConfirmedPassword,
     } = that.state.userProfile;
 
     const userData = {
-      password: process.env.REACT_APP_DEF_PWD,
+      password: DEFAULT_PASSWORD,
       role: role,
       firstName: firstName,
       lastName: lastName,
@@ -798,9 +812,8 @@ class UserProfileAdd extends Component {
       allowsDuplicateName: allowsDuplicateName,
       createdDate: createdDate,
       teamCode: this.state.teamCode,
-      trophyFollowedUp: false,
-      actualEmail: actualEmail,
-      actualPassword: actualPassword,
+      actualEmail: role === 'Administrator' || role === 'Owner' ? actualEmail : '',
+      actualPassword: role === 'Administrator' || role === 'Owner' ? actualPassword : '',
       startDate: startDate,
     };
 
@@ -1253,6 +1266,18 @@ class UserProfileAdd extends Component {
           },
         });
         break;
+      case 'defaultPassword':
+        this.setState({
+          userProfile: {
+            ...userProfile,
+            defaultPassword: event.target.value,
+          },
+          formErrors: {
+            ...formErrors,
+            defaultPassword: event.target.value.length > 0 ? '' : 'Default Password is required',
+          },
+        });
+        break;
       default:
         this.setState({
           ...userProfile,
@@ -1280,4 +1305,4 @@ export default connect(mapStateToProps, {
   addTeamMember,
   fetchAllProjects,
   hasPermission,
-})(UserProfileAdd);
+})(UserProfileAdd);