Skip to content

Commit 57ee7db

Browse files
Merge pull request #3397 from OneCommunityGlobal/Ramakrishna_Fix_userprofile_teamassign
Ramakrishna fix assigning project via userProfile
2 parents e058026 + edf37f7 commit 57ee7db

3 files changed

Lines changed: 56 additions & 33 deletions

File tree

src/components/Teams/Team.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export function Team(props) {
5757
props.onEditTeam(props.name, props.teamId, props.active, props.teamCode);
5858
}}
5959
style={darkMode ? {} : boxStyle}
60+
disabled={!canPutTeam}
6061
>
6162
Edit
6263
</Button>
@@ -69,6 +70,7 @@ export function Team(props) {
6970
props.onDeleteClick(props.name, props.teamId, props.active, props.teamCode);
7071
}}
7172
style={darkMode ? boxStyleDark : boxStyle}
73+
disabled={!canDeleteTeam}
7274
>
7375
{DELETE}
7476
</Button>

src/components/UserProfile/TeamsAndProjects/AddProjectPopup.jsx

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,31 @@ const AddProjectPopup = React.memo(props => {
3939
}, [props.projects]);
4040

4141
const onAssignProject = async () => {
42-
if (isUserIsNotSelectedAutoComplete) {
43-
const validateProjectName = validationProjectName();
44-
45-
if (!validateProjectName) {
46-
isSetShowAlert(true);
47-
setIsOpenDropdown(true);
48-
return;
42+
try {
43+
if (isUserIsNotSelectedAutoComplete) {
44+
const validateProjectName = validationProjectName();
45+
46+
if (!validateProjectName) {
47+
isSetShowAlert(true);
48+
setIsOpenDropdown(true);
49+
return;
50+
}
4951
}
52+
53+
if (selectedProject && !props.userProjectsById.some(x => x._id === selectedProject._id)) {
54+
await props.onSelectAssignProject(selectedProject);
55+
onSelectProject(undefined);
56+
if (props.handleSubmit !== undefined) {
57+
await props.handleSubmit();
58+
}
59+
toast.success('Project assigned successfully');
60+
} else {
61+
onValidation(false);
62+
}
63+
} catch (error) {
64+
5065
}
51-
52-
if (selectedProject && !props.userProjectsById.some(x => x._id === selectedProject._id)) {
53-
await props.onSelectAssignProject(selectedProject);
54-
onSelectProject(undefined);
55-
toast.success('Project assigned successfully');
56-
} else {
57-
onValidation(false);
58-
}
59-
if (props.handleSubmit !== undefined) {
60-
props.handleSubmit();
61-
}
66+
6267
};
6368

6469
const selectProject = project => {

src/components/UserProfile/UserProfile.jsx

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -206,26 +206,42 @@ function UserProfile(props) {
206206
}
207207
};
208208

209+
const updateProjetTouserProfile = () => {
210+
return new Promise((resolve) => {
211+
checkIsProjectsEqual();
212+
213+
setUserProfile(prevState => {
214+
const updatedProfile = prevState;
215+
if(updatedProfile){
216+
updatedProfile.projects = projects || updatedProfile.projects;
217+
}
218+
return updatedProfile
219+
});
220+
setOriginalUserProfile(prevState => {
221+
const updatedOriginalProfile = prevState;
222+
if(updatedOriginalProfile){
223+
updatedOriginalProfile.projects = projects || updatedOriginalProfile.projects;
224+
}
225+
return updatedOriginalProfile
226+
});
227+
228+
});
229+
};
230+
231+
209232
useEffect(() => {
210233
userProfileRef.current = userProfile;
211234
});
212235

213236
useEffect(() => {
214-
checkIsProjectsEqual();
215-
setUserProfile(prevState => {
216-
const updatedProfile = prevState;
217-
if(updatedProfile){
218-
updatedProfile.projects = projects || updatedProfile.projects;
219-
}
220-
return updatedProfile
221-
});
222-
setOriginalUserProfile(prevState => {
223-
const updatedOriginalProfile = prevState;
224-
if(updatedOriginalProfile){
225-
updatedOriginalProfile.projects = projects || updatedOriginalProfile.projects;
226-
}
227-
return updatedOriginalProfile
228-
});
237+
const helper = async ()=>{
238+
try {
239+
await updateProjetTouserProfile();
240+
} catch (error) {
241+
242+
}
243+
}
244+
helper();
229245
}, [projects]);
230246

231247
useEffect(() => {

0 commit comments

Comments
 (0)