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
14 changes: 10 additions & 4 deletions src/sentry/static/sentry/app/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import OrganizationContext from 'app/views/organizationContext';
import OrganizationDetails from 'app/views/organizationDetails';
import OrganizationRoot from 'app/views/organizationRoot';
import ProjectEventRedirect from 'app/views/projectEventRedirect';
import ProjectPluginDetails from 'app/views/projectPluginDetails';
import ProjectPlugins from 'app/views/projectPlugins';
import RouteNotFound from 'app/views/routeNotFound';
import SettingsProjectProvider from 'app/views/settings/components/settingsProjectProvider';
import SettingsWrapper from 'app/views/settings/components/settingsWrapper';
Expand Down Expand Up @@ -406,11 +404,19 @@ function routes() {
/>
</Route>
<Route path="plugins/" name="Legacy Integrations">
<IndexRoute component={errorHandler(ProjectPlugins)} />
<IndexRoute
componentPromise={() =>
import(/* webpackChunkName: "ProjectPlugins" */ 'app/views/settings/projectPlugins')
}
component={errorHandler(LazyLoad)}
/>
<Route
path=":pluginId/"
name="Integration Details"
component={errorHandler(ProjectPluginDetails)}
componentPromise={() =>
import(/* webpackChunkName: "ProjectPluginDetails" */ 'app/views/settings/projectPlugins/details')
}
component={errorHandler(LazyLoad)}
/>
</Route>
<Route path="install/" name="Configuration">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PluginConfig from 'app/components/pluginConfig';
import SettingsPageHeader from 'app/views/settings/components/settingsPageHeader';
import withPlugins from 'app/utils/withPlugins';

import {DEPRECATED_PLUGINS} from 'app/views/projectPlugins/constants';
import {DEPRECATED_PLUGINS} from './constants';

/**
* There are currently two sources of truths for plugin details:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import React from 'react';
import {fetchPlugins, enablePlugin, disablePlugin} from 'app/actionCreators/plugins';
import {t} from 'app/locale';
import PermissionAlert from 'app/views/settings/project/permissionAlert';
import ProjectPlugins from 'app/views/projectPlugins/projectPlugins';
import SentryTypes from 'app/sentryTypes';
import SettingsPageHeader from 'app/views/settings/components/settingsPageHeader';
import withPlugins from 'app/utils/withPlugins';

import ProjectPlugins from './projectPlugins';

class ProjectPluginsContainer extends React.Component {
static propTypes = {
plugins: SentryTypes.PluginsStore,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import {t, tct} from 'app/locale';
import Access from 'app/components/acl/access';
import Link from 'app/components/links/link';
import LoadingIndicator from 'app/components/loadingIndicator';
import ProjectPluginRow from 'app/views/projectPlugins/projectPluginRow';
import RouteError from 'app/views/routeError';
import SentryTypes from 'app/sentryTypes';

import {DEPRECATED_PLUGINS} from './constants';
import ProjectPluginRow from './projectPluginRow';

class ProjectPlugins extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion tests/js/spec/views/projectPluginDetails.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {mount} from 'enzyme';

import ProjectPluginDetailsContainer, {
ProjectPluginDetails,
} from 'app/views/projectPluginDetails';
} from 'app/views/settings/projectPlugins/details';

jest.mock('jquery');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,24 +138,24 @@ exports[`ProjectPluginRow renders 1`] = `
>
<PluginInfo>
<div
className="css-sm2hu2-PluginInfo ectqpp0"
className="css-sm2hu2-PluginInfo e1y7j6vq0"
>
<StyledPluginIcon
pluginId="amazon-sqs"
size={48}
>
<PluginIcon
className="css-228l0j-StyledPluginIcon ectqpp2"
className="css-228l0j-StyledPluginIcon e1y7j6vq2"
pluginId="amazon-sqs"
size={48}
>
<IntegrationIcon
className="css-228l0j-StyledPluginIcon ectqpp2"
className="css-228l0j-StyledPluginIcon e1y7j6vq2"
image={Object {}}
size={48}
>
<div
className="ectqpp2 css-vzj3gb-IntegrationIcon-StyledPluginIcon e1bhjds90"
className="e1y7j6vq2 css-vzj3gb-IntegrationIcon-StyledPluginIcon e1bhjds90"
size={48}
/>
</IntegrationIcon>
Expand All @@ -176,7 +176,7 @@ exports[`ProjectPluginRow renders 1`] = `
>
<PluginName>
<div
className="css-36lssg-PluginName ectqpp1"
className="css-36lssg-PluginName e1y7j6vq1"
>
Amazon SQS
<DynamicWrapper
Expand All @@ -194,7 +194,7 @@ exports[`ProjectPluginRow renders 1`] = `
<span>
<Version>
<span
className="css-1det7j8-Version ectqpp3"
className="css-1det7j8-Version e1y7j6vq3"
>
v8.23.0.dev0
</span>
Expand Down
2 changes: 1 addition & 1 deletion tests/js/spec/views/projectPlugins/index.spec.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import {mount} from 'enzyme';

import ProjectPlugins from 'app/views/projectPlugins';
import ProjectPlugins from 'app/views/settings/projectPlugins';
import {fetchPlugins, enablePlugin, disablePlugin} from 'app/actionCreators/plugins';

jest.mock('app/actionCreators/plugins');
Expand Down
2 changes: 1 addition & 1 deletion tests/js/spec/views/projectPlugins/projectPlugins.spec.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {shallow} from 'enzyme';
import ProjectPlugins from 'app/views/projectPlugins/projectPlugins';
import ProjectPlugins from 'app/views/settings/projectPlugins/projectPlugins';

describe('ProjectPlugins', function() {
let wrapper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {mount} from 'enzyme';
import ProjectPluginRow from 'app/views/projectPlugins/projectPluginRow';
import ProjectPluginRow from 'app/views/settings/projectPlugins/projectPluginRow';

describe('ProjectPluginRow', function() {
let wrapper;
Expand Down