From 79097cecde9b066e75004bc5c6d3d031f1466ec5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gr=C3=A9goire=20Aubert?= <gregoire.aubert@sonarsource.com>
Date: Thu, 20 Dec 2018 15:52:35 +0100
Subject: [PATCH] Fix docs old version warning.

---
 .../src/layouts/components/Sidebar.js          | 18 +++++++++---------
 .../src/layouts/components/VersionSelect.js    | 10 ++--------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/server/sonar-docs/src/layouts/components/Sidebar.js b/server/sonar-docs/src/layouts/components/Sidebar.js
index cd5e7a8f515..a0614a27796 100644
--- a/server/sonar-docs/src/layouts/components/Sidebar.js
+++ b/server/sonar-docs/src/layouts/components/Sidebar.js
@@ -124,9 +124,11 @@ export default class Sidebar extends React.PureComponent {
   };
 
   render() {
-    const isOnCurrentVersion =
-      this.props.version === 'latest' ||
-      this.state.versions.find(v => v.value === this.props.version) !== undefined;
+    const { versions } = this.state;
+    const currentVersion = versions.find(v => v.current);
+    const selectedVersionValue =
+      currentVersion && this.props.version === 'latest' ? currentVersion.value : this.props.version;
+    const isOnCurrentVersion = !currentVersion || selectedVersionValue === currentVersion.value;
     return (
       <div className="page-sidebar">
         <div className="sidebar-header">
@@ -140,11 +142,10 @@ export default class Sidebar extends React.PureComponent {
             />
           </Link>
           <VersionSelect
-            location={this.props.location}
-            version={this.props.version}
-            versions={this.state.versions}
+            isOnCurrentVersion={isOnCurrentVersion}
+            selectedVersionValue={selectedVersionValue}
+            versions={versions}
           />
-
           {this.state.loaded &&
             !isOnCurrentVersion && (
               <div className="alert alert-warning">
@@ -160,8 +161,7 @@ export default class Sidebar extends React.PureComponent {
             onResultsChange={this.handleSearch}
             pages={this.props.pages}
           />
-          {this.state.query !== '' && this.renderResults()}
-          {this.state.query === '' && this.renderCategories(NavigationTree)}
+          {this.state.query !== '' ? this.renderResults() : this.renderCategories(NavigationTree)}
         </div>
         <div className="sidebar-footer">
           <a href="https://www.sonarqube.org/" rel="noopener noreferrer" target="_blank">
diff --git a/server/sonar-docs/src/layouts/components/VersionSelect.js b/server/sonar-docs/src/layouts/components/VersionSelect.js
index 6b4e1bdde28..f2f5b4472fc 100644
--- a/server/sonar-docs/src/layouts/components/VersionSelect.js
+++ b/server/sonar-docs/src/layouts/components/VersionSelect.js
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import fetch from 'isomorphic-fetch';
 import ChevronDownIcon from './icons/ChevronDownIcon';
 import ChevronUpIcon from './icons/ChevronUpIcon';
 import OutsideClickHandler from './OutsideClickHandler';
@@ -35,18 +34,13 @@ export default class VersionSelect extends React.PureComponent {
   };
 
   render() {
-    const { versions } = this.props;
+    const { isOnCurrentVersion, selectedVersionValue, versions } = this.props;
     const hasVersions = versions.length > 1;
-    const currentVersion = versions.find(v => v.current);
-    const versionLabel =
-      this.props.version === 'latest' && currentVersion ? currentVersion.value : this.props.version;
-    const isOnCurrentVersion =
-      !hasVersions || (currentVersion && versionLabel === currentVersion.value);
 
     return (
       <div className="version-select">
         <button onClick={this.handleClick} type="button">
-          Docs <span className={isOnCurrentVersion ? 'current' : ''}>{versionLabel}</span>
+          Docs <span className={isOnCurrentVersion ? 'current' : ''}>{selectedVersionValue}</span>
           {hasVersions && !this.state.open && <ChevronDownIcon size={10} />}
           {hasVersions && this.state.open && <ChevronUpIcon size={10} />}
         </button>
-- 
2.39.5