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

[MM-26023] - Add Category related websocket actions #5924

Merged
merged 12 commits into from
Jul 28, 2020
Merged

[MM-26023] - Add Category related websocket actions #5924

merged 12 commits into from
Jul 28, 2020

Conversation

nevyangelova
Copy link
Contributor

@nevyangelova nevyangelova commented Jul 17, 2020 •
edited by hmhealey
Loading

Summary

Test added websocket events for category related actions.

Ticket Link

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

Related Pull Requests

mattermost/mattermost-redux#1206

@nevyangelova nevyangelova added the 2: Dev Review Requires review by a core commiter label Jul 17, 2020
@nevyangelova nevyangelova added this to the v5.26 milestone Jul 17, 2020
Nevyana Angelova added 2 commits July 18, 2020 14:20
@nevyangelova nevyangelova changed the title WIP [MM-26023] - Add Category related websocket actions [MM-26023] - Add Category related websocket actions Jul 18, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Jul 20, 2020
@hmhealey hmhealey mentioned this pull request Jul 23, 2020
Merged
@hmhealey hmhealey requested review from sudheerDev and Willyfrog and removed request for hmhealey July 23, 2020 22:18
@hmhealey hmhealey added the 3: QA Review Requires review by a QA tester label Jul 23, 2020
@hmhealey hmhealey requested a review from prapti July 23, 2020 22:21
@hmhealey hmhealey added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Jul 23, 2020
@hmhealey hmhealey removed the 2: Dev Review Requires review by a core commiter label Jul 27, 2020
@hmhealey hmhealey requested review from jgilliam17 and removed request for prapti July 27, 2020 14:39
@jgilliam17 jgilliam17 added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Jul 27, 2020
jgilliam17
jgilliam17 approved these changes Jul 27, 2020
View reviewed changes
Copy link
Contributor

@jgilliam17 jgilliam17 left a comment

Choose a reason for hiding this comment

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

Thank you @nevyangelova
(and thanks @ogi-m for helping with websocket testing)

  • Verified 4 websocket actions as listed in the ticket (sidebar_category_created , sidebar_category_updated, sidebar_category_deleted , sidebar_category_order_updated)

@jgilliam17 jgilliam17 removed 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Jul 27, 2020
@jgilliam17 jgilliam17 added the 4: Reviews Complete All reviewers have approved the pull request label Jul 27, 2020
@mm-cloud-bot
Copy link

Test server destroyed

@hmhealey hmhealey removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Jul 28, 2020
@hmhealey hmhealey assigned hmhealey and unassigned nevyangelova Jul 28, 2020
@hmhealey
Copy link
Member

When cherry-picking, the mattermost-redux commit has to be updated to 422f46b16b3f4b0a9e6acada344c2404aa634e53

@hmhealey hmhealey merged commit 49269c2 into master Jul 28, 2020
@hmhealey hmhealey deleted the MM-26023 branch July 28, 2020 13:48
@mattermod
Copy link
Contributor

@nevyangelova
Error trying doing the automated Cherry picking. Please do this manually


+++ Returning you to the master branch and cleaning up.

hmhealey added a commit that referenced this pull request Jul 28, 2020
@nevyangelova @hmhealey
[MM-26023] - Add Category related websocket actions (#5924)
625adf0 
* WIP [MM-26023] - Add Category related websocket actions

* pick dc321d9 MM-24914 Attach sidebar logic to server (#1177)
add category ids to category updated event

* MM-26023 Add proper handling for sidebar websocket events

* Switch mattermost-redux to PR branch

* Update mattermost-redux to master

* Fix mattermost-redux commit

Co-authored-by: Nevyana Angelova <[email protected]>
Co-authored-by: Harrison Healey <[email protected]>
@hmhealey hmhealey added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Jul 28, 2020
@hmhealey
Copy link
Member

Manually cherry-picked onto release-5.26

@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Jul 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Willyfrog Willyfrog Willyfrog approved these changes

@sudheerDev sudheerDev sudheerDev approved these changes

@jgilliam17 jgilliam17 jgilliam17 approved these changes

Assignees

@hmhealey hmhealey

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
v5.26.0
Development

Successfully merging this pull request may close these issues.
8 participants
@nevyangelova @mm-cloud-bot @hmhealey @mattermod @Willyfrog @sudheerDev @jgilliam17 @amyblais