From 7f939f50b63f7c6ac7aab6d8fbb71a06193df0be Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Wed, 10 May 2017 10:32:33 +0200
Subject: [PATCH] Apply review comments

---
 .../src/main/js/app/components/extensions/Extension.js      | 4 +++-
 .../src/main/js/app/components/extensions/PortfoliosPage.js | 3 ---
 server/sonar-web/src/main/js/apps/code/components/App.js    | 2 +-
 .../apps/coding-rules/components/CodingRulesAppContainer.js | 2 +-
 .../js/apps/organizations/components/OrganizationDelete.js  | 5 +++--
 .../js/apps/organizations/components/OrganizationEdit.js    | 5 +++--
 .../__tests__/__snapshots__/OrganizationDelete-test.js.snap | 6 +++---
 .../__tests__/__snapshots__/OrganizationEdit-test.js.snap   | 6 +++---
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.js b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
index 7d05ab8840b..93dac302b0e 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/Extension.js
+++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
@@ -19,6 +19,7 @@
  */
 // @flow
 import React from 'react';
+import Helmet from 'react-helmet';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import { addGlobalErrorMessage } from '../../../store/globalMessages/duck';
@@ -31,7 +32,7 @@ type Props = {
   currentUser: Object,
   extension: {
     key: string,
-    title: string
+    name: string
   },
   location: { hash: string },
   onFail: string => void,
@@ -94,6 +95,7 @@ class Extension extends React.PureComponent {
   render() {
     return (
       <div>
+        <Helmet title={this.props.extension.name} />
         <div ref={container => (this.container = container)} />
       </div>
     );
diff --git a/server/sonar-web/src/main/js/app/components/extensions/PortfoliosPage.js b/server/sonar-web/src/main/js/app/components/extensions/PortfoliosPage.js
index 4e6da93deea..a7f96db6cf6 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/PortfoliosPage.js
+++ b/server/sonar-web/src/main/js/app/components/extensions/PortfoliosPage.js
@@ -19,14 +19,11 @@
  */
 // @flow
 import React from 'react';
-import Helmet from 'react-helmet';
 import GlobalPageExtension from './GlobalPageExtension';
-import { translate } from '../../../helpers/l10n';
 
 export default function PortfoliosPage(props: Object) {
   return (
     <div>
-      <Helmet title={translate('portfolios.page')} />
       <GlobalPageExtension
         location={props.location}
         params={{ pluginKey: 'governance', extensionKey: 'portfolios' }}
diff --git a/server/sonar-web/src/main/js/apps/code/components/App.js b/server/sonar-web/src/main/js/apps/code/components/App.js
index 1918cac2abf..a85387a0e5e 100644
--- a/server/sonar-web/src/main/js/apps/code/components/App.js
+++ b/server/sonar-web/src/main/js/apps/code/components/App.js
@@ -181,7 +181,7 @@ class App extends React.PureComponent {
 
     return (
       <div className="page page-limited">
-        <Helmet title={translate('code')} />
+        <Helmet title={translate('code.page')} />
 
         {error &&
           <div className="alert alert-danger">
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js b/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
index 52b1b29d6a1..020977d998a 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
@@ -72,7 +72,7 @@ class CodingRulesAppContainer extends React.PureComponent {
     // but react wants it to be there to unmount it
     return (
       <div>
-        <Helmet title={translate('rules')} />
+        <Helmet title={translate('coding_rules.page')} />
         <div ref="container" />
       </div>
     );
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationDelete.js b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationDelete.js
index 1cd73c0be0f..dbfce33a3fd 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationDelete.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationDelete.js
@@ -95,12 +95,13 @@ class OrganizationDelete extends React.PureComponent {
   }
 
   render() {
+    const title = translate('organization.delete');
     return (
       <div className="page page-limited">
-        <Helmet title={translate('delete')} />
+        <Helmet title={title} />
 
         <header className="page-header">
-          <h1 className="page-title">{translate('organization.delete')}</h1>
+          <h1 className="page-title">{title}</h1>
           <div className="page-description">{translate('organization.delete.description')}</div>
         </header>
 
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationEdit.js b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationEdit.js
index e108da282a5..a75fd2d9444 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/OrganizationEdit.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/OrganizationEdit.js
@@ -95,12 +95,13 @@ class OrganizationEdit extends React.PureComponent {
   };
 
   render() {
+    const title = translate('organization.edit');
     return (
       <div className="page page-limited">
-        <Helmet title={translate('edit')} />
+        <Helmet title={title} />
 
         <header className="page-header">
-          <h1 className="page-title">{translate('organization.edit')}</h1>
+          <h1 className="page-title">{title}</h1>
         </header>
 
         <form onSubmit={this.handleSubmit}>
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationDelete-test.js.snap b/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationDelete-test.js.snap
index fa13f06a074..4762fa4e4d9 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationDelete-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationDelete-test.js.snap
@@ -5,7 +5,7 @@ exports[`smoke test 1`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="delete"
+    title="organization.delete"
   />
   <header
     className="page-header"
@@ -38,7 +38,7 @@ exports[`smoke test 2`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="delete"
+    title="organization.delete"
   />
   <header
     className="page-header"
@@ -119,7 +119,7 @@ exports[`smoke test 3`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="delete"
+    title="organization.delete"
   />
   <header
     className="page-header"
diff --git a/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationEdit-test.js.snap b/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationEdit-test.js.snap
index 9fe30235a62..86dcb2b5556 100644
--- a/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationEdit-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/organizations/components/__tests__/__snapshots__/OrganizationEdit-test.js.snap
@@ -5,7 +5,7 @@ exports[`smoke test 1`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="edit"
+    title="organization.edit"
   />
   <header
     className="page-header"
@@ -136,7 +136,7 @@ exports[`smoke test 2`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="edit"
+    title="organization.edit"
   />
   <header
     className="page-header"
@@ -282,7 +282,7 @@ exports[`smoke test 3`] = `
   className="page page-limited"
 >
   <HelmetWrapper
-    title="edit"
+    title="organization.edit"
   />
   <header
     className="page-header"
-- 
2.39.5