Skip to content
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

[FIX] Show active admin and user account menu item #17047

Merged
merged 10 commits into from
Apr 21, 2020
Merged

[FIX] Show active admin and user account menu item #17047

merged 10 commits into from
Apr 21, 2020

Conversation

hullen
Copy link
Contributor

@hullen hullen commented Mar 27, 2020 •
edited by rodrigok
Loading

Closes #8500

Added support to show active sidebar menu item on the user account and admin panels.

Screen Capture on 2020-03-27 at 10-35-25

Screen Capture on 2020-03-27 at 10-43-23

@CLAassistant
Copy link

CLAassistant commented Mar 27, 2020 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@rodrigok rodrigok added this to the 3.2.0 milestone Mar 27, 2020
hullen added 3 commits March 27, 2020 14:00
@hullen
Added active sidebar menu item on omnichannel
2abaffe
@hullen
Changed route href on some pages to show menu active
38409e6 
Tks @rodrigok fot the tips! 🚀 👊
This changes made current active menu item highlight on the pages bellow
- Connectivity Services
- Federation Dashboard
@hullen
Fix affected routes by name changes (cloud route)
1a79813
rodrigok
rodrigok previously approved these changes Mar 27, 2020
View reviewed changes
@sampaiodiego
Copy link
Member

sampaiodiego commented Apr 13, 2020 •
edited
Loading

Looks like admin routes definition has changed, causing conflicts to this PR.. can you please take a look?

maybe @tassoevan can give a little help as he changed them on #17209

@hullen
Copy link
Contributor Author

hullen commented Apr 18, 2020

Hey @tassoevan, did you change route '/admin/info' param name? Before section param returns 'admin-info', but now just 'admin'. I control the active menu item with this prop param.
File: app/ui-admin/client/adminFlex.js:83

@tassoevan
Copy link
Contributor

@hullen I don't think so. At least it seems correctly defined in app/ui-admin/client/routes.js.

@hullen
Copy link
Contributor Author

hullen commented Apr 19, 2020

@hullen I don't think so. At least it seems correctly defined in app/ui-admin/client/routes.js.
I see this changes, but i dont understand why route param name changed.

@tassoevan tassoevan requested a review from a team April 19, 2020 02:43
@rodrigok
Copy link
Member

Would this replace the PR #13111?

@hullen
Copy link
Contributor Author

hullen commented Apr 20, 2020

Would this replace the PR #13111?

Yes, my PR cover itens this PR too. ;) But with another aproach to solve this.

@tassoevan tassoevan mentioned this pull request Apr 20, 2020
Closed
@rodrigok rodrigok merged commit 545e03a into RocketChat:develop Apr 21, 2020
@rodrigok rodrigok mentioned this pull request Apr 21, 2020
Closed
@tassoevan tassoevan mentioned this pull request Apr 22, 2020
Closed
gabriellsh added a commit that referenced this pull request Apr 22, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
750b050 
…users_and_rooms

* 'develop' of github.com:RocketChat/Rocket.Chat: (29 commits)
  [FIX] 2FA not showing codes for Spanish translation (#17378)
  [NEW] [ENTERPRISE] Restrict the permissions configuration for guest users  (#17333)
  [NEW] Federation event for when users left rooms (#17091)
  [FIX] CSV Importer fails when there are no users to import (#16790)
  Import slack's mpims as direct rooms instead of private groups (#17206)
  [FIX] SAML Idp Initiated Logout Error (#17324)
  [NEW] Better Push and Email Notification logic (#17357)
  [NEW] Error page when browser is not supported (#17372)
  [NEW] [ENTERPRISE] Omnichannel queue priorities (#17141)
  [IMPROVE] Change the SAML metadata order to conform to XSD specification (#15488)
  [IMPROVE] Filter markdown in notifications (#9995)
  [IMPROVE] User gets UI feedback when message is pinned or unpinned (#16056)
  Remove set as alias setting (#16343)
  [IMPROVE] Add `file-title` and `file-desc` as new filter tag options on message search (#16858)
  [NEW]  Add ability to set tags in the Omnichannel room closing dialog (#17254)
  [FIX] Show active admin and user account menu item (#17047)
  [NEW] [ENTERPRISE] Allows to set a group of departments accepted for forwarding chats (#17335)
  [FIX] Prevent user from getting stuck on login, if there is some bad fname (#17331)
  [FIX] Remove properties from users.info response (#17238)
  Bump version to 3.1.1
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 27, 2020
Merged
@engelgabriel engelgabriel mentioned this pull request May 21, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tassoevan tassoevan tassoevan approved these changes

@rodrigok rodrigok rodrigok left review comments

Assignees
No one assigned
Labels
ui/ux
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.

[Bug] Active link not highlighted in sidebar
5 participants
@hullen @CLAassistant @sampaiodiego @tassoevan @rodrigok