Merge pull request #3164 from OneCommunityGlobal/development

Frontend Release to Main [4.0]

Author: one-community

src/components/TeamMemberTasks/TeamMemberTask.jsx

@@ -253,7 +253,7 @@ const TeamMemberTask = React.memo(
                               <Link
                                 to= {`/peoplereport/${user?.personId}`}
                                >
-                                <span class="team-member-tasks-number">{completedTasks.length}</span>.
+                                <span class="team-member-tasks-number">{completedTasks.length}</span>
                               </Link>
                             }
                           <Warning

src/components/UserProfile/UserProfile.jsx

@@ -951,6 +951,7 @@ function UserProfile(props) {
               {(userProfile?.profilePic!==undefined)?
                 <Button color="danger" onClick={toggleRemoveModal} className="remove-button">
                   Remove Image</Button>:<></>}
+{/*                   
               {((userProfile?.profilePic==undefined || 
                 userProfile?.profilePic==null || 
                 userProfile?.profilePic=="")&& 
@@ -959,10 +960,10 @@ function UserProfile(props) {
                   userProfile?.suggestedProfilePics.length!==0
                 ))?
                 <Button color="primary" onClick={toggleModal}>Suggested Profile Image</Button>
-                :null}
+                :null} */}
                 </div>
 
-                {userProfile!==undefined && userProfile.suggestedProfilePics!==undefined?<ProfileImageModal isOpen={isModalOpen} toggleModal={toggleModal} userProfile={userProfile}/>:<></>}
+                {/* {userProfile!==undefined && userProfile.suggestedProfilePics!==undefined?<ProfileImageModal isOpen={isModalOpen} toggleModal={toggleModal} userProfile={userProfile}/>:<></>} */}
                 <ConfirmRemoveModal
                   isOpen={isRemoveModalOpen}
                   toggleModal={toggleRemoveModal}

src/components/UserProfile/UserProfileModal/suggestedProfileModal.js

@@ -13,9 +13,20 @@ const ProfileImageModal = ({ isOpen, toggleModal, userProfile }) => {
     setSelectedImage(image);  // Store the selected image info
   };
 
+  function getImageSource(image) {
+    if (image.nitro_src !== null && image.nitro_src !== undefined) {
+      return image.nitro_src;
+    } else if (image.src && image.src.startsWith("http")) {
+      return image.src;
+    } else if (image.data_src !== undefined) {
+      return image.data_src;
+    }
+    return null; // Return null if no valid source is found
+  }
+
   const updateProfileImage= async ()=>{
     try {
-      let image=selectedImage.nitro_src!==undefined && selectedImage.nitro_src!==null?selectedImage.nitro_src:selectedImage.src;
+      let image=getImageSource(selectedImage);
       await axios.put(ENDPOINTS.USERS_UPDATE_PROFILE_FROM_WEBSITE,{'selectedImage':image,'user_id':userProfile._id})
       toast.success("Profile Image Updated")
     }    
@@ -36,7 +47,7 @@ const ProfileImageModal = ({ isOpen, toggleModal, userProfile }) => {
               className={`suggestedProfileTile ${selectedImage === image ? 'selected' : ''}`}
               onClick={() => handleImageSelect(image)}
             >
-              <img src={image.nitro_src!==undefined && image.nitro_src!==null?image.nitro_src:image.src} alt={image.alt} />
+              <img src={getImageSource(image)} alt={image.alt} />
             </div>
           ))}
         </div>