Merge branch 'main' into feat/show-package-size-1864

Author: gajeshbhat

konf/site.yaml

@@ -100,6 +100,10 @@ extraHosts:
 # Overrides for production
 production:
   replicas: 5
+  env:
+    - name: ANALYTICS_ENDPOINT
+      value: https://marketplace-analytics.canonical.com/k8s-prod-marketplace-analytics-marketplace-analytics/analytics/events
+
   nginxConfigurationSnippet: |
     if ($host = 'docs.snapcraft.io' ) {
       rewrite ^ https://snapcraft.io/docs$request_uri? permanent;
@@ -153,3 +157,8 @@ staging:
       replicas: 2
       memoryLimit: 256Mi
       env: *env
+
+demo:
+  env:
+    - name: ANALYTICS_ENDPOINT
+      value: https://marketplace-analytics.staging.canonical.com/k8s-stg-marketplace-marketplace-analytics-marketplace-analytics/analytics/events

package.json

@@ -25,6 +25,7 @@
     "@babel/preset-env": "7.29.0",
     "@babel/preset-react": "7.28.5",
     "@babel/preset-typescript": "7.28.5",
+    "@canonical/analytics-events": "1.0.4",
     "@canonical/cookie-policy": "3.8.4",
     "@canonical/global-nav": "3.8.0",
     "@canonical/react-components": "3.12.1",

static/js/base/base.ts

@@ -1,3 +1,17 @@
 import "./ga";
 import "./contactForm";
 import "./sentry";
+import { initAnalytics } from "@canonical/analytics-events";
+
+declare global {
+  interface Window {
+    ANALYTICS_ENDPOINT: string;
+  }
+}
+
+if (window.ANALYTICS_ENDPOINT) {
+  initAnalytics({
+    appName: "snapcraft",
+    endpoint: window.ANALYTICS_ENDPOINT,
+  });
+}

static/js/public/store-details.ts

@@ -7,6 +7,11 @@ import initEmbeddedCardModal from "./snap-details/embeddedCard";
 import { snapDetailsPosts } from "./snap-details/blog-posts";
 import initExpandableArea from "./expandable-area";
 import declareGlobal from "../libs/declare";
+import { trackPageView } from "@canonical/analytics-events";
+
+if (window.ANALYTICS_ENDPOINT) {
+  trackPageView("snap_details_page");
+}
 
 declareGlobal("snapcraft.public.storeDetails", {
   map,

templates/_base-layout.html

@@ -85,6 +85,7 @@
       window.COMMIT_ID = "{{ COMMIT_ID }}";
       window.ENVIRONMENT = "{{ ENVIRONMENT }}";
       window.SENTRY_DSN = "{{ SENTRY_DSN }}";
+      window.ANALYTICS_ENDPOINT = "{{ ANALYTICS_ENDPOINT }}";
     </script>
 
   <script type="application/ld+json" nonce="{{ CSP_NONCE }}">

templates/store/snap-details.html

@@ -189,7 +189,7 @@ <h2>Where people are using {{ snap_title }}</h2>
         </div>
         <div class="grid-row {% if normalized_os %}u-equal-height{% endif %}">
           {% if countries %}
-            <div class="{% if normalized_os %}grid-col-4{% else %}grid-col-6{% endif %} grid-col-start-large-3 js-snap-map-holder" data-live="installed_base_by_country_percent">
+            <div class="{% if normalized_os %}grid-col-4{% else %}grid-col-6{% endif %} grid-col-start-large-3 js-snap-map-holder" data-live="installed_base_by_country_percent" data-analytics-view data-analytics-hover data-analytics-target="snap_details_map_installed_base_by_country_percent" >
               <div id="js-snap-map" class="snapcraft-territories"></div>
             </div>
           {% endif %}
@@ -231,7 +231,7 @@ <h3 class="p-muted-heading">Users by distribution (log)</h3>
                     </div>
                     <div class="p-show-more__fade">
                       <div class="p-show-more__link-container">
-                        <button class="p-button--link p-show-more__link is-small u-no-padding" aria-expanded="false">Show more</button>
+                        <button class="p-button--link p-show-more__link is-small u-no-padding" aria-expanded="false" data-analytics-click data-analytics-target="snap_details_map_show_more_distributions">Show more</button>
                       </div>
                     </div>
                   </div>

webapp/config.py

@@ -49,5 +49,6 @@ class ConfigurationError(Exception):
 SEARCH_CUSTOM_ID = "009048213575199080868:i3zoqdwqk8o"
 
 APP_NAME = "snapcraft"
+ANALYTICS_ENDPOINT = os.getenv("ANALYTICS_ENDPOINT", "").strip()
 
 REPORT_SHEET_URL = os.getenv("REPORT_SHEET_URL", "").strip()

webapp/handlers.py

@@ -24,6 +24,7 @@
     DNS_VERIFICATION_SALT,
     IS_DEVELOPMENT,
     VITE_PORT,
+    ANALYTICS_ENDPOINT,
 )
 
 from canonicalwebteam.exceptions import (
@@ -90,6 +91,7 @@
         "px.ads.linkedin.com",
         "*.snapcraft.io",
         "*.snapcraftcontent.com",
+        "marketplace-analytics.staging.canonical.com",
         "www.google.com",
     ],
     "frame-src": [
@@ -192,6 +194,7 @@ def snapcraft_utility_processor():
         "stores": stores,
         "format_link": template_utils.format_link,
         "DNS_VERIFICATION_SALT": DNS_VERIFICATION_SALT,
+        "ANALYTICS_ENDPOINT": ANALYTICS_ENDPOINT,
     }
 
 

yarn.lock

@@ -924,6 +924,11 @@
     hashery "^1.5.0"
     keyv "^5.6.0"
 
+"@canonical/analytics-events@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@canonical/analytics-events/-/analytics-events-1.0.4.tgz#27440161a7970f2f2a990dd0597e70685706c3b4"
+  integrity sha512-+ChQJHpwpBQxuSdVwNv1YSGSzX6z6QeCmfxKqo8K02Hk2nJGuIdwEfi4yIa/KxVOhxaFLO7fy7ACSsBkTGeGRA==
+
 "@canonical/cookie-policy@3.8.4":
   version "3.8.4"
   resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.8.4.tgz#38fd82f35d98ab0476bc106b0d813a2719bae26c"