Skip to content

regression: Fix Users list in the Administration #22034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
ggazzo merged 37 commits into from
May 17, 2021
Merged

regression: Fix Users list in the Administration #22034

ggazzo merged 37 commits into from
May 17, 2021

Conversation

@Jeanstaquet
Copy link
Contributor

@Jeanstaquet Jeanstaquet commented May 14, 2021 •
edited
Loading

Proposed changes (including videos or screenshots)

The app crashed if no custom fields for user profiles have been created by the admin. I fixed this issue. This bug was introduced by a recent commit.

2021-05-14.03-59-55.mp4

Issue(s)

Fixes #22035

Steps to test or reproduce

Further comments

Jeanstaquet and others added 30 commits March 12, 2021 06:46
@Jeanstaquet
Merge pull request #1 from RocketChat/develop
36203dd 
updating the code
@Jeanstaquet
Merge pull request #2 from RocketChat/develop
f0ca3f3 
updating the code
@Jeanstaquet
Merge pull request #3 from RocketChat/develop
579fecc 
updating the fork
@Jeanstaquet
Merge pull request #5 from RocketChat/develop
c77a81a 
update main branch
@Jeanstaquet
Merge pull request #6 from RocketChat/develop
05fe364 
updating the branch
@Jeanstaquet
Merge pull request #7 from RocketChat/develop
5d756bd 
Update fork
@Jeanstaquet
Merge pull request #8 from RocketChat/develop
9d0361a 
Upating the fork
@Jeanstaquet
Merge pull request #9 from RocketChat/develop
3d57173 
Updating fork
@Jeanstaquet
Merge pull request #10 from RocketChat/develop
a94b15f 
Updating fork
@Jeanstaquet
Merge pull request #11 from RocketChat/develop
04e64c3 
Updating fork
@Jeanstaquet
Merge pull request #12 from RocketChat/develop
4ba0ac7 
Updating Fork
@Jeanstaquet
Adding the RO permission on the Channel Modal
6c6fe18
@Jeanstaquet
Adding the Fix
3ea8158
@Jeanstaquet
Merge pull request #13 from RocketChat/develop
63bc7e9 
Updating fork
@Jeanstaquet
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
e6247c8 
…into develop
@Jeanstaquet
Merge branch 'FixPermission2' into develop
790ccab
@Jeanstaquet
Merge pull request #14 from RocketChat/develop
8f22262 
Updating fork
@Jeanstaquet
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
096cb36 
…into develop
@Jeanstaquet
.
ca1ec19
@Jeanstaquet
Merge pull request #15 from RocketChat/develop
666ef55 
Updating fork
@Jeanstaquet
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
2db4458 
…into develop
@Jeanstaquet
Merge pull request #16 from RocketChat/develop
bbef619 
Updating fork
@Jeanstaquet
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
8030748 
…into develop
@Jeanstaquet
Merge pull request #17 from RocketChat/develop
c754b3a 
Updating fork
@Jeanstaquet
Merge branch 'develop' of https://github.com/Jeanstaquet/Rocket.Chat …
adb1b79 
…into develop
@Jeanstaquet
Cleaning
40ebb18
@Jeanstaquet
Merge pull request #34 from RocketChat/develop
97c03a9 
Update branch
@Jeanstaquet
Merge pull request #39 from RocketChat/develop
3b48b0b 
Updating fork
@Jeanstaquet
Merge pull request #40 from RocketChat/develop
4b1fcb7 
Updating fork
@Jeanstaquet
Merge pull request #47 from RocketChat/develop
4416c8f 
Updating fork
@Jeanstaquet Jeanstaquet changed the title [FIX] Prevent the app from crashing when there a no custom fields defined [FIX] The app crashed if no custom fields for user profiles have been created by the admin May 14, 2021
@Jeanstaquet Jeanstaquet changed the title [FIX] The app crashed if no custom fields for user profiles have been created by the admin [FIX] The app crashed when you go to the Users list in Admin if no custom fields for user profiles have been created by the admin May 14, 2021
@Jeanstaquet Jeanstaquet changed the title [FIX] The app crashed when you go to the Users list in Admin if no custom fields for user profiles have been created by the admin [FIX] The app crashed when you went to the Users list in Admin if no custom fields for user profiles have been created by the admin May 14, 2021
@Jeanstaquet Jeanstaquet changed the title [FIX] The app crashed when you went to the Users list in Admin if no custom fields for user profiles have been created by the admin [FIX] The application crashes when accessing the Users list in the Administration if no custom fields for user profiles have been created by the administrator. May 14, 2021
ggazzo
ggazzo requested changes May 14, 2021
View reviewed changes
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should insert a try catch here, just in case we insert an invalid json.

If I'm not wrong there is one more place that we could insert this test ,could you check please? thanks

@Jeanstaquet
Copy link
Contributor Author

Jeanstaquet commented May 14, 2021

I think we should insert a try catch here, just in case we insert an invalid json.

If I'm not wrong there is one more place that we could insert this test ,could you check please? thanks

Hello @ggazzo,
Many thanks for your review and advice. However after your comment I have done multiple tests, and searched in many places, I don't see where I can add to the other similar test. Do you have any details on adding the extra test you mention?
Thanks a lot

@ggazzo
Copy link
Member

ggazzo commented May 14, 2021

by bad I thought we had this in two places

@Jeanstaquet Jeanstaquet requested a review from ggazzo May 14, 2021 17:26
@ggazzo ggazzo changed the title [FIX] The application crashes when accessing the Users list in the Administration if no custom fields for user profiles have been created by the administrator. regression: Fix Users list in the Administration May 17, 2021
@ggazzo ggazzo merged commit 3aff951 into RocketChat:develop May 17, 2021
@Jeanstaquet Jeanstaquet deleted the FixUserInfo branch May 17, 2021 14:38
@Jeanstaquet Jeanstaquet mentioned this pull request May 18, 2021
Closed
@sampaiodiego sampaiodiego mentioned this pull request May 28, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ggazzo ggazzo ggazzo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

The app crashes if you go in the Admin Users section

2 participants

@Jeanstaquet @ggazzo