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

MM-25261: Adds archived channels to admin console channel list view. #5635

Merged
merged 18 commits into from
Jun 19, 2020
Merged

MM-25261: Adds archived channels to admin console channel list view. #5635

merged 18 commits into from
Jun 19, 2020

Conversation

mkraft
Copy link
Contributor

@mkraft mkraft commented Jun 1, 2020

Summary

Displays archived channels in the channels list view. Add ability to archive and unarchive channels from their details view.

Also this PR reorders the channel moderation widget among the other widgets in the channel details view.

Ticket Link

Related Pull Requests

Screenshots

localhost_8065_admin_console_user_management_channels_5jkagupgaiba7xs5z7dauampbc

localhost_8065_admin_console_user_management_channels_5jkagupgaiba7xs5z7dauampbc

localhost_8065_admin_console_user_management_channels_5jkagupgaiba7xs5z7dauampbc (2)

@mkraft mkraft added the Work in Progress Not yet ready for review label Jun 1, 2020
@mkraft mkraft added 1: UX Review Requires review by a UX Designer 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester and removed Work in Progress Not yet ready for review labels Jun 2, 2020
@mkraft mkraft requested a review from michaelgamble June 2, 2020 20:39
Copy link
Contributor

@michaelgamble michaelgamble left a comment

Choose a reason for hiding this comment

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

looks great :)

@mkraft mkraft added Setup Cloud Test Server Setup a test server using Mattermost Cloud and removed Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Jun 4, 2020
@mm-cloud-bot
Copy link

Test server destroyed

@@ -26,7 +44,7 @@ export const ChannelProfile: React.SFC<ChannelProfileProps> = (props: ChannelPro
subtitleId={t('admin.channel_settings.channel_detail.profileDescription')}
subtitleDefault='Summary of the channel, including the channel name.'
>
<div className='group-teams-and-channels'>
<div className='group-teams-and-channels AdminChannelDetails'>
Copy link
Contributor

@fmunshi fmunshi Jun 10, 2020

Choose a reason for hiding this comment

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

do we need to keep the old class? Would be nice to get rid of it / update e2e tests to use the new class if its not being used

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure how to deal with this. My thinking was to use the new naming convention, but there are still a bunch of styles tied to .group-teams-and-channels. What do you think? We could:

a) replace AdminChannelDetails with group-teams-and-channels and tie the new styles to it instead
c) update group-teams-and-channels to be GroupTeamsAndChannels and then all of the associated states like group-teams-and-channels--body, etc, this does mean updating a bunch of things including tests, not insurmountable just noting it
d) new stuff goes under AdminChannelDetails (ie leave it as-is in the PR)

Thoughts? Other ideas?

Copy link
Contributor

@fmunshi fmunshi left a comment

Choose a reason for hiding this comment

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

Looks good to me other than one minor comment

@fmunshi
Copy link
Contributor

fmunshi commented Jun 10, 2020

Also looks like you've got some conflicts to take care of @mkraft

@fmunshi fmunshi removed the 1: UX Review Requires review by a UX Designer label Jun 10, 2020
@fmunshi
Copy link
Contributor

fmunshi commented Jun 10, 2020

Paging @catalintomai for review

@mkraft mkraft added this to the v5.26 milestone Jun 10, 2020
@mkraft mkraft requested a review from srkgupta June 12, 2020 22:00
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Hi @mkraft
I tested the PR and overall it looks good. Found couple of issues which I have raised them here:

MM-26176: Discard Changes confirmation is not displayed when user archives/unarchives a channel in Channel Configurations page & clicks anywhere else
MM-26177 - Team Member is allowed to view the archived channels even when the option is restricted in System Console

Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Tested the PR along with it's dependent PRs and the feature is working fine as expected. There is a known limitation currently which will be handled in this story https://mattermost.atlassian.net/browse/MM-26217

Apart from this, the rest of the functionalities were working fine. Approving the PR.

@srkgupta srkgupta added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Jun 18, 2020
@mkraft mkraft merged commit 223d2f9 into mattermost:master Jun 19, 2020
@mkraft mkraft deleted the MM-25261_console-archived-channels branch June 19, 2020 20:53
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Needed Requires documentation labels Jul 17, 2020
@thefactremains
Copy link

adding a note to remind myself to update this docs page before release: https://docs.mattermost.com/help/getting-started/organizing-conversations.html#archiving-a-channel

justinegeffen added a commit to mattermost/docs that referenced this pull request Aug 12, 2020
justinegeffen added a commit to mattermost/docs that referenced this pull request Aug 12, 2020
Docs for: mattermost/mattermost-webapp#5635.

Adds a change to docs that are already submitted in a PR but shouldn't cause any conflicts.
@amyblais amyblais added Docs/Done Required documentation has been written and removed Docs/Needed Requires documentation labels Aug 12, 2020
amyblais pushed a commit to mattermost/docs that referenced this pull request Aug 13, 2020
Docs for: mattermost/mattermost-webapp#5635.

Adds a change to docs that are already submitted in a PR but shouldn't cause any conflicts.
amyblais added a commit to mattermost/docs that referenced this pull request Aug 13, 2020
* Update team-channel-management.rst

Docs for: mattermost/mattermost-webapp#5635

* Update team-channel-management.rst

Added filters to channel management section. Fixed incorrect use of "team" in channel section.
Documents: mattermost/mattermost-webapp#5899.

Co-authored-by: Amy Blais <[email protected]>
amyblais added a commit to mattermost/docs that referenced this pull request Aug 13, 2020
* Update conf.py (#3755)

* Update open-source-components.rst (#3793)

* Update important-upgrade-notes.rst (#3771)

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Documentation for "ask the community" feature (#3804)

* Update config-settings.rst

* Update source/administration/config-settings.rst

Co-authored-by: Justine Geffen <[email protected]>

* Update source/administration/config-settings.rst

Co-authored-by: Justine Geffen <[email protected]>

* Make modifications (add link URL, remove mention of the Main Menu)

* Update source/administration/config-settings.rst

Co-authored-by: Jason Blais <[email protected]>

* Add default value

Co-authored-by: Justine Geffen <[email protected]>

* ES-v5.26-docs (#3812)

* Update formatting-text.rst

* prefetching and sidebar updates for v5.26

* Channel sidebar phase 2 updates

* Add files via upload

* Update source/administration/config-settings.rst

Co-authored-by: Amy Blais <[email protected]>

* Update config-settings.rst

* Update formatting-text.rst

Co-authored-by: Amy Blais <[email protected]>

* added telemetry for Team & Channel management (#3818)

* added telemetry for Team & Channel management

* Update source/administration/telemetry.rst

* Update source/administration/telemetry.rst

* Update source/administration/telemetry.rst

Co-authored-by: Justine Geffen <[email protected]>

* added telemetry for gossip encryption (#3819)

* Update Global Relay config-settings.rst (#3820)

* Update config-settings.rst

Changes for: mattermost/mattermost#14994

* Update source/administration/config-settings.rst

Co-authored-by: Ibrahim Serdar Acikgoz <[email protected]>

* Apply suggestions from code review

Co-authored-by: Justine Geffen <[email protected]>

* Update config-settings.rst

Fixed example formatting.

Co-authored-by: Ibrahim Serdar Acikgoz <[email protected]>

* Update elasticsearch.rst (#3826)

Update for: mattermost/mattermost#14463

* Update team-channel-management.rst

* Advanced Logging (#3836)

* Advanced Logging

Added section to cover Advanced Logging Options (E20 only). Changed "Logging" to "Standard Logging"

* Update config-settings.rst

Review of additional content and general review of page to fix heading lengths and some typos.

* Fixing broken links

Co-authored-by: Justine Geffen <[email protected]>
Co-authored-by: Amy Blais <[email protected]>

* added member filters (#3835)

added member filters - mattermost/mattermost-webapp#5882

* v5.26 Changelog (#3757)

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update mentioning-teammates.rst (#3821)

Added mobile support for group mentions.

* Update organizing-conversations.rst (#3832)

Docs for: mattermost/mattermost-webapp#5635.

Adds a change to docs that are already submitted in a PR but shouldn't cause any conflicts.

* Update team-channel-management.rst (#3830)

* Update team-channel-management.rst

Docs for: mattermost/mattermost-webapp#5635

* Update team-channel-management.rst

Added filters to channel management section. Fixed incorrect use of "team" in channel section.
Documents: mattermost/mattermost-webapp#5899.

Co-authored-by: Amy Blais <[email protected]>

Co-authored-by: Jason Blais <[email protected]>
Co-authored-by: Justine Geffen <[email protected]>
Co-authored-by: Eric Sethna <[email protected]>
Co-authored-by: Dennis Kittrell <[email protected]>
Co-authored-by: Ibrahim Serdar Acikgoz <[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/Done Required changelog entry has been written Docs/Done Required documentation has been written
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants