chore: address code review

Author: bcoe

static/app/constants/index.tsx

@@ -21,6 +21,10 @@ export const CUSTOMER_DOMAIN =
     ? undefined
     : window?.__initialData?.customerDomain?.subdomain;
 
+// Constant used for tracking referrer in session storage rather than
+// ?referrer=foo get parameter:
+export const CUSTOM_REFERRER_KEY = 'customReferrer';
+
 // This is considered the "default" route/view that users should be taken
 // to when the application does not have any further context
 //

static/app/views/nav/orgDropdown.tsx

@@ -9,22 +9,25 @@ import {Button} from 'sentry/components/core/button';
 import {DropdownMenu, type MenuItemProps} from 'sentry/components/dropdownMenu';
 import OrganizationBadge from 'sentry/components/idBadge/organizationBadge';
 import QuestionTooltip from 'sentry/components/questionTooltip';
+import {CUSTOM_REFERRER_KEY} from 'sentry/constants';
 import {IconAdd} from 'sentry/icons';
 import {t, tn} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
 import OrganizationsStore from 'sentry/stores/organizationsStore';
 import {useLegacyStore} from 'sentry/stores/useLegacyStore';
 import type {Organization} from 'sentry/types/organization';
 import {isDemoModeActive} from 'sentry/utils/demoMode';
-import localStorage from 'sentry/utils/localStorage';
 import {localizeDomain, resolveRoute} from 'sentry/utils/resolveRoute';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
+import {useSessionStorage} from 'sentry/utils/useSessionStorage';
 import {useNavContext} from 'sentry/views/nav/context';
 import {NavLayout} from 'sentry/views/nav/types';
 import {makeProjectsPathname} from 'sentry/views/projects/pathname';
 
+const ORG_DROPDOWN_REFERRER = 'org-dropdown';
+
 function createOrganizationMenuItem(): MenuItemProps {
   const configFeatures = ConfigStore.get('features');
   const sentryUrl = localizeDomain(ConfigStore.get('links').sentryUrl);
@@ -64,6 +67,7 @@ export function OrgDropdown({
   const config = useLegacyStore(ConfigStore);
   const organization = useOrganization();
   const navigate = useNavigate();
+  const [, setReferrer] = useSessionStorage<string | null>(CUSTOM_REFERRER_KEY, null);
 
   // It's possible we do not have an org in context (e.g. RouteNotFound)
   // Otherwise, we should have the full org
@@ -148,7 +152,7 @@ export function OrgDropdown({
               key: 'projects',
               label: t('Projects'),
               onAction: () => {
-                localStorage.setItem('customReferrer', 'org-dropdown');
+                setReferrer(ORG_DROPDOWN_REFERRER);
                 navigate(makeProjectsPathname({path: '/', organization}));
               },
               hidden: hideOrgLinks,

static/gsApp/utils/rawTrackAnalyticsEvent.spec.tsx

@@ -3,9 +3,9 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
 import {SubscriptionFixture} from 'getsentry-test/fixtures/subscription';
 import {setWindowLocation} from 'sentry-test/utils';
 
+import {CUSTOM_REFERRER_KEY} from 'sentry/constants';
 import ConfigStore from 'sentry/stores/configStore';
 import {uniqueId} from 'sentry/utils/guid';
-import localStorageWrapper from 'sentry/utils/localStorage';
 import sessionStorage from 'sentry/utils/sessionStorage';
 
 import rawTrackAnalyticsEvent from 'getsentry/utils/rawTrackAnalyticsEvent';
@@ -187,7 +187,7 @@ describe('rawTrackAnalyticsEvent', () => {
   });
 
   it('sets custom_referrer if found in local storage', () => {
-    localStorageWrapper.setItem('customReferrer', 'batman');
+    sessionStorage.setItem(CUSTOM_REFERRER_KEY, 'batman');
     setWindowLocation('http:/localhost');
     rawTrackAnalyticsEvent({
       eventKey: 'test_event',
@@ -207,7 +207,7 @@ describe('rawTrackAnalyticsEvent', () => {
       {time: undefined}
     );
     setWindowLocation('http:/localhost/');
-    expect(localStorageWrapper.getItem('customReferrer')).toBeNull();
+    expect(sessionStorage.getItem(CUSTOM_REFERRER_KEY)).toBeNull();
   });
 
   it('start analytics session', () => {

static/gsApp/utils/rawTrackAnalyticsEvent.tsx

@@ -1,12 +1,12 @@
 import * as qs from 'query-string';
 
+import {CUSTOM_REFERRER_KEY} from 'sentry/constants';
 import ConfigStore from 'sentry/stores/configStore';
 import type {Hooks} from 'sentry/types/hooks';
 import type {Organization} from 'sentry/types/organization';
 import type {User} from 'sentry/types/user';
 import getDaysSinceDate from 'sentry/utils/getDaysSinceDate';
 import {uniqueId} from 'sentry/utils/guid';
-import localStorage from 'sentry/utils/localStorage';
 import sessionStorage from 'sentry/utils/sessionStorage';
 
 import type {Subscription} from 'getsentry/types';
@@ -71,20 +71,21 @@ const hasAnalyticsDebug = () => localStorage.getItem('DEBUG_ANALYTICS_GETSENTRY'
 
 const getCustomReferrer = () => {
   try {
-    // pull the referrer from local storage.
-    if (
-      localStorage.getItem('customReferrer') &&
-      typeof localStorage.getItem('customReferrer') === 'string'
-    ) {
-      const referrer = localStorage.getItem('customReferrer');
-      localStorage.removeItem('customReferrer');
-      return referrer;
-    }
     // pull the referrer from the query parameter of the page
     const {referrer} = qs.parse(window.location.search) || {};
     if (referrer && typeof referrer === 'string') {
       return referrer;
     }
+
+    // pull the referrer from session storage.
+    if (
+      sessionStorage.getItem(CUSTOM_REFERRER_KEY) &&
+      typeof sessionStorage.getItem(CUSTOM_REFERRER_KEY) === 'string'
+    ) {
+      const sessionReferrer = sessionStorage.getItem(CUSTOM_REFERRER_KEY);
+      sessionStorage.removeItem(CUSTOM_REFERRER_KEY);
+      return sessionReferrer;
+    }
   } catch {
     // ignore if this fails to parse
     // this can happen if we have an invalid query string