File tree 5 files changed +16
-15
lines changed
5 files changed +16
-15
lines changed Original file line number Diff line number Diff line change @@ -18,14 +18,14 @@ import {
18
18
getFieldDefinition ,
19
19
IsFieldValues ,
20
20
} from 'sentry/utils/fields' ;
21
+ import useAssignedValues from 'sentry/utils/membersAndTeams/useAssignedValues' ;
21
22
import { decodeScalar } from 'sentry/utils/queryString' ;
22
23
import useApi from 'sentry/utils/useApi' ;
23
24
import { useLocation } from 'sentry/utils/useLocation' ;
24
25
import { useNavigate } from 'sentry/utils/useNavigate' ;
25
26
import useOrganization from 'sentry/utils/useOrganization' ;
26
27
import usePageFilters from 'sentry/utils/usePageFilters' ;
27
28
import { Dataset } from 'sentry/views/alerts/rules/metric/types' ;
28
- import useAssignedValues from 'sentry/views/issueList/utils/useAssignedValues' ;
29
29
30
30
const EXCLUDED_TAGS : string [ ] = [
31
31
// These are found in issue platform and redundant (= __.name, ex os.name)
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import {t} from 'sentry/locale';
10
10
import MemberListStore from 'sentry/stores/memberListStore' ;
11
11
import TeamStore from 'sentry/stores/teamStore' ;
12
12
import { useLegacyStore } from 'sentry/stores/useLegacyStore' ;
13
- import type { User } from 'sentry/types/user ' ;
13
+ import { getUsername } from 'sentry/utils/membersAndTeams/userUtils ' ;
14
14
15
15
export default function useAssignedValues ( ) : SearchGroup [ ] {
16
16
const { teams} = useLegacyStore ( TeamStore ) ;
@@ -47,16 +47,6 @@ export default function useAssignedValues(): SearchGroup[] {
47
47
return assignedValues ;
48
48
}
49
49
50
- export const getUsername = ( { isManaged, username, email} : User ) => {
51
- const uuidPattern = / [ 0 - 9 a - f ] { 32 } $ / ;
52
- // Users created via SAML receive unique UUID usernames. Use
53
- // their email in these cases, instead.
54
- if ( username && uuidPattern . test ( username ) ) {
55
- return email ;
56
- }
57
- return ! isManaged && username ? username : email ;
58
- } ;
59
-
60
50
const convertToSearchItem = ( value : string ) => {
61
51
const escapedValue = escapeTagValue ( value ) ;
62
52
return {
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import {useMemo} from 'react';
2
2
3
3
import MemberListStore from 'sentry/stores/memberListStore' ;
4
4
import { useLegacyStore } from 'sentry/stores/useLegacyStore' ;
5
- import { getUsername } from 'sentry/views/issueList/ utils/useAssignedValues ' ;
5
+ import { getUsername } from 'sentry/utils/membersAndTeams/userUtils ' ;
6
6
7
7
export default function useMemberUsernames ( ) {
8
8
const { members} = useLegacyStore ( MemberListStore ) ;
Original file line number Diff line number Diff line change
1
+ import type { User } from 'sentry/types/user' ;
2
+
3
+ export const getUsername = ( { isManaged, username, email} : User ) => {
4
+ const uuidPattern = / [ 0 - 9 a - f ] { 32 } $ / ;
5
+ // Users created via SAML receive unique UUID usernames. Use
6
+ // their email in these cases, instead.
7
+ if ( username && uuidPattern . test ( username ) ) {
8
+ return email ;
9
+ }
10
+ return ! isManaged && username ? username : email ;
11
+ } ;
Original file line number Diff line number Diff line change @@ -24,10 +24,10 @@ import {
24
24
ISSUE_FIELDS ,
25
25
ISSUE_PROPERTY_FIELDS ,
26
26
} from 'sentry/utils/fields' ;
27
+ import useAssignedValues from 'sentry/utils/membersAndTeams/useAssignedValues' ;
28
+ import useMemberUsernames from 'sentry/utils/membersAndTeams/useMemberUsernames' ;
27
29
import { Dataset } from 'sentry/views/alerts/rules/metric/types' ;
28
- import useAssignedValues from 'sentry/views/issueList/utils/useAssignedValues' ;
29
30
import useFetchOrganizationFeatureFlags from 'sentry/views/issueList/utils/useFetchOrganizationFeatureFlags' ;
30
- import useMemberUsernames from 'sentry/views/issueList/utils/useMemberUsernames' ;
31
31
32
32
type UseFetchIssueTagsParams = {
33
33
org : Organization ;
You can’t perform that action at this time.
0 commit comments