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

[MM-28063] Cloud Telemetry - Admin Console #6762

Merged
merged 6 commits into from
Oct 13, 2020
Merged

[MM-28063] Cloud Telemetry - Admin Console #6762

merged 6 commits into from
Oct 13, 2020

Conversation

devinbinnie
Copy link
Member

Summary

Telemetry code for the Admin Console portion of Cloud Billing.

NOTES:

  • There are a handful of telemetry that weren't yet completed because the features aren't built yet. Will be making a follow-up ticket to finish those up.
  • Some of the telemetry items (ie. clicking on cloud-specific portions of the console's sidebar, clicking on the header) are invalid. I've made notes in the Google Doc explaining why we can't do them.

Ticket Link

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

@devinbinnie devinbinnie added the 2: Dev Review Requires review by a core commiter label Oct 13, 2020
Adovenmuehle
Adovenmuehle suggested changes Oct 13, 2020
View reviewed changes
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.

Just a typo otherwise LGTM

components/admin_console/billing/billing_summary.tsx Outdated
@@ -33,6 +34,7 @@ const noBillingHistory = (
rel='noopener noreferrer'
href={CloudLinks.BILLING_DOCS}
className='BillingSummary__noBillingHistory-link'
onClick={() => trackEvent('cloud_admin', 'click_how_billiing_works', {screen: 'subscriptions'})}
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo here (billiing)

marianunez
marianunez approved these changes Oct 13, 2020
View reviewed changes
Copy link
Member

@marianunez marianunez left a comment

Choose a reason for hiding this comment

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

LGTM, just a comment on the opening of the upgrade modal

components/admin_console/billing/billing_subscriptions.tsx Outdated Show resolved Hide resolved
components/admin_console/billing/billing_subscriptions.tsx Outdated Show resolved Hide resolved
components/admin_console/billing/payment_info_edit.tsx Show resolved Hide resolved
nickmisasi
nickmisasi reviewed Oct 13, 2020
View reviewed changes
Copy link
Contributor

@nickmisasi nickmisasi left a comment

Choose a reason for hiding this comment

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

One comment about overlap here.

components/admin_console/billing/billing_history.tsx Show resolved Hide resolved
@devinbinnie devinbinnie changed the title Mm 28063 [MM-28063] Cloud Telemetry - Admin Console Oct 13, 2020
@devinbinnie devinbinnie removed the request for review from alifarooq0 October 13, 2020 20:51
@devinbinnie devinbinnie added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Oct 13, 2020
@devinbinnie devinbinnie merged commit 76e31d1 into mattermost:master Oct 13, 2020
@devinbinnie
Copy link
Member Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

mattermod commented Oct 13, 2020 •
edited by jira bot
Loading

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.114.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-webapp
   10a30b479..47d68b1b9  campaign/applytheme_sidebar-text-active-border -> upstream/campaign/applytheme_sidebar-text-active-border
   5ea49bc86..e25227aed  cloud-ga   -> upstream/cloud-ga
   9b7d71cd0..76e31d18f  master     -> upstream/master
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost-build/mattermost-webapp
   4e15e37ff..c2b866429  automated-cherry-pick-of-mattermost-webapp-#6731-upstream-cloud-ga -> origin/automated-cherry-pick-of-mattermost-webapp-#6731-upstream-cloud-ga
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6762-upstream-cloud-ga-1602623108
Switched to a new branch 'automated-cherry-pick-of-mattermost-webapp-#6762-upstream-cloud-ga-1602623108'
Branch 'automated-cherry-pick-of-mattermost-webapp-#6762-upstream-cloud-ga-1602623108' set up to track remote branch 'cloud-ga' from 'upstream'.

+++ About to attempt cherry pick of PR #6762 with merge commit 76e31d18f3a41ebd99e884edc8cb897f657cd2ba.

error: could not apply 76e31d18f... [MM-28063] Cloud Telemetry - Admin Console (#6762)
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
UU components/admin_console/billing/billing_summary.tsx
UU components/admin_console/billing/plan_details.tsx
Aborting.

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

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

@devinbinnie
Copy link
Member Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Oct 13, 2020
@devinbinnie @mattermost-build
[MM-28063] Cloud Telemetry - Admin Console (mattermost#6762)
0f06c42 
* WIP

* [MM-28063] Cloud Billing Telemetry - Admin Console

* PR feedback

* Lint fix

(cherry picked from commit 76e31d1)
@mattermost-build mattermost-build mentioned this pull request Oct 13, 2020
Merged
@mattermod mattermod added the CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone label Oct 13, 2020
marianunez pushed a commit that referenced this pull request Oct 13, 2020
@mattermost-build @devinbinnie
Automated cherry pick of #6762 (#6770)
b39af55 
Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
@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
Merge branch 'master' of github.com:Tak-Iwamoto/mattermost-webapp int…
cdc2288 
…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
@devinbinnie @jfrerich
[MM-28063] Cloud Telemetry - Admin Console (#6762)
3b56cd8 
* WIP

* [MM-28063] Cloud Billing Telemetry - Admin Console

* PR feedback

* Lint fix
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@devinbinnie @calebroseland
[MM-28063] Cloud Telemetry - Admin Console (#6762)
60538ee 
* WIP

* [MM-28063] Cloud Billing Telemetry - Admin Console

* PR feedback

* Lint fix
@snyk-bot snyk-bot mentioned this pull request Jan 18, 2022
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nickmisasi nickmisasi nickmisasi approved these changes

@Adovenmuehle Adovenmuehle Adovenmuehle approved these changes

@marianunez marianunez marianunez approved these changes

Assignees
No one assigned
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
No milestone
6 participants
@devinbinnie @mattermod @Adovenmuehle @marianunez @nickmisasi @amyblais