From 2932c720eff0834d82490aee604784fc792c1108 Mon Sep 17 00:00:00 2001 From: josue Date: Sun, 29 Mar 2020 19:38:34 -0500 Subject: [PATCH 1/6] Enabled sending of user properties --- lib/src/analytics.dart | 6 +++--- lib/src/interop/analytics_interop.dart | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/analytics.dart b/lib/src/analytics.dart index b89c68bd..7bf78a1a 100644 --- a/lib/src/analytics.dart +++ b/lib/src/analytics.dart @@ -44,12 +44,12 @@ class Analytics extends JsObjectWrapper { } } - void setUserProperties(CustomParams properties, + void setUserProperties(Map properties, [AnalyticsCallOptions options]) { if (options != null) { - jsObject.setUserProperties(properties.jsObject, options.jsObject); + jsObject.setUserProperties(jsify(properties), options.jsObject); } else { - jsObject.setUserProperties(properties.jsObject); + jsObject.setUserProperties(jsify(properties)); } } } diff --git a/lib/src/interop/analytics_interop.dart b/lib/src/interop/analytics_interop.dart index c6426255..d6bb4c20 100644 --- a/lib/src/interop/analytics_interop.dart +++ b/lib/src/interop/analytics_interop.dart @@ -11,7 +11,7 @@ abstract class AnalyticsJsImpl { external void setCurrentScreen(String screenName, [AnalyticsCallOptionsJsImpl options]); external void setUserId(String id, [AnalyticsCallOptionsJsImpl options]); - external void setUserProperties(CustomParamsJsImpl properties, + external void setUserProperties(Object properties, [AnalyticsCallOptionsJsImpl options]); } From ea0ef7037ce6c4b7b45e3e94f508eef8e3c6f2fd Mon Sep 17 00:00:00 2001 From: josue Date: Tue, 31 Mar 2020 23:49:55 -0500 Subject: [PATCH 2/6] Cleaned up unnecessary classes --- lib/src/analytics.dart | 6 ------ lib/src/interop/analytics_interop.dart | 5 ----- 2 files changed, 11 deletions(-) diff --git a/lib/src/analytics.dart b/lib/src/analytics.dart index 7bf78a1a..cd8585bf 100644 --- a/lib/src/analytics.dart +++ b/lib/src/analytics.dart @@ -65,9 +65,3 @@ class AnalyticsCallOptions jsObject.global = t; } } - -class CustomParams - extends JsObjectWrapper { - CustomParams._fromJsObject(analytics_interop.CustomParamsJsImpl jsObject) - : super.fromJsObject(jsObject); -} diff --git a/lib/src/interop/analytics_interop.dart b/lib/src/interop/analytics_interop.dart index d6bb4c20..16ac6bbb 100644 --- a/lib/src/interop/analytics_interop.dart +++ b/lib/src/interop/analytics_interop.dart @@ -23,8 +23,3 @@ class AnalyticsCallOptionsJsImpl { external factory AnalyticsCallOptionsJsImpl({bool global}); } - -@JS('CustomParams') -class CustomParamsJsImpl { - //TODO: implement -} From f3b0f487e65d3296fd339cd2e466c1c4a99854c4 Mon Sep 17 00:00:00 2001 From: josue Date: Tue, 31 Mar 2020 23:54:37 -0500 Subject: [PATCH 3/6] prepare for 7.2.2 --- CHANGELOG.md | 4 ++++ pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70b7d90f..307648fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 7.2.2 + +- Enabled sending of user properties in analytics with `setUserProperties` + ## 7.2.1 - Mark intereop types `AuthProvider` and `OAuthCredential` anonymous. diff --git a/pubspec.yaml b/pubspec.yaml index 928f1e4e..d8290926 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: firebase description: Firebase libraries for Dart on the web and server -version: 7.2.1 +version: 7.2.2 homepage: https://github.com/FirebaseExtended/firebase-dart environment: From 1622ffdbd91e256daf6f9b18917e33d750074faa Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 1 Apr 2020 12:12:29 -0700 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 307648fe..80f0f2ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 7.2.2 -- Enabled sending of user properties in analytics with `setUserProperties` +- Enabled sending of user properties in analytics with `setUserProperties`. +- Removed unused (and unusable) `CustomParams` class. ## 7.2.1 From 33e889d7ca06f818175929c71a4e85f3b7b6a264 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 1 Apr 2020 12:12:56 -0700 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f0f2ca..4fe1e9db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 7.2.2 +## 7.2.2-dev - Enabled sending of user properties in analytics with `setUserProperties`. - Removed unused (and unusable) `CustomParams` class. From 0348ccce6e37df8cff0e2d3984c512dced5af8d2 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Wed, 1 Apr 2020 12:13:08 -0700 Subject: [PATCH 6/6] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index d8290926..7b4ddf97 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: firebase description: Firebase libraries for Dart on the web and server -version: 7.2.2 +version: 7.2.2-dev homepage: https://github.com/FirebaseExtended/firebase-dart environment: