Skip to content

Fix custom parameters type for web platform #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KentJohnson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix custom parameters type for web platform #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import dev.gitlive.firebase.analytics.externals.getAnalytics
import dev.gitlive.firebase.js
import kotlinx.coroutines.await
import kotlin.time.Duration
import kotlin.js.json

public actual val Firebase.analytics: FirebaseAnalytics
get() = FirebaseAnalytics(getAnalytics())
Expand All @@ -20,7 +21,8 @@ public actual class FirebaseAnalytics(internal val js: dev.gitlive.firebase.anal
name: String,
parameters: Map<String, Any>?,
) {
dev.gitlive.firebase.analytics.externals.logEvent(js, name, parameters)
val json = json(*parameters?.map { it.key to it.value }.orEmpty().toTypedArray())
dev.gitlive.firebase.analytics.externals.logEvent(js, name, json)
}

public actual fun setUserProperty(name: String, value: String) {
Expand Down
3 changes: 2 additions & 1 deletion firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ package dev.gitlive.firebase.analytics.externals

import dev.gitlive.firebase.externals.FirebaseApp
import kotlin.js.Promise
import kotlin.js.Json

public external fun getAnalytics(app: FirebaseApp? = definedExternally): FirebaseAnalytics

public external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, Any>?)
public external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Json?)
public external fun setUserProperty(app: FirebaseAnalytics, name: String, value: String)
public external fun setUserId(app: FirebaseAnalytics, id: String?)
public external fun resetAnalyticsData(app: FirebaseAnalytics)
Expand Down