Merge pull request #5071 from OneCommunityGlobal/peterson-fix-user-email-not-showing

Peterson fix email column not displaying in user search

Author: one-community

src/components/Projects/Members/FoundUser/FoundUser.jsx

@@ -17,29 +17,22 @@ const FoundUser = props => {
           <div>{props.index + 1}</div>
         </th>
         <td className="foundUsers__order">
-          <a href={`/userprofile/${props.uid}`} className={darkMode ? 'text-azure' : ''}>{props.firstName + ' ' + props.lastName}</a>
+          <a href={`/userprofile/${props.uid}`}>
+            {props.fullName}
+          </a>
+        </td>
+        <td className="foundUsers__email">
+          {props.email}
         </td>
-        <td className="foundUsers__email">{props.email}</td>
         <td className="foundUsers__assign">
           {props.assigned ? (
             <span className="text-success">Assigned</span>
           ) : (
             <button
               className="btn btn-outline-primary btn-sm"
               type="button"
-              onClick={async e => {
-                await props.assignProject(
-                  props.projectId,
-                  props.uid,
-                  'Assign',
-                  props.firstName,
-                  props.lastName,
-                  props.isActive,
-                );
-                // Optionally, trigger a refresh or update local state if needed
-                // e.g., props.onAssigned && props.onAssigned(props.uid);
-              }}
               style={darkMode ? {} : boxStyle}
+              onClick={() => props.assignProject(props.projectId, props.uid, 'Assign', props.firstName, props.lastName, 'true')}
             >
               <i className="fa fa-plus" aria-hidden="true"></i>
             </button>

src/components/Projects/Members/FoundUser/__tests__/FoundUser.test.jsx

@@ -33,6 +33,7 @@ describe('FoundUser Component', () => {
     uid: 'user123',
     firstName: 'John',
     lastName: 'Smith',
+    fullName: 'John Smith',
     isActive: 'true',
     email: 'john.smith@example.com',
     assigned: false,

src/components/Projects/Members/Members.jsx

@@ -22,6 +22,8 @@ import { boxStyle, boxStyleDark } from '~/styles';
 import ToggleSwitch from '~/components/UserProfile/UserProfileEdit/ToggleSwitch';
 import Loading from '~/components/common/Loading';
 import { getProjectDetail } from '~/actions/project';
+import axios from 'axios';
+import { ENDPOINTS } from '~/utils/URL';
 
 const Members = props => {
   const darkMode = props.state.theme.darkMode;
@@ -34,6 +36,37 @@ const Members = props => {
 
   const [isLoading, setIsLoading] = useState(true);
 
+  const [allProfiles, setAllProfiles] = useState([]);
+
+  useEffect(() => {
+    axios.get(ENDPOINTS.USER_PROFILES)
+      .then(response => {
+        setAllProfiles(response.data || []);
+      })
+      .catch(() => {
+        setAllProfiles([]);
+      });
+  }, []);
+
+  const filteredUsers = searchText.trim()
+    ? allProfiles
+        .filter(user => {
+          const search = searchText.trim().toLowerCase();
+          return (
+            (user.firstName && user.firstName.toLowerCase().includes(search)) ||
+            (user.lastName && user.lastName.toLowerCase().includes(search)) ||
+            (user.email && user.email.toLowerCase().includes(search))
+          );
+        })
+        .map(user => ({
+          fullName: `${user.firstName || ''} ${user.lastName || ''}`.trim(),
+          email: user.email,
+          assigned: false,
+          _id: user._id,
+        }))
+        .filter(user => !!user.email)
+    : [];
+
   const canAssignProjectToUsers = props.hasPermission('assignProjectToUsers');
   const canUnassignUserInProject = props.hasPermission('unassignUserInProject');
 
@@ -232,13 +265,11 @@ const Members = props => {
 
 
 
-          {showFindUserList && props.state.projectMembers.foundUsers.length > 0 ? (
+          {showFindUserList && filteredUsers.length > 0 && (
             <table className={`table table-bordered table-responsive-sm ${darkMode ? 'text-light' : ''}`}>
               <thead>
                 <tr className={darkMode ? 'bg-space-cadet' : ''}>
-                  <th scope="col" id="foundUsers__order">
-                    #
-                  </th>
+                  <th scope="col" id="foundUsers__order">#</th>
                   <th scope="col">Name</th>
                   <th scope="col">Email</th>
                   {canAssignProjectToUsers ? (
@@ -257,22 +288,21 @@ const Members = props => {
                 </tr>
               </thead>
               <tbody>
-                {props.state.projectMembers.foundUsers.map((user, i) => (
+                {filteredUsers.map((user, i) => (
                   <FoundUser
                     index={i}
                     key={user._id}
                     projectId={projectId}
                     uid={user._id}
+                    fullName={user.fullName}
                     email={user.email}
-                    firstName={user.firstName}
-                    lastName={user.lastName}
                     assigned={user.assigned}
                     darkMode={darkMode}
                   />
                 ))}
               </tbody>
             </table>
-          ) : null}
+          )}
 
           <ToggleSwitch
             switchType="active_members"