DI and jazz

Author: jamesdaniels

src/analytics/analytics.ts

@@ -6,6 +6,7 @@ import { Router, NavigationEnd, ActivationEnd } from '@angular/router';
 import { FirebaseAnalytics, FIREBASE_OPTIONS, FIREBASE_APP_NAME, _firebaseAppFactory } from '@angular/fire';
 
 export const AUTOMATICALLY_SET_CURRENT_SCREEN = new InjectionToken<boolean>('angularfire2.analytics.setCurrentScreen');
+export const AUTOMATICALLY_LOG_SCREEN_VIEWS = new InjectionToken<boolean>('angularfire2.analytics.logScreenViews');
 export const ANALYTICS_COLLECTION_ENABLED = new InjectionToken<boolean>('angularfire2.analytics.analyticsCollectionEnabled');
 export const AUTOMATICALLY_TRACK_USER_IDENTIFIER = new InjectionToken<boolean>('angularfire2.analytics.trackUserIdentifier');
 export const APP_VERSION = new InjectionToken<string>('angularfire2.analytics.appVersion');
@@ -27,6 +28,7 @@ export class AngularFireAnalytics {
     @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig:string|FirebaseAppConfig|null|undefined,
     @Optional() router:Router,
     @Optional() @Inject(AUTOMATICALLY_SET_CURRENT_SCREEN) automaticallySetCurrentScreen:boolean|null,
+    @Optional() @Inject(AUTOMATICALLY_LOG_SCREEN_VIEWS) automaticallyLogScreenViews:boolean|null,
     @Optional() @Inject(ANALYTICS_COLLECTION_ENABLED) analyticsCollectionEnabled:boolean|null,
     @Optional() @Inject(AUTOMATICALLY_TRACK_USER_IDENTIFIER) automaticallyTrackUserIdentifier:boolean|null,
     @Optional() @Inject(APP_VERSION) providedAppVersion:string|null,
@@ -45,7 +47,7 @@ export class AngularFireAnalytics {
       runOutsideAngular(zone)
     );
 
-    if (router && automaticallySetCurrentScreen !== false) {
+    if (router && (automaticallySetCurrentScreen !== false || automaticallyLogScreenViews !== false)) {
       const app_name = providedAppName || DEFAULT_APP_NAME;
       const app_version = providedAppVersion || DEFAULT_APP_VERSION;
       const activationEndEvents = router.events.pipe(filter<ActivationEnd>(e => e instanceof ActivationEnd));
@@ -56,9 +58,13 @@ export class AngularFireAnalytics {
           const url = navigationEnd.url;
           const screen_name = activationEnd.snapshot.routeConfig && activationEnd.snapshot.routeConfig.path || undefined;
           const outlet = activationEnd.snapshot.outlet;
-          analytics.logEvent("screen_view", { app_name, app_version, screen_name, outlet, url });
-          // TODO when is screen_name undefined?
-          analytics.setCurrentScreen(screen_name || url, { global: outlet == "primary" })
+          if (automaticallyLogScreenViews !== false) {
+            analytics.logEvent("screen_view", { app_name, app_version, screen_name, outlet, url });
+          }
+          if (automaticallySetCurrentScreen !== false) {
+            // TODO when is screen_name undefined?
+            analytics.setCurrentScreen(screen_name || url, { global: outlet == "primary" })
+          }
         }),
         runOutsideAngular(zone)
       ).subscribe();

src/remote-config/remote-config.ts

@@ -1,6 +1,6 @@
 import { Injectable, Inject, Optional, NgZone, InjectionToken } from '@angular/core';
-import { Observable, from } from 'rxjs';
-import { map, switchMap, tap } from 'rxjs/operators';
+import { Observable, from, concat } from 'rxjs';
+import { map, switchMap, tap, take } from 'rxjs/operators';
 import { FirebaseAppConfig, FirebaseOptions, FIREBASE_OPTIONS, FIREBASE_APP_NAME } from '@angular/fire';
 import { remoteConfig } from 'firebase/app';
 
@@ -26,6 +26,8 @@ export class AngularFireRemoteConfig {
 
   public readonly configuration: Observable<{[key:string]: remoteConfig.Value}>;
 
+  public readonly activate: Observable<{[key:string]: remoteConfig.Value}>;
+
   constructor(
     @Inject(FIREBASE_OPTIONS) options:FirebaseOptions,
     @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig:string|FirebaseAppConfig|null|undefined,
@@ -50,15 +52,25 @@ export class AngularFireRemoteConfig {
       runOutsideAngular(zone)
     );
 
+    this.activate = this.remoteConfig.pipe(
+      switchMap(rc => rc.activate().then(() => rc)),
+      tap(rc => rc.fetch()),
+      map(rc => rc.getAll()),
+      runOutsideAngular(zone),
+      take(1)
+    )
+
     this.freshConfiguration = this.remoteConfig.pipe(
       switchMap(rc => rc.fetchAndActivate().then(() => rc.getAll())),
-      runOutsideAngular(zone)
+      runOutsideAngular(zone),
+      take(1)
     )
 
     this.configuration = this.remoteConfig.pipe(
-      switchMap(rc => rc.activate().then(() => rc)),
-      tap(rc => rc.fetch()),
-      map(rc => rc.getAll()),
+      switchMap(rc => concat(
+        rc.activate().then(() => rc.getAll()),
+        rc.fetchAndActivate().then(() => rc.getAll())
+      )),
       runOutsideAngular(zone)
     )
   }