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

[MM-28064] Add telemetry in various places around cloud message banners #6763

Merged
merged 8 commits into from
Oct 13, 2020

Conversation

nickmisasi
Copy link
Contributor

Summary

Adds telemetry according to: https://docs.google.com/document/d/102uElsng_cnpFHAr8tqTEIhktX5x5R9LAxDLBPDOvAU/edit#heading=h.tgaxd6frqkfr

Note that not all banners in the list exist. This PR includes

User presented with light blue user limit contextual banner ‘Just a heads up … you’re nearing the user limit with the free tier of Mattermost Cloud. We’ll let you know when you hit the limit’

and lower in the table.

Ticket Link

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

Related Pull Requests

n/a

Screenshots

n/a

Copy link
Contributor

@Adovenmuehle Adovenmuehle left a comment

Choose a reason for hiding this comment

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

:shipit:

Copy link
Contributor

@ethervoid ethervoid left a comment

Choose a reason for hiding this comment

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

LGTM!

@devinbinnie devinbinnie added the 4: Reviews Complete All reviewers have approved the pull request label Oct 13, 2020
@nickmisasi nickmisasi merged commit 79737da into master Oct 13, 2020
@nickmisasi nickmisasi deleted the MM-28064 branch October 13, 2020 19:48
@nickmisasi
Copy link
Contributor Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

mattermod commented Oct 13, 2020

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

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.112.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
 * [new branch]          MM-29557   -> upstream/MM-29557
   06ac3caf8..3c5e8d68a  campaign/applytheme_center-channel-bg -> upstream/campaign/applytheme_center-channel-bg
   03a147d13..a4cdea10c  campaign/applytheme_sidebar-bg -> upstream/campaign/applytheme_sidebar-bg
   2740f854d..994d1d529  campaign/applytheme_sidebar-text -> upstream/campaign/applytheme_sidebar-text
   b23767112..6e4398591  cloud-ga   -> upstream/cloud-ga
   8618aeb2f..79737dac1  master     -> upstream/master
Fetching origin
Failed to add the RSA host key for IP address '140.82.112.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6763-upstream-cloud-ga-1602618500
Switched to a new branch 'automated-cherry-pick-of-mattermost-webapp-#6763-upstream-cloud-ga-1602618500'
Branch 'automated-cherry-pick-of-mattermost-webapp-#6763-upstream-cloud-ga-1602618500' set up to track remote branch 'cloud-ga' from 'upstream'.

+++ About to attempt cherry pick of PR #6763 with merge commit 79737dac18dcbdfb7c35b44af57513773eb3ca53.

error: could not apply 79737dac1... [MM-28064] Add telemetry in various places around cloud message banners (#6763)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU components/admin_console/billing/billing_subscriptions.tsx
Aborting.

+++ Aborting in-progress git cherry-pick.

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

nickmisasi added a commit that referenced this pull request Oct 13, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 13, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 14, 2020
…o MM-20457

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (87 commits)
  MM-T644 Integrations display on team where they were created (mattermost#6752)
  [MM-20478] Migrate post_header module to TypeScript (mattermost#6631)
  [MM-20599] Migrated select_team component to Typescript (mattermost#6574)
  MM-20554 Migrate 'components/delete_post_modal' module and associated tests to TypeScript (mattermost#6656)
  [MM-24436]- Add a threshold from bottom for new messages toast (mattermost#5828)
  [MM-20489] Migrate failed_post_options and its tests to typescript (mattermost#6717)
  [MM-28063] Cloud Telemetry - Admin Console (mattermost#6762)
  [MM-29559][MM-29558] Company Info Fixes (mattermost#6764)
  [MM-29557] [MM-29590] Update subscription when purchase modal closes (mattermost#6765)
  [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (mattermost#6766)
  [MM-28064] Add telemetry in various places around cloud message banners (mattermost#6763)
  migrate changeCSS function CSS variable for mobile CSS .tutorial-steps__container selector. (mattermost#6743)
  [MM-27231]: cypress test for MM-T1837 (mattermost#6676)
  [MM-28062] Add telemetry for in-app purchase flow (mattermost#6760)
  MM-27454 - Contact Us and Billing Documentation Links (mattermost#6731)
  [MM-20514] Migrates components/password reset send link to typescript (mattermost#6584)
  Cloud Billing polish Soft GA (mattermost#6740)
  [MM-28221] Payment Info Edit/View (mattermost#6709)
  MM-T636 Description field for incoming and outgoing webhooks can hold 500 characters (mattermost#6682)
  Translations update from Weblate (mattermost#6748)
  ...
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
…rs (#6763)

* Add telemetry for in-app purchase flow

* Fix spelling mistake in telemetry doc

* Fixes

* Add some telemetry, waiting for clarification

* Adding telemetry for various banners

* Move out of inline to proper function
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
…rs (#6763)

* Add telemetry for in-app purchase flow

* Fix spelling mistake in telemetry doc

* Fixes

* Add some telemetry, waiting for clarification

* Adding telemetry for various banners

* Move out of inline to proper function
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/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation
Projects
None yet
6 participants