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

MM-10516: Added interactive action support to ephemeral messages #2351

Merged
merged 5 commits into from
Feb 21, 2019
Merged

MM-10516: Added interactive action support to ephemeral messages #2351

merged 5 commits into from
Feb 21, 2019

Conversation

levb
Copy link
Contributor

@levb levb commented Feb 8, 2019

Summary

This PR supports adding interactive actions to ephemeral messages. The client now recognizes "action cookies" that are sent by mattermost-server included in PostAction's; It stores them and sends them back to the server when submitting DoPostActionRequest.

  • Preserve the cookie in PostActions
  • Replaced doPostAction with doPostActionWithCookie

Ticket Link

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

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

See Also:

- Preserve the cookie in PostActions
- Replaced doPostAction with doPostActionWithCookie
@levb levb added Work in Progress Not yet ready for review 2: Dev Review Requires review by a core commiter labels Feb 8, 2019
@jasonblais jasonblais added the 1: PM Review Requires review by a product manager label Feb 8, 2019
@jasonblais jasonblais self-requested a review February 8, 2019 14:21
@jasonblais jasonblais self-assigned this Feb 8, 2019
@levb levb removed the Work in Progress Not yet ready for review label Feb 9, 2019
@jasonblais jasonblais added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Feb 9, 2019
Copy link
Contributor

@jasonblais jasonblais left a comment

Choose a reason for hiding this comment

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

Thanks Lev!

Approving changes as-is. As noted on the server PR, we would test with the Giphy plugin once this PR has been merged (along with Redux). So I will do testing there and provide client-side feedback there.

I can also test the Giphy plugin on mobile to see if a mobile PR needs to be submitted.

@jasonblais jasonblais removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Feb 9, 2019
@jasonblais jasonblais removed their assignment Feb 9, 2019
@jasonblais jasonblais removed the 1: PM Review Requires review by a product manager label Feb 9, 2019
@hanzei
Copy link
Contributor

hanzei commented Feb 9, 2019

How can I do a "E2E" on this feature? Does updating the redux hash in package.lock help?

@levb
Copy link
Contributor Author

levb commented Feb 9, 2019

How can I do a "E2E" on this feature? Does updating the redux hash in package.lock help?
Here's what I did.

  1. get the appropriate commits of server, client, redux, and giphy; make clean
  2. I run npm run dev:watch in mattermost-redux
  3. I rm -rf ./server/vendor/mattermost/mattermost-server in giphy to make it use my current server RPC stubs.
    I did not update package.lock just yet - was expecting the (redux) merge to happen first.
    Also, I failed to successfully instruct dep to exclude mattermost-server from vendor; would be good to know how to do that.

Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

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

LGTM

@hanzei
Copy link
Contributor

hanzei commented Feb 13, 2019

Thanks @levb for the hint. 👍 Got my local setup working.

@levb levb merged commit bb51e42 into mattermost:master Feb 21, 2019
@hanzei hanzei added the 4: Reviews Complete All reviewers have approved the pull request label Feb 21, 2019
@hanzei hanzei removed the 2: Dev Review Requires review by a core commiter label Feb 21, 2019
@hanzei hanzei added this to the v5.10.0 milestone Feb 21, 2019
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Needed Requires documentation labels Mar 22, 2019
stevepartridge pushed a commit to stevepartridge/mattermost-webapp that referenced this pull request Mar 30, 2019
…termost#2351)

* MM-10516: Added interactive action support to ephemeral messages

- Preserve the cookie in PostActions
- Replaced doPostAction with doPostActionWithCookie

* Updated mattermost-redux include to the supporting changes.

mattermost/mattermost-redux@aa1b7f5
@jasonblais jasonblais added Docs/Done Required documentation has been written and removed Docs/Needed Requires documentation labels Apr 3, 2019
@lindy65 lindy65 removed the 4: Reviews Complete All reviewers have approved the pull request label Apr 12, 2019
@lindalumitchell lindalumitchell added the Tests/Done Release tests have been written label May 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Done Required changelog entry has been written Docs/Done Required documentation has been written Tests/Done Release tests have been written
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants