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

Mobile/Desktop Sidebar View + Restored Team Sidebar and Header #5016

Merged

Conversation

devinbinnie
Copy link
Member

@devinbinnie devinbinnie commented Mar 9, 2020

Summary

Mobile/desktop sidebar view fixes so that it works correctly.
Also added back the team sidebar and sidebar header since we aren't changing those in Phase 1.

Ticket Link

https://mattermost.atlassian.net/browse/MM-22835

@devinbinnie devinbinnie added the 2: Dev Review Requires review by a core commiter label Mar 9, 2020
@devinbinnie devinbinnie added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Mar 9, 2020
@devinbinnie devinbinnie changed the title Mobile Sidebar View + Restored Team Sidebar and Header Mobile/Desktop Sidebar View + Restored Team Sidebar and Header Mar 9, 2020
@devinbinnie devinbinnie requested review from deanwhillier and removed request for bradjcoughlin March 9, 2020 19:09
@devinbinnie devinbinnie removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Mar 9, 2020
@devinbinnie devinbinnie added 4: Reviews Complete All reviewers have approved the pull request Do Not Merge Should not be merged until this label is removed and removed 2: Dev Review Requires review by a core commiter Do Not Merge Should not be merged until this label is removed labels Mar 10, 2020
@devinbinnie devinbinnie merged commit 01480e3 into mattermost:feature/channel-sidebar-organization Mar 10, 2020
devinbinnie added a commit that referenced this pull request Mar 18, 2020
* [MM-20881] Moved out old sidebar and added setting to activate new one (#4553)

* Redux update

* Update redux commit

* Redux merge

* Base channel sidebar architecture (#4706)

Automatic Merge

* [MM-21911] Moved favicon and titlebar update to its own component (#4811)

* [MM-21911] Moved favicon and titlebar update to its own component

* Moved favicon/title tests to their own file

* PR feedback

* [MM-21907][MM-21908] Unread Handling and Scrolling (#4799)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* PR feedback

* aaa

* [MM-21909] Keyboard shortcuts and a11y-controller classes (#4821)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Added a11y classes to new sidebar

* Keyboard shortcuts

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* PR feedback

* Removed isSwitchingChannel

* aaa

* Revert redux commit until tests are fixed

* [MM-22290] Collapsible Category Logic (#4873)

* Barebone collapsing of categories (no saving)

* Take into account unreads and if the channel is the current visible channel

* Reactifying and cleaning up a couple small things

* More cleanup

* Clarity

* Added new style sheet for new sidebar, and the animation for collapsing categories

* Lint/type fixes and accessibility

* Moved a11y section to just the title, for better reading and navigation

* Removing code that won't be used

* Merge'd

* Category name is repeated

* PR feedback

* Removing unnecessary code

* [MM-21910] Modal Handling for new Sidebar (#4847)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Added a11y classes to new sidebar

* Keyboard shortcuts

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* Moved modals over to sidebar

* PR feedback

* Removed isSwitchingChannel

* aaa

* Modals functional

* PR feedback

* Merge'd

* MM-22114 Add view state for collapsed categories and unread filter (#4914)

* [MM-22291] Additional functionality from old sidebar (#4860)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* PR feedback

* MM-21584 Replace removeItem call with setItem (#5003)

* Update redux commit

* Merging of CSS styles into new sidebar code (#4998)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

Co-authored-by: mattermod <[email protected]>

* [MM-22478] Unread Filtering and Create New Channel Menu (#5005)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Added base structure

* Unread filter and add channel dropdown design and some functionality

* Unread filtering and collapsible category logic hookup to redux

* Lint fixes

* Added translations

* Disable collapse when unread filter is on

* Merge'd

* PR feedback

* And more

Co-authored-by: mattermod <[email protected]>

* CSS fix for single team instances

* PR feedback and some more missing redux hookups

* Mobile/Desktop Sidebar View + Restored Team Sidebar and Header (#5016)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

* WIP

* Added back original team sidebar and sidebar header for Phase 1

* Mobile bar fits, still styling issues

* Style and lint fixes to make the sidebar work properly

* Desktop and other mobile fixes

* Merge'd

Co-authored-by: mattermod <[email protected]>

* Fixed labels to match spec

* Snapshot update

* Channel Switcher + History Button Style (#5023)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

* Added channel switcher modal button and back/forward buttons

* Lint fixes and formatting

* Styled arrows and buttons, and mock back/forward

* Unmocking for Phase 1

* Removed unnecessary ms-filter

Co-authored-by: mattermod <[email protected]>

* Fixed so that the swap between old and new sidebars is instant, mobile view fixes

* Type fix

* Lint fix

* PR feedback for Eric/Harrison

* A bunch of alignment changes

* Another design fix

* [MM-23056] Analytics for new and old sidebar

* More alignment fixes

* Fixed letter cutoff issue and an alignment issue

* [MM-22834] Hide unused Account Settings options when the new sidebar is enabled

* Even more more alignment fixes, a test fix and some scrolling fixes

* Additional alignment and style fixes

* Alignment fixes for the history arrows

* Fixed a test and a couple small issues

* Added missing tooltips

* Fix for the team switching crashing issue

* Lint fix

* A lot of a11y fixes, still need more

* Lint and test fixes

* Added some missing aria-labels

* Fix crash issue #2

* Removed autoclose redirect since it can't fire

* Removed more dead code

* Redux update

* PR feedback

* Fixed a couple more small issues

* Fixed a redux issue

* More redux fixes and a bug fix

* Fixed a test

* Lint error

Co-authored-by: Harrison Healey <[email protected]>
Co-authored-by: mattermod <[email protected]>
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Mar 18, 2020
sowmiyamuthuraman pushed a commit to sowmiyamuthuraman/mattermost-webapp that referenced this pull request Apr 10, 2020
* [MM-20881] Moved out old sidebar and added setting to activate new one (mattermost#4553)

* Redux update

* Update redux commit

* Redux merge

* Base channel sidebar architecture (mattermost#4706)

Automatic Merge

* [MM-21911] Moved favicon and titlebar update to its own component (mattermost#4811)

* [MM-21911] Moved favicon and titlebar update to its own component

* Moved favicon/title tests to their own file

* PR feedback

* [MM-21907][MM-21908] Unread Handling and Scrolling (mattermost#4799)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* PR feedback

* aaa

* [MM-21909] Keyboard shortcuts and a11y-controller classes (mattermost#4821)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Added a11y classes to new sidebar

* Keyboard shortcuts

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* PR feedback

* Removed isSwitchingChannel

* aaa

* Revert redux commit until tests are fixed

* [MM-22290] Collapsible Category Logic (mattermost#4873)

* Barebone collapsing of categories (no saving)

* Take into account unreads and if the channel is the current visible channel

* Reactifying and cleaning up a couple small things

* More cleanup

* Clarity

* Added new style sheet for new sidebar, and the animation for collapsing categories

* Lint/type fixes and accessibility

* Moved a11y section to just the title, for better reading and navigation

* Removing code that won't be used

* Merge'd

* Category name is repeated

* PR feedback

* Removing unnecessary code

* [MM-21910] Modal Handling for new Sidebar (mattermost#4847)

* WIP

* Barely working sidebar

* Temp fix so you can use the sidebar better

* Lint and type fixes

* Unread badge and bolding class added

* Split up sidebar channel types into different components

* Lint/type fixes

* WIP

* PR feedback

* Lint fix

* Unread indicators and scrolling!

* Auto scrolling when changing teams/when channel is in view

* Lint and type fixes

* Another type fix

* Removing unnecessary styling

* PR feedback

* package fix

* Added a11y classes to new sidebar

* Keyboard shortcuts

* Reverted to regular scrollbars

* Whoops, left my dumb test styling in :P

* Moved modals over to sidebar

* PR feedback

* Removed isSwitchingChannel

* aaa

* Modals functional

* PR feedback

* Merge'd

* MM-22114 Add view state for collapsed categories and unread filter (mattermost#4914)

* [MM-22291] Additional functionality from old sidebar (mattermost#4860)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* PR feedback

* MM-21584 Replace removeItem call with setItem (mattermost#5003)

* Update redux commit

* Merging of CSS styles into new sidebar code (mattermost#4998)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

Co-authored-by: mattermod <[email protected]>

* [MM-22478] Unread Filtering and Create New Channel Menu (mattermost#5005)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Added base structure

* Unread filter and add channel dropdown design and some functionality

* Unread filtering and collapsible category logic hookup to redux

* Lint fixes

* Added translations

* Disable collapse when unread filter is on

* Merge'd

* PR feedback

* And more

Co-authored-by: mattermod <[email protected]>

* CSS fix for single team instances

* PR feedback and some more missing redux hookups

* Mobile/Desktop Sidebar View + Restored Team Sidebar and Header (mattermost#5016)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

* WIP

* Added back original team sidebar and sidebar header for Phase 1

* Mobile bar fits, still styling issues

* Style and lint fixes to make the sidebar work properly

* Desktop and other mobile fixes

* Merge'd

Co-authored-by: mattermod <[email protected]>

* Fixed labels to match spec

* Snapshot update

* Channel Switcher + History Button Style (mattermost#5023)

* [MM-22291] Additional functionality from old sidebar

* PR feedback

* PR feedback

* Lank bline

* Lint again

* PR feedback

* Merge'd

* Actual functioning sidebar!

* Using react-custom-scrollbars again and fixed a few styling issues

* PR feedback

* Lint fixes

* Added channel switcher modal button and back/forward buttons

* Lint fixes and formatting

* Styled arrows and buttons, and mock back/forward

* Unmocking for Phase 1

* Removed unnecessary ms-filter

Co-authored-by: mattermod <[email protected]>

* Fixed so that the swap between old and new sidebars is instant, mobile view fixes

* Type fix

* Lint fix

* PR feedback for Eric/Harrison

* A bunch of alignment changes

* Another design fix

* [MM-23056] Analytics for new and old sidebar

* More alignment fixes

* Fixed letter cutoff issue and an alignment issue

* [MM-22834] Hide unused Account Settings options when the new sidebar is enabled

* Even more more alignment fixes, a test fix and some scrolling fixes

* Additional alignment and style fixes

* Alignment fixes for the history arrows

* Fixed a test and a couple small issues

* Added missing tooltips

* Fix for the team switching crashing issue

* Lint fix

* A lot of a11y fixes, still need more

* Lint and test fixes

* Added some missing aria-labels

* Fix crash issue mattermost#2

* Removed autoclose redirect since it can't fire

* Removed more dead code

* Redux update

* PR feedback

* Fixed a couple more small issues

* Fixed a redux issue

* More redux fixes and a bug fix

* Fixed a test

* Lint error

Co-authored-by: Harrison Healey <[email protected]>
Co-authored-by: mattermod <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation
Projects
None yet
5 participants