Skip to content

[FIX] Closing sidebar when room menu is clicked.#13842

Merged
rodrigok merged 9 commits intoRocketChat:developfrom
Kailash0311:sidebar-close
Apr 6, 2019
Merged

[FIX] Closing sidebar when room menu is clicked.#13842
rodrigok merged 9 commits intoRocketChat:developfrom
Kailash0311:sidebar-close

Conversation

@Kailash0311
Copy link
Contributor

Closes #13841.
Stops propagation of "closing the menu event" onto the sidebar_menu class.

@engelgabriel engelgabriel added this to the 1.0.0 milestone Mar 21, 2019
@engelgabriel engelgabriel changed the title Don't close sidebar when room menu is clicked. [FIX] Closing sidebar when room menu is clicked. Mar 21, 2019
@engelgabriel engelgabriel added the area: ui Touches the code on client side label Mar 21, 2019
tassoevan
tassoevan previously approved these changes Mar 25, 2019
Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

can you please add an end-to-end test to prevent this? like, test clicking on the '3 dots' and see if the sidebar is still open.

I would add it after opening the menu on this test.

@Kailash0311
Copy link
Contributor Author

Kailash0311 commented Mar 26, 2019

@sampaiodiego I have added the test, can you please review it


get sidebarWrap() { return browser.element('.sidebar-wrap'); }

get sidebarItemMenu() { return browser.element('.sidebar-menu'); }
Copy link
Member

Choose a reason for hiding this comment

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

I haven't found this element on the source code. Maybe you were trying to get sidebar-item__menu instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes sorry

@Kailash0311
Copy link
Contributor Author

@sampaiodiego I've rectified the mistake.

Copy link
Member

@sampaiodiego sampaiodiego left a comment

Choose a reason for hiding this comment

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

thanks @Kailash0311 .. but the tests are not passing.

you can run tests locally by running meteor setting the env var TEST_MODE=true like:

TEST_MODE=true meteor

and in another console run meteor npm run chimp-test

@rodrigok rodrigok self-assigned this Apr 6, 2019
@rodrigok rodrigok merged commit 0383c28 into RocketChat:develop Apr 6, 2019
wreiske added a commit to wreiske/Rocket.Chat that referenced this pull request Apr 7, 2019
… into emoji-upgrades

* 'emoji-upgrades' of https://github.com/wreiske/Rocket.Chat:
  Settings: disable reset button (RocketChat#14026)
  Settings: hiding  reset button for readonly fields (RocketChat#14025)
  [NEW] Add support to updatedSince parameter in emoji-custom.list and deprecated old endpoint (RocketChat#13510)
  [IMPROVE] Add permission to change other user profile avatar (RocketChat#13884)
  [IMPROVE] UI of Permissions page (RocketChat#13732)
  [NEW] Chatpal: Enable custom search parameters (RocketChat#13828) (RocketChat#13829)
  [FIX] Closing sidebar when room menu is clicked. (RocketChat#13842)
  [FIX] Check settings for name requirement before validating (RocketChat#14021)
  Fix debug logging not being enabled by the setting (RocketChat#13979)
  [FIX] Links and upload paths when running in a subdir (RocketChat#13982)
@rodrigok rodrigok mentioned this pull request Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: ui Touches the code on client side

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Sidebar menu closes on clicking room menu (when screen-size is less.)

5 participants

Comments