Skip to content

feat(aci): Add pagination to detector list page #93190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions static/app/views/detectors/components/detectorListRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ const RowWrapper = styled('div')<{disabled?: boolean}>`
align-items: center;
padding: ${space(2)};

&:not(:last-child) {
border-bottom: 1px solid ${p => p.theme.innerBorder};
}

${p =>
p.disabled &&
css`
Expand Down
2 changes: 1 addition & 1 deletion static/app/views/detectors/constants.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {FieldValueType} from 'sentry/utils/fields';

export const DETECTOR_LIST_PAGE_LIMIT = 25;
export const DETECTOR_LIST_PAGE_LIMIT = 20;

export const DETECTOR_FILTER_KEYS: Record<
string,
Expand Down
13 changes: 11 additions & 2 deletions static/app/views/detectors/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ import {
} from 'sentry/utils/queryClient';
import useApi from 'sentry/utils/useApi';
import useOrganization from 'sentry/utils/useOrganization';
import {DETECTOR_LIST_PAGE_LIMIT} from 'sentry/views/detectors/constants';

interface UseDetectorsQueryKeyOptions {
cursor?: string;
limit?: number;
projects?: number[];
query?: string;
sortBy?: string;
Expand All @@ -22,25 +25,31 @@ const makeDetectorListQueryKey = ({
query,
sortBy,
projects,
limit,
cursor,
}: {
orgSlug: string;
cursor?: string;
limit?: number;
projects?: number[];
query?: string;
sortBy?: string;
}): ApiQueryKey => [
`/organizations/${orgSlug}/detectors/`,
{query: {query, sortBy, project: projects}},
{query: {query, sortBy, project: projects, per_page: limit, cursor}},
];

export function useDetectorsQuery({
query,
sortBy,
projects,
limit = DETECTOR_LIST_PAGE_LIMIT,
cursor,
}: UseDetectorsQueryKeyOptions = {}) {
const org = useOrganization();

return useApiQuery<Detector[]>(
makeDetectorListQueryKey({orgSlug: org.slug, query, sortBy, projects}),
makeDetectorListQueryKey({orgSlug: org.slug, query, sortBy, projects, limit, cursor}),
{
staleTime: 0,
retry: false,
Expand Down
25 changes: 23 additions & 2 deletions static/app/views/detectors/list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Flex} from 'sentry/components/container/flex';
import {LinkButton} from 'sentry/components/core/button/linkButton';
import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
import {ProjectPageFilter} from 'sentry/components/organizations/projectPageFilter';
import Pagination from 'sentry/components/pagination';
import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
import {ActionsProvider} from 'sentry/components/workflowEngine/layout/actions';
import ListLayout from 'sentry/components/workflowEngine/layout/list';
Expand All @@ -12,6 +13,7 @@ import {IconAdd} from 'sentry/icons';
import {t} from 'sentry/locale';
import {space} from 'sentry/styles/space';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import useOrganization from 'sentry/utils/useOrganization';
import usePageFilters from 'sentry/utils/usePageFilters';
import DetectorListTable from 'sentry/views/detectors/components/detectorListTable';
Expand All @@ -23,14 +25,22 @@ export default function DetectorsList() {
useWorkflowEngineFeatureGate({redirect: true});

const location = useLocation();
const navigate = useNavigate();
const {selection} = usePageFilters();

const query =
typeof location.query.query === 'string' ? location.query.query : undefined;
const sortBy =
typeof location.query.sort === 'string' ? location.query.sort : undefined;
const cursor =
typeof location.query.cursor === 'string' ? location.query.cursor : undefined;

const {data: detectors, isPending} = useDetectorsQuery({
const {
data: detectors,
isPending,
getResponseHeader,
} = useDetectorsQuery({
cursor,
query,
sortBy,
projects: selection.projects,
Expand All @@ -42,7 +52,18 @@ export default function DetectorsList() {
<ActionsProvider actions={<Actions />}>
<ListLayout>
<TableHeader />
<DetectorListTable detectors={detectors ?? []} isPending={isPending} />
<div>
<DetectorListTable detectors={detectors ?? []} isPending={isPending} />
<Pagination
pageLinks={getResponseHeader?.('Link')}
onCursor={newCursor => {
navigate({
pathname: location.pathname,
query: {...location.query, cursor: newCursor},
});
}}
/>
</div>
</ListLayout>
</ActionsProvider>
</PageFiltersContainer>
Expand Down
Loading