{t('Users')}
{userCount !== 0 ?
-
+
:
diff --git a/src/sentry/static/sentry/app/views/groupTagValues.jsx b/src/sentry/static/sentry/app/views/groupTagValues.jsx
index 28b297fe2287ba..e31cb195d52a21 100644
--- a/src/sentry/static/sentry/app/views/groupTagValues.jsx
+++ b/src/sentry/static/sentry/app/views/groupTagValues.jsx
@@ -1,20 +1,19 @@
+/*eslint react/jsx-key:0*/
import React from 'react';
import {Link} from 'react-router';
import jQuery from 'jquery';
import ApiMixin from '../mixins/apiMixin';
-import Count from '../components/count';
-import GroupState from '../mixins/groupState';
+import Avatar from '../components/avatar';
import LoadingError from '../components/loadingError';
import LoadingIndicator from '../components/loadingIndicator';
import Pagination from '../components/pagination';
import TimeSince from '../components/timeSince';
import {isUrl, percent, deviceNameMapper} from '../utils';
-import {t, tn} from '../locale';
+import {t} from '../locale';
const GroupTagValues = React.createClass({
mixins: [
- ApiMixin,
- GroupState
+ ApiMixin
],
getInitialState() {
@@ -47,7 +46,7 @@ const GroupTagValues = React.createClass({
error: false
});
- this.api.request('/issues/' + this.getGroup().id + '/tags/' + params.tagKey + '/', {
+ this.api.request(`/issues/${params.groupId}/tags/${params.tagKey}/`, {
success: (data) => {
this.setState({
tagKey: data,
@@ -62,7 +61,7 @@ const GroupTagValues = React.createClass({
}
});
- this.api.request('/issues/' + this.getGroup().id + '/tags/' + params.tagKey + '/values/?' + querystring, {
+ this.api.request(`/issues/${params.groupId}/tags/${params.tagKey}/values/?${querystring}`, {
success: (data, _, jqXHR) => {
this.setState({
tagValueList: data,
@@ -79,6 +78,10 @@ const GroupTagValues = React.createClass({
});
},
+ getUserDisplayName(item) {
+ return item.email || item.username || item.identifier || item.ipAddress || item.value;
+ },
+
render() {
if (this.state.loading) {
return
;
@@ -86,11 +89,10 @@ const GroupTagValues = React.createClass({
return
;
}
+ let {orgId, projectId} = this.props.params;
let tagKey = this.state.tagKey;
let children = this.state.tagValueList.map((tagValue, tagValueIdx) => {
let pct = percent(tagValue.count, tagKey.totalValues).toFixed(2);
- let orgId = this.getOrganization().slug;
- let projectId = this.getProject().slug;
return (
@@ -101,10 +103,20 @@ const GroupTagValues = React.createClass({
{this.getUserDisplayName(tagValue)}
+ ] :
+ deviceNameMapper(tagValue.name)
+ }
+ {tagValue.email &&
+
+
+ }
{isUrl(tagValue.value) &&
- {tagKey.name + ' '}
- {tn(
- '%2$d unique historical value',
- '%2$d unique historical values',
- tagKey.uniqueValues,
-
+ {tagKey.key == 'user' ? t('Affected Users') : tagKey.name}
+ {t('Export to CSV')}
-
- {t('Data is based on events seen in the last 7 days.')}
-
%
- {t('Value')}
+ {t('Last Seen')}
@@ -145,6 +150,7 @@ const GroupTagValues = React.createClass({
+ {t('Note: Percentage of issue is based on events seen in the last 7 days.')}
);
}
diff --git a/src/sentry/web/frontend/group_tag_export.py b/src/sentry/web/frontend/group_tag_export.py
index 551c4e3cd660fa..66cb41c0b3aa5c 100644
--- a/src/sentry/web/frontend/group_tag_export.py
+++ b/src/sentry/web/frontend/group_tag_export.py
@@ -1,46 +1,76 @@
from __future__ import absolute_import
-import csv
-import six
-
-from django.http import Http404, StreamingHttpResponse
-from django.utils.text import slugify
+from django.http import Http404
from sentry.models import (
- GroupTagValue, TagKey, TagKeyStatus, Group, get_group_with_redirect
+ EventUser, GroupTagValue, TagKey, TagKeyStatus, Group, get_group_with_redirect
)
from sentry.web.frontend.base import ProjectView
+from sentry.web.frontend.mixins.csv import CsvMixin
+from sentry.utils.query import RangeQuerySetWrapper
+
+
+def attach_eventuser(project_id):
+ def wrapped(items):
+ users = EventUser.for_tags(project_id, [i.value for i in items])
+ for item in items:
+ item._eventuser = users.get(item.value)
+ return wrapped
+
+
+class GroupTagExportView(ProjectView, CsvMixin):
+ required_scope = 'event:read'
+ def get_header(self, key):
+ if key == 'user':
+ return self.get_user_header()
+ return self.get_generic_header()
-# Python 2 doesn't support unicode with CSV, but Python 3 does via
-# the encoding param
-if six.PY3:
- def get_row(row):
+ def get_row(self, item, key):
+ if key == 'user':
+ return self.get_user_row(item)
+ return self.get_generic_row(item)
+
+ def get_generic_header(self):
return (
- row.value,
- six.text_type(row.times_seen),
- row.last_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
- row.first_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
+ 'value',
+ 'times_seen',
+ 'last_seen',
+ 'first_seen',
)
-else:
- def get_row(row):
+
+ def get_generic_row(self, item):
return (
- row.value.encode('utf-8'),
- six.text_type(row.times_seen),
- row.last_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
- row.first_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
+ item.value,
+ item.times_seen,
+ item.last_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
+ item.first_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
)
+ def get_user_header(self):
+ return (
+ 'value',
+ 'id',
+ 'email',
+ 'username',
+ 'ip_address',
+ 'times_seen',
+ 'last_seen',
+ 'first_seen',
+ )
-# csv.writer doesn't provide a non-file interface
-# https://docs.djangoproject.com/en/1.9/howto/outputting-csv/#streaming-large-csv-files
-class Echo(object):
- def write(self, value):
- return value
-
-
-class GroupTagExportView(ProjectView):
- required_scope = 'event:read'
+ def get_user_row(self, item):
+ euser = item._eventuser
+ return (
+ item.value,
+ euser.ident if euser else '',
+ euser.email if euser else '',
+ euser.username if euser else '',
+ euser.ip_address if euser else '',
+ item.times_seen,
+ item.last_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
+ item.first_seen.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
+ )
def get(self, request, organization, project, team, group_id, key):
try:
@@ -68,23 +98,22 @@ def get(self, request, organization, project, team, group_id, key):
except TagKey.DoesNotExist:
raise Http404
- queryset = GroupTagValue.objects.filter(
- group=group,
- key=lookup_key,
- )
-
- def row_iter():
- yield ('value', 'times_seen', 'last_seen', 'first_seen')
- for row in queryset.iterator():
- yield get_row(row)
+ if key == 'user':
+ callbacks = [attach_eventuser(project.id)]
+ else:
+ callbacks = []
- pseudo_buffer = Echo()
- writer = csv.writer(pseudo_buffer)
- response = StreamingHttpResponse(
- (writer.writerow(r) for r in row_iter()),
- content_type='text/csv',
+ queryset = RangeQuerySetWrapper(
+ GroupTagValue.objects.filter(
+ group=group,
+ key=lookup_key,
+ ),
+ callbacks=callbacks,
)
- response['Content-Disposition'] = 'attachment; filename="{}-{}.csv"'.format(
- group.qualified_short_id or group.id, slugify(key)
+
+ filename = '{}-{}'.format(
+ group.qualified_short_id or group.id,
+ key,
)
- return response
+
+ return self.to_csv_response(queryset, filename, key=key)
diff --git a/src/sentry/web/frontend/mixins/__init__.py b/src/sentry/web/frontend/mixins/__init__.py
new file mode 100644
index 00000000000000..c3961685ab8def
--- /dev/null
+++ b/src/sentry/web/frontend/mixins/__init__.py
@@ -0,0 +1 @@
+from __future__ import absolute_import
diff --git a/src/sentry/web/frontend/mixins/csv.py b/src/sentry/web/frontend/mixins/csv.py
new file mode 100644
index 00000000000000..6f9e7b692ceffb
--- /dev/null
+++ b/src/sentry/web/frontend/mixins/csv.py
@@ -0,0 +1,48 @@
+from __future__ import absolute_import
+
+import csv
+import six
+
+from django.http import StreamingHttpResponse
+
+# Python 2 doesn't support unicode with CSV, but Python 3 does via
+# the encoding param
+if six.PY3:
+ def encode_row(row):
+ return row
+else:
+ def encode_row(row):
+ return [six.text_type(e).encode('utf-8') for e in row]
+
+
+# csv.writer doesn't provide a non-file interface
+# https://docs.djangoproject.com/en/1.9/howto/outputting-csv/#streaming-large-csv-files
+class Echo(object):
+ def write(self, value):
+ return value
+
+
+class CsvMixin(object):
+ def get_header(self, **kwargs):
+ return ()
+
+ def get_row(self, item, **kwargs):
+ return ()
+
+ def to_csv_response(self, iterable, filename, **kwargs):
+ def row_iter():
+ header = self.get_header(**kwargs)
+ if header:
+ yield header
+ for item in iterable:
+ yield self.get_row(item, **kwargs)
+
+ pseudo_buffer = Echo()
+ writer = csv.writer(pseudo_buffer)
+ response = StreamingHttpResponse(
+ (writer.writerow(r) for r in row_iter()),
+ content_type='text/csv',
+ )
+ response['Content-Disposition'] = \
+ 'attachment; filename="{}.csv"'.format(filename)
+ return response
diff --git a/tests/sentry/api/endpoints/test_group_tagkey_values.py b/tests/sentry/api/endpoints/test_group_tagkey_values.py
index 63c31acca00259..a070800f05000e 100644
--- a/tests/sentry/api/endpoints/test_group_tagkey_values.py
+++ b/tests/sentry/api/endpoints/test_group_tagkey_values.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import
-from sentry.models import GroupTagValue, TagKey, TagValue
+from sentry.models import EventUser, GroupTagValue, TagKey, TagValue
from sentry.testutils import APITestCase
@@ -33,3 +33,41 @@ def test_simple(self):
assert len(response.data) == 1
assert response.data[0]['value'] == 'bar'
+
+ def test_user_tag(self):
+ project = self.create_project()
+ group = self.create_group(project=project)
+ euser = EventUser.objects.create(
+ project_id=project.id,
+ ident='1',
+ email='foo@example.com',
+ username='foo',
+ ip_address='127.0.0.1',
+ )
+ TagKey.objects.create(
+ project=project,
+ key='sentry:user',
+ )
+ TagValue.objects.create(
+ project=project,
+ key='sentry:user',
+ value=euser.tag_value,
+ )
+ GroupTagValue.objects.create(
+ project=project,
+ group=group,
+ key='sentry:user',
+ value=euser.tag_value,
+ )
+
+ self.login_as(user=self.user)
+
+ url = '/api/0/issues/{}/tags/user/values/'.format(group.id)
+
+ response = self.client.get(url)
+
+ assert response.status_code == 200
+ assert len(response.data) == 1
+
+ assert response.data[0]['email'] == 'foo@example.com'
+ assert response.data[0]['value'] == euser.tag_value