Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Refactor Modals, ChannelHeader and Navbar component #1666

Merged
merged 100 commits into from
Nov 22, 2018
Merged

Refactor Modals, ChannelHeader and Navbar component #1666

merged 100 commits into from
Nov 22, 2018

Commits on Nov 22, 2018

  1. Refactor duplicated RenameChannelModal component 

    Remove duplicated RenameChannelModal code from Navbar and ChannelHeader, Use ModalController instead
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    7a3d7ed View commit details
    Browse the repository at this point in the history

  2. Refactor duplicated EditChannelPurposeModal comp 

    - Remove duplicated EditChannelPurposeModal code from ChannelHeader and
Navbar
- Use ModalController instead of to use it directly
- Change the modal to PureComponent
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a53c657 View commit details
    Browse the repository at this point in the history

  3. Refactor duplicated ChannelMembersModal component 

    - Remove ChannelMembersModal code from ChannelHeader and Navbar
- Now the modal is managed by the ModalController instead of directly by the component.
- Add docs for props of ChannelMemebersModal
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    fb641b7 View commit details
    Browse the repository at this point in the history

  4. Refactor ChannelNotificationsModal comp 

    - Change the ChannelNotificationsModal component to PureComponent
- Add docs for props of ChannelNotificationsModal
- Remove duplicated ChannelNotificationModal code from ChannelHeader and
Navbar
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    7c2cf32 View commit details
    Browse the repository at this point in the history

  5. Move QuickSwitchModal to ModalController

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    45d3eaf View commit details
    Browse the repository at this point in the history

  6. Refactor ModalController component 

    - Change to PureComponent
- Add docs for props
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    0d0e4be View commit details
    Browse the repository at this point in the history

  7. Change Navbar component to PureComponent

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    0681abe View commit details
    Browse the repository at this point in the history

  8. Migrate NavBar code to be use mattermost-redux

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    21b4eeb View commit details
    Browse the repository at this point in the history

  9. Refactor actions in NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    faba039 View commit details
    Browse the repository at this point in the history

  10. Extract SetChannelHeaderOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    4da5158 View commit details
    Browse the repository at this point in the history

  11. Extract ViewChannelInfoOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    6daa40f View commit details
    Browse the repository at this point in the history

  12. Extract NotificationPreferencesOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    2abbbf3 View commit details
    Browse the repository at this point in the history

  13. Extract ChannelMembersOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    32d06e6 View commit details
    Browse the repository at this point in the history

  14. Extract ViewPinnedPostsOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    ab03668 View commit details
    Browse the repository at this point in the history

  15. Extract AddMembersOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    fdb3627 View commit details
    Browse the repository at this point in the history

  16. Extract SetChannelPurposeOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a71acdc View commit details
    Browse the repository at this point in the history

  17. Extract RenameChannelOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    5eae8c3 View commit details
    Browse the repository at this point in the history

  18. Extract ConvertChannelOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    68db33c View commit details
    Browse the repository at this point in the history

  19. Extract DeleteChannelOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    59f3602 View commit details
    Browse the repository at this point in the history

  20. Extract LeaveChannelOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    07f8b6a View commit details
    Browse the repository at this point in the history

  21. Extract ToggleFavoriteChannel component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    65891fa View commit details
    Browse the repository at this point in the history

  22. Fix typo in ModalIdentifiers

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a0793cb View commit details
    Browse the repository at this point in the history

  23. Extract WebrtcOption component from NavBar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    28fd15f View commit details
    Browse the repository at this point in the history

  24. Building clean dropdown code, start from AddMembers

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    3d6aeb5 View commit details
    Browse the repository at this point in the history

  25. ... ViewChannelInfo

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    32f2c62 View commit details
    Browse the repository at this point in the history

  26. ... ViewPinnedPosts

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    29097b1 View commit details
    Browse the repository at this point in the history

  27. ... NotificationPreferences

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    4541859 View commit details
    Browse the repository at this point in the history

  28. ... ToggleFavoriteChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    3f0195f View commit details
    Browse the repository at this point in the history

  29. ... SetChannelHeader

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    099fa0a View commit details
    Browse the repository at this point in the history

  30. ... SetChannelPurpose

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    193568b View commit details
    Browse the repository at this point in the history

  31. ... ViewMembers

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    ff6f507 View commit details
    Browse the repository at this point in the history

  32. ... ManageMembers

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    37e650c View commit details
    Browse the repository at this point in the history

  33. ... ConvertChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    48592df View commit details
    Browse the repository at this point in the history

  34. ... RenameChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    6e0a628 View commit details
    Browse the repository at this point in the history

  35. ... DeleteChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    5d47cc7 View commit details
    Browse the repository at this point in the history

  36. ... LeaveChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    7109c11 View commit details
    Browse the repository at this point in the history

  37. ... WebRTC

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    858b868 View commit details
    Browse the repository at this point in the history

  38. Add draft of ChannelHeaderDropdown component

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    457ee43 View commit details
    Browse the repository at this point in the history

  39. Connect MobileChannelHeaderComponent to redux store

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    2ec1a44 View commit details
    Browse the repository at this point in the history

  40. Change the default rendering of dropdown

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    c306bab View commit details
    Browse the repository at this point in the history

  41. Clean Navbar component with the new dropdown component

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    94d673d View commit details
    Browse the repository at this point in the history

  42. Remove more

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    b0dc1e7 View commit details
    Browse the repository at this point in the history

  43. Extract ShowSearchButton component from Navbar

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    8b43b15 View commit details
    Browse the repository at this point in the history

  44. Remove undefined prop

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    69ab511 View commit details
    Browse the repository at this point in the history

  45. Remove unnecessary wrapper

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    91119f1 View commit details
    Browse the repository at this point in the history

  46. Comment on collapseButtons

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    54025e9 View commit details
    Browse the repository at this point in the history

  47. Refactor Navbar even more 

    - Extract collapse buttons
- Remove code that is unused or never called
- Remove jQuery
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    21defc4 View commit details
    Browse the repository at this point in the history

  48. Fix character of close button

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    cf0ff04 View commit details
    Browse the repository at this point in the history

  49. Make channel prop to be required

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    16c3702 View commit details
    Browse the repository at this point in the history

  50. Remove unused codes

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    f39ea39 View commit details
    Browse the repository at this point in the history

  51. Fix ToggleFavorite menu

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    fb38963 View commit details
    Browse the repository at this point in the history

  52. [MM-11162] Add mute icon to mobile view (mattermost#1744) 

    * add mute icon to mobile view

* use let or const as necessary and do some clean up

Modified.
    @saturninoabril @cometkim
    saturninoabril authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    29e4211 View commit details
    Browse the repository at this point in the history

  53. Fix the composition of navbar 

    TODO:
- Notification preference would not be updated when change
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    ed484a3 View commit details
    Browse the repository at this point in the history

  54. Fix NotificationPreference modal

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    b0e2b06 View commit details
    Browse the repository at this point in the history

  55. Extract ToggleMuteChannel comp from ChannelHeader

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    bb30e01 View commit details
    Browse the repository at this point in the history

  56. Cleanup ChannelHeader with new ChannelHeaderDropdown

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    d082673 View commit details
    Browse the repository at this point in the history

  57. Update snapshot of NotificationPreferences menu

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    d7139fd View commit details
    Browse the repository at this point in the history

  58. Refactor ChannelHeader component

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    4b87632 View commit details
    Browse the repository at this point in the history

  59. Fix tests

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    7bd8110 View commit details
    Browse the repository at this point in the history

  60. MM-12150 - Updating x icon and plugins (mattermost#1841)

    @asaadmahmood @cometkim
    asaadmahmood authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a392c5a View commit details
    Browse the repository at this point in the history

  61. Fix tests

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a032ccb View commit details
    Browse the repository at this point in the history

  62. Rename Navbar to ChannelHeaderMobile 

    - Rename `navbar` to `channel_header_mobile`
- Rename `navbar_info_button` to `channel_info_button`
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    f9f0f67 View commit details
    Browse the repository at this point in the history

  63. MM-12503: Show Mute/Unmute menu item for GMs too. (mattermost#1847)

    @grundleborg @cometkim
    grundleborg authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    d76f995 View commit details
    Browse the repository at this point in the history

  64. Remove comment from view

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    c9fefde View commit details
    Browse the repository at this point in the history

  65. Change ext of modified components to .js instead of .jsx

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    f1c2823 View commit details
    Browse the repository at this point in the history

  66. MM-12494 Removing some flux store usage. (mattermost#1882) 

    * Removing some flux store usage.

* Feedback fixes

Cherry-picked.
    @crspeller @cometkim
    crspeller authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    7fafd9e View commit details
    Browse the repository at this point in the history

  67. Fix some filename extensions

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    8e6d305 View commit details
    Browse the repository at this point in the history

  68. Fix a updated snaphost

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    2c96292 View commit details
    Browse the repository at this point in the history

  69. Migrate ChannelActions joinChannel and leaveChannel to redux (matterm… 

    …ost#1898)

* Migrate ChannelActions favorite and unfavorite channel to redux

* Fix unit test after rebase

* Migrate ChannelActions joinChannel and leaveChannel to redux

Cherry-picked
    @enahum @cometkim
    enahum authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    96b03b3 View commit details
    Browse the repository at this point in the history

  70. Update ModalController snapshot

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    496dc0b View commit details
    Browse the repository at this point in the history

  71. Drop WebRTC from ChannelHeader

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    d887c61 View commit details
    Browse the repository at this point in the history

  72. Remove deprecated lifecycle method from ChannelHeader

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    f2ada0f View commit details
    Browse the repository at this point in the history

  73. Replace hardcoded isMobile to utils

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    8f8b197 View commit details
    Browse the repository at this point in the history

  74. Fix import annotations

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    8420ef1 View commit details
    Browse the repository at this point in the history

  75. Migrate current channel state selectors to use mattermost-redux

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    5b7a299 View commit details
    Browse the repository at this point in the history

  76. Remove unused declarations

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    95deaf0 View commit details
    Browse the repository at this point in the history

  77. Cherry-picked MM-11577: Back to previous channel on archive (mattermo… 

    …st#1775)
    @jespino @cometkim
    jespino authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    48aa099 View commit details
    Browse the repository at this point in the history

  78. Cherry-picked: MM-12497 Remove flux store usages from user settings (m… 

    …attermost#1915)

* Remove Flux store usages from account settings modal

* Fix test

* Remove global action for opening account settings modal

* Fix notifications not updating correctly

* Refactor executeCommand to remove import cycle
    @jwilander @cometkim
    jwilander authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    2a5d742 View commit details
    Browse the repository at this point in the history

  79. Change ToggleMuteChannel component to PureComponent class style to av… 

    …oid arrow function in render
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    b854604 View commit details
    Browse the repository at this point in the history

  80. Remove unnecessary arrow function in render

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    c4292d9 View commit details
    Browse the repository at this point in the history

  81. Rollback mapStateToProps to plain function

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    114d417 View commit details
    Browse the repository at this point in the history

  82. Change UnmuteChannelButton component to PureComponent class style to … 

    …avoid arrow function in render
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    70fdf9c View commit details
    Browse the repository at this point in the history

  83. Change file ext for UnmuteChannelButton to .js

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    18e55b4 View commit details
    Browse the repository at this point in the history

  84. Move back QuickSwitchModal to ChannelHeader (Desktop only), and use r… 

    …edux action
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    859e6b9 View commit details
    Browse the repository at this point in the history

  85. Change ShowSearchButton component to PureComponent class style to avo… 

    …id arrow function in render
    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    288f618 View commit details
    Browse the repository at this point in the history

  86. Rollback mapStateToProps for ViewPinnedPosts to plain function

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    ce99b44 View commit details
    Browse the repository at this point in the history

  87. Cherry-picked: Remove flux usages from email invite modal (mattermost… 

    …#1954)
    @jwilander @cometkim
    jwilander authored and cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    f29dda7 View commit details
    Browse the repository at this point in the history

  88. Fix Channel Header

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    9d9c512 View commit details
    Browse the repository at this point in the history

  89. Fix ShowSearchButton in ChannelHeaderMobile

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    cf00c3f View commit details
    Browse the repository at this point in the history

  90. Fix ChannelMembersModal on PopoverListMembers

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    a86b9e1 View commit details
    Browse the repository at this point in the history

  91. Migrate test files to component path

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    463501b View commit details
    Browse the repository at this point in the history

  92. fix eslint style error on test mock

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    5acdc93 View commit details
    Browse the repository at this point in the history

  93. Update per feedback

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    32a47c4 View commit details
    Browse the repository at this point in the history

  94. Fix ChannelMembersModal test, IDK when it have been break exactly

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    e32df59 View commit details
    Browse the repository at this point in the history

  95. Fix errors on dropdown

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    3c31e33 View commit details
    Browse the repository at this point in the history

  96. Fix view_and_manage_members to show different name by permission

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    84a809e View commit details
    Browse the repository at this point in the history

  97. Fix to show RenameChannel on defaultChannel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    b3c430d View commit details
    Browse the repository at this point in the history

  98. Refactor ChannelMembersModal to use redux action

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    71b0f26 View commit details
    Browse the repository at this point in the history

  99. Fix ChannelNotificationModal to handle hide anim correctly

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    22d8563 View commit details
    Browse the repository at this point in the history

  100. Fix ViewAndManageMembers to be view mode only in default channel

    @cometkim
    cometkim committed Nov 22, 2018
    Configuration menu
    Copy the full SHA
    59d3874 View commit details
    Browse the repository at this point in the history