Merge pull request #3397 from OneCommunityGlobal/Ramakrishna_Fix_userprofile_teamassign

Ramakrishna fix assigning project via userProfile

Author: one-community

src/components/Teams/Team.jsx

@@ -57,6 +57,7 @@ export function Team(props) {
                 props.onEditTeam(props.name, props.teamId, props.active, props.teamCode);
               }}
               style={darkMode ? {} : boxStyle}
+              disabled={!canPutTeam}
             >
               Edit
             </Button>
@@ -69,6 +70,7 @@ export function Team(props) {
                 props.onDeleteClick(props.name, props.teamId, props.active, props.teamCode);
               }}
               style={darkMode ? boxStyleDark : boxStyle}
+              disabled={!canDeleteTeam}
             >
               {DELETE}
             </Button>

src/components/UserProfile/TeamsAndProjects/AddProjectPopup.jsx

@@ -39,26 +39,31 @@ const AddProjectPopup = React.memo(props => {
   }, [props.projects]);
 
   const onAssignProject = async () => {
-    if (isUserIsNotSelectedAutoComplete) {
-      const validateProjectName = validationProjectName();
-
-      if (!validateProjectName) {
-        isSetShowAlert(true);
-        setIsOpenDropdown(true);
-        return;
+    try {
+      if (isUserIsNotSelectedAutoComplete) {
+        const validateProjectName = validationProjectName();
+  
+        if (!validateProjectName) {
+          isSetShowAlert(true);
+          setIsOpenDropdown(true);
+          return;
+        }
       }
+  
+      if (selectedProject && !props.userProjectsById.some(x => x._id === selectedProject._id)) {
+        await props.onSelectAssignProject(selectedProject);
+        onSelectProject(undefined);
+        if (props.handleSubmit !== undefined) {
+         await props.handleSubmit();
+        }
+        toast.success('Project assigned successfully');
+      } else {
+        onValidation(false);
+      }
+    } catch (error) {
+      
     }
-
-    if (selectedProject && !props.userProjectsById.some(x => x._id === selectedProject._id)) {
-      await props.onSelectAssignProject(selectedProject);
-      onSelectProject(undefined);
-      toast.success('Project assigned successfully');
-    } else {
-      onValidation(false);
-    }
-    if (props.handleSubmit !== undefined) {
-      props.handleSubmit();
-    }
+   
   };
 
   const selectProject = project => {

src/components/UserProfile/UserProfile.jsx

@@ -206,26 +206,42 @@ function UserProfile(props) {
     }
   };
 
+  const updateProjetTouserProfile = () => {
+    return new Promise((resolve) => {
+      checkIsProjectsEqual();
+      
+      setUserProfile(prevState => {
+        const updatedProfile = prevState;
+        if(updatedProfile){
+          updatedProfile.projects = projects || updatedProfile.projects;
+        }
+        return updatedProfile
+      });
+      setOriginalUserProfile(prevState => {
+        const updatedOriginalProfile = prevState;
+        if(updatedOriginalProfile){
+          updatedOriginalProfile.projects = projects || updatedOriginalProfile.projects;
+        }
+        return updatedOriginalProfile
+      });
+  
+    });
+  };
+  
+
   useEffect(() => {
     userProfileRef.current = userProfile;
   });
 
   useEffect(() => {
-    checkIsProjectsEqual();
-    setUserProfile(prevState => {
-      const updatedProfile = prevState;
-      if(updatedProfile){
-        updatedProfile.projects = projects || updatedProfile.projects;
-      }
-      return updatedProfile
-    });
-    setOriginalUserProfile(prevState => {
-      const updatedOriginalProfile = prevState;
-      if(updatedOriginalProfile){
-        updatedOriginalProfile.projects = projects || updatedOriginalProfile.projects;
-      }
-      return updatedOriginalProfile
-    });
+     const helper = async ()=>{
+        try {
+          await updateProjetTouserProfile();
+        } catch (error) {
+          
+        }
+     }
+    helper();
   }, [projects]);
 
   useEffect(() => {