From 279deef3e8534bba914245ccf10610a459073640 Mon Sep 17 00:00:00 2001
From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Fri, 3 Jan 2020 13:44:12 +0100
Subject: SONAR-12429 Fix 404 when opening embedded documentation in new tab

Cherry-pick of SC-1304
---
 server/sonar-web/src/main/js/apps/projectLinks/App.tsx       |  4 ++--
 .../projectLinks/__tests__/__snapshots__/App-test.tsx.snap   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'server/sonar-web/src/main/js/apps/projectLinks')

diff --git a/server/sonar-web/src/main/js/apps/projectLinks/App.tsx b/server/sonar-web/src/main/js/apps/projectLinks/App.tsx
index 4130098fc83..ab0b7fce8bc 100644
--- a/server/sonar-web/src/main/js/apps/projectLinks/App.tsx
+++ b/server/sonar-web/src/main/js/apps/projectLinks/App.tsx
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import Helmet from 'react-helmet';
+import { Helmet } from 'react-helmet-async';
 import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import { createLink, deleteLink, getProjectLinks } from '../../api/projectLinks';
@@ -92,7 +92,7 @@ export default class App extends React.PureComponent<Props, State> {
   render() {
     return (
       <div className="page page-limited">
-        <Helmet title={translate('project_links.page')} />
+        <Helmet defer={false} title={translate('project_links.page')} />
         <Header onCreate={this.handleCreateLink} />
         <DeferredSpinner loading={this.state.loading}>
           {this.state.links && <Table links={this.state.links} onDelete={this.handleDeleteLink} />}
diff --git a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/__snapshots__/App-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/__snapshots__/App-test.tsx.snap
index b817f3fbcfd..1062c8f90cd 100644
--- a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/__snapshots__/App-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/__snapshots__/App-test.tsx.snap
@@ -4,8 +4,8 @@ exports[`should create link 1`] = `
 <div
   className="page page-limited"
 >
-  <HelmetWrapper
-    defer={true}
+  <Helmet
+    defer={false}
     encodeSpecialCharacters={true}
     title="project_links.page"
   />
@@ -48,8 +48,8 @@ exports[`should delete link 1`] = `
 <div
   className="page page-limited"
 >
-  <HelmetWrapper
-    defer={true}
+  <Helmet
+    defer={false}
     encodeSpecialCharacters={true}
     title="project_links.page"
   />
@@ -86,8 +86,8 @@ exports[`should fetch links and render 1`] = `
 <div
   className="page page-limited"
 >
-  <HelmetWrapper
-    defer={true}
+  <Helmet
+    defer={false}
     encodeSpecialCharacters={true}
     title="project_links.page"
   />
-- 
cgit v1.2.3