cleanup

Author: suejung-sentry

static/app/types/prevent.tsx

@@ -1,21 +1,5 @@
-// Add any new providers here e.g., 'github' | 'bitbucket' | 'gitlab'
-export type PreventAIProvider = 'github';
-
 export type Sensitivity = 'low' | 'medium' | 'high' | 'critical';
 
-export interface PreventAIRepo {
-  fullName: string;
-  id: string;
-  name: string;
-}
-
-export interface PreventAIOrg {
-  githubOrganizationId: string;
-  name: string;
-  provider: PreventAIProvider;
-  repos: PreventAIRepo[];
-}
-
 interface PreventAIFeatureConfig {
   enabled: boolean;
   triggers: PreventAIFeatureTriggers;

static/app/views/prevent/preventAI/hooks/usePreventAIInfiniteRepositories.tsx

@@ -11,7 +11,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 
 type QueryKey = [url: string, endpointOptions: QueryKeyEndpointOptions];
 
-export type UseInfiniteRepositoriesOptions = {
+type UseInfiniteRepositoriesOptions = {
   integrationId: string;
   searchTerm?: string;
 };

static/app/views/prevent/preventAI/manageRepos.tsx

@@ -1,4 +1,4 @@
-import {useCallback, useEffect, useMemo, useState} from 'react';
+import {useCallback, useMemo, useState} from 'react';
 import {useTheme} from '@emotion/react';
 import styled from '@emotion/styled';
 import uniqBy from 'lodash/uniqBy';
@@ -13,7 +13,7 @@ import {Heading, Text} from 'sentry/components/core/text';
 import {Tooltip} from 'sentry/components/core/tooltip';
 import {IconSettings} from 'sentry/icons';
 import {t, tct} from 'sentry/locale';
-import type {OrganizationIntegration, Repository} from 'sentry/types/integrations';
+import type {OrganizationIntegration} from 'sentry/types/integrations';
 import {useInfiniteRepositories} from 'sentry/views/prevent/preventAI/hooks/usePreventAIInfiniteRepositories';
 import ManageReposPanel from 'sentry/views/prevent/preventAI/manageReposPanel';
 import ManageReposToolbar, {
@@ -30,7 +30,6 @@ function ManageReposPage({integratedOrgs}: {integratedOrgs: OrganizationIntegrat
     () => integratedOrgs[0]?.id ?? ''
   );
   const [selectedRepoId, setSelectedRepoId] = useState<string>(() => ALL_REPOS_VALUE);
-  const [selectedRepoData, setSelectedRepoData] = useState<Repository | null>(null);
 
   const queryResult = useInfiniteRepositories({
     integrationId: selectedOrgId,
@@ -47,27 +46,23 @@ function ManageReposPage({integratedOrgs}: {integratedOrgs: OrganizationIntegrat
     return found ?? integratedOrgs[0];
   }, [integratedOrgs, selectedOrgId]);
 
-  // Update selectedRepoData when reposData changes and we have a selectedRepoId
-  useEffect(() => {
+  // If the selected repo is not present in the list of repos, use null (for "All Repos")
+  const selectedRepo = useMemo(() => {
     if (selectedRepoId === ALL_REPOS_VALUE) {
-      setSelectedRepoData(null);
-      return;
+      return null;
     }
     const found = reposData.find(repo => repo.id === selectedRepoId);
-    if (found) {
-      setSelectedRepoData(found);
-    }
+    return found ?? null;
   }, [reposData, selectedRepoId]);
 
   // When the org changes, reset to "All Repos"
   const setSelectedOrgIdWithCascadeRepoId = useCallback((orgId: string) => {
     setSelectedOrgId(orgId);
     setSelectedRepoId(ALL_REPOS_VALUE);
-    setSelectedRepoData(null);
   }, []);
 
   const isOrgSelected = !!selectedOrg;
-  const isRepoSelected = selectedRepoId === ALL_REPOS_VALUE || !!selectedRepoData;
+  const isRepoSelected = selectedRepoId === ALL_REPOS_VALUE || !!selectedRepo;
 
   return (
     <Flex direction="column" maxWidth="1000px" gap="xl">
@@ -76,7 +71,7 @@ function ManageReposPage({integratedOrgs}: {integratedOrgs: OrganizationIntegrat
           integratedOrgs={integratedOrgs}
           selectedOrg={selectedOrgId}
           selectedRepo={selectedRepoId}
-          selectedRepoData={selectedRepoData}
+          selectedRepoData={selectedRepo}
           onOrgChange={setSelectedOrgIdWithCascadeRepoId}
           onRepoChange={setSelectedRepoId}
         />
@@ -146,13 +141,13 @@ function ManageReposPage({integratedOrgs}: {integratedOrgs: OrganizationIntegrat
         />
       </Flex>
 
-      {selectedOrg && (selectedRepoId === ALL_REPOS_VALUE || selectedRepoData) && (
+      {selectedOrg && (selectedRepoId === ALL_REPOS_VALUE || selectedRepo) && (
         <ManageReposPanel
           key={`${selectedOrgId || 'no-org'}-${selectedRepoId || 'no-repo'}`}
           collapsed={!isPanelOpen}
           onClose={() => setIsPanelOpen(false)}
           org={selectedOrg}
-          repo={selectedRepoData}
+          repo={selectedRepo}
           allRepos={reposData}
           isEditingOrgDefaults={selectedRepoId === ALL_REPOS_VALUE}
         />

static/app/views/prevent/preventAI/manageReposToolbar.spec.tsx

@@ -108,10 +108,7 @@ describe('ManageReposToolbar', () => {
     integratedOrgs: mockIntegratedOrgs,
     selectedOrg: '1',
     selectedRepo: '1',
-    selectedRepoData: {
-      id: mockRepositories[0]!.id,
-      name: mockRepositories[0]!.name,
-    },
+    selectedRepoData: mockRepositories[0] ?? null,
     onOrgChange: jest.fn(),
     onRepoChange: jest.fn(),
   };
@@ -236,10 +233,7 @@ describe('ManageReposToolbar', () => {
         {...defaultProps}
         selectedOrg="2"
         selectedRepo="3"
-        selectedRepoData={{
-          id: mockOrg2Repositories[0]!.id,
-          name: mockOrg2Repositories[0]!.name,
-        }}
+        selectedRepoData={mockOrg2Repositories[0] ?? null}
       />,
       {
         organization: OrganizationFixture({slug: 'org-slug'}),

static/app/views/prevent/preventAI/manageReposToolbar.tsx

@@ -6,7 +6,7 @@ import {TriggerLabel} from 'sentry/components/core/compactSelect/control';
 import PageFilterBar from 'sentry/components/organizations/pageFilterBar';
 import {IconBuilding, IconRepository} from 'sentry/icons';
 import {t} from 'sentry/locale';
-import type {OrganizationIntegration} from 'sentry/types/integrations';
+import type {OrganizationIntegration, Repository} from 'sentry/types/integrations';
 import {useDebouncedValue} from 'sentry/utils/useDebouncedValue';
 import {useInfiniteRepositories} from 'sentry/views/prevent/preventAI/hooks/usePreventAIInfiniteRepositories';
 import {getRepoNameWithoutOrg} from 'sentry/views/prevent/preventAI/utils';
@@ -26,7 +26,7 @@ function ManageReposToolbar({
   onRepoChange: (repoId: string) => void;
   selectedOrg: string;
   selectedRepo: string;
-  selectedRepoData: {id: string; name: string} | null;
+  selectedRepoData: Repository | null;
 }) {
   const [searchValue, setSearchValue] = useState<string | undefined>();
   const debouncedSearch = useDebouncedValue(searchValue, 300);
@@ -63,15 +63,15 @@ function ManageReposToolbar({
         scrollListenerIdRef.current += 1;
         const currentId = scrollListenerIdRef.current;
 
-        const attachListener = (attempts = 0) => {
-          if (scrollListenerIdRef.current !== currentId || attempts > 10) return;
+        const attachListener = () => {
+          if (scrollListenerIdRef.current !== currentId) return;
           const dropdownLists = document.querySelectorAll('ul[role="listbox"]');
           const lastList = dropdownLists[dropdownLists.length - 1];
           if (lastList instanceof HTMLElement) {
             scrollParentRef.current = lastList;
             lastList.addEventListener('scroll', handleScroll, {passive: true});
           } else {
-            setTimeout(() => attachListener(attempts + 1), 20);
+            setTimeout(attachListener, 20);
           }
         };
         attachListener();