diff options
Diffstat (limited to 'server/sonar-web/src/main/js/apps/security-hotspots')
5 files changed, 8 insertions, 15 deletions
diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsApp.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsApp.tsx index fce568a6aed..83b805bd143 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsApp.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsApp.tsx @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { Location } from 'history'; import { flatMap, range } from 'lodash'; import * as React from 'react'; import { getMeasures } from '../../api/measures'; import { getSecurityHotspotList, getSecurityHotspots } from '../../api/security-hotspots'; import withBranchStatusActions from '../../app/components/branch-status/withBranchStatusActions'; +import withComponentContext from '../../app/components/componentContext/withComponentContext'; import withCurrentUserContext from '../../app/components/current-user/withCurrentUserContext'; -import { Router } from '../../components/hoc/withRouter'; +import { Location, Router, withRouter } from '../../components/hoc/withRouter'; import { getLeakValue } from '../../components/measure/utils'; import { getBranchLikeQuery, isPullRequest, isSameBranchLike } from '../../helpers/branch-like'; import { KeyboardKeys } from '../../helpers/keycodes'; @@ -550,4 +550,6 @@ export class SecurityHotspotsApp extends React.PureComponent<Props, State> { } } -export default withCurrentUserContext(withBranchStatusActions(SecurityHotspotsApp)); +export default withRouter( + withComponentContext(withCurrentUserContext(withBranchStatusActions(SecurityHotspotsApp))) +); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx index a4c025191a9..92c6afdd267 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Link } from 'react-router'; +import { Link } from 'react-router-dom'; import { translate } from '../../../helpers/l10n'; import { getBaseUrl } from '../../../helpers/system'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx index 6e3aa2bfd65..7dd943896f6 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx @@ -19,7 +19,7 @@ */ import React from 'react'; -import { Link } from 'react-router'; +import { Link } from 'react-router-dom'; import { translate } from '../../../helpers/l10n'; import { getRuleUrl } from '../../../helpers/urls'; import { Hotspot, HotspotStatusOption } from '../../../types/security-hotspots'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/EmptyHotspotsPage-test.tsx.snap b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/EmptyHotspotsPage-test.tsx.snap index 9ea274c206a..5ca002b074f 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/EmptyHotspotsPage-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/EmptyHotspotsPage-test.tsx.snap @@ -22,8 +22,6 @@ exports[`should render correctly 1`] = ` </div> <Link className="big-spacer-top" - onlyActiveOnIndex={false} - style={Object {}} target="_blank" to={ Object { @@ -58,8 +56,6 @@ exports[`should render correctly: file 1`] = ` </div> <Link className="big-spacer-top" - onlyActiveOnIndex={false} - style={Object {}} target="_blank" to={ Object { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotHeader-test.tsx.snap index eb76f5685b9..47b62f17a02 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotHeader-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotHeader-test.tsx.snap @@ -22,16 +22,11 @@ exports[`should render correctly 1`] = ` </span> <Link className="small" - onlyActiveOnIndex={false} - style={Object {}} target="_blank" to={ Object { "pathname": "/coding_rules", - "query": Object { - "open": "squid:S2077", - "rule_key": "squid:S2077", - }, + "search": "?open=squid%3AS2077&rule_key=squid%3AS2077", } } > |