diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/sonar-web/src/main/js/apps/background-tasks/main.js | 23 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/background-tasks/stats.js | 5 |
2 files changed, 20 insertions, 8 deletions
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/main.js b/server/sonar-web/src/main/js/apps/background-tasks/main.js index 02fa64391e1..521d3e36556 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/main.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/main.js @@ -171,8 +171,7 @@ export default React.createClass({ statusFilter: STATUSES.FAILED, currentsFilter: CURRENTS.ONLY_CURRENTS, activityPage: 1 - }, - this.requestActivity); + }, this.requestActivity); }, onTaskCanceled(task) { @@ -192,23 +191,31 @@ export default React.createClass({ <div className="page"> <Header/> - <Stats {...this.state} cancelPending={this.cancelPending} showFailures={this.showFailures}/> + <Stats + {...this.props} + {...this.state} + cancelPending={this.cancelPending} + showFailures={this.showFailures}/> - <Search {...this.props} {...this.state} + <Search + {...this.props} + {...this.state} refresh={this.requestData} onStatusChange={this.onStatusChange} onCurrentsChange={this.onCurrentsChange} onDateChange={this.onDateChange} onSearch={this.onSearch}/> - <Tasks {...this.props} + <Tasks + {...this.props} tasks={[].concat(this.state.queue, this.state.activity)} onTaskCanceled={this.onTaskCanceled} onFilter={this.handleFilter}/> - <ListFooter count={this.state.queue.length + this.state.activity.length} - total={this.state.queue.length + this.state.activityTotal} - loadMore={this.loadMore}/> + <ListFooter + count={this.state.queue.length + this.state.activity.length} + total={this.state.queue.length + this.state.activityTotal} + loadMore={this.loadMore}/> </div> ); } diff --git a/server/sonar-web/src/main/js/apps/background-tasks/stats.js b/server/sonar-web/src/main/js/apps/background-tasks/stats.js index 308d7e4d8a8..2383f8d76fa 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/stats.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/stats.js @@ -61,6 +61,11 @@ export default React.createClass({ if (this.props.failuresCount == null) { return null; } + + if (this.props.options.component) { + return null; + } + if (this.props.failuresCount > 0) { return ( <span> |