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

MM-20259 Revert react-intl upgrade #4255

Merged
merged 7 commits into from
Nov 20, 2019
Merged

MM-20259 Revert react-intl upgrade #4255

merged 7 commits into from
Nov 20, 2019

Conversation

hmhealey
Copy link
Member

As discussed in the Release Discussion channel on community.mattermost.com, #3866 didn't get QA tested before merge (my bad), and it's been causing unexpected bugs that have us worried about having it in 5.18. This mostly reverts the upgrade so we'll now be doing that in 5.20.

I didn't do a full revert with this PR. I left some minor code cleanup (mostly removing the file extensions from imports) and my followup PR (#4170)

Ticket Link

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

@hmhealey hmhealey added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester CherryPick/Approved Meant for the quality or patch release tracked in the milestone Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Nov 18, 2019
@hmhealey hmhealey added this to the v5.18.0 milestone Nov 18, 2019
@enahum
Copy link
Contributor

enahum commented Nov 18, 2019

@hmhealey some conflicts with this PR

@hmhealey
Copy link
Member Author

Of course there was a conflicting PR that was merged 3 minutes after I submitted this one. I'm fighting with the type checker first anyway

jespino
jespino approved these changes Nov 19, 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.

Some small comments for improvement, but nothing mayor

@hmhealey hmhealey mentioned this pull request Nov 19, 2019
Merged
@mattermod
Copy link
Contributor

Mattermost test server updated with git commit a1d40dfa691ae6766b03a15be6f28afcc8ea3c99.

Access here: https://mattermost-webapp-pr-4255.test.mattermost.cloud

@marianunez marianunez mentioned this pull request Nov 20, 2019
Closed
jgilliam17
jgilliam17 approved these changes Nov 20, 2019
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.

Tested, looks good to merge.
Tested around few issues that were reported recently that may be related to react upgrade

  • alt+up and alt+down
  • profile popover
  • logging in
    all worked as expected

@jgilliam17 jgilliam17 added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Nov 20, 2019
@enahum enahum added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Nov 20, 2019
@enahum enahum merged commit d698954 into master Nov 20, 2019
@enahum enahum deleted the mm20259 branch November 20, 2019 23:46
@mattermod
Copy link
Contributor

@hmhealey
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-#4255-upstream-release-5.18-1574293577
Branch 'automated-cherry-pick-of-#4255-upstream-release-5.18-1574293577' set up to track remote branch 'release-5.18' from 'upstream'.
+++ Downloading patch to /tmp/4255.patch (in case you need to do this again)

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

Applying: MM-20259 Revert react-intl upgrade
Using index info to reconstruct a base tree...
M	components/admin_console/plugin_management/__snapshots__/plugin_management.test.jsx.snap
M	components/dot_menu/dot_menu_empty.test.jsx
M	components/dot_menu/dot_menu_mobile.test.jsx
M	components/invitation_modal/invitation_modal.jsx
M	components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap
M	components/post_view/post/post.jsx
M	components/rhs_comment/rhs_comment.jsx
M	components/rhs_root_post/rhs_root_post.jsx
M	package-lock.json
M	package.json
Falling back to patching base and 3-way merge...
Removing tests/helpers/intl-test-helper.tsx
Auto-merging package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Removing components/widgets/loading/__snapshots__/loading_wrapper.test.tsx.snap
Removing components/widgets/admin_console/__snapshots__/formatted_admin_header.test.tsx.snap
Removing components/widgets/admin_console/__snapshots__/admin_panel.test.tsx.snap
Auto-merging components/rhs_root_post/rhs_root_post.jsx
Auto-merging components/rhs_comment/rhs_comment.jsx
Auto-merging components/post_view/post/post.jsx
Auto-merging components/plugin_marketplace/marketplace_item/__snapshots__/marketplace_item.test.js.snap
Auto-merging components/invitation_modal/invitation_modal.jsx
Auto-merging components/formatted_markdown_message.test.jsx
Auto-merging components/dot_menu/dot_menu_mobile.test.jsx
Auto-merging components/dot_menu/dot_menu_empty.test.jsx
Auto-merging components/admin_console/plugin_management/__snapshots__/plugin_management.test.jsx.snap
CONFLICT (content): Merge conflict in components/admin_console/plugin_management/__snapshots__/plugin_management.test.jsx.snap
Removing components/__snapshots__/formatted_markdown_message.test.tsx.snap
Patch failed at 0001 MM-20259 Revert react-intl upgrade
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/admin_console/plugin_management/__snapshots__/plugin_management.test.jsx.snap
UU package-lock.json

+++ Aborting in-progress git am.

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

@mattermod
Copy link
Contributor

Test server destroyed

@enahum
Copy link
Contributor

enahum commented Nov 20, 2019

@hmhealey help to cherry-pick please

@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation and removed Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 21, 2019
hmhealey added a commit that referenced this pull request Nov 22, 2019
@hmhealey
MM-20259 Revert react-intl upgrade (#4255)
2f9df20 
* MM-20259 Revert react-intl upgrade

* Fix type issues

* Fix FullScreenModal snapshots

* Fix snapshot for MenuItemToggleModalRedux

* Address feedback

* Update snapshots
@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 Nov 22, 2019
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 22, 2019
@hanzei hanzei removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Dec 10, 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

@enahum enahum enahum 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 QA Review Done
Projects
None yet
Milestone
v5.18.0
Development

Successfully merging this pull request may close these issues.
7 participants
@hmhealey @enahum @mattermod @jespino @jgilliam17 @hanzei @amyblais