Skip to content

Commit e745b23

Browse files
committed
Move utils to a top level utils folder
1 parent 325eeb9 commit e745b23

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

static/app/components/feedback/feedbackSearch.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import {
1818
getFieldDefinition,
1919
IsFieldValues,
2020
} from 'sentry/utils/fields';
21+
import useAssignedValues from 'sentry/utils/membersAndTeams/useAssignedValues';
2122
import {decodeScalar} from 'sentry/utils/queryString';
2223
import useApi from 'sentry/utils/useApi';
2324
import {useLocation} from 'sentry/utils/useLocation';
2425
import {useNavigate} from 'sentry/utils/useNavigate';
2526
import useOrganization from 'sentry/utils/useOrganization';
2627
import usePageFilters from 'sentry/utils/usePageFilters';
2728
import {Dataset} from 'sentry/views/alerts/rules/metric/types';
28-
import useAssignedValues from 'sentry/views/issueList/utils/useAssignedValues';
2929

3030
const EXCLUDED_TAGS: string[] = [
3131
// These are found in issue platform and redundant (= __.name, ex os.name)

static/app/views/issueList/utils/useAssignedValues.tsx renamed to static/app/utils/membersAndTeams/useAssignedValues.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {t} from 'sentry/locale';
1010
import MemberListStore from 'sentry/stores/memberListStore';
1111
import TeamStore from 'sentry/stores/teamStore';
1212
import {useLegacyStore} from 'sentry/stores/useLegacyStore';
13-
import type {User} from 'sentry/types/user';
13+
import {getUsername} from 'sentry/utils/membersAndTeams/userUtils';
1414

1515
export default function useAssignedValues(): SearchGroup[] {
1616
const {teams} = useLegacyStore(TeamStore);
@@ -47,16 +47,6 @@ export default function useAssignedValues(): SearchGroup[] {
4747
return assignedValues;
4848
}
4949

50-
export const getUsername = ({isManaged, username, email}: User) => {
51-
const uuidPattern = /[0-9a-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-
6050
const convertToSearchItem = (value: string) => {
6151
const escapedValue = escapeTagValue(value);
6252
return {

static/app/views/issueList/utils/useMemberUsernames.tsx renamed to static/app/utils/membersAndTeams/useMemberUsernames.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {useMemo} from 'react';
22

33
import MemberListStore from 'sentry/stores/memberListStore';
44
import {useLegacyStore} from 'sentry/stores/useLegacyStore';
5-
import {getUsername} from 'sentry/views/issueList/utils/useAssignedValues';
5+
import {getUsername} from 'sentry/utils/membersAndTeams/userUtils';
66

77
export default function useMemberUsernames() {
88
const {members} = useLegacyStore(MemberListStore);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import type {User} from 'sentry/types/user';
2+
3+
export const getUsername = ({isManaged, username, email}: User) => {
4+
const uuidPattern = /[0-9a-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+
};

static/app/views/issueList/utils/useFetchIssueTags.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import {
2424
ISSUE_FIELDS,
2525
ISSUE_PROPERTY_FIELDS,
2626
} from 'sentry/utils/fields';
27+
import useAssignedValues from 'sentry/utils/membersAndTeams/useAssignedValues';
28+
import useMemberUsernames from 'sentry/utils/membersAndTeams/useMemberUsernames';
2729
import {Dataset} from 'sentry/views/alerts/rules/metric/types';
28-
import useAssignedValues from 'sentry/views/issueList/utils/useAssignedValues';
2930
import useFetchOrganizationFeatureFlags from 'sentry/views/issueList/utils/useFetchOrganizationFeatureFlags';
30-
import useMemberUsernames from 'sentry/views/issueList/utils/useMemberUsernames';
3131

3232
type UseFetchIssueTagsParams = {
3333
org: Organization;

0 commit comments

Comments
 (0)