Backed out changeset 28e92798b7fb (bug 1596514) for ESlint failure on OnboardingMessageProvider.jsm. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Mon, 18 Nov 2019 19:55:52 +0200
changeset 502445 7a519d43db7f8cfded9f05d388926fffcb8146a2
parent 502444 820aca345d9e018e23d3273ff0cb7d1b7883bff3
child 502446 9cd05214d12a8727677c0db1fe46a73ca51f70b8
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1596514
milestone72.0a1
backs out28e92798b7fba8f17c9facb00cc66d845ef73779
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 28e92798b7fb (bug 1596514) for ESlint failure on OnboardingMessageProvider.jsm. CLOSED TREE
browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- a/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
+++ b/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
@@ -564,20 +564,20 @@ declare const userPrefs: {
 
 Information about connected services associated with the FxA Account.
 Return an empty array if no account is found or an error occurs.
 
 #### Definition
 
 ```
 interface OAuthClient {
-  // OAuth client_id of the service
-  // https://docs.telemetry.mozilla.org/datasets/fxa_metrics/attribution.html#service-attribution
   id: string;
-  lastAccessedDaysAgo: number;
+  // FxA service name
+  name: string;
+  lastAccessTime: UnixEpochNumber;
 }
 
 declare const attachedFxAOAuthClients: Promise<OAuthClient[]>
 ```
 
 #### Examples
 ```javascript
 {
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -11,17 +11,16 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "AddonRepository",
   "resource://gre/modules/addons/AddonRepository.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const FIREFOX_VERSION = parseInt(Services.appinfo.version.match(/\d+/), 10);
 const ONE_MINUTE = 60 * 1000;
-const FX_MONITOR_CLIENT_ID = '802d56ef2a9af9fa';
 
 const L10N = new Localization([
   "branding/brand.ftl",
   "browser/branding/brandings.ftl",
   "browser/branding/sync-brand.ftl",
   "browser/newtab/onboarding.ftl",
 ]);
 
@@ -285,20 +284,18 @@ const ONBOARDING_MESSAGES = () => [
       primary_button: {
         label: { string_id: "onboarding-firefox-monitor-button" },
         action: {
           type: "OPEN_URL",
           data: { args: "https://monitor.firefox.com/", where: "tabshifted" },
         },
       },
     },
-    // Use service oauth client_id to identify 'Firefox Monitor' service attached to Firefox Account
-    // https://docs.telemetry.mozilla.org/datasets/fxa_metrics/attribution.html#service-attribution
     targeting:
-      "trailheadTriplet == 'supercharge' || (trailheadTriplet == 'dynamic' && !(FX_MONITOR_CLIENT_ID in attachedFxAOAuthClients|mapToProperty('id')))",
+      "trailheadTriplet == 'supercharge' || (trailheadTriplet == 'dynamic' && !('Firefox Monitor' in attachedFxAOAuthClients|mapToProperty('name')))",
     trigger: { id: "showOnboarding" },
   },
   {
     id: "TRAILHEAD_CARD_4",
     template: "onboarding",
     bundled: 3,
     order: 3,
     content: {