Skip to content
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

Jump to bottom

Remove duplicated plausible props #2578

Merged
merged 4 commits into from
Jul 11, 2023
Merged

Remove duplicated plausible props #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aeb1f2b
Remove duplicated plausible props
zackkrida Jul 6, 2023
370e2f4
Update eslint rule and remove outdated comment
zackkrida Jul 7, 2023
29050ad
Merge branch 'main' into dedupe-plausible-props
zackkrida Jul 7, 2023
1ee0a96
Remove language from default props as well
zackkrida Jul 11, 2023
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
20 changes: 2 additions & 18 deletions frontend/src/composables/use-analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useContext } from "@nuxtjs/composition-api"
import type { Events, EventName } from "~/types/analytics"
import { useUiStore } from "~/stores/ui"
import { useFeatureFlagStore } from "~/stores/feature-flag"
import { useI18n } from "~/composables/use-i18n"

import { log } from "~/utils/console"

Expand All @@ -13,8 +12,7 @@ import { log } from "~/utils/console"
* bounds of the composition API.
*/
export const useAnalytics = () => {
const { $plausible, $ua } = useContext()
const i18n = useI18n()
const { $plausible } = useContext()
const uiStore = useUiStore()
const featureFlagStore = useFeatureFlagStore()

Expand All @@ -27,18 +25,7 @@ export const useAnalytics = () => {
* client-side; This excludes props that need `window`.
*/
const isomorphicProps = computed(() => ({
timestamp: new Date().toISOString(),
language: i18n.locale,
breakpoint: uiStore.breakpoint,
...($ua
? {
ua: $ua.source,
os: $ua.os,
platform: $ua.platform,
browser: $ua.browser,
version: $ua.version,
}
: {}),
}))

/**
Expand All @@ -48,9 +35,6 @@ export const useAnalytics = () => {
const windowProps = computed(() =>
window
? {
origin: window.location.origin,
pathname: window.location.pathname,
referrer: window.document.referrer,
width: window.innerWidth,
height: window.innerHeight,
}
Expand All @@ -73,7 +57,7 @@ export const useAnalytics = () => {
props: {
...isomorphicProps.value,
...windowProps.value,
...payload, // can override mandatory props
...payload,
},
})
}
Expand Down
16 changes: 1 addition & 15 deletions packages/eslint-plugin/src/configs/recommended.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,7 @@ export const recommended = {
"@openverse/analytics-configuration": [
"error",
{
reservedPropNames: [
"timestamp",
"language",
"breakpoint",
"ua",
"os",
"platform",
"browser",
"version",
"origin",
"pathname",
"referrer",
"width",
"height",
],
reservedPropNames: ["width", "height"],
},
],
},
Expand Down