Skip to content
Open
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
58 changes: 58 additions & 0 deletions static/app/views/sentryAppExternalInstallation/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -327,4 +327,62 @@ describe('SentryAppExternalInstallation', () => {
expect(getFeaturesMock).toHaveBeenCalled();
});
});

describe('sentry app fetch error', () => {
beforeEach(() => {
MockApiClient.addMockResponse({
url: '/organizations/',
body: [org1Lite],
});

// These endpoints are fetched concurrently with the sentry app request.
// Mock them so the test framework does not complain about unmocked requests,
// even though the error state renders before their responses are used.
MockApiClient.addMockResponse({
url: `/organizations/${org1.slug}/`,
body: org1,
});

MockApiClient.addMockResponse({
url: `/organizations/${org1.slug}/sentry-app-installations/`,
body: [],
});

window.__initialData = ConfigFixture({
customerDomain: {
subdomain: 'org1',
organizationUrl: 'https://org1.sentry.io',
sentryUrl: 'https://sentry.io',
},
links: {
...window.__initialData?.links,
sentryUrl: 'https://sentry.io',
},
});
ConfigStore.loadInitialData(window.__initialData);
});

it('shows an error when the sentry app request fails (e.g. 403)', async () => {
MockApiClient.addMockResponse({
url: `/sentry-apps/${sentryApp.slug}/`,
statusCode: 403,
body: {
detail: "User must be in the app owner's organization for unpublished apps",
},
});

render(<SentryAppExternalInstallation />, {
initialRouterConfig: {
route: '/sentry-apps/:sentryAppSlug/external-install/',
location: {
pathname: `/sentry-apps/${sentryApp.slug}/external-install/`,
},
},
});

expect(
await screen.findByText('There was an error loading this integration.')
).toBeInTheDocument();
});
});
});
25 changes: 22 additions & 3 deletions static/app/views/sentryAppExternalInstallation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {addErrorMessage} from 'sentry/actionCreators/indicator';
import {fetchOrganizations} from 'sentry/actionCreators/organizations';
import {installSentryApp} from 'sentry/actionCreators/sentryAppInstallations';
import {FieldGroup} from 'sentry/components/forms/fieldGroup';
import {LoadingError} from 'sentry/components/loadingError';
import {LoadingIndicator} from 'sentry/components/loadingIndicator';
import {SentryAppDetailsModal} from 'sentry/components/modals/sentryAppDetailsModal';
import {NarrowLayout} from 'sentry/components/narrowLayout';
Expand Down Expand Up @@ -51,17 +52,23 @@ function SentryAppExternalInstallationContent() {

const [organizations, setOrganizations] = useState<OrganizationSummary[]>([]);
const [orgsLoading, setOrgsLoading] = useState<boolean>(true);
const [orgsError, setOrgsError] = useState<boolean>(false);
const [isInstalled, setIsInstalled] = useState<boolean>();

// Load data on mount.
const {data: sentryApp, isPending: sentryAppLoading} = useApiQuery<SentryApp>(
const {
data: sentryApp,
isPending: sentryAppLoading,
isError: sentryAppError,
} = useApiQuery<SentryApp>(
Comment thread
cursor[bot] marked this conversation as resolved.
[
getApiUrl('/sentry-apps/$sentryAppIdOrSlug/', {
path: {sentryAppIdOrSlug: params.sentryAppSlug},
}),
],
{
staleTime: 0,
retry: false,
}
);

Expand All @@ -73,7 +80,7 @@ function SentryAppExternalInstallationContent() {
setOrgsLoading(false);
} catch (e) {
setOrgsLoading(false);
// Do nothing.
setOrgsError(true);
}
}
loadOrgs();
Expand Down Expand Up @@ -192,10 +199,22 @@ function SentryAppExternalInstallationContent() {
return onClose();
}, [api, organization, sentryApp, onClose, location.query.state]);

if (sentryAppLoading || orgsLoading || !sentryApp) {
if (sentryAppLoading || orgsLoading) {
return <LoadingIndicator />;
}
Comment thread
sentry[bot] marked this conversation as resolved.

if (sentryAppError) {
return <LoadingError message={t('There was an error loading this integration.')} />;
}

if (orgsError) {
return <LoadingError message={t('There was an error loading your organizations.')} />;
}

if (!sentryApp) {
return <LoadingError message={t('This integration could not be found.')} />;
}

return (
<div>
<OrgViewHolder>
Expand Down
Loading