Add user.geo fields to feedback tags display and alphabetize tags

Author: aliu39

static/app/components/feedback/feedbackItem/tagsSection.tsx

@@ -1,5 +1,6 @@
 import type {ReactNode} from 'react';
 import styled from '@emotion/styled';
+import orderBy from 'lodash/orderBy';
 
 import Collapsible from 'sentry/components/collapsible';
 import {Button} from 'sentry/components/core/button';
@@ -14,7 +15,7 @@ interface Props {
 }
 
 export default function TagsSection({tags}: Props) {
-  const entries = Object.entries(tags);
+  const orderedEntries = orderBy(Object.entries(tags), ['key'], ['asc']);
 
   return (
     <KeyValueTable noMargin>
@@ -31,7 +32,7 @@ export default function TagsSection({tags}: Props) {
           </StyledButton>
         )}
       >
-        {entries.map(([key, value]) => (
+        {orderedEntries.map(([key, value]) => (
           <KeyValueTableRow
             key={key}
             keyName={key}

static/app/components/feedback/hydrateFeedbackTags.tsx

@@ -50,12 +50,6 @@ export default function hydrateFeedbackTags(
     ...(context.device?.name ? {'device.name': context.device?.name} : {}),
     ...(context.os?.name ? {'os.name': context.os?.name} : {}),
     ...(context.os?.version ? {'os.version': context.os?.version} : {}),
-    ...(eventTags.some(e => e.key === 'environment')
-      ? {environment: eventTags.find(e => e.key === 'environment')?.value}
-      : {}),
-    ...(eventTags.some(e => e.key === 'transaction')
-      ? {transaction: eventTags.find(e => e.key === 'transaction')?.value}
-      : {}),
     ...(eventData.platform
       ? {platform: issueData?.project?.platform ?? eventData.platform}
       : {}),
@@ -64,6 +58,14 @@ export default function hydrateFeedbackTags(
     ...(eventData?.contexts?.feedback?.replay_id
       ? {replay_id: eventData?.contexts?.feedback?.replay_id}
       : {}),
+    ...(eventData.user?.geo?.city ? {'geo.city': eventData.user?.geo?.city} : {}),
+    ...(eventData.user?.geo?.country_code
+      ? {'geo.country_code': eventData.user?.geo?.country_code}
+      : {}),
+    ...(eventData.user?.geo?.region ? {'geo.region': eventData.user?.geo?.region} : {}),
+    ...(eventData.user?.geo?.subdivision
+      ? {'geo.subdivision': eventData.user?.geo?.subdivision}
+      : {}),
   };
 
   // Sort the tags by key

static/app/types/event.tsx

@@ -677,6 +677,12 @@ export type EventTag = {key: string; value: string};
 type EventUser = {
   data?: string | null;
   email?: string;
+  geo?: {
+    city?: string;
+    country_code?: string;
+    region?: string;
+    subdivision?: string;
+  };
   id?: string;
   ip_address?: string;
   name?: string | null;