Merge pull request #1438 from AppQuality/send-utm-source-to-analytics

Store UTM source and improve Userpilot token handling

Author: cannarocks

src/analytics.ts

@@ -15,7 +15,7 @@ const analytics = Analytics({
         }),
       }),
       userpilot({
-        token: isDev() ? 'STG-NX-54e88e10' : 'NX-54e88e10',
+        token: 'NX-54e88e10',
       }),
     ],
   }),

src/common/Track.tsx

@@ -19,6 +19,7 @@ export const Track = ({
   const { data: userData, isLoading, isSuccess } = useGetUsersMeQuery();
   const { activeWorkspace } = useActiveWorkspace();
   const { track, identify, page } = useAnalytics();
+  const utmSource = sessionStorage.getItem('utmSource');
   const location = useLocation();
 
   const defaultMeta = [
@@ -63,6 +64,7 @@ export const Track = ({
         email: userData.email,
         company: activeWorkspace.company,
         workspace: activeWorkspace,
+        ...((utmSource && { utm_source: utmSource }) || {}),
       });
 
       track(

src/common/analytics-plugins/userpilot.ts

@@ -1,5 +1,6 @@
 import { User } from 'src/features/api';
 import { Userpilot } from 'userpilot';
+import { isDev } from '../isDevEnvironment';
 
 declare global {
   interface Window {
@@ -56,6 +57,9 @@ export default function userpilotPlugin(pluginSettings: UserpilotConfig) {
       Userpilot.track(event, { ...properties, userId });
     },
 
-    loaded: () => !!window.userpilot,
+    loaded: () => {
+      const previewEnabled = localStorage.getItem('userpilot_ug_preview');
+      return isDev() && previewEnabled !== null ? true : !!window.userpilot;
+    },
   };
 }

src/pages/JoinPage/useJoinSubmit.tsx

@@ -16,6 +16,7 @@ export function useJoinSubmit(isInvited: boolean) {
   const sendGTMevent = useSendGTMevent({ loggedUser: false });
 
   const templateParam = searchParams.get('template');
+  const utmSource = searchParams.get('utm_source');
   let templateId: number | undefined;
 
   if (templateParam !== null) {
@@ -29,6 +30,10 @@ export function useJoinSubmit(isInvited: boolean) {
     templateId = parsed;
   }
 
+  if (utmSource !== null) {
+    sessionStorage.setItem('utmSource', utmSource);
+  }
+
   const onSubmit = useCallback(
     async (
       values: JoinFormValues,