Skip to content

fix(analytics): Matomo analytics #817

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

Merged
merged 3 commits into from
Sep 3, 2025
Merged

fix(analytics): Matomo analytics #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b73081
fix: Matomo analytics
ldez Sep 2, 2025
1d86e6f
chore: use with
ldez Sep 3, 2025
acd18d0
Revert "chore: use with"
imfing Sep 3, 2025
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
12 changes: 12 additions & 0 deletions layouts/_partials/components/analytics/matomo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
https://developer.matomo.org/guides/tracking-javascript-guide
*/ -}}

{{- with .Site.Params.analytics.matomo -}}
Copy link
Owner

@imfing imfing Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is also checked at

hextra/layouts/_partials/components/analytics/analytics.html

Line 15 in cc5884d

{{- if .Site.Params.analytics.matomo -}}

I guess we don't need both?

Copy link
Contributor Author

@ldez ldez Sep 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's 2 different things:

  • The if is purely conditional and doesn't change the scope of .
  • The with is conditional, but it also changes the scope of .

IMHO, it's better to have a larger scope at the global partial level (because it's easier to override), and inside the partial have a restricted scope for readability and maintenance.

Copy link
Contributor Author

@ldez ldez Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 If someone wants to override (to a specific analytics), he can either override layouts/_partials/components/analytics/analytics.html or add an element inside layouts/_partials/custom/head-end.html.

So I think I will use with.

Copy link
Owner

@imfing imfing Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's 2 different things:

  • The if is purely conditional and doesn't change the scope of .
  • The with is conditional, but it also changes the scope of .

IMHO, it's better to have a larger scope at the global partial level (because it's easier to override), and inside the partial have a restricted scope for readability and maintenance.

I see, that makes more sense, I think I’d actually prefer giving the partial a broader scope now 🤔


{{- if not .serverURL }}
{{- errorf "Missing Matomo 'serverURL' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#matomo-analytics" -}}
{{- end -}}

{{- if not .websiteID }}
{{- errorf "Missing Matomo 'websiteID' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#matomo-analytics" -}}
{{- end -}}

<!-- Matomo -->
<script type="text/javascript">
var _paq = window._paq = window._paq || [];
Expand All @@ -17,3 +27,5 @@
})();
</script>
<!-- End Matomo Code -->

{{- end -}}
4 changes: 2 additions & 2 deletions layouts/_partials/components/analytics/umami.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
{{- with .Site.Params.analytics.umami -}}

{{- if not .serverURL }}
{{- errorf "Missing Umami 'serverURL' configuration. See TODO" -}}
{{- errorf "Missing Umami 'serverURL' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#umami-analytics" -}}
{{- end -}}

{{- if not .websiteID }}
{{- errorf "Missing Umami 'websiteID' configuration. See TODO" -}}
{{- errorf "Missing Umami 'websiteID' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#umami-analytics" -}}
{{- end -}}

{{- $attributes := newScratch -}}
Expand Down