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

[MM-18589] Fix channel mention autocomplete behaviour #4041

Merged
merged 6 commits into from
Oct 30, 2019
Merged

[MM-18589] Fix channel mention autocomplete behaviour #4041

merged 6 commits into from
Oct 30, 2019

Conversation

streamer45
Copy link
Contributor

Summary

PR fixes a couple of problems with the channel mention autocomplete provider:

Other Channels list wasn't populated and the final channel list was not properly kept in sync.

Ticket Link

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

@streamer45 streamer45 added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 24, 2019
@streamer45 streamer45 added this to the v5.17.0 milestone Oct 24, 2019
@streamer45 streamer45 self-assigned this Oct 24, 2019
@streamer45 streamer45 requested a review from ogi-m October 24, 2019 13:48
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Oct 24, 2019
hmhealey
hmhealey reviewed Oct 28, 2019
View reviewed changes
Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

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

Is this something we could add tests for?

@streamer45
Copy link
Contributor Author

Is this something we could add tests for?

I think it might be tricky to properly test this. Maybe e2e could be an option. Will look into it.

jespino
jespino approved these changes Oct 29, 2019
View reviewed changes
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

ogi-m
ogi-m approved these changes Oct 29, 2019
View reviewed changes
Copy link

@ogi-m ogi-m left a comment

Choose a reason for hiding this comment

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

QA will test after it's merged.

@ogi-m ogi-m added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Oct 29, 2019
hmhealey
hmhealey approved these changes Oct 30, 2019
View reviewed changes
Copy link
Member

@hmhealey hmhealey left a comment

Choose a reason for hiding this comment

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

Awesome! Cypress tests are more thorough than I was expecting

@hmhealey hmhealey added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Oct 30, 2019
@hmhealey hmhealey merged commit 8996d17 into mattermost:master Oct 30, 2019
@mattermod
Copy link
Contributor

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

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#4041-upstream-release-5.17-1572469194
Branch 'automated-cherry-pick-of-#4041-upstream-release-5.17-1572469194' set up to track remote branch 'release-5.17' from 'upstream'.
+++ Downloading patch to /tmp/4041.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/4041.patch

Applying: Fix channel autocomplete to properly group returned channels
Using index info to reconstruct a base tree...
M	components/suggestion/channel_mention_provider.jsx
Falling back to patching base and 3-way merge...
Auto-merging components/suggestion/channel_mention_provider.jsx
CONFLICT (content): Merge conflict in components/suggestion/channel_mention_provider.jsx
Patch failed at 0001 Fix channel autocomplete to properly group returned channels
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

UU components/suggestion/channel_mention_provider.jsx

+++ Aborting in-progress git am.

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

@amyblais amyblais removed the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Oct 31, 2019
@amyblais amyblais removed this from the v5.17.0 milestone Oct 31, 2019
@amyblais amyblais added this to the v5.18.0 milestone Oct 31, 2019
brewsterbhg pushed a commit to brewsterbhg/mattermost-webapp that referenced this pull request Nov 11, 2019
@streamer45 @brewsterbhg
[MM-18589] Fix channel mention autocomplete behaviour (mattermost#4041)
f35d8be 
* Fix channel autocomplete to properly group returned channels

* Only update channels from last request

* Revert to extensionless import

* Add e2e tests for channel mention autocomplete

* Fix test name
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 18, 2019
@ogi-m ogi-m added the Tests/Done Release tests have been written label Dec 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jespino jespino jespino approved these changes

@hmhealey hmhealey hmhealey approved these changes

@ogi-m ogi-m ogi-m approved these changes

Assignees

@streamer45 streamer45

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 QA Review Done Tests/Done Release tests have been written
Projects
None yet
Milestone
v5.18.0
6 participants
@streamer45 @mattermod @jespino @hmhealey @ogi-m @amyblais