SONAR-8300 Create new "Projects" page [second iteration] (#1347)

3 files changed, 61 insertions, 11 deletions

diff --git a/server/sonar-web/src/main/js/apps/projects/components/App.js b/server/sonar-web/src/main/js/apps/projects/components/App.js
index b6abec6f45f..c86cd6935df 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/App.js
+++ b/server/sonar-web/src/main/js/apps/projects/components/App.js
@@ -22,7 +22,7 @@ import Helmet from 'react-helmet';
 import PageHeaderContainer from './PageHeaderContainer';
 import ProjectsListContainer from './ProjectsListContainer';
 import ProjectsListFooterContainer from './ProjectsListFooterContainer';
-import PageSidebar from './PageSidebar';
+import PageSidebarContainer from './PageSidebarContainer';
 import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer';
 import { parseUrlQuery } from '../store/utils';
 import '../styles.css';
@@ -73,7 +73,7 @@ export default class App extends React.Component {
               <ProjectsListFooterContainer query={this.state.query}/>
             </div>
             <aside className="page-sidebar-fixed">
-              <PageSidebar query={this.state.query}/>
+              <PageSidebarContainer query={this.state.query}/>
             </aside>
           </div>
         </div>
diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
index c250d97c141..705ade84aea 100644
--- a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
+++ b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js
@@ -18,19 +18,42 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import React from 'react';
-import CoverageFilterContainer from '../filters/CoverageFilterContainer';
-import DuplicationsFilterContainer from '../filters/DuplicationsFilterContainer';
-import SizeFilterContainer from '../filters/SizeFilterContainer';
-import QualityGateFilterContainer from '../filters/QualityGateFilterContainer';
+import { Link } from 'react-router';
+import CoverageFilter from '../filters/CoverageFilter';
+import DuplicationsFilter from '../filters/DuplicationsFilter';
+import SizeFilter from '../filters/SizeFilter';
+import QualityGateFilter from '../filters/QualityGateFilter';
+import ReliabilityFilter from '../filters/ReliabilityFilter';
+import SecurityFilter from '../filters/SecurityFilter';
+import MaintainabilityFilter from '../filters/MaintainabilityFilter';
+import { translate } from '../../../helpers/l10n';
 
 export default class PageSidebar extends React.Component {
+  static propTypes = {
+    query: React.PropTypes.object.isRequired,
+    closeAllFilters: React.PropTypes.func.isRequired
+  };
+
   render () {
+    const isFiltered = Object.keys(this.props.query).some(key => this.props.query[key] != null);
+
     return (
-        <div>
-          <CoverageFilterContainer query={this.props.query}/>
-          <DuplicationsFilterContainer query={this.props.query}/>
-          <SizeFilterContainer query={this.props.query}/>
-          <QualityGateFilterContainer query={this.props.query}/>
+        <div className="search-navigator-facets-list">
+          <ReliabilityFilter query={this.props.query}/>
+          <SecurityFilter query={this.props.query}/>
+          <MaintainabilityFilter query={this.props.query}/>
+          <CoverageFilter query={this.props.query}/>
+          <DuplicationsFilter query={this.props.query}/>
+          <SizeFilter query={this.props.query}/>
+          <QualityGateFilter query={this.props.query}/>
+
+          {isFiltered && (
+              <div className="projects-facets-reset">
+                <Link to="/projects" className="button button-red" onClick={this.props.closeAllFilters}>
+                  {translate('reset_verb')}
+                </Link>
+              </div>
+          )}
         </div>
     );
   }
diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageSidebarContainer.js b/server/sonar-web/src/main/js/apps/projects/components/PageSidebarContainer.js
new file mode 100644
index 00000000000..c61e554c94b
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/projects/components/PageSidebarContainer.js
@@ -0,0 +1,27 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import { connect } from 'react-redux';
+import PageSidebar from './PageSidebar';
+import { closeAllFilters } from '../store/filters/statuses/actions';
+
+export default connect(
+    () => ({}),
+    { closeAllFilters }
+)(PageSidebar);