SONAR-7191 fix backrgound tasks page

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.js b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.js
new file mode 100644 (file)
index 0000000..3fbf337
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.js
@@ -0,0 +1,35 @@
+/*
+ * 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 React from 'react';
+
+import { translate } from '../../../helpers/l10n';
+
+export default function Header () {
+  return (
+      <header className="page-header">
+        <h1 className="page-title">
+          {translate('background_tasks.page')}
+        </h1>
+        <p className="page-description">
+          {translate('background_tasks.page.description')}
+        </p>
+      </header>
+  );
+}

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/header.js b/server/sonar-web/src/main/js/apps/background-tasks/components/header.js
deleted file mode 100644 (file)
index 3fbf337..0000000
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/header.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 React from 'react';
-
-import { translate } from '../../../helpers/l10n';
-
-export default function Header () {
-  return (
-      <header className="page-header">
-        <h1 className="page-title">
-          {translate('background_tasks.page')}
-        </h1>
-        <p className="page-description">
-          {translate('background_tasks.page.description')}
-        </p>
-      </header>
-  );
-}

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/stats.js b/server/sonar-web/src/main/js/apps/background-tasks/components/stats.js
index d59e40bf0efb2481b3efe3ad2f0e2ff68c56a05c..2fc18a7bd75130fb946cc9bfaedcd9c65066cd26 100644 (file)
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/stats.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/stats.js
@@ -90,7 +90,7 @@ export default class Stats extends Component {
       return null;
     }
 
-    if (this.props.options && this.props.options.component) {
+    if (this.props.component) {
       return null;
     }
 

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/containers/StatsContainer.js b/server/sonar-web/src/main/js/apps/background-tasks/containers/StatsContainer.js
index f1828926628d0fe6144d728a310dcb81898daeaa..86fa2952825e9e7432432db74707c9ac027944b9 100644 (file)
--- a/server/sonar-web/src/main/js/apps/background-tasks/containers/StatsContainer.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/containers/StatsContainer.js
@@ -27,7 +27,8 @@ function mapStateToProps (state) {
   return {
     pendingCount: state.pendingCount,
     failingCount: state.failingCount,
-    inProgressDuration: state.inProgressDuration
+    inProgressDuration: state.inProgressDuration,
+    component: state.component
   };
 }