Address PR comments

Author: hsubox76

common/api-review/analytics-exp.api.md

@@ -8,7 +8,6 @@ import { Analytics } from '@firebase/analytics-types-exp';
 import { AnalyticsCallOptions } from '@firebase/analytics-types-exp';
 import { ControlParams } from '@firebase/analytics-types-exp';
 import { CustomParams } from '@firebase/analytics-types-exp';
-import { DataLayer } from '@firebase/analytics-types-exp';
 import { EventNameString } from '@firebase/analytics-types-exp';
 import { EventParams } from '@firebase/analytics-types-exp';
 import { FirebaseApp } from '@firebase/app-types-exp';
@@ -27,66 +26,6 @@ export type CustomEventName<T> = T extends EventNameString ? never : T;
 
 export { CustomParams }
 
-export { DataLayer }
-
-// @public
-export enum EventName {
-    // (undocumented)
-    ADD_PAYMENT_INFO = "add_payment_info",
-    // (undocumented)
-    ADD_SHIPPING_INFO = "add_shipping_info",
-    // (undocumented)
-    ADD_TO_CART = "add_to_cart",
-    // (undocumented)
-    ADD_TO_WISHLIST = "add_to_wishlist",
-    // (undocumented)
-    BEGIN_CHECKOUT = "begin_checkout",
-    // @deprecated (undocumented)
-    CHECKOUT_PROGRESS = "checkout_progress",
-    // (undocumented)
-    EXCEPTION = "exception",
-    // (undocumented)
-    GENERATE_LEAD = "generate_lead",
-    // (undocumented)
-    LOGIN = "login",
-    // (undocumented)
-    PAGE_VIEW = "page_view",
-    // (undocumented)
-    PURCHASE = "purchase",
-    // (undocumented)
-    REFUND = "refund",
-    // (undocumented)
-    REMOVE_FROM_CART = "remove_from_cart",
-    // (undocumented)
-    SCREEN_VIEW = "screen_view",
-    // (undocumented)
-    SEARCH = "search",
-    // (undocumented)
-    SELECT_CONTENT = "select_content",
-    // (undocumented)
-    SELECT_ITEM = "select_item",
-    // (undocumented)
-    SELECT_PROMOTION = "select_promotion",
-    // @deprecated (undocumented)
-    SET_CHECKOUT_OPTION = "set_checkout_option",
-    // (undocumented)
-    SHARE = "share",
-    // (undocumented)
-    SIGN_UP = "sign_up",
-    // (undocumented)
-    TIMING_COMPLETE = "timing_complete",
-    // (undocumented)
-    VIEW_CART = "view_cart",
-    // (undocumented)
-    VIEW_ITEM = "view_item",
-    // (undocumented)
-    VIEW_ITEM_LIST = "view_item_list",
-    // (undocumented)
-    VIEW_PROMOTION = "view_promotion",
-    // (undocumented)
-    VIEW_SEARCH_RESULTS = "view_search_results"
-}
-
 export { EventParams }
 
 // @public

packages-exp/analytics-exp/src/api.ts

@@ -49,7 +49,6 @@ import {
 } from './functions';
 
 export { settings } from './factory';
-export { EventName } from './constants';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {

packages-exp/analytics-exp/src/constants.ts

@@ -36,47 +36,3 @@ export const enum GtagCommand {
   SET = 'set',
   CONFIG = 'config'
 }
-
-/**
- * Officially recommended event names for gtag.js
- * Any other string is also allowed.
- *
- * @public
- */
-export enum EventName {
-  ADD_SHIPPING_INFO = 'add_shipping_info',
-  ADD_PAYMENT_INFO = 'add_payment_info',
-  ADD_TO_CART = 'add_to_cart',
-  ADD_TO_WISHLIST = 'add_to_wishlist',
-  BEGIN_CHECKOUT = 'begin_checkout',
-  /**
-   * @deprecated This event name is deprecated and is unsupported in updated
-   * Enhanced Ecommerce reports.
-   */
-  CHECKOUT_PROGRESS = 'checkout_progress',
-  EXCEPTION = 'exception',
-  GENERATE_LEAD = 'generate_lead',
-  LOGIN = 'login',
-  PAGE_VIEW = 'page_view',
-  PURCHASE = 'purchase',
-  REFUND = 'refund',
-  REMOVE_FROM_CART = 'remove_from_cart',
-  SCREEN_VIEW = 'screen_view',
-  SEARCH = 'search',
-  SELECT_CONTENT = 'select_content',
-  SELECT_ITEM = 'select_item',
-  SELECT_PROMOTION = 'select_promotion',
-  /**
-   * @deprecated This event name is deprecated and is unsupported in updated
-   * Enhanced Ecommerce reports.
-   */
-  SET_CHECKOUT_OPTION = 'set_checkout_option',
-  SHARE = 'share',
-  SIGN_UP = 'sign_up',
-  TIMING_COMPLETE = 'timing_complete',
-  VIEW_CART = 'view_cart',
-  VIEW_ITEM = 'view_item',
-  VIEW_ITEM_LIST = 'view_item_list',
-  VIEW_PROMOTION = 'view_promotion',
-  VIEW_SEARCH_RESULTS = 'view_search_results'
-}

packages-exp/analytics-exp/src/functions.test.ts

@@ -25,7 +25,7 @@ import {
   setUserProperties,
   setAnalyticsCollectionEnabled
 } from './functions';
-import { GtagCommand, EventName } from './constants';
+import { GtagCommand } from './constants';
 
 const fakeMeasurementId = 'abcd-efgh-ijkl';
 const fakeInitializationPromise = Promise.resolve(fakeMeasurementId);
@@ -38,57 +38,45 @@ describe('FirebaseAnalytics methods', () => {
   });
 
   it('logEvent() calls gtag function correctly', async () => {
-    await logEvent(gtagStub, fakeInitializationPromise, EventName.ADD_TO_CART, {
+    await logEvent(gtagStub, fakeInitializationPromise, 'add_to_cart', {
       currency: 'USD'
     });
 
-    expect(gtagStub).to.have.been.calledWith(
-      GtagCommand.EVENT,
-      EventName.ADD_TO_CART,
-      {
-        'send_to': fakeMeasurementId,
-        currency: 'USD'
-      }
-    );
+    expect(gtagStub).to.have.been.calledWith(GtagCommand.EVENT, 'add_to_cart', {
+      'send_to': fakeMeasurementId,
+      currency: 'USD'
+    });
   });
 
   it('logEvent() with no event params calls gtag function correctly', async () => {
-    await logEvent(gtagStub, fakeInitializationPromise, EventName.VIEW_ITEM);
+    await logEvent(gtagStub, fakeInitializationPromise, 'view_item');
 
-    expect(gtagStub).to.have.been.calledWith(
-      GtagCommand.EVENT,
-      EventName.VIEW_ITEM,
-      {
-        'send_to': fakeMeasurementId
-      }
-    );
+    expect(gtagStub).to.have.been.calledWith(GtagCommand.EVENT, 'view_item', {
+      'send_to': fakeMeasurementId
+    });
   });
 
   it('logEvent() globally calls gtag function correctly', async () => {
     await logEvent(
       gtagStub,
       fakeInitializationPromise,
-      EventName.ADD_TO_CART,
+      'add_to_cart',
       {
         currency: 'USD'
       },
       { global: true }
     );
 
-    expect(gtagStub).to.have.been.calledWith(
-      GtagCommand.EVENT,
-      EventName.ADD_TO_CART,
-      {
-        currency: 'USD'
-      }
-    );
+    expect(gtagStub).to.have.been.calledWith(GtagCommand.EVENT, 'add_to_cart', {
+      currency: 'USD'
+    });
   });
 
   it('logEvent() with no event params globally calls gtag function correctly', async () => {
     await logEvent(
       gtagStub,
       fakeInitializationPromise,
-      EventName.ADD_TO_CART,
+      'add_to_cart',
       undefined,
       {
         global: true
@@ -97,7 +85,7 @@ describe('FirebaseAnalytics methods', () => {
 
     expect(gtagStub).to.have.been.calledWith(
       GtagCommand.EVENT,
-      EventName.ADD_TO_CART,
+      'add_to_cart',
       undefined
     );
   });

packages-exp/analytics-exp/src/index.test.ts

@@ -24,7 +24,7 @@ import {
   getFakeInstallations
 } from '../testing/get-fake-firebase-services';
 import { FirebaseApp } from '@firebase/app-types-exp';
-import { GtagCommand, EventName } from './constants';
+import { GtagCommand } from './constants';
 import { findGtagScriptOnPage } from './helpers';
 import { removeGtagScript } from '../testing/gtag-script-util';
 import { Deferred } from '@firebase/util';
@@ -157,7 +157,7 @@ describe('FirebaseAnalytics instance tests', () => {
       expect(analyticsInstance.app).to.equal(app);
     });
     it('Calls gtag correctly on logEvent (instance)', async () => {
-      logEvent(analyticsInstance, EventName.ADD_PAYMENT_INFO, {
+      logEvent(analyticsInstance, 'add_payment_info', {
         currency: 'USD'
       });
       // Clear promise chain started by logEvent.
@@ -174,7 +174,7 @@ describe('FirebaseAnalytics instance tests', () => {
       );
       expect(gtagStub).to.have.been.calledWith(
         GtagCommand.EVENT,
-        EventName.ADD_PAYMENT_INFO,
+        'add_payment_info',
         {
           'send_to': 'abcd-efgh',
           currency: 'USD'
@@ -237,7 +237,7 @@ describe('FirebaseAnalytics instance tests', () => {
     it('Warns on logEvent if indexedDB API not available', async () => {
       const idbStub = stub(window, 'indexedDB').value(undefined);
       analyticsInstance = analyticsFactory(app, fakeInstallations);
-      logEvent(analyticsInstance, EventName.ADD_PAYMENT_INFO, {
+      logEvent(analyticsInstance, 'add_payment_info', {
         currency: 'USD'
       });
       // Clear promise chain started by logEvent.
@@ -257,7 +257,7 @@ describe('FirebaseAnalytics instance tests', () => {
       idbOpenStub.restore();
       idbOpenStub = stub(indexedDB, 'open').throws('idb open error test');
       analyticsInstance = analyticsFactory(app, fakeInstallations);
-      logEvent(analyticsInstance, EventName.ADD_PAYMENT_INFO, {
+      logEvent(analyticsInstance, 'add_payment_info', {
         currency: 'USD'
       });
       // Clear promise chain started by logEvent.
@@ -307,7 +307,7 @@ describe('FirebaseAnalytics instance tests', () => {
       idbOpenStub.restore();
     });
     it('Calls gtag correctly on logEvent (instance)', async () => {
-      logEvent(analyticsInstance, EventName.ADD_PAYMENT_INFO, {
+      logEvent(analyticsInstance, 'add_payment_info', {
         currency: 'USD'
       });
       // Clear promise chain started by logEvent.
@@ -324,7 +324,7 @@ describe('FirebaseAnalytics instance tests', () => {
       );
       expect(gtagStub).to.have.been.calledWith(
         GtagCommand.EVENT,
-        EventName.ADD_PAYMENT_INFO,
+        'add_payment_info',
         {
           'send_to': 'abcd-efgh',
           currency: 'USD'

packages-exp/analytics-exp/src/index.ts

@@ -83,7 +83,6 @@ registerAnalytics();
 export * from './api';
 
 export {
-  DataLayer,
   Analytics,
   AnalyticsCallOptions,
   SettingsOptions,

packages-exp/analytics-exp/testing/integration-tests/integration.ts

@@ -17,7 +17,7 @@
 
 import { initializeApp, deleteApp } from '@firebase/app-exp';
 import '@firebase/installations-exp';
-import { getAnalytics, logEvent, EventName } from '../../src/index';
+import { getAnalytics, logEvent } from '../../src/index';
 import '../setup';
 import { expect } from 'chai';
 import { stub } from 'sinon';
@@ -40,7 +40,7 @@ describe('FirebaseAnalytics Integration Smoke Tests', () => {
   afterEach(() => deleteApp(app));
   it('logEvent() sends correct network request.', async () => {
     app = initializeApp(config);
-    logEvent(getAnalytics(app), EventName.LOGIN, { method: 'email' });
+    logEvent(getAnalytics(app), 'login', { method: 'email' });
     async function checkForEventCalls(): Promise<number> {
       await new Promise(resolve => setTimeout(resolve, RETRY_INTERVAL));
       const resources = performance.getEntriesByType('resource');