From eed6ad203a414e9dfa271d1e358a5440abbc46aa Mon Sep 17 00:00:00 2001
From: davidenwang <dwang@sentry.io>
Date: Wed, 3 Apr 2024 04:57:56 +0900
Subject: [PATCH 1/2] ref(crons): Remove unused projects prop in
 sentryMemberTeamSelectorField

commit-id:95b04ff9
---
 .../forms/fields/sentryMemberTeamSelectorField.spec.tsx      | 5 -----
 .../forms/fields/sentryMemberTeamSelectorField.tsx           | 2 --
 2 files changed, 7 deletions(-)

diff --git a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
index 3e1effb7d1ff8c..5849cff094eadd 100644
--- a/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
+++ b/static/app/components/forms/fields/sentryMemberTeamSelectorField.spec.tsx
@@ -1,5 +1,4 @@
 import {OrganizationFixture} from 'sentry-fixture/organization';
-import {ProjectFixture} from 'sentry-fixture/project';
 import {TeamFixture} from 'sentry-fixture/team';
 import {UserFixture} from 'sentry-fixture/user';
 
@@ -16,7 +15,6 @@ describe('SentryMemberTeamSelectorField', () => {
   const org = OrganizationFixture();
   const mockUsers = [UserFixture()];
   const mockTeams = [TeamFixture()];
-  const mockProjects = [ProjectFixture()];
 
   beforeEach(() => {
     MemberListStore.init();
@@ -46,7 +44,6 @@ describe('SentryMemberTeamSelectorField', () => {
         label="Select Owner"
         onChange={mock}
         name="team-or-member"
-        projects={mockProjects}
       />
     );
 
@@ -68,7 +65,6 @@ describe('SentryMemberTeamSelectorField', () => {
         label="Select Owner"
         onChange={mock}
         name="team-or-member"
-        projects={mockProjects}
       />
     );
 
@@ -90,7 +86,6 @@ describe('SentryMemberTeamSelectorField', () => {
         label="Select Owner"
         onChange={mock}
         name="team-or-member"
-        projects={mockProjects}
         multiple
       />
     );
diff --git a/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx b/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
index 45b29f21c8e912..81b74906e947db 100644
--- a/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
+++ b/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
@@ -2,7 +2,6 @@ import {useContext, useEffect, useMemo} from 'react';
 
 import Avatar from 'sentry/components/avatar';
 import {t} from 'sentry/locale';
-import type {Project} from 'sentry/types';
 import {useMembers} from 'sentry/utils/useMembers';
 import {useTeams} from 'sentry/utils/useTeams';
 import {useTeamsById} from 'sentry/utils/useTeamsById';
@@ -16,7 +15,6 @@ import SelectField from './selectField';
 // projects can be passed as a direct prop as well
 export interface RenderFieldProps extends SelectFieldProps<any> {
   avatarSize?: number;
-  projects?: Project[];
   /**
    * Use the slug as the select field value. Without setting this the numeric id
    * of the project will be used.

From f98fd5e81660567f2d6ccb530ccd64378ce5dec0 Mon Sep 17 00:00:00 2001
From: davidenwang <dwang@sentry.io>
Date: Thu, 4 Apr 2024 02:02:32 +0900
Subject: [PATCH 2/2] ref(crons): Remove usage of useTeams in
 sentryMemberTeamSelectorField

commit-id:ebae42bf
---
 .../forms/fields/sentryMemberTeamSelectorField.tsx  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx b/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
index 81b74906e947db..28fc7780831355 100644
--- a/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
+++ b/static/app/components/forms/fields/sentryMemberTeamSelectorField.tsx
@@ -3,8 +3,8 @@ import {useContext, useEffect, useMemo} from 'react';
 import Avatar from 'sentry/components/avatar';
 import {t} from 'sentry/locale';
 import {useMembers} from 'sentry/utils/useMembers';
-import {useTeams} from 'sentry/utils/useTeams';
 import {useTeamsById} from 'sentry/utils/useTeamsById';
+import {useUserTeams} from 'sentry/utils/useUserTeams';
 
 import FormContext from '../formContext';
 
@@ -70,12 +70,7 @@ function SentryMemberTeamSelectorField({
   );
   useTeamsById({ids: ensureTeamIds});
 
-  const {
-    teams,
-    fetching: fetchingTeams,
-    onSearch: onTeamSearch,
-    loadMore: loadMoreTeams,
-  } = useTeams({provideUserTeams: true});
+  const {teams, isLoading: loadingTeams} = useUserTeams();
 
   const teamOptions = teams?.map(team => ({
     value: `team:${team.id}`,
@@ -92,7 +87,6 @@ function SentryMemberTeamSelectorField({
   useEffect(
     () => {
       loadMoreMembers();
-      loadMoreTeams();
     },
     // Only ensure things are loaded at mount
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -105,9 +99,8 @@ function SentryMemberTeamSelectorField({
       allowClear
       onInputChange={value => {
         onMemberSearch(value);
-        onTeamSearch(value);
       }}
-      isLoading={fetchingMembers || fetchingTeams}
+      isLoading={fetchingMembers || loadingTeams}
       options={[
         {
           label: t('Members'),