Skip to content
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Fragment, useContext} from 'react';
import {useQuery} from '@tanstack/react-query';

import * as Layout from 'sentry/components/layouts/thirds';
import {LoadingError} from 'sentry/components/loadingError';
Expand All @@ -12,6 +13,7 @@ import {t, tn} from 'sentry/locale';
import type {Repository} from 'sentry/types/integrations';
import type {Organization} from 'sentry/types/organization';
import type {Project} from 'sentry/types/project';
import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
import {routeTitleGen} from 'sentry/utils/routeTitle';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
Expand All @@ -25,7 +27,7 @@ import {
getQuery,
getReposToRender,
} from 'sentry/views/releases/detail/utils';
import {useReleaseCommitFiles} from 'sentry/views/releases/utils/useReleaseCommitFiles';
import {releaseCommitFilesApiOptions} from 'sentry/views/releases/utils/releaseCommitFilesApiOptions';

import {EmptyState, NoReleaseRepos, NoRepositories} from './emptyState';
import {FileChange} from './fileChange';
Expand All @@ -45,20 +47,24 @@ function FilesChangedList({organization, releaseRepos, projectSlug}: FilesChange

const query = getQuery({location});
const {
data: fileList = [],
data,
isPending: isLoadingFileList,
error: fileListError,
refetch,
getResponseHeader,
} = useReleaseCommitFiles({
release: params.release,
activeRepository: activeReleaseRepo,
...query,
} = useQuery({
...releaseCommitFilesApiOptions({
organization,
release: params.release,
activeRepository: activeReleaseRepo,
...query,
}),
select: selectJsonWithHeaders,
});
const fileList = data?.json ?? [];

const filesByRepository = getFilesByRepository(fileList);
const reposToRender = getReposToRender(Object.keys(filesByRepository));
const fileListPageLinks = getResponseHeader?.('Link');
const fileListPageLinks = data?.headers.Link;

return (
<Fragment>
Expand Down
24 changes: 16 additions & 8 deletions static/app/views/releases/drawer/filesChangedList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Fragment} from 'react';
import {useQuery} from '@tanstack/react-query';

import {Container} from '@sentry/scraps/layout';

Expand All @@ -10,15 +11,17 @@ import {PanelHeader} from 'sentry/components/panels/panelHeader';
import {Placeholder} from 'sentry/components/placeholder';
import {t, tn} from 'sentry/locale';
import type {Repository} from 'sentry/types/integrations';
import {selectJsonWithHeaders} from 'sentry/utils/api/apiOptions';
import {decodeScalar} from 'sentry/utils/queryString';
import {useLocationQuery} from 'sentry/utils/url/useLocationQuery';
import {useNavigate} from 'sentry/utils/useNavigate';
import {useOrganization} from 'sentry/utils/useOrganization';
import {EmptyState} from 'sentry/views/releases/detail/commitsAndFiles/emptyState';
import {FileChange} from 'sentry/views/releases/detail/commitsAndFiles/fileChange';
import {RepositorySwitcher} from 'sentry/views/releases/detail/commitsAndFiles/repositorySwitcher';
import {getFilesByRepository, getReposToRender} from 'sentry/views/releases/detail/utils';
import {ReleasesDrawerFields} from 'sentry/views/releases/drawer/utils';
import {useReleaseCommitFiles} from 'sentry/views/releases/utils/useReleaseCommitFiles';
import {releaseCommitFilesApiOptions} from 'sentry/views/releases/utils/releaseCommitFilesApiOptions';

interface FilesChangedProps {
release: string;
Expand All @@ -27,6 +30,7 @@ interface FilesChangedProps {

export function FilesChangedList({releaseRepos, release}: FilesChangedProps) {
const navigate = useNavigate();
const organization = useOrganization();
const {
[ReleasesDrawerFields.ACTIVE_REPO]: rdActiveRepo,
[ReleasesDrawerFields.FILES_CURSOR]: rdFilesCursor,
Expand All @@ -40,20 +44,24 @@ export function FilesChangedList({releaseRepos, release}: FilesChangedProps) {
releaseRepos.find(repo => repo.name === rdActiveRepo) ?? releaseRepos[0];

const {
data: fileList = [],
data,
isPending: isLoadingFileList,
error: fileListError,
refetch,
getResponseHeader,
} = useReleaseCommitFiles({
release,
activeRepository: activeReleaseRepo,
cursor: rdFilesCursor,
} = useQuery({
...releaseCommitFilesApiOptions({
organization,
release,
activeRepository: activeReleaseRepo,
cursor: rdFilesCursor,
}),
select: selectJsonWithHeaders,
});
const fileList = data?.json ?? [];

const filesByRepository = getFilesByRepository(fileList);
const reposToRender = getReposToRender(Object.keys(filesByRepository));
const fileListPageLinks = getResponseHeader?.('Link');
const fileListPageLinks = data?.headers.Link;

return (
<div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import type {CommitFile, Repository} from 'sentry/types/integrations';
import type {Organization} from 'sentry/types/organization';
import {apiOptions} from 'sentry/utils/api/apiOptions';

// These are the URL params that our project/date/env picker generates (+ cursor for pagination)
type PageFilterUrlParams =
| 'start'
| 'end'
| 'utc'
| 'statsPeriod'
| 'project'
| 'environment';
type OtherUrlParams = 'cursor' | 'perPage';

interface Params extends Partial<
Record<
PageFilterUrlParams | OtherUrlParams,
string | string[] | number | null | undefined
>
> {
organization: Organization;
release: string;
activeRepository?: Repository;
}
export function releaseCommitFilesApiOptions({
release,
organization,
activeRepository,
perPage = 40,
...query
}: Params) {
return apiOptions.as<CommitFile[]>()(
'/organizations/$organizationIdOrSlug/releases/$version/commitfiles/',
{
path: {organizationIdOrSlug: organization.slug, version: release},
query: {
...query,
per_page: perPage,
...(activeRepository
? {
repo_id: activeRepository.externalId,
repo_name: activeRepository.name,
}
: {}),
},
staleTime: Infinity,
}
);
}
53 changes: 0 additions & 53 deletions static/app/views/releases/utils/useReleaseCommitFiles.tsx

This file was deleted.

Loading